update

9 files changed, 71 insertions, 41 deletions

diff --git a/fish/config.fish b/fish/config.fish
index 08341bc..40af5f9 100644
--- a/fish/config.fish
+++ b/fish/config.fish
@@ -19,7 +19,6 @@ set -gx TERM screen-256color
 set -gx SHELL /usr/bin/fish
 set -gx LESS '-iMRS -x2'
 set -gx PATH ~/.local/bin $PATH
-set -gx PATH ~/scripts $PATH
 set -gx PATH ~/bin $PATH
 
 set -gx BOOKMARK_PY_SMTP_HOST smtp.fastmail.com
@@ -35,7 +34,7 @@ set -gx FZF_DEFAULT_OPTS '--color info:108,prompt:109,spinner:108,pointer:168,ma
 #set -gx FZF_DEFAULT_OPTS '--color=bw'
 
 #source /usr/local/share/fish/functions/fzf-key-bindings.fish
-fzf_key_bindings
+#fzf_key_bindings
 
 # OPAM configuration
 #source /home/lemon/.opam/opam-init/init.fish > /dev/null 2> /dev/null or true
diff --git a/fish/fish_variables b/fish/fish_variables
index a4412f5..98a4cb7 100644
--- a/fish/fish_variables
+++ b/fish/fish_variables
@@ -10,35 +10,46 @@ SETUVAR __fish_init_2_39_8:\x1d
 SETUVAR __fish_init_2_3_0:\x1d
 SETUVAR __fish_init_3_x:\x1d
 SETUVAR __fish_initialized:3400
-SETUVAR fish_color_autosuggestion:555\x1ebrblack
-SETUVAR fish_color_cancel:\x2dr
-SETUVAR fish_color_command:005fd7
-SETUVAR fish_color_comment:990000
-SETUVAR fish_color_cwd:green
-SETUVAR fish_color_cwd_root:red
+SETUVAR _fish_abbr_bud:cd\x20\x7e/Documents/Budget/ledger/hledger
+SETUVAR fish_color_autosuggestion:666
+SETUVAR fish_color_cancel:\x2d\x2dreverse
+SETUVAR fish_color_command:normal
+SETUVAR fish_color_comment:888\x1e\x2d\x2ditalics
+SETUVAR fish_color_cwd:0A0
+SETUVAR fish_color_cwd_root:A00
 SETUVAR fish_color_end:009900
-SETUVAR fish_color_error:ff0000
-SETUVAR fish_color_escape:00a6b2
-SETUVAR fish_color_history_current:\x2d\x2dbold
+SETUVAR fish_color_error:F22
+SETUVAR fish_color_escape:0AA
+SETUVAR fish_color_history_current:0AA
 SETUVAR fish_color_host:normal
-SETUVAR fish_color_host_remote:yellow
-SETUVAR fish_color_match:\x2d\x2dbackground\x3dbrblue
-SETUVAR fish_color_normal:normal
-SETUVAR fish_color_operator:00a6b2
-SETUVAR fish_color_param:00afff
-SETUVAR fish_color_quote:999900
-SETUVAR fish_color_redirection:00afff
-SETUVAR fish_color_search_match:bryellow\x1e\x2d\x2dbackground\x3dbrblack
-SETUVAR fish_color_selection:white\x1e\x2d\x2dbold\x1e\x2d\x2dbackground\x3dbrblack
+SETUVAR fish_color_host_remote:\x1d
+SETUVAR fish_color_keyword:\x1d
+SETUVAR fish_color_match:0AA
+SETUVAR fish_color_normal:B2B2B2
+SETUVAR fish_color_operator:0AA
+SETUVAR fish_color_option:\x1d
+SETUVAR fish_color_param:ccccff
+SETUVAR fish_color_quote:9ce781
+SETUVAR fish_color_redirection:FFF
+SETUVAR fish_color_search_match:\x2d\x2dbackground\x3d533
+SETUVAR fish_color_selection:\x2d\x2dbackground\x3dB218B2
 SETUVAR fish_color_status:red
 SETUVAR fish_color_user:brgreen
 SETUVAR fish_color_valid_path:\x2d\x2dunderline
 SETUVAR fish_greeting:
 SETUVAR fish_key_bindings:fish_default_key_bindings
