diff options
Diffstat (limited to 'config')
| -rw-r--r-- | config/nvim/init.lua | 4 | ||||
| -rw-r--r-- | config/nvim/lua/mappings.lua | 2 | ||||
| m--------- | config/tmux/plugins/tpm | 0 | ||||
| -rw-r--r-- | config/tmux/tmux.conf | 102 | ||||
| -rw-r--r-- | config/vim/pluggins.vim | 2 | ||||
| -rwxr-xr-x | config/zsh/zprofile | 1 |
6 files changed, 63 insertions, 48 deletions
diff --git a/config/nvim/init.lua b/config/nvim/init.lua index 1afc4a3..5b9770d 100644 --- a/config/nvim/init.lua +++ b/config/nvim/init.lua @@ -66,6 +66,7 @@ require('telescope').setup { ['kj'] = actions.close, } }, + -- preview = false, } } @@ -96,8 +97,9 @@ require('nvim-treesitter.configs').setup { } } vim.cmd [[ highlight link pythonTSKeywordOperator Keyword ]] +-- vim.cmd [[ highlight link TSError Normal ]] -- require 'nvim-treesitter.highlight' --- local hlmap = vim.treesitter.TSHighlighter.hl_map +-- local hlmap = vim.treesitter.highlighter.hl_map -- hlmap.error = nil diff --git a/config/nvim/lua/mappings.lua b/config/nvim/lua/mappings.lua index 08e9862..ef4df4b 100644 --- a/config/nvim/lua/mappings.lua +++ b/config/nvim/lua/mappings.lua @@ -43,7 +43,7 @@ map('c', '<C-k>', '<up>', {}) -- augroup END -- python breakpoints -vim.cmd [[ autocmd FileType python nmap <leader>bd :g/^\s*breakpoint()$/d<cr> ]] +vim.cmd [[ autocmd FileType python nmap <leader>bd mq:g/^\s*breakpoint()$/d<cr>`q ]] vim.cmd [[ autocmd FileType python nmap <leader>ba mqobreakpoint()<esc>`q ]] -- pluggins diff --git a/config/tmux/plugins/tpm b/config/tmux/plugins/tpm new file mode 160000 +Subproject 693e5a2a0f6acfd2666882655d5dfd32e8c6c50 diff --git a/config/tmux/tmux.conf b/config/tmux/tmux.conf index c9e2a5e..418d51e 100644 --- a/config/tmux/tmux.conf +++ b/config/tmux/tmux.conf @@ -8,53 +8,65 @@ setw -g mode-keys vi set -sg escape-time 0 # otherwise <ESC> in vim has a small delay +bind '"' split-window -c "#{pane_current_path}" +bind '%' split-window -c "#{pane_current_path}" -h +bind 'c' new-window -c "#{pane_current_path}" -# from: https://github.com/egel/tmux-gruvbox -## COLORSCHEME: gruvbox dark (medium) -set-option -g status "on" - -# default statusbar color -set-option -g status-style bg=colour237,fg=colour223 # bg=bg1, fg=fg1 - -# default window title colors -set-window-option -g window-status-style bg=colour214,fg=colour237 # bg=yellow, fg=bg1 - -# default window with an activity alert -set-window-option -g window-status-activity-style bg=colour237,fg=colour248 # bg=bg1, fg=fg3 - -# active window title colors -set-window-option -g window-status-current-style bg=red,fg=colour237 # fg=bg1 - -# pane border -set-option -g pane-active-border-style fg=colour250 #fg2 -set-option -g pane-border-style fg=colour237 #bg1 -# message infos -set-option -g message-style bg=colour239,fg=colour223 # bg=bg2, fg=fg1 +set -g @plugin 'tmux-plugins/tpm' -# writing commands inactive -set-option -g message-command-style bg=colour239,fg=colour223 # bg=fg3, fg=bg1 +set -g @plugin 'egel/tmux-gruvbox' +set -g @tmux-gruvbox 'dark' +set -g @plugin 'tomhey/tmux-remote-sessions' -# pane number display -set-option -g display-panes-active-colour colour250 #fg2 -set-option -g display-panes-colour colour237 #bg1 +run "$XDG_CONFIG_HOME/tmux/plugins/tpm/tpm" -# clock -set-window-option -g clock-mode-colour colour109 #blue - -# bell -set-window-option -g window-status-bell-style bg=colour167,fg=colour235 # bg=red, fg=bg - -## Theme settings mixed with colors (unfortunately, but there is no cleaner way) -set-option -g status-justify "left" -set-option -g status-left-style none -set-option -g status-left-length "80" -set-option -g status-right-style none -set-option -g status-right-length "80" -set-window-option -g window-status-separator "" - -set-option -g status-left "#[bg=colour241,fg=colour248] #S #[bg=colour237,fg=colour241,nobold,noitalics,nounderscore]" -set-option -g status-right "#[bg=colour237,fg=colour239 nobold, nounderscore, noitalics]#[bg=colour239,fg=colour246] %Y-%m-%d %H:%M #[bg=colour239,fg=colour248,nobold,noitalics,nounderscore]#[bg=colour248,fg=colour237] #h " - -set-window-option -g window-status-current-format "#[bg=colour214,fg=colour237,nobold,noitalics,nounderscore]#[bg=colour214,fg=colour239] #I #[bg=colour214,fg=colour239,bold] #W#{?window_zoomed_flag,*Z,} #[bg=colour237,fg=colour214,nobold,noitalics,nounderscore]" -set-window-option -g window-status-format "#[bg=colour239,fg=colour237,noitalics]#[bg=colour239,fg=colour223] #I #[bg=colour239,fg=colour223] #W #[bg=colour237,fg=colour239,noitalics]" +# from: https://github.com/egel/tmux-gruvbox +## COLORSCHEME: gruvbox dark (medium) +# set-option -g status "on" +# +# # default statusbar color +# set-option -g status-style bg=colour237,fg=colour223 # bg=bg1, fg=fg1 +# +# # default window title colors +# set-window-option -g window-status-style bg=colour214,fg=colour237 # bg=yellow, fg=bg1 +# +# # default window with an activity alert +# set-window-option -g window-status-activity-style bg=colour237,fg=colour248 # bg=bg1, fg=fg3 +# +# # active window title colors +# set-window-option -g window-status-current-style bg=red,fg=colour237 # fg=bg1 +# +# # pane border +# set-option -g pane-active-border-style fg=colour250 #fg2 +# set-option -g pane-border-style fg=colour237 #bg1 +# +# # message infos +# set-option -g message-style bg=colour239,fg=colour223 # bg=bg2, fg=fg1 +# +# # writing commands inactive +# set-option -g message-command-style bg=colour239,fg=colour223 # bg=fg3, fg=bg1 +# +# # pane number display +# set-option -g display-panes-active-colour colour250 #fg2 +# set-option -g display-panes-colour colour237 #bg1 +# +# # clock +# set-window-option -g clock-mode-colour colour109 #blue +# +# # bell +# set-window-option -g window-status-bell-style bg=colour167,fg=colour235 # bg=red, fg=bg +# +# ## Theme settings mixed with colors (unfortunately, but there is no cleaner way) +# set-option -g status-justify "left" +# set-option -g status-left-style none +# set-option -g status-left-length "80" +# set-option -g status-right-style none +# set-option -g status-right-length "80" +# set-window-option -g window-status-separator "" +# +# set-option -g status-left "#[bg=colour241,fg=colour248] #S #[bg=colour237,fg=colour241,nobold,noitalics,nounderscore]" +# set-option -g status-right "#[bg=colour237,fg=colour239 nobold, nounderscore, noitalics]#[bg=colour239,fg=colour246] %Y-%m-%d %H:%M #[bg=colour239,fg=colour248,nobold,noitalics,nounderscore]#[bg=colour248,fg=colour237] #h " +# +# set-window-option -g window-status-current-format "#[bg=colour214,fg=colour237,nobold,noitalics,nounderscore]#[bg=colour214,fg=colour239] #I #[bg=colour214,fg=colour239,bold] #W#{?window_zoomed_flag,*Z,} #[bg=colour237,fg=colour214,nobold,noitalics,nounderscore]" +# set-window-option -g window-status-format "#[bg=colour239,fg=colour237,noitalics]#[bg=colour239,fg=colour223] #I #[bg=colour239,fg=colour223] #W #[bg=colour237,fg=colour239,noitalics]" diff --git a/config/vim/pluggins.vim b/config/vim/pluggins.vim index 3f3e20c..d8822d7 100644 --- a/config/vim/pluggins.vim +++ b/config/vim/pluggins.vim @@ -43,7 +43,7 @@ call plug#begin($XDG_DATA_HOME . '/vim/plugged') " s19 at home Plug 'cacharle/vim-42header' " 42 header - " Plug 'ctrlpvim/ctrlp.vim' " Ctrl-P similar to vsc + Plug 'ctrlpvim/ctrlp.vim' " Ctrl-P similar to vsc " terrible startuptime on markdown/css files https://github.com/ap/vim-css-color/issues/87 " Plug 'skammer/vim-css-color' diff --git a/config/zsh/zprofile b/config/zsh/zprofile index 1388cd9..d6c19d9 100755 --- a/config/zsh/zprofile +++ b/config/zsh/zprofile @@ -13,6 +13,7 @@ then export TERM='xterm-256color' export MAIL='charles.cabergs@colruytgroup.com' export SUDO='sudo' + export LC_CTYPE='en_US.UTF-8' fi # applications |