uncontrolled update - removes xi and xq fish funcs

11 files changed, 131 insertions, 48 deletions

diff --git a/Xresources b/Xresources
index b6e8054..ccb0445 100644
--- a/Xresources
+++ b/Xresources
@@ -10,7 +10,7 @@
 /* xterm*fontSize: 12 */
 /* xterm*faceName:     unifont */
 /* xterm*faceSize:10 */
-/* xterm*font: terminus-16 */
+/* xterm*faceName: terminus-16 */
 /* xterm*font: terminus-18 */
 /* xterm*faceName:  Hack Nerd Font Mono */
 xterm*faceSize: 14
@@ -22,8 +22,9 @@ XTerm*colorBDMode: false
 XTerm*colorULMode: false
 /* XTerm*cursorColor: black */
 /* xterm*boldFont: terminus-16 */
-/* xterm*faceName: Iosevka Nerd Font Mono */
-xterm*faceName: Ubuntu Mono
+/* xterm*faceName: Hack Nerd Font */
+xterm*faceName: Iosevka Nerd Font Mono
+/* xterm*faceName: Ubuntu Mono */
 /* xterm*faceName: "Jetbrains Mono Nerd Mono" */
 /* xterm*faceName: "Cascadia Code Nerd Font" */
 /* xterm*faceName: "Jetbrains Mono Nerd Font" */
diff --git a/bashrc b/bashrc
index e1a7f9f..8ebf63c 100644
--- a/bashrc
+++ b/bashrc
@@ -80,7 +80,8 @@ set -o noclobber
 
 # aliases
 alias c='printf "\e[H\e[2J"'
-alias xterm-blue='xterm -bg Dark\ Slate\ Blue -fg white'
+alias xterm-blue='xterm -bg Dark\ Slate\ Blue -fg white -fa -*-fixed-*-*-*-*-20-*-*-*-*-*-iso8859-*'
+alias xterm-lastmiles='xterm -bg black -fg white -fa terminus'
 alias temp='cd $(mktemp -d)'
 alias am='append_to_masterlist'
 alias annex-sync='cd ~/annex/ && git annex sync && cd -'
@@ -364,5 +365,7 @@ ytmp3-split-to-chapters() {
   if [ -z "$1" ]; then print "I need a valid YouTube URL.\n"; fi
     yt-dlp -f 'bestaudio' -x --audio-format mp3 --split-chapters -o '%(title)s.%(ext)s' "$1" && cd - || return
 }
+
 . "$HOME/.cargo/env"
+
 eval "$(direnv hook bash)"
diff --git a/fish2024/functions/tcompweek.fish b/fish2024/functions/tcompweek.fish
new file mode 100644
index 0000000..fdf93d3
--- /dev/null
+++ b/fish2024/functions/tcompweek.fish
@@ -0,0 +1,4 @@
+function tcompweek --wraps='task end.after:today-7d completed' --description 'alias tcompweek=task end.after:today-7d completed'
+  task end.after:today-7d completed $argv
+        
+end
diff --git a/fish2024/functions/xi.fish b/fish2024/functions/xi.fish
deleted file mode 100644
index 9a1f668..0000000
--- a/fish2024/functions/xi.fish
+++ /dev/null
@@ -1,4 +0,0 @@
-function xi --wraps='sudo xbps-install' --description 'alias xi=sudo xbps-install'
-  sudo xbps-install $argv
-        
-end
diff --git a/fish2024/functions/xq.fish b/fish2024/functions/xq.fish
deleted file mode 100644
index 1be89e8..0000000
--- a/fish2024/functions/xq.fish
+++ /dev/null
@@ -1,4 +0,0 @@
-function xq --wraps='xbps-query -Rs ' --wraps='xbps-query -Rs' --description 'alias xq xbps-query -Rs'
-  xbps-query -Rs $argv
-        
-end
diff --git a/fish2024/functions/xupdate.fish b/fish2024/functions/xupdate.fish
deleted file mode 100644
index 8cd4cd9..0000000
--- a/fish2024/functions/xupdate.fish
+++ /dev/null
@@ -1,4 +0,0 @@
-function xupdate --wraps='sudo xbps-install -Su' --description 'alias xupdate sudo xbps-install -Su'
-  sudo xbps-install -Su $argv
-        
-end
diff --git a/i3-config b/i3-config
index 3dfbaea..c05afb8 100644
--- a/i3-config
+++ b/i3-config
@@ -112,10 +112,10 @@ bindsym $mod+minus exec mdlinkopen
 #bindsym $mod+Return exec ~/.local/bin/alacritty
 #bindsym $mod+Return exec xterm -itc -en en_GB.UTF-8
 #bindsym $mod+Return exec xfce4-terminal