-SETUVAR fish_pager_color_completion:normal
-SETUVAR fish_pager_color_description:B3A06D\x1eyellow
-SETUVAR fish_pager_color_prefix:white\x1e\x2d\x2dbold\x1e\x2d\x2dunderline
-SETUVAR fish_pager_color_progress:brwhite\x1e\x2d\x2dbackground\x3dcyan
-SETUVAR fish_pager_color_selected_background:\x2dr
+SETUVAR fish_pager_color_background:\x1d
+SETUVAR fish_pager_color_completion:BBB
+SETUVAR fish_pager_color_description:666
+SETUVAR fish_pager_color_prefix:0AA\x1e\x2d\x2dunderline
+SETUVAR fish_pager_color_progress:0AA
+SETUVAR fish_pager_color_secondary_background:\x1d
+SETUVAR fish_pager_color_secondary_completion:\x1d
+SETUVAR fish_pager_color_secondary_description:\x1d
+SETUVAR fish_pager_color_secondary_prefix:\x1d
+SETUVAR fish_pager_color_selected_background:\x2d\x2dbackground\x3d333
+SETUVAR fish_pager_color_selected_completion:\x1d
+SETUVAR fish_pager_color_selected_description:\x1d
+SETUVAR fish_pager_color_selected_prefix:\x1d
 SETUVAR fish_user_paths:/home/lemon/go/bin
 SETUVAR fisher_dependency_count:Colored\x2dMan\x2dPages\x1ebass
diff --git a/fish/functions/fish_prompt.fish b/fish/functions/fish_prompt.fish
index 57a3c21..c4e8847 100644
--- a/fish/functions/fish_prompt.fish
+++ b/fish/functions/fish_prompt.fish
@@ -1,13 +1,21 @@
-# Defined in /tmp/fish.OarydH/fish_prompt.fish @ line 2
-function fish_prompt --description 'Write out the prompt'
-	if not set -q __fish_prompt_normal
-        set -g __fish_prompt_normal (set_color normal)
+function fish_prompt
+    # This is a simple prompt. It looks like
+    # alfa@nobby /path/to/dir $
+    # with the path shortened and colored
+    # and a "#" instead of a "$" when run as root.
+    set -l symbol ' $ '
+    set -l color $fish_color_cwd
+    if fish_is_root_user
+        set symbol ' # '
+        set -q fish_color_cwd_root
+        and set color $fish_color_cwd_root
     end
 
-    if not set -q __fish_prompt_cwd
-        set -g __fish_prompt_cwd (set_color $fish_color_cwd)
-    end
+    echo -n $USER@$hostname
+
+    set_color $color
+    echo -n (prompt_pwd)
+    set_color normal
 
-    #    echo -n -s "$USER" @ (prompt_hostname) ' ' "$__fish_prompt_cwd" (prompt_pwd) (__fish_vcs_prompt) "$__fish_prompt_normal" ' ' (task +in +PENDING count) '> '
-        echo -n -s "$USER" @ (prompt_hostname) ' ' "$__fish_prompt_cwd" (prompt_pwd) (__fish_vcs_prompt) "$__fish_prompt_normal"'> '
+    echo -n $symbol
 end
diff --git a/ledgerrc b/ledgerrc
new file mode 100644
index 0000000..e786808
--- /dev/null
+++ b/ledgerrc
@@ -0,0 +1,4 @@
+--strict
+--file ~/Documents/Budget/ledger/2022/ledger_budget/budget.ldg
+--start-of-week=1
+--pretty
diff --git a/mutt/mailcap b/mutt/mailcap
index 9f40b57..f4ff4fe 100644
--- a/mutt/mailcap
+++ b/mutt/mailcap
@@ -12,7 +12,7 @@ image/gif; ~/.mutt/view_attachment.sh %s gif feh
 text/x-patch; vimdiff '%s'; needsterminal
 
 # PDFs
