diff options
| -rw-r--r-- | config/git/config.darwin | 13 | ||||
| -rw-r--r-- | config/git/config.linux (renamed from config/git/config) | 0 | ||||
| -rw-r--r-- | config/nvim/init.lua | 20 | ||||
| -rw-r--r-- | config/nvim/lua/mappings.lua | 2 | ||||
| -rw-r--r-- | config/nvim/lua/plugins.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 | ||||
| -rwxr-xr-x | install | 21 |
10 files changed, 97 insertions, 66 deletions
diff --git a/config/git/config.darwin b/config/git/config.darwin new file mode 100644 index 0000000..87edb8b --- /dev/null +++ b/config/git/config.darwin @@ -0,0 +1,13 @@ +[user] + name = Charles Cabergs + email = charles.cabergs@colruytgroup.com +[log] + decorate = full +[pull] + rebase = false +[merge] + tool = vimdiff +[commit] + gpgsign = false +[init] + defaultBranch = master diff --git a/config/git/config b/config/git/config.linux index 0dbbd8f..0dbbd8f 100644 --- a/config/git/config +++ b/config/git/config.linux diff --git a/config/nvim/init.lua b/config/nvim/init.lua index 9409c5c..7665221 100644 --- a/config/nvim/init.lua +++ b/config/nvim/init.lua @@ -43,20 +43,22 @@ vim.opt.laststatus=2 -- always a statusline (all window) vim.opt.showcmd = true -- show current partial command in the bottom right vim.opt.showmode = false -- dont show current mode (i.e --INSERT--) +-- colorscheme +vim.opt.termguicolors = true +vim.opt.background = "dark" +vim.cmd [[ colorscheme gruvbox ]] +vim.g.gruvbox_italic = 1 +vim.g.gruvbox_bold = 1 +vim.g.gruvbox_termcolors = 256 +vim.g.gruvbox_contrast_dark = 'medium' +vim.g.gruvbox_contrast_light = 'hard' +vim.g.gruvbox_invert_selection = 0 + -- remove ugly treesitter error highlight require 'nvim-treesitter.highlight' local hlmap = vim.treesitter.highlighter.hl_map hlmap.error = nil --- local on_attach = function(_, bufnr) --- local opts = {noremap = true, silent = true } --- vim.api.nvim_buf_set_keymap(bufnr, 'n', 'gD', '<cmd>lua vim.lsp.buf.declaration()<cr>', opts) --- vim.api.nvim_buf_set_keymap(bufnr, 'n', 'K', '<cmd>lua vim.lsp.buf.hover()<cr>', opts) --- vim.api.nvim_buf_set_keymap(bufnr, 'n', '<C-k>', '<cmd>lua vim.lsp.buf.signature_help()<cr>', opts) --- end - --- require('lspconfig').pyright.setup { on_attach = on_attach } - vim.cmd [[ augroup packer_user_config autocmd! diff --git a/config/nvim/lua/mappings.lua b/config/nvim/lua/mappings.lua index 008405d..50c57e2 100644 --- a/config/nvim/lua/mappings.lua +++ b/config/nvim/lua/mappings.lua @@ -46,7 +46,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/nvim/lua/plugins.lua b/config/nvim/lua/plugins.lua index 72ef03d..34b878d 100644 --- a/config/nvim/lua/plugins.lua +++ b/config/nvim/lua/plugins.lua @@ -205,5 +205,5 @@ return require('packer').startup(function() } use { 'nvim-treesitter/playground', opt = true, cmd = { 'TSPlaygroundToggle' } } - use { '~/git/argwrap.nvim', opt = true } + -- use { '~/git/argwrap.nvim', opt = true } end) 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 f7ef434..418d51e 100644 --- a/config/tmux/tmux.conf +++ b/config/tmux/tmux.conf @@ -6,53 +6,67 @@ set -g default-terminal "xterm-256color" set -g mouse on setw -g mode-keys vi +set -sg escape-time 0 # otherwise <ESC> in vim has a small delay -# 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 +bind '"' split-window -c "#{pane_current_path}" +bind '%' split-window -c "#{pane_current_path}" -h +bind 'c' new-window -c "#{pane_current_path}" -# 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 e9527f3..b64522f 100755 --- a/config/zsh/zprofile +++ b/config/zsh/zprofile @@ -11,6 +11,7 @@ then export PATH="$PATH:$HOME/.brew/bin:$HOME/git/dotfiles/bin:$HOME/bin:/usr/local/anaconda3/bin" export MAIL='charles.cabergs@colruytgroup.com' export SUDO='sudo' + export LC_CTYPE='en_US.UTF-8' fi # applications @@ -45,8 +45,8 @@ link_home_files() { # generate a file with the file path in this repo and the link for the real path # each line is in the format: TARGET LINKNAME find "$rice_dir" -type f | - sed "/\.$other_platform\./ d" | - sed -e 'p' -e "s:^$rice_dir:$dest_dir:" -e "s/\.$platform\././" | + sed "/\.$other_platform/ d" | + sed -e 'p' -e "s:^$rice_dir:$dest_dir:" -e "s/\.$platform//" | awk '{ if (NR % 2 == 1) { print "'"$(pwd)"'" "/" $0 } else print }' | xargs -L 2 > "$paths" < "$paths" cut -d ' ' -f 2 | xargs -L 1 dirname | xargs -L 1 mkdir -pv @@ -58,14 +58,6 @@ link_home_files 'local' "$HOME/.local" ln -svf "$(pwd)/config/zsh/zprofile" "$HOME/.zprofile" -################################################################################ -# sync install -################################################################################ - -echo '---------------------------- SYNC FILE LINKS ----------------------------' -mkdir -pv "$CLOUT_SYNC_PATH" -ln -svf "$CLOUT_SYNC_PATH/newsboat/urls" "$XDG_CONFIG_HOME/newsboat/urls" -ln -svf "$CLOUT_SYNC_PATH/qutebrowser/bookmarks/urls" "$XDG_CONFIG_HOME/qutebrowser/bookmarks/urls" ################################################################################ # vim plug @@ -110,6 +102,15 @@ parallel_wait # Linux specific ############################################################################### +################################################################################ +# sync install +################################################################################ + +echo '---------------------------- SYNC FILE LINKS ----------------------------' +mkdir -pv "$CLOUT_SYNC_PATH" +ln -svf "$CLOUT_SYNC_PATH/newsboat/urls" "$XDG_CONFIG_HOME/newsboat/urls" +ln -svf "$CLOUT_SYNC_PATH/qutebrowser/bookmarks/urls" "$XDG_CONFIG_HOME/qutebrowser/bookmarks/urls" + ############################################################################### # crontab ############################################################################### |