diff --git a/.config/nvim/coc-settings.json b/.config/nvim/coc-settings.json index 6d1fd7b..ef1d99a 100644 --- a/.config/nvim/coc-settings.json +++ b/.config/nvim/coc-settings.json @@ -1,5 +1,3 @@ { - "suggest.noselect": true, - "suggest.enablePreselect": false, "diagnostic.checkCurrentLine": true } diff --git a/.config/nvim/init.vim b/.config/nvim/init.vim index 4adafd7..a42a7b7 100644 --- a/.config/nvim/init.vim +++ b/.config/nvim/init.vim @@ -11,7 +11,7 @@ set nohlsearch set hidden set incsearch set scrolloff=8 -set colorcolumn=100 +set colorcolumn=80 set signcolumn=yes " Remove arrow keys to train my fingers @@ -45,7 +45,7 @@ colorscheme gruvbox set background=dark hi Normal guibg=NONE ctermbg=NONE -" Setup yara syntax highlighting +" Yara syntax highlighting autocmd BufNewFile,BufRead *.yar,*.yara setlocal filetype=yara " FZF key bindings @@ -54,15 +54,12 @@ nnoremap fg Rg nnoremap fb Buffers " use for trigger completion and navigate to the next complete item -function! CheckBackspace() abort +function! s:check_back_space() abort let col = col('.') - 1 - return !col || getline('.')[col - 1] =~# '\s' + return !col || getline('.')[col - 1] =~ '\s' endfunction inoremap - \ coc#pum#visible() ? coc#pum#next(1) : - \ CheckBackspace() ? "\" : + \ pumvisible() ? "\" : + \ check_back_space() ? "\" : \ coc#refresh() - -inoremap coc#pum#visible() ? coc#pum#next(1) : "\" -inoremap coc#pum#visible() ? coc#pum#prev(1) : "\" diff --git a/.emacs.d/config.org b/.emacs.d/config.org index 30a426f..c03b3bf 100644 --- a/.emacs.d/config.org +++ b/.emacs.d/config.org @@ -878,7 +878,8 @@ When using zsh with powerlevel10k, the ~MesloLGS NF~ font is required to make th This is the section to include imports from other files. #+begin_src emacs-lisp +;; Uncomment this to use EXWM. I currently don't use this. (let ((exwm-org-file "~/.emacs.d/exwm.org")) -(when (file-exists-p exwm-org-file) - (org-babel-load-file exwm-org-file))) +;(when (file-exists-p exwm-org-file) +; (org-babel-load-file exwm-org-file))) #+end_src diff --git a/.zshrc b/.zshrc index 2ab52fc..73344c2 100644 --- a/.zshrc +++ b/.zshrc @@ -215,8 +215,8 @@ if [ -f "/usr/share/doc/fzf/examples/completion.zsh" ]; then source /usr/share/doc/fzf/examples/completion.zsh elif [ -f "/usr/share/fzf/completion.zsh" ]; then source /usr/share/fzf/completion.zsh -elif [ -f "/opt/homebrew/Cellar/fzf/0.39.0/shell/completion.zsh" ]; then - source /opt/homebrew/Cellar/fzf/0.39.0/shell/completion.zsh +elif [ -f /opt/homebrew/Cellar/fzf/*/shell/completion.zsh ]; then + source /opt/homebrew/Cellar/fzf/*/shell/completion.zsh else echo "completion.zsh not installed" fi @@ -225,8 +225,8 @@ if [ -f "/usr/share/doc/fzf/examples/key-bindings.zsh" ]; then source /usr/share/doc/fzf/examples/key-bindings.zsh elif [ -f "/usr/share/fzf/key-bindings.zsh" ]; then source /usr/share/fzf/key-bindings.zsh -elif [ -f "/opt/homebrew/Cellar/fzf/0.39.0/shell/key-bindings.zsh" ]; then - source /opt/homebrew/Cellar/fzf/0.39.0/shell/key-bindings.zsh +elif [ -f /opt/homebrew/Cellar/fzf/*/shell/key-bindings.zsh ]; then + source /opt/homebrew/Cellar/fzf/*/shell/key-bindings.zsh else echo "key-bidings.zsh not installed" fi @@ -249,7 +249,7 @@ fi [[ $(uname -r) == *"arch"* ]] && export DEBUGINFOD_URLS="https://debuginfod.archlinux.org" # To customize prompt, run `p10k configure` or edit ~/.p10k.zsh. -[[ ! -f ~/.p10k.zsh ]] || source ~/.p10k.zsh +[[ -f ~/.p10k.zsh ]] && source ~/.p10k.zsh # CUSTOM ALIASES & FUNCTIONS @@ -261,7 +261,7 @@ function ..... () {cd ../../../../} function ...... () {cd ../../../../../} function up() { - for ip in $(ip addr | awk "/inet .*$1/ {print \$2}" | cut -d / -f 1) + for ip in $(ifconfig | awk "/inet .*$1/ {print \$2}" | cut -d / -f 1) do for filepath in $(find . -maxdepth 1 -type f -name '[^.]*' -printf '%f\n') do @@ -279,4 +279,4 @@ export fasttrack="/usr/share/seclists/Passwords/fasttrack.txt" alias open='xdg-open' alias tryhackme="sudo openvpn ~/.tryhackme.ovpn" alias listen="rlwrap nc -lnvp" -alias emacs="emacsclient -c" +alias reload="source ~/.zshrc"