-application/pdf; ~/.mutt/view_attachment.sh %s pdf zathura
+application/pdf; ~/.mutt/view_attachment.sh %s pdf evince
 
 # HTML
 #text/html; ~/.mutt/view_attachment.sh %s html w3m # try different
diff --git a/mutt/view_attachment.sh b/mutt/view_attachment.sh
index 1ff52ea..a7651b4 100755
--- a/mutt/view_attachment.sh
+++ b/mutt/view_attachment.sh
@@ -1,4 +1,4 @@
-#!/usr/local/bin/bash
+#!/usr/bin/bash
 #
 # Author:  Eric Gebhart
 #
diff --git a/taskrc b/taskrc
index 947de08..c8662fd 100644
--- a/taskrc
+++ b/taskrc
@@ -51,7 +51,7 @@ weekstart=Monday
 #include /usr/share/taskwarrior/dark-gray-256.theme
 #include /usr/share/taskwarrior/dark-gray-blue-256.theme
 #include /usr/share/taskwarrior/solarized-dark-256.theme
-include /usr/share/taskwarrior/solarized-light-256.theme
+include /usr/share/doc/task/rc/solarized-light-256.theme
 #include /usr/local/share/doc/taskwarrior/rc/no-color.theme
 #include /home/lemon/.task/solarized-16.theme
 #include /home/lemon/.task/solarized-dark-256.theme
diff --git a/urlview b/urlview
new file mode 100644
index 0000000..6eb8d57
--- /dev/null
+++ b/urlview
@@ -0,0 +1 @@
+COMMAND firefox %s &
diff --git a/vim/vimrc b/vim/vimrc
index 64e879b..1ad1d01 100644
--- a/vim/vimrc
+++ b/vim/vimrc
@@ -143,6 +143,7 @@ autocmd BufLeave * call s:copy_filename_as_mdlink()
 " vim-plug
 call plug#begin('~/.vim/plugged')
 Plug 'morhetz/gruvbox'
+Plug 'sickill/vim-monokai'
 Plug 'ledger/vim-ledger'
 Plug 'ycm-core/YouCompleteMe'
 "Plug 'prabirshrestha/vim-lsp'
@@ -175,6 +176,11 @@ Plug 'powerman/vim-plugin-AnsiEsc'
 "Plug 'majutsushi/tagbar'
 call plug#end()
 
+" Ultisnips
+let g:UltiSnipsExpandTrigger="<c-space>"
+let g:UltiSnipsJumpForwardTrigger="<c-j>"
+let g:UltiSnipsJumpBackwardTrigger="<c-k>"
+
 " YouCompleteMe
 let g:ycm_python_interpreter_path = '.venv/bin/python3'
 let g:ycm_python_sys_path = []
@@ -191,9 +197,10 @@ nnoremap <leader>jd :YcmCompleter GoTo<CR>
 " the mappings below are from vim-test
 " https://github.com/vim-test/vim-test
 " dispatch opens send test output to quickfix window
-" let test#strategy = "vimterminal"
 let test#strategy = "basic"
-let test#python#runner = "pytest"
+"let test#strategy = "basic"
+let test#python#runner = "djangotest"
+"let test#project_root = "./dbasik/"
 let test#vim#term_position = "topleft 10"
 " let test#python#pytest#options = '-vvv --tb=short'
 let test#python#pytest#options = '--tb=short'
@@ -468,7 +475,7 @@ let g:gruvbox_number_column='bg0'
 let g:gruvbox_invert_signs='0'
 let g:gruvbox_improved_strings='0'
 set background=dark
-colorscheme gruvbox
+colorscheme monokai
 "colorscheme delek
 "
 " manual highlights
@@ -503,4 +510,4 @@ augroup languages
     autocmd FileType html :syntax sync fromstart
     autocmd FileType html,javascript,css,json,yaml,sh
                 \ setlocal ts=2 sts=2 sw=2 expandtab
-augroup ENDj
+augroup END