.gitignore

@@ -3,5 +3,3 @@ id_rsa.pub
 id_rsa-cert.pub
 known_hosts
 fish_variables
-roles/dotfiles/files/fish/functions/fundle.fish
-roles/dotfiles/files/fish/fundle/

roles/dotfiles/files/fish/config.fish

@@ -7,20 +7,4 @@ if status --is-login
   end
 end
 
-fundle plugin 'edc/bass'
-fundle init
-# run `fundle install` in the terminal
-
-# bass to run utilities written in for bash in fish
-if test -e /opt/ros/noetic/setup.bash
-	bass source /opt/ros/noetic/setup.bash
-end
-if test -e /home/rothe/catkin_ws/install/setup.bash
-	bass source /home/rothe/catkin_ws/install/setup.bash
-end
-
-if test -e /home/rothe/catkin_ws/install/setup.bash
-	bass source ~/.profile
-end
-
-eval (keychain --eval --agents ssh)
+eval (keychain --eval --agents ssh,gpg 82CD152AAAE9CAF77EACB29E73F092605AF3286C)

roles/dotfiles/files/i3_config

@@ -37,7 +37,7 @@ bindsym Mod1+l exec i3lock-fancy
 bindsym Mod1+s exec i3lock-fancy  && systemctl suspend
 
 # screenshot
-bindsym --release Print exec "flameshot gui -p '/home/rothe/pictures/shots/'"
+bindsym --release Print exec "scrot -s '%Y-%m-%d-%H-%M-%S.png' -e 'mv $f ~/pictures/shots/'"
 
 # kill focused window
 bindsym $mod+Shift+q kill

roles/dotfiles/files/vimrc

@@ -5,11 +5,11 @@ set cursorline
 syntax on
 
 " python
-au BufNewFile,BufRead *.py,*.go set tabstop=4 softtabstop=4 shiftwidth=4
-			\ expandtab autoindent fileformat=unix
-au BufNewFile,BufRead *.yaml,*.tf set tabstop=2 softtabstop=2 shiftwidth=2
-			\ expandtab autoindent fileformat=unix
-au BufNewFile,BufRead *.html,*.css set tabstop=2 softtabstop=2 shiftwidth=2
+au BufNewFile,BufRead *.py,*.go set tabstop=4 softtabstop=4 shiftwidth=4 
+			\ textwidth=79 expandtab autoindent fileformat=unix
+au BufNewFile,BufRead *.yaml set tabstop=2 softtabstop=2 shiftwidth=2 
+			\ textwidth=79 expandtab autoindent fileformat=unix
+au BufNewFile,BufRead *.html,*.css set tabstop=2 softtabstop=2 shiftwidth=2 
 			\ expandtab autoindent colorcolumn=0
 au BufNewFile,BufRead *.launch set filetype=xml
 
@@ -26,7 +26,6 @@ Plug 'junegunn/fzf', { 'do': { -> fzf#install() } }
 Plug 'junegunn/fzf.vim'
 Plug 'luochen1990/rainbow'
 Plug 'psf/black'
-Plug 'jvirtanen/vim-hcl' " HCL files used by terraform
 " show git diff in sign column
 Plug 'airblade/vim-gitgutter'
 " Themes

roles/dotfiles/tasks/main.yml

@@ -8,10 +8,8 @@
     name:
       - ack
       - black  # code formatting
-      - bsdmainutils  # ncal calendar
       - feh  # set background
       - fish
-      - flameshot
       - fonts-roboto
       - fzf
       - htop
@@ -20,6 +18,7 @@
       - i3
       - i3lock-fancy
       - keychain
+      - ncal
       - pass
       - python3-pylint-common
       - pulseaudio-utils  # pactl volume control