From fcac7f830ce833ad74298a88a07c77aad9277fb6 Mon Sep 17 00:00:00 2001 From: Urbain Vaes Date: Sat, 29 Feb 2020 11:13:02 +0000 Subject: Minor changes --- zsh/.zshrc | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) (limited to 'zsh') diff --git a/zsh/.zshrc b/zsh/.zshrc index cc2e1ad..e54be1c 100644 --- a/zsh/.zshrc +++ b/zsh/.zshrc @@ -172,9 +172,9 @@ alias mca='make clean-all' # Misc alias a='vifm . .' -alias ff='FreeFem++' alias m='cd ~/.mutt/attachments && mutt && cd -' alias e='nvim' +alias f='fzm' alias mux='tmuxinator' alias email='mbsync -a' alias renet='systemctl restart NetworkManager.service' -- cgit v1.2.3 From 53ad321dec265dd2f625197493a9848a7559a410 Mon Sep 17 00:00:00 2001 From: Urbain Vaes Date: Sun, 23 Aug 2020 17:50:44 +0200 Subject: Minor changes --- bash/.bashrc | 2 +- surfraw/.surfraw.bookmarks | 2 -- surfraw/.surfraw.conf | 3 --- vim/.vim/spell/en.utf-8.add | 2 ++ vim/.vim/spell/en.utf-8.add.spl | Bin 1067 -> 1111 bytes vim/.vimrc | 49 ++++++++++++++++++++-------------------- zsh/.zshrc | 2 +- 7 files changed, 29 insertions(+), 31 deletions(-) delete mode 100644 surfraw/.surfraw.bookmarks delete mode 100644 surfraw/.surfraw.conf (limited to 'zsh') diff --git a/bash/.bashrc b/bash/.bashrc index 542ce53..b5460fc 100644 --- a/bash/.bashrc +++ b/bash/.bashrc @@ -11,5 +11,5 @@ fi # FZF [ -f ~/.fzf.bash ] && source ~/.fzf.bash -FZF_MARKS_PLUGIN=$HOME/Dropbox/projects/fzf-marks/fzf-marks.plugin.bash +FZF_MARKS_PLUGIN=$HOME/dotfiles/plugins/fzf-marks/fzf-marks.plugin.bash [ -f "$FZF_MARKS_PLUGIN" ] && source "$FZF_MARKS_PLUGIN" diff --git a/surfraw/.surfraw.bookmarks b/surfraw/.surfraw.bookmarks deleted file mode 100644 index a46527b..0000000 --- a/surfraw/.surfraw.bookmarks +++ /dev/null @@ -1,2 +0,0 @@ -startpage https://startpage.com/do/search?hmb=1&cat=web&cmd=process_search&language=english_uk&engine0=v1all&query=%s&abp=-1&nj=0&pg=0 -dictionary http://www.dictionary.com/browse/%s diff --git a/surfraw/.surfraw.conf b/surfraw/.surfraw.conf deleted file mode 100644 index 07cedef..0000000 --- a/surfraw/.surfraw.conf +++ /dev/null @@ -1,3 +0,0 @@ -SURFRAW_graphical_browser=/usr/bin/xdg-open -SURFRAW_text_browser=w3m -SURFRAW_graphical=yes diff --git a/vim/.vim/spell/en.utf-8.add b/vim/.vim/spell/en.utf-8.add index ed6a065..b70e5e7 100644 --- a/vim/.vim/spell/en.utf-8.add +++ b/vim/.vim/spell/en.utf-8.add @@ -67,3 +67,5 @@ colorscheme plugin hypoellipticity minorization +perturbative +documentclass diff --git a/vim/.vim/spell/en.utf-8.add.spl b/vim/.vim/spell/en.utf-8.add.spl index e68d3e5..459931e 100644 Binary files a/vim/.vim/spell/en.utf-8.add.spl and b/vim/.vim/spell/en.utf-8.add.spl differ diff --git a/vim/.vimrc b/vim/.vimrc index 22447e8..77189c5 100644 --- a/vim/.vimrc +++ b/vim/.vimrc @@ -89,20 +89,19 @@ nnoremap cpu :GundoToggle nnoremap cp Remembrall('cp') " Fuzzy finder -nnoremap a :Ag -nnoremap b :Buffers -nnoremap C :Colors -nnoremap f :Files -nnoremap g :GitFiles -nnoremap r :History -nnoremap : :History: -nnoremap / :History/ -nnoremap l :BLines -nnoremap a :Ag - -nnoremap :Buffers -nnoremap :Files -nnoremap :GitFiles +nnoremap a :Ag +nnoremap b :Buffers +nnoremap C :Colors +nnoremap f :Files +nnoremap g :GitFiles +nnoremap r :History +nnoremap : :History: +nnoremap / :History/ +nnoremap l :BLines + +nnoremap :Buffers +nnoremap :Files +nnoremap :GitFiles " Fugitive nnoremap gs :Gstatus @@ -481,16 +480,18 @@ if has("nvim") endif "" Experimental {{{1 -lua require'nvim_lsp'.pyls.setup{} -autocmd Filetype python setlocal omnifunc=v:lua.vim.lsp.omnifunc -nnoremap Remembrall('') -nnoremap h lua vim.lsp.buf.hover() -nnoremap a lua vim.lsp.buf.declaration() -nnoremap d lua vim.lsp.buf.definition() -nnoremap i lua vim.lsp.buf.implementation() -nnoremap s lua vim.lsp.buf.signature_help() -nnoremap t lua vim.lsp.buf.type_definition() -nnoremap lua vim.lsp.stop_client(vim.lsp.get_active_clients()) +if has("nvim") + lua require'nvim_lsp'.pyls.setup{} + autocmd Filetype python setlocal omnifunc=v:lua.vim.lsp.omnifunc + nnoremap Remembrall('') + nnoremap h lua vim.lsp.buf.hover() + nnoremap a lua vim.lsp.buf.declaration() + nnoremap d lua vim.lsp.buf.definition() + nnoremap i lua vim.lsp.buf.implementation() + nnoremap s lua vim.lsp.buf.signature_help() + nnoremap t lua vim.lsp.buf.type_definition() + nnoremap lua vim.lsp.stop_client(vim.lsp.get_active_clients()) +endif function Create_floating_buffer() let buffer = nvim_create_buf(1, 0) diff --git a/zsh/.zshrc b/zsh/.zshrc index e54be1c..c1000e0 100644 --- a/zsh/.zshrc +++ b/zsh/.zshrc @@ -65,8 +65,8 @@ fi source "$HOME/.zsh/zgen/zgen.zsh" FZF_MARKS_PLUGIN_ZSH=$HOME/dotfiles/plugins/fzf-marks/fzf-marks.plugin.zsh -FZF_MARKS_COMMAND='fzf --height 40% --reverse -e' [ -f "$FZF_MARKS_PLUGIN_ZSH" ] && source "$FZF_MARKS_PLUGIN_ZSH" +FZF_MARKS_COMMAND="$FZF_MARKS_COMMAND -e -n 1 -d ' : '" if ! zgen saved; then echo "Creating a zgen save" -- cgit v1.2.3 From 6d2c328b6aab6d8c8d77f2ca798aae276fb0df91 Mon Sep 17 00:00:00 2001 From: Urbain Vaes Date: Thu, 1 Oct 2020 08:40:59 +0100 Subject: [zsh] Fix completion --- vim/.vimrc | 2 +- zsh/.zshrc | 1 + 2 files changed, 2 insertions(+), 1 deletion(-) (limited to 'zsh') diff --git a/vim/.vimrc b/vim/.vimrc index b225bcd..4b896bb 100644 --- a/vim/.vimrc +++ b/vim/.vimrc @@ -244,7 +244,7 @@ set shiftwidth=4 set showcmd set splitright set smartcase -set smartindent +set nosmartindent set softtabstop=-1 " set sotftabstop=&shiftwidth " set formatoptions+=orw silent! set breakindent diff --git a/zsh/.zshrc b/zsh/.zshrc index c1000e0..1cc4d4b 100644 --- a/zsh/.zshrc +++ b/zsh/.zshrc @@ -43,6 +43,7 @@ setopt inc_append_history setopt no_share_history # Completion +autoload -Uz compinit && compinit zstyle ':completion:*' matcher-list 'm:{a-zA-Z-_}={A-Za-z_-}' 'r:|=*' 'l:|=* r:|=*' # Kill word -- cgit v1.2.3 From 60496da375fa7355a0f01d0e3dd6bf8afc46ffe5 Mon Sep 17 00:00:00 2001 From: Urbain Vaes Date: Fri, 2 Oct 2020 10:16:07 +0100 Subject: Do not sign by default --- git/.gitconfig | 4 ++-- tmux/.tmux.conf | 2 ++ zsh/.zshenv | 4 ++-- 3 files changed, 6 insertions(+), 4 deletions(-) (limited to 'zsh') diff --git a/git/.gitconfig b/git/.gitconfig index 0e7df50..1169c34 100644 --- a/git/.gitconfig +++ b/git/.gitconfig @@ -4,7 +4,7 @@ [user] name = Urbain Vaes email = urbain@vaes.uk - signingKey = 716064C0 + ; signingKey = 716064C0 [init] templatedir = ~/.git_template [alias] @@ -13,7 +13,7 @@ [http] sslverify = false [commit] - gpgSign = true + ; gpgSign = true verbose = true [push] default = simple diff --git a/tmux/.tmux.conf b/tmux/.tmux.conf index c16febc..6259e47 100644 --- a/tmux/.tmux.conf +++ b/tmux/.tmux.conf @@ -22,6 +22,8 @@ set -g pane-border-status off # Alternative: top/bottom/... set -g pane-border-format "#{pane_current_command}" set -g status-justify centre # Center window list set -ga terminal-overrides '*:Ss=\E[%p1%d q:Se=\E[ q' # Get | cursor nvim insert +set -sa terminal-overrides ',xterm*:RGB' +set -sa terminal-overrides ',rxvt*:RGB' set-hook -g session-created "if-shell '[ -n \""'$SSH_CONNECTION'"\" ]' 'set status-bg \"#aa4444\"' 'set status-bg \"green\"'" set-hook -g client-attached "if-shell '[ -n \""'$SSH_CONNECTION'"\" ]' 'set status-bg \"#aa4444\"' 'set status-bg \"green\"'" diff --git a/zsh/.zshenv b/zsh/.zshenv index 7917e82..7991bf1 100644 --- a/zsh/.zshenv +++ b/zsh/.zshenv @@ -16,5 +16,5 @@ fi [[ -f "$HOME/.pythonrc" ]] && export PYTHONSTARTUP="$HOME/.pythonrc" # Source guix profile -guix_profile=$HOME/.guix-env -[[ -f $guix_profile ]] && . $guix_profile +# guix_profile=$HOME/.guix-env +# [[ -f $guix_profile ]] && . $guix_profile -- cgit v1.2.3