roles/dotfiles/files/fish/config.fish

@@ -8,7 +8,6 @@ if status --is-login
 end
 
 fundle plugin 'edc/bass'
-fundle plugin 'danhper/fish-ssh-agent'
 fundle init
 # run `fundle install` in the terminal
 
@@ -24,8 +23,6 @@ if test -e /home/rothe/catkin_ws/install/setup.bash
 	bass source ~/.profile
 end
 
-fish_add_path ~/go/bin/
-fish_add_path ~/bin/
+set -Ua fish_user_paths ~/go/bin/
 
-# set work specific stuff in there like GIT_AUTHOR_EMAIL and JIRA_API_TOKEN
-bass source ~/.profile
+eval (keychain --eval --agents ssh)

roles/dotfiles/files/i3_config

@@ -1,17 +1,15 @@
-	set $mod Mod4
+set $mod Mod4
 
-	font pango:Roboto Medium 8
+font pango:Roboto Medium 8
 
 
-	# xss-lock grabs a logind suspend inhibit lock and will use i3lock to lock the
-	# screen before suspend. Use loginctl lock-session to lock your screen.
-	exec --no-startup-id xss-lock --transfer-sleep-lock -- i3lock --nofork
+# xss-lock grabs a logind suspend inhibit lock and will use i3lock to lock the
+# screen before suspend. Use loginctl lock-session to lock your screen.
+exec --no-startup-id xss-lock --transfer-sleep-lock -- i3lock --nofork
 
-	# NetworkManager is the most popular way to manage wireless networks on Linux,
-	# and nm-applet is a desktop environment-independent system tray GUI for it.
-	exec --no-startup-id nm-applet
-
-	exec --no-startup-id "setxkbmap de"
+# NetworkManager is the most popular way to manage wireless networks on Linux,
+# and nm-applet is a desktop environment-independent system tray GUI for it.
+exec --no-startup-id nm-applet
 
 # Use pactl to adjust volume in PulseAudio.
 set $refresh_i3status killall -SIGUSR1 i3status
@@ -30,7 +28,7 @@ new_window 1pixel
 bindsym $mod+Return exec gnome-terminal
 
 # set background
-exec --no-startup-id "hsetroot -center ~/pictures/wallpaper/voxel-city-by-huntingfluff.jpg"
+exec --no-startup-id "hsetroot -center ~/pictures/wallpaper/malle.png"
 
 # lock
 bindsym Mod1+l exec i3lock-fancy

roles/dotfiles/files/tmux.conf

@@ -38,5 +38,3 @@ set-window-option -g window-status-bell-style fg=colour232,bg=colour253
 # Correct colors
 set -g default-terminal "tmux-256color"
 set -ga terminal-overrides ",*256col*:Tc"
-
-set -g history-limit 150000

roles/dotfiles/files/vimrc

@@ -49,7 +49,6 @@ Plug 'luochen1990/rainbow'
 Plug 'psf/black', {'branch': 'main'}
 Plug 'fisadev/vim-isort'
 Plug 'jvirtanen/vim-hcl' " HCL files used by terraform
-Plug 'hashivim/vim-terraform'
 " show git diff in sign column
 Plug 'airblade/vim-gitgutter'
 " Themes
@@ -108,10 +107,3 @@ let g:rainbow_active = 1
 
 " vim-go
 let g:go_def_mapping_enabled = 0
-
-" terraform
-let g:terraform_fmt_on_save = 1
-let g:terraform_align = 1
-
-"underline spell errors in terminals
-hi SpellBad ctermfg=218 cterm=underline

roles/dotfiles/tasks/main.yml

@@ -2,12 +2,11 @@
 # Install base packages
 - name: Install necessary packages
   become: yes
-  become_method: sudo
+  become_method: su
   become_user: root
   apt:
     name:
       - ack
-      - arandr
       - bat
       - black  # code formatting
       - bsdmainutils  # ncal calendar
@@ -28,10 +27,8 @@
       - ripgrep
       - rofi  # dmenu replacement
       - scrot  # screenshot
-      - shellcheck
       - tmux
       - vim
-      - vim-nox
     state: present
     cache_valid_time: 3600
 
@@ -75,7 +72,6 @@
     - '{{ home }}/.config/i3/'
     - '{{ home }}/.config/i3status/'
     - '{{ home }}/.config/rofi/'
-    - '{{ home }}/.config/tmux/'
     - '{{ home }}/.ssh/'
     - '{{ home }}/pictures/shots/'
     - '{{ home }}/.gnupg/'
@@ -96,7 +92,7 @@
     - src: '{{ files_dir }}/rofi_config'
       dest: '{{ home }}/.config/rofi/config.rasi'
     - src: '{{ files_dir }}/tmux.conf'
-      dest: '{{ home }}/.config/tmux/tmux.conf'
+      dest: '{{ home }}/.tmux.conf'
     - src: '{{ files_dir }}/ssh_config'
       dest: '{{ home }}/.ssh/config'
     - src: '{{ files_dir }}/fish'