-#bindsym $mod+Return exec xterm
+bindsym $mod+Return exec xterm
 #bindsym $mod+Return exec xterm -fg black -bg Dark\ Sea\ Green -fa fixed -fs 12
 #bindsym $mod+Return exec xterm -fg black -bg white -fa Ubuntu\ Mono -fs 12
-bindsym $mod+Return exec xterm -fg Sky\ Blue -bg black -fa Ubuntu\ Mono -fs 14
+#bindsym $mod+Return exec xterm -fg Sky\ Blue -bg black -fa Ubuntu\ Mono -fs 14
 #bindsym $mod+Return exec xterm -fg green3 -fs 12
 #bindsym $mod+Return exec xterm -fa terminus
 # bindsym $mod+Return exec xterm -fa "Cascadia Code Nerd Font" -fs 12
diff --git a/mbsyncrc b/mbsyncrc
index 6281385..863085a 100644
--- a/mbsyncrc
+++ b/mbsyncrc
@@ -5,7 +5,7 @@ IMAPAccount gmail
 Host imap.gmail.com
 User matthew.lemon@gmail.com
 PassCmd "echo $(pass google_isync_mbsync)"
-SSLType IMAPS
+TLSType IMAPS
 CertificateFile /etc/ssl/certs/ca-certificates.crt
 
 IMAPStore gmail-remote
@@ -35,7 +35,7 @@ Host imap.purelymail.com
 Port 993
 User mrlemon@purelymail.com
 PassCmd "echo $(pass purelymail_neomutt)"
-SSLType IMAPS
+TLSType IMAPS
 
 IMAPStore purelymail-remote
 Account mrlemon@purelymail.com
diff --git a/mpv/mpv.conf b/mpv/mpv.conf
index e2e323d..a240759 100644
--- a/mpv/mpv.conf
+++ b/mpv/mpv.conf
@@ -10,4 +10,4 @@ audio-channels=2
 save-position-on-quit=yes
 #ytdl-format=bestvideo[height <= 1080]+bestaudio/best
 ytdl-format="bestvideo[height<=?1080]+bestaudio/best"
-script-opts-append=ytdl_hook-ytdl_path=/home/lemon/src/virtualenvs/yt-dlp/bin/yt-dlp
+script-opts-append=ytdl_hook-ytdl_path=/usr/bin/yt-dlp
diff --git a/tmux.conf b/tmux.conf
index a85d943..ca7cbc5 100644
--- a/tmux.conf
+++ b/tmux.conf
@@ -2,7 +2,7 @@
 # unbind some default keybindings
 unbind C-b
 
-set-option -sa terminal-features ',screen-256color:RGB'
+#set-option -sa terminal-features ',screen-256color:RGB'
 set-option -g focus-events on
 
 # set shell
@@ -33,7 +33,7 @@ set -sg escape-time 1
 # force tmux to use xterm
 #set -g default-terminal "xterm-256color"
 #set -g default-terminal "tmux-256color"
-set -g default-terminal "screen-256color"
+#set -g default-terminal "screen-256color"
 
 # set from advice in neovim :checkhealth
 #set-option -sa terminal-overrides ',screen-256color:RGB'
@@ -100,9 +100,9 @@ bind p paste-buffer
 #bind -t vi-copy 'y' copy-selection
 # new copy and paste (needed for st terminal) = https://www.rushiagr.com/blog/2016/06/16/everything-you-need-to-know-about-tmux-copy-pasting-ubuntu/
 
-bind-key -T copy-mode-vi v send-keys -X begin-selection
-bind-key -T copy-mode-vi y send-keys -X copy-selection
-bind-key -T copy-mode-vi r send-keys -X rectangle-toggle
+# bind-key -T copy-mode-vi v send-keys -X begin-selection
+# bind-key -T copy-mode-vi y send-keys -X copy-selection
+# bind-key -T copy-mode-vi r send-keys -X rectangle-toggle
 
 # also copy to system clipboard
 #bind -T vi-copy y copy-pipe "xclip -sel clip -i"
@@ -111,7 +111,7 @@ bind-key -T copy-mode-vi r send-keys -X rectangle-toggle
 set -g mouse off
 
 # geohot colors
-set -g status-position bottom
+set -g status-position top
 set -g status-bg colour234
 set -g status-fg colour137
 set -g status-style dim
@@ -125,7 +125,6 @@ set -g status-left-length 20
 
 ## COLORSCHEME: gruvbox dark (medium) (stolen from github)
 ## from https://gitlab.com/herrhotzenplotz/unfoofed-dotfiles/-/blob/trunk/homedir/.tmux.conf?ref_type=heads
