a

3 files changed, 32 insertions, 11 deletions

diff --git a/config/openbox/rc-templ.xml b/config/openbox/rc-templ.xml
index 85b0c92..c1da4f1 100644
--- a/config/openbox/rc-templ.xml
+++ b/config/openbox/rc-templ.xml
@@ -327,7 +327,7 @@
     </keybind>
     <keybind key="W-C-s">
       <action name="Execute">
-        <command>scrot -s -e 'xclip -selection clipboard -t image/png -i $f'</command>
+        <command>scrot -s -e 'xclip -selection clipboard -t image/png -i $f &amp;&amp; rm $f'</command>
       </action>
     </keybind>
     <keybind key="W-C-e">
diff --git a/vimrc b/vimrc
index 5dadd8b..b260646 100644
--- a/vimrc
+++ b/vimrc
@@ -35,6 +35,7 @@ lua <<EOF
   Plug('HakonHarnes/img-clip.nvim')
   Plug('jcdickinson/wpm.nvim')
   Plug('puremourning/vimspector')
+  -- Plug('github/copilot.vim')
 
   Plug('yetone/avante.nvim', { ['branch'] = 'main', ['do'] = 'make' } )
   vim.call('plug#end');
@@ -599,10 +600,16 @@ vnoremap <leader>c "+y
 nnoremap <leader>p "+gP
 vnoremap <leader>p "+P
 
+nnoremap <leader>f :lua vim.lsp.buf.code_action()<CR>
+vnoremap <leader>f :lua vim.lsp.buf.code_action()<CR>
+
+nnoremap <leader>rs :lua vim.lsp.buf.rename()<CR>
+vnoremap <leader>rs :lua vim.lsp.buf.rename()<CR>
+
 nnoremap gf :call GFLine()<CR>
 vnoremap <leader>ap :call AddSpacesToParentheses()<CR>
 
-autocmd BufReadPost * call TurnOffDiag()
+autocmd BufReadPost,BufNew * call TurnOffDiag()
 
 nnoremap <CR> :noh<CR><CR>
 
@@ -668,9 +675,13 @@ vnoremap ]] /}<CR>:<C-u>nohl<CR>gv
 vnoremap ][ /{<CR>:<C-u>nohl<CR>gv
 vnoremap [] ?}<CR>:<C-u>nohl<CR>gv
 
-nnoremap <C-l> <C-i>
+nnoremap <C-j> <C-i>
 nnoremap <leader>ta :call ToggleTabby()<CR>
 
+xnoremap ip :<C-u>silent! normal! T,vt,<CR>
+onoremap ip :<C-u>silent! normal! T,vt,<CR>
+
+
 colorscheme base16-synth-midnight-dark
 hi LineNr guibg=#000000
 hi String ctermfg=1 guifg=#ea5971
@@ -703,6 +714,7 @@ let NERDTreeQuitOnOpen=1
 
 autocmd BufNewFile,BufRead *.zig set shiftwidth=2
 autocmd BufNewFile,BufRead *.modelfile set ft=gotmpl
+autocmd BufNewFile,BufRead *.vsh set ft=glsl
 
 aunmenu PopUp.Inspect
 aunmenu PopUp.-1-
diff --git a/zshrc b/zshrc
index 1cb0850..b7de09e 100644
--- a/zshrc
+++ b/zshrc
@@ -1,7 +1,8 @@
-source ~/.lscolors
-source ~/.profile
-source <(fzf --zsh)
 export PATH=$HOME/bin:/usr/local/bin:$HOME/.cargo/bin:$PATH
+export PATH=$PATH:$ANDROID_HOME/emulator
+export PATH=$PATH:$ANDROID_HOME/platform-tools
+export PATH=$PATH:$ANDROID_HOME/tools
+export PATH=$PATH:$ANDROID_HOME/tools-bin
 
 fpath+=${ZSH_CUSTOM:-${ZSH:-~/.oh-my-zsh}/custom}/plugins/zsh-completions/src
 
@@ -17,8 +18,6 @@ plugins=(
   git
   zsh-syntax-highlighting
   zsh-autosuggestions
-  zsh-completions
-  fzf-tab
 )
 
 source $ZSH/oh-my-zsh.sh
@@ -56,20 +55,26 @@ alias l='ls'
 alias ll='ls -lahG'
 alias lg='lazygit'
 
-export ANDROID_HOME=/media/aurelia/data/android-projects
+alias musik='musikcube'
+
+export ANDROID_HOME=/media/data/android-projects
 
 export MANPATH="/usr/local/man:$MANPATH"
 
 export EDITOR='nvim'
 export ARCHFLAGS="-arch x86_64"
 
-OLLAMA_HOME="/media/aurelia/dev/ollama"
-OLLAMA_MODELS="/media/aurelia/dev/ollama/models"
+OLLAMA_HOME="/media/dev/ollama"
+OLLAMA_MODELS="/media/dev/ollama/models"
 export OLLAMA_HOME
 export OLLAMA_MODELS
 
 EMSDK_QUIET=1 source $HOME/code/emsdk/emsdk_env.sh
 
+alias pkg='sudo slpkg --repository="*"'
+alias sbopkg='sudo slpkg --repository="sbo"'
+alias slpkg="sudo slpkg"
+
 # The next line updates PATH for the Google Cloud SDK.
 if [ -f '/home/aurelia/google-cloud-sdk/path.zsh.inc' ]; then . '/home/aurelia/google-cloud-sdk/path.zsh.inc'; fi
 # The next line enables shell command completion for gcloud.
@@ -78,3 +83,7 @@ if [ -f '/home/aurelia/google-cloud-sdk/completion.zsh.inc' ]; then . '/home/aur
 zstyle ':completion:*' menu select
 fpath+=~/.zfunc
 
+source ~/.lscolors
+source ~/.profile
+
+eval "$(/home/linuxbrew/.linuxbrew/bin/brew shellenv)"