a lot happened
This commit is contained in:
parent
379bb99498
commit
322e2f81ae
9 changed files with 65 additions and 25 deletions
3
.gitmodules
vendored
3
.gitmodules
vendored
|
@ -34,3 +34,6 @@
|
||||||
[submodule "tmux/plugins/tmux-fzf"]
|
[submodule "tmux/plugins/tmux-fzf"]
|
||||||
path = tmux/plugins/tmux-fzf
|
path = tmux/plugins/tmux-fzf
|
||||||
url = https://git::@github.com/sainnhe/tmux-fzf
|
url = https://git::@github.com/sainnhe/tmux-fzf
|
||||||
|
[submodule "tmux/plugins/tmux-open"]
|
||||||
|
path = tmux/plugins/tmux-open
|
||||||
|
url = https://git::@github.com/tmux-plugins/tmux-open
|
||||||
|
|
|
@ -1 +1 @@
|
||||||
Subproject commit a27488549dedf528406d4b41c35bf0708b0aa242
|
Subproject commit d56be89504ad11d3ac3d3da26196b3f2ff2b8ed2
|
1
nvim
Symbolic link
1
nvim
Symbolic link
|
@ -0,0 +1 @@
|
||||||
|
/home/adrien/.config/nvim
|
|
@ -9,7 +9,6 @@
|
||||||
"ayu",
|
"ayu",
|
||||||
"Compare Side-By-Side",
|
"Compare Side-By-Side",
|
||||||
"Dartlight",
|
"Dartlight",
|
||||||
"Diffy",
|
|
||||||
"DocBlockr_Python",
|
"DocBlockr_Python",
|
||||||
"Dockerfile Syntax Highlighting",
|
"Dockerfile Syntax Highlighting",
|
||||||
"ExportHtml",
|
"ExportHtml",
|
||||||
|
@ -38,6 +37,7 @@
|
||||||
"SwitchDictionary",
|
"SwitchDictionary",
|
||||||
"Terraform",
|
"Terraform",
|
||||||
"WordingStatus",
|
"WordingStatus",
|
||||||
|
"Diffable",
|
||||||
],
|
],
|
||||||
"submit_usage": false,
|
"submit_usage": false,
|
||||||
}
|
}
|
||||||
|
|
|
@ -158,4 +158,5 @@
|
||||||
"predawn_sidebar_small": true,
|
"predawn_sidebar_small": true,
|
||||||
"predawn_tabs_small": true,
|
"predawn_tabs_small": true,
|
||||||
"theme": "predawn-DEV.sublime-theme",
|
"theme": "predawn-DEV.sublime-theme",
|
||||||
|
"index_files": true,
|
||||||
}
|
}
|
||||||
|
|
60
tmux.conf
60
tmux.conf
|
@ -11,23 +11,17 @@
|
||||||
# Prefix + U => Update packages
|
# Prefix + U => Update packages
|
||||||
set -g @plugin 'tmux-plugins/tpm'
|
set -g @plugin 'tmux-plugins/tpm'
|
||||||
|
|
||||||
# Tmux OneDark: http://github.com/odedlaz/tmux-onedark-themetheme
|
|
||||||
#set -g @plugin 'odedlaz/tmux-onedark-theme'
|
|
||||||
# Tmux-Themepack (feat Powerline)
|
|
||||||
set -g @plugin 'jimeh/tmux-themepack'
|
|
||||||
set -g @themepack 'powerline/default/blues'
|
|
||||||
|
|
||||||
# Save and restore Tmux sessions
|
# Save and restore Tmux sessions
|
||||||
# Prefix + Ctrl-s => Save current session
|
# Prefix + Ctrl-s => Save current session
|
||||||
# Prefix + Ctrl-r => Restore
|
# Prefix + Ctrl-r => Restore
|
||||||
set -g @plugin 'tmux-plugins/tmux-resurrect'
|
#set -g @plugin 'tmux-plugins/tmux-resurrect'
|
||||||
|
|
||||||
# Continuous saving tmux environment (depends on Ressurect)
|
# Continuous saving tmux environment (depends on Ressurect)
|
||||||
# Also auto-starts tmux on boot and auto-restores last session
|
# Also auto-starts tmux on boot and auto-restores last session
|
||||||
set -g @plugin 'tmux-plugins/tmux-continuum'
|
#set -g @plugin 'tmux-plugins/tmux-continuum'
|
||||||
#set -g status-right 'Continuum status: #{continuum_status}'
|
#set -g status-right 'Continuum status: #{continuum_status}'
|
||||||
set -g @continuum-restore 'on' # Auto restore previous session
|
#set -g @continuum-restore 'on' # Auto restore previous session
|
||||||
set -g @continuum-save-interval '15' # save time in minutes
|
#set -g @continuum-save-interval '15' # save time in minutes
|
||||||
|
|
||||||
# Copy to system clipboard
|
# Copy to system clipboard
|
||||||
# Normal mode:
|
# Normal mode:
|
||||||
|
@ -35,25 +29,55 @@ set -g @continuum-save-interval '15' # save time in minutes
|
||||||
# Copy mode:
|
# Copy mode:
|
||||||
# y => copy selection to clipboard
|
# y => copy selection to clipboard
|
||||||
# Y => Put (copy a selection then paste it to cmd)
|
# Y => Put (copy a selection then paste it to cmd)
|
||||||
set -g @plugin 'tmux-plugins/tmux-yank'
|
#set -g @plugin 'tmux-plugins/tmux-yank'
|
||||||
|
|
||||||
# Manage sessions, windows etc. with fzf
|
# Manage sessions, windows etc. with fzf
|
||||||
set -g @plugin 'sainnhe/tmux-fzf'
|
#set -g @plugin 'sainnhe/tmux-fzf'
|
||||||
|
|
||||||
|
# Opens stuff
|
||||||
|
#set -g @plugin 'tmux-plugins/tmux-open'
|
||||||
|
#set -g @open-S 'https://www.startpage.com/do/search?cat=web&cmd=process_search&language=english&engine0=v1all&abp=1&query='
|
||||||
|
#set -g @open 'C-f'
|
||||||
|
#set -g @open-editor 'C-e'
|
||||||
|
|
||||||
###########
|
###########
|
||||||
# Theming #
|
# Theming #
|
||||||
###########
|
###########
|
||||||
|
|
||||||
|
# Set current dir name as tab (window) name
|
||||||
|
# * Shows pwd #{b:pane_current_path}
|
||||||
|
# * Shows full path #{pane_current_path}
|
||||||
|
# path="#(if [[ $HOME == #{pane_current_path} ]]; then echo \"~\" ; else echo #{b:pane_current_path}; fi)"
|
||||||
|
# set -g status-interval 1
|
||||||
|
# set-window-option -g window-status-separator ""
|
||||||
|
# set-window-option -g window-status-current-format " #{b:pane_current_path} "
|
||||||
|
#set-window-option -g window-status-format " #{b:pane_current_path} "
|
||||||
|
|
||||||
|
|
||||||
|
# Tmux OneDark: http://github.com/odedlaz/tmux-onedark-themetheme
|
||||||
|
#set -g @plugin 'odedlaz/tmux-onedark-theme'
|
||||||
|
# Tmux-Themepack (feat Powerline)
|
||||||
|
set -g @plugin 'jimeh/tmux-themepack'
|
||||||
|
set -g @themepack 'powerline/default/blues'
|
||||||
|
|
||||||
# Make tmux display true colors
|
# Make tmux display true colors
|
||||||
set -g default-terminal "screen-256color"
|
#set -g default-terminal "screen-256color"
|
||||||
#set -g default-terminal "xterm-256color"
|
set -g default-terminal "xterm-256color"
|
||||||
|
# Creates a visual glitch with e.g. colored comments, don't use.
|
||||||
#set -ga terminal-overrides ",*256col*:Tc"
|
#set -ga terminal-overrides ",*256col*:Tc"
|
||||||
|
|
||||||
|
#set-option -g allow-rename off
|
||||||
|
|
||||||
########
|
########
|
||||||
# Misc #
|
# Misc #
|
||||||
########
|
########
|
||||||
|
|
||||||
|
set -g mouse on
|
||||||
|
|
||||||
|
# Home/End keys handled in [n]vim maybe?
|
||||||
|
bind-key -n Home send Escape "OH"
|
||||||
|
bind-key -n End send Escape "OF"
|
||||||
|
|
||||||
# Set the display duration of message (in ms)
|
# Set the display duration of message (in ms)
|
||||||
set-option -g display-time 4000
|
set-option -g display-time 4000
|
||||||
|
|
||||||
|
@ -79,6 +103,7 @@ bind-key -n 'C-h' if-shell "$is_vim" 'send-keys C-h' 'select-pane -L'
|
||||||
bind-key -n 'C-j' if-shell "$is_vim" 'send-keys C-j' 'select-pane -D'
|
bind-key -n 'C-j' if-shell "$is_vim" 'send-keys C-j' 'select-pane -D'
|
||||||
bind-key -n 'C-k' if-shell "$is_vim" 'send-keys C-k' 'select-pane -U'
|
bind-key -n 'C-k' if-shell "$is_vim" 'send-keys C-k' 'select-pane -U'
|
||||||
bind-key -n 'C-l' if-shell "$is_vim" 'send-keys C-l' 'select-pane -R'
|
bind-key -n 'C-l' if-shell "$is_vim" 'send-keys C-l' 'select-pane -R'
|
||||||
|
|
||||||
#tmux_version='$(tmux -V | sed -En "s/^tmux ([1-9]+(.[0-9]+)?).*/\1/p")'
|
#tmux_version='$(tmux -V | sed -En "s/^tmux ([1-9]+(.[0-9]+)?).*/\1/p")'
|
||||||
#if-shell -b '[ "$(echo "$tmux_version < 3.0" | bc)" = 1 ]' \
|
#if-shell -b '[ "$(echo "$tmux_version < 3.0" | bc)" = 1 ]' \
|
||||||
# "bind-key -n 'C-\\' if-shell \"$is_vim\" 'send-keys C-\\' 'select-pane -l'"
|
# "bind-key -n 'C-\\' if-shell \"$is_vim\" 'send-keys C-\\' 'select-pane -l'"
|
||||||
|
@ -152,12 +177,5 @@ bind j select-pane -D
|
||||||
bind ^H previous-window
|
bind ^H previous-window
|
||||||
bind ^L next-window
|
bind ^L next-window
|
||||||
|
|
||||||
# OTHER OPTIONS
|
|
||||||
|
|
||||||
set -g mouse on
|
|
||||||
|
|
||||||
# don't rename windows automatically
|
|
||||||
set-option -g allow-rename off
|
|
||||||
|
|
||||||
# Initialize TMUX plugin manager (keep this line at the very bottom of tmux.conf)
|
# Initialize TMUX plugin manager (keep this line at the very bottom of tmux.conf)
|
||||||
run -b '~/.tmux/plugins/tpm/tpm'
|
run -b '~/.tmux/plugins/tpm/tpm'
|
||||||
|
|
1
tmux/plugins/tmux-open
Submodule
1
tmux/plugins/tmux-open
Submodule
|
@ -0,0 +1 @@
|
||||||
|
Subproject commit 763d0a852e6703ce0f5090a508330012a7e6788e
|
17
vimrc
17
vimrc
|
@ -62,8 +62,9 @@ set scrolloff=12
|
||||||
""""""""""""""""""""
|
""""""""""""""""""""
|
||||||
|
|
||||||
" auto-reload tmux conf when updated
|
" auto-reload tmux conf when updated
|
||||||
autocmd bufwritepost ~/dotfiles/.tmux.conf execute ':!tmux source-file %'
|
if has("autocmd")
|
||||||
|
autocmd bufwritepost ~/dotfiles/.tmux.conf execute ':!tmux source-file %'
|
||||||
|
endif
|
||||||
"""""""""""
|
"""""""""""
|
||||||
" Theming "
|
" Theming "
|
||||||
"""""""""""
|
"""""""""""
|
||||||
|
@ -78,6 +79,12 @@ let g:airline_powerline_fonts=1 " Make airline use powerline fonts (pretty arrow
|
||||||
" Misc "
|
" Misc "
|
||||||
""""""""
|
""""""""
|
||||||
|
|
||||||
|
" Autoreload vimrc
|
||||||
|
if has("autocmd")
|
||||||
|
autocmd! bufwritepost .vimrc source ~/.vimrc
|
||||||
|
autocmd! bufwritepost vimrc source ~/.vimrc
|
||||||
|
endif
|
||||||
|
|
||||||
" Allow saving of files as sudo when I forgot to start vim using sudo.
|
" Allow saving of files as sudo when I forgot to start vim using sudo.
|
||||||
cmap w!! w !sudo tee > /dev/null %
|
cmap w!! w !sudo tee > /dev/null %
|
||||||
|
|
||||||
|
@ -98,6 +105,9 @@ augroup numbertoggle autocmd!
|
||||||
autocmd BufLeave,FocusLost,InsertEnter * set norelativenumber
|
autocmd BufLeave,FocusLost,InsertEnter * set norelativenumber
|
||||||
augroup END
|
augroup END
|
||||||
|
|
||||||
|
" jk to <ESC>
|
||||||
|
inoremap jk <esc>
|
||||||
|
|
||||||
" Yank vim text to system & selection clipboard with Ctrl+C
|
" Yank vim text to system & selection clipboard with Ctrl+C
|
||||||
" Paste with Ctrl+V
|
" Paste with Ctrl+V
|
||||||
" Requires `gvim` that is the following flags to your `vim --version`
|
" Requires `gvim` that is the following flags to your `vim --version`
|
||||||
|
@ -108,6 +118,9 @@ augroup END
|
||||||
vnoremap <C-c> "*y :let @+=@*<CR>
|
vnoremap <C-c> "*y :let @+=@*<CR>
|
||||||
map <C-v> "+P
|
map <C-v> "+P
|
||||||
|
|
||||||
|
" Toggle search high-lighting
|
||||||
|
nnoremap <F3> :set hlsearch!<CR>
|
||||||
|
|
||||||
" You wanna suffer? Disable arrow keys
|
" You wanna suffer? Disable arrow keys
|
||||||
" noremap <Up> <NOP>
|
" noremap <Up> <NOP>
|
||||||
" noremap <Down> <NOP>
|
" noremap <Down> <NOP>
|
||||||
|
|
3
zshrc
3
zshrc
|
@ -58,6 +58,9 @@ alias o="xdg-open > /dev/null 2>&1"
|
||||||
alias awsdf="aws --endpoint-url https://garage.deuxfleurs.fr"
|
alias awsdf="aws --endpoint-url https://garage.deuxfleurs.fr"
|
||||||
alias sshfs="sshfs -o reconnect,ServerAliveInterval=15,ServerAliveCountMax=3"
|
alias sshfs="sshfs -o reconnect,ServerAliveInterval=15,ServerAliveCountMax=3"
|
||||||
alias sshfs_rasp="sshfs coloc@warez.luxeylab.net:/hdd/shared/ /media/adrien/rasp"
|
alias sshfs_rasp="sshfs coloc@warez.luxeylab.net:/hdd/shared/ /media/adrien/rasp"
|
||||||
|
alias ctrlc="xclip -selection clipboard"
|
||||||
|
alias icat="kitty icat"
|
||||||
|
|
||||||
|
|
||||||
# You may need to manually set your language environment
|
# You may need to manually set your language environment
|
||||||
export LANG=fr_FR.UTF-8
|
export LANG=fr_FR.UTF-8
|
||||||
|
|
Loading…
Reference in a new issue