-set-option -g status-position top
 set-option -g status on
 set-option -g status-style bg=colour237,fg=colour223 # bg=bg1, fg=fg1
 set-window-option -g window-status-style bg=colour214,fg=colour237 # bg=yellow, fg=bg1
diff --git a/vim/vimrc-sept24 b/vim/vimrc-sept24
index d202f0e..e0706b6 100644
--- a/vim/vimrc-sept24
+++ b/vim/vimrc-sept24
@@ -106,6 +106,7 @@ set ttyfast
 set exrc
 set nocuc
 set secure
+set updatetime=300 " https://github.com/neoclide/coc.nvim
 set scrolloff=1
 set history=799
 set encoding=utf-8
@@ -147,7 +148,8 @@ set shortmess+=c
 set tags+=./tags
 set background=dark
 set completeopt=menuone,longest
-set omnifunc=syntaxcomplete#Complete
+"set omnifunc=syntaxcomplete#Complete
+set omnifunc=ale#completion#OmniFunc
 " 
 " Folding 
 if has('folding')
@@ -175,10 +177,7 @@ nnoremap <C-n> :Fern -drawer .<CR> <C-w>l
 call plug#begin()
 "Plug 'vim-scripts/AutoComplPop'
 Plug 'mattn/emmet-vim',
-Plug 'lambdalisue/fern.vim',
-Plug 'tpope/vim-rails',
 " Plug 'ycm-core/YouCompleteMe'
