Fix merge from colorscheme clash

6 files changed, 17 insertions, 9 deletions

diff --git a/fish2024/config.fish b/fish2024/config.fish
index d9d67d3..abe69b1 100644
--- a/fish2024/config.fish
+++ b/fish2024/config.fish
@@ -1,4 +1,5 @@
 if status is-interactive
-  set -gx EDITOR nvim
     # Commands to run in interactive sessions can go here
+  set -gx EDITOR nvim
+  set -gx LEDGER_FILE $HOME/Budget/hledger/budget.ledger
 end
diff --git a/fish2024/functions/_extract_description_from_task.fish b/fish2024/functions/_extract_description_from_task.fish
new file mode 100644
index 0000000..0b82d9d
--- /dev/null
+++ b/fish2024/functions/_extract_description_from_task.fish
@@ -0,0 +1,5 @@
+function _extract_description_from_task --description 'Given a taskwarrior task ID, it returns the description of the task and adds it to clipboard'
+  set desc (task $argv[1] |grep Description |cut -d' ' -f4-)
+  echo $desc |xclip
+  echo $desc
+end
diff --git a/fish2024/functions/gitrepos.fish b/fish2024/functions/gitrepos.fish
index ef940cd..bf009a4 100644
--- a/fish2024/functions/gitrepos.fish
+++ b/fish2024/functions/gitrepos.fish
@@ -1,4 +1,5 @@
-function gitrepos --wraps='ssh git@joannalemon.com "tree -L 2 repositories"' --description 'alias gitrepos=ssh git@joannalemon.com "tree -L 2 repositories"'
-  ssh git@joannalemon.com "tree -L 2 repositories" $argv
+function gitrepos --wraps='ssh git@joannalemon.com "tree -L 2 repositories"' --wraps='ssh git@joannalemon.com "find repositories/ -maxdepth 2 -type d|cut -d/ -f2-"' --description 'alias gitrepos=ssh git@joannalemon.com "find repositories/ -maxdepth 2 -type d|cut -d/ -f2-"'
+  # ssh git@joannalemon.com "tree -L 2 repositories" $argv
+  ssh git@joannalemon.com "find repositories/ -maxdepth 2 -type d|cut -d/ -f2-"
         
 end
diff --git a/i3-laptop-config b/i3-laptop-config
index 381298c..956dc19 100644
--- a/i3-laptop-config
+++ b/i3-laptop-config
@@ -73,8 +73,9 @@ floating_modifier $mod
 #exec --no-startup-id nm-applet
 #exec --no-startup-id /usr/bin/qjackctl
 #exec --no-startup-id /usr/bin/nextcloud
-exec --no-startup-id /usr/bin/feh --bg-max /home/lemon/Pictures/Wallpapers/wp2015908-dystopia-wallpapers.jpg
-exec --no-startup-id /usr/bin/feh --bg-max /home/lemon/Pictures/Wallpapers/IMG_20191030_111003_Bokeh.jpg
+#exec --no-startup-id /usr/bin/feh --bg-max /home/lemon/Pictures/Wallpapers/wp2015908-dystopia-wallpapers.jpg
+#exec --no-startup-id /usr/bin/feh --bg-max /home/lemon/Pictures/Wallpapers/IMG_20191030_111003_Bokeh.jpg
+exec --no-startup-id /usr/bin/feh --bg-max /home/lemon/Pictures/Wallpapers/gnu-linux-simple-wallpaper.png
 #exec --no-startup-id /home/lemon/.screenlayout/two_screens_normal.sh
 #exec --no-startup-id /home/lemon/.screenlayout/desktop_layout_debian.sh
 exec --no-startup-id /home/lemon/.screenlayout/left_horiz_right_vert.sh
diff --git a/mutt/mailcap b/mutt/mailcap
index ee5877e..f189bbd 100644
--- a/mutt/mailcap
+++ b/mutt/mailcap
@@ -15,8 +15,8 @@ application/pdf; ~/.mutt/view_attachment.sh %s pdf zathura
 #text/html; ~/.mutt/view_attachment.sh %s html w3m # try different
 # text/html; w3m %s; nametemplate=%s.html
 # text/html; w3m -dump %s; nametemplate=%s.html; copiousoutput
-# text/html; lynx -dump %s; nametemplate=%s.html; copiousoutput
-text/html; firefox %s & sleep 3; description=HTML Text; test=test -n "$DISPLAY";  nametemplate=%s.html
+text/html; lynx -dump %s; nametemplate=%s.html; copiousoutput
+#text/html; firefox %s & sleep 3; description=HTML Text; test=test -n "$DISPLAY";  nametemplate=%s.html
 
 # Plain Text
 text/plain; cat; copiousoutput; edit=$VISUAL %s 
diff --git a/vim/vimrc b/vim/vimrc
index 9ada02d..07c9375 100644
--- a/vim/vimrc
+++ b/vim/vimrc
@@ -317,8 +317,8 @@ let g:gruvbox_improved_warnings = 1
 let g:gruvbox_invert_indent_guides = 1
 let g:gruvbox_invert_signs = 1
 "colorscheme evening
-" colorscheme sitruuna
-colorscheme ayu
+colorscheme sitruuna
+"colorscheme ayu
 "colorscheme gruvbox
 " }}}
 " GPG files {{{