-Plug 'vim-ruby/vim-ruby',
 Plug 'junegunn/fzf', { 'do': { -> fzf#install() } }
 Plug 'junegunn/fzf.vim'
 Plug 'ayu-theme/ayu-vim'
@@ -186,7 +185,7 @@ Plug 'airblade/vim-tailwind'
 Plug 'vim-perl/vim-perl', { 'for': 'perl', 'do': 'make clean carp dancer highlight-all-pragmas moose test-more try-tiny' }
 Plug 'morhetz/gruvbox'
 Plug 'eemed/sitruuna.vim'
-" Plug 'sheerun/vim-polyglot'
+Plug 'sheerun/vim-polyglot'
 Plug 'preservim/vim-markdown'
 Plug 'mhinz/vim-signify'
 Plug 'vim-test/vim-test'
@@ -200,20 +199,109 @@ Plug 'tpope/vim-fugitive'
 Plug 'SirVer/UltiSnips'
 Plug 'honza/vim-snippets'
 Plug 'dense-analysis/ale'
+" Plug 'neoclide/coc.nvim', {'branch': 'release'}
+"Plug 'gergap/vim-ollama'
 call plug#end()
-" 
-" Snippets 
-" Trigger configuration. You need to change this to something other than
-"<tab> if you use one of the following:
-" - https://github.com/Valloric/YouCompleteMe
-" - https://github.com/nvim-lua/completion-nvim
-let g:UltiSnipsExpandTrigger="<C-y>"
-"let g:UltiSnipsExpandTrigger="<S-t>"
-let g:UltiSnipsJumpForwardTrigger="<S-f>"
-let g:UltiSnipsJumpBackwardTrigger="<S-b>"
-let g:ycm_key_list_select_completion=[]
-let g:ycm_key_list_previous_completion=[]
+
+" " New CoC stuff.... https://github.com/neoclide/coc.nvim
+
+" " Use `[g` and `]g` to navigate diagnostics
+" " Use `:CocDiagnostics` to get all diagnostics of current buffer in location list
+" nmap <silent> [g <Plug>(coc-diagnostic-prev)
+" nmap <silent> ]g <Plug>(coc-diagnostic-next)
+
+" " GoTo code navigation
+" nmap <silent> gd <Plug>(coc-definition)
+" nmap <silent> gy <Plug>(coc-type-definition)
+" nmap <silent> gi <Plug>(coc-implementation)
+" nmap <silent> gr <Plug>(coc-references)
+
+" " Use K to show documentation in preview window
+" nnoremap <silent> K :call ShowDocumentation()<CR>
+
+" function! ShowDocumentation()
+"   if CocAction('hasProvider', 'hover')
+"     call CocActionAsync('doHover')
+"   else
+"     call feedkeys('K', 'in')
+"   endif
+" endfunction
+
+" " Highlight the symbol and its references when holding the cursor
+" autocmd CursorHold * silent call CocActionAsync('highlight')
+
+" " Formatting selected code
+" xmap <leader>f  <Plug>(coc-format-selected)
+" nmap <leader>f  <Plug>(coc-format-selected)
+
+" " Remap keys for applying code actions at the cursor position
+" nmap <leader>ac  <Plug>(coc-codeaction-cursor)
+" " Remap keys for apply code actions affect whole buffer
+" nmap <leader>as  <Plug>(coc-codeaction-source)
+" " Apply the most preferred quickfix action to fix diagnostic on the current line
+" nmap <leader>qf  <Plug>(coc-fix-current)
+
+" " Remap keys for applying refactor code actions
+" nmap <silent> <leader>re <Plug>(coc-codeaction-refactor)
+" xmap <silent> <leader>r  <Plug>(coc-codeaction-refactor-selected)
+" nmap <silent> <leader>r  <Plug>(coc-codeaction-refactor-selected)
+
+" " Run the Code Lens action on the current line
+" nmap <leader>cl  <Plug>(coc-codelens-action)
+
+" " Remap <C-f> and <C-b> to scroll float windows/popups
+" if has('nvim-0.4.0') || has('patch-8.2.0750')
+"   nnoremap <silent><nowait><expr> <C-f> coc#float#has_scroll() ? coc#float#scroll(1) : "\<C-f>"
+"   nnoremap <silent><nowait><expr> <C-b> coc#float#has_scroll() ? coc#float#scroll(0) : "\<C-b>"
+"   inoremap <silent><nowait><expr> <C-f> coc#float#has_scroll() ? "\<c-r>=coc#float#scroll(1)\<cr>" : "\<Right>"
+"   inoremap <silent><nowait><expr> <C-b> coc#float#has_scroll() ? "\<c-r>=coc#float#scroll(0)\<cr>" : "\<Left>"
+"   vnoremap <silent><nowait><expr> <C-f> coc#float#has_scroll() ? coc#float#scroll(1) : "\<C-f>"
+"   vnoremap <silent><nowait><expr> <C-b> coc#float#has_scroll() ? coc#float#scroll(0) : "\<C-b>"
+" endif
+
+" " Add `:Format` command to format current buffer
+" command! -nargs=0 Format :call CocActionAsync('format')
+
+" " Add `:OR` command for organize imports of the current buffer
+" command! -nargs=0 OR   :call     CocActionAsync('runCommand', 'editor.action.organizeImport')
+
+" " END OF COC
+"
+"" vim-ollama
+"" Default chat model
+"let g:ollama_chat_model = 'llama3.1'
 "
+"" Codellama models
+""let g:ollama_model = 'codellama:13b-code'
+"" let g:ollama_model = 'codellama:7b-code'
+"" let g:ollama_model = 'codellama:code'
+"
+"" Codegemma (small and fast)
+"let g:ollama_model = 'codegemma:latest'
+"" let g:ollama_model = 'codegemma:2b'
+"let g:ollama_fim_prefix = '<|fim_prefix|>'
+"let g:ollama_fim_middle = '<|fim_middle|>'
+"let g:ollama_fim_suffix = '<|fim_suffix|>'
+"
+"" Deepseek-coder-v2
+""let g:ollama_model = 'deepseek-coder-v2:16b-lite-base-q4_0'
+"" let g:ollama_fim_prefix = '<｜fim▁begin｜>'
+"" let g:ollama_fim_suffix = '<｜fim▁hole｜>'
+"" let g:ollama_fim_middle = '<｜fim▁end｜>'
+"
+"" 
+"" Snippets 
+"" Trigger configuration. You need to change this to something other than
+""<tab> if you use one of the following:
+"" - https://github.com/Valloric/YouCompleteMe
+"" - https://github.com/nvim-lua/completion-nvim
+"let g:UltiSnipsExpandTrigger="<C-y>"
+""let g:UltiSnipsExpandTrigger="<S-t>"
+"let g:UltiSnipsJumpForwardTrigger="<S-f>"
+"let g:UltiSnipsJumpBackwardTrigger="<S-b>"
+"let g:ycm_key_list_select_completion=[]
+"let g:ycm_key_list_previous_completion=[]
+""
 " 
 "  emmet
 " being very explicit, which is not required
@@ -261,7 +349,7 @@ let g:ale_open_list = 0
 let g:ale_set_highlights = 1
 let g:ale_set_signs = 1
 let g:ale_set_loclist = 1
-let g:ale_set_quickfix = 1
+let g:ale_set_quickfix = 0
 let g:ale_echo_cursor = 1
 let g:ale_echo_msg_error_str = 'ALE Error'
 let g:ale_echo_msg_format = 'ALE: %linter% - %code: %%s'
@@ -407,9 +495,9 @@ let g:gruvbox_invert_signs = 0
 let g:gruvbox_italic = 0
 
 "colorscheme evening
-"colorscheme sitruuna
+colorscheme sitruuna
 "colorscheme ayu
-colorscheme evening
+"colorscheme evening
 "colorscheme gruvbox
 " 
 " GPG files