From 0b668de8a90bcdb49b8c22493a0b8d10e443fe01 Mon Sep 17 00:00:00 2001 From: Ricardo Madriz Date: Thu, 31 Dec 2020 08:56:55 -0600 Subject: [PATCH 1/7] Configure vim to use windows clipboard --- dotfiles/.config/git/config | 3 +++ dotfiles/.config/nvim/init.vim | 3 +++ dotfiles/.zshrc | 2 ++ 3 files changed, 8 insertions(+) diff --git a/dotfiles/.config/git/config b/dotfiles/.config/git/config index f016543..d46d001 100644 --- a/dotfiles/.config/git/config +++ b/dotfiles/.config/git/config @@ -10,3 +10,6 @@ [delta] syntax-theme = Dracula +[user] + email = richin13@gmail.com + name = Ricardo Madriz diff --git a/dotfiles/.config/nvim/init.vim b/dotfiles/.config/nvim/init.vim index f887dcd..b2aba1b 100644 --- a/dotfiles/.config/nvim/init.vim +++ b/dotfiles/.config/nvim/init.vim @@ -533,6 +533,9 @@ augroup coc_highligh autocmd CursorHold * silent call CocActionAsync('highlight') augroup end +" +let g:system_copy#copy_command='clip.exe' + " }}} " Plugin: Heirline ---------------------------- {{{ diff --git a/dotfiles/.zshrc b/dotfiles/.zshrc index dd6df4b..f5e18aa 100644 --- a/dotfiles/.zshrc +++ b/dotfiles/.zshrc @@ -200,6 +200,8 @@ if [ -x "$(command -v fd)" ]; then fi export DOTFILES="$HOME/dotfiles" + +export DISPLAY=:0 # }}} # Key Bindings ---------------------------------------------------- {{{ From 8b8a68f1710b8d81e970c7ee05612bbcf92e9cb8 Mon Sep 17 00:00:00 2001 From: Ricardo Madriz Date: Thu, 31 Dec 2020 08:57:07 -0600 Subject: [PATCH 2/7] wsl: Change docker config --- dotfiles/.docker/config.json | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/dotfiles/.docker/config.json b/dotfiles/.docker/config.json index 2ee0e9e..8ccf24d 100644 --- a/dotfiles/.docker/config.json +++ b/dotfiles/.docker/config.json @@ -1,3 +1,3 @@ { - "credsStore": "ecr-login" + "credsStore": "desktop.exe" } From ee1ffbd9204c6f90c61cf0f1210cf5e0238bc885 Mon Sep 17 00:00:00 2001 From: Ricardo Madriz Date: Thu, 31 Dec 2020 10:22:30 -0600 Subject: [PATCH 3/7] Fix clipboard in tmux config --- dotfiles/.tmux.conf | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/dotfiles/.tmux.conf b/dotfiles/.tmux.conf index 3de931c..8561549 100644 --- a/dotfiles/.tmux.conf +++ b/dotfiles/.tmux.conf @@ -174,7 +174,7 @@ bind-key -r M-b swap-window -t :- # swap current window with the previous one # # Copy functionality like Vi bind-key -T copy-mode-vi 'v' send -X begin-selection -bind -T copy-mode-vi 'y' send-keys -X copy-pipe-and-cancel "xsel -i --clipboard" +bind -T copy-mode-vi 'y' send-keys -X copy-pipe-and-cancel "clip.exe" # # Make new tmux windows open with directory in current pane bind-key c new-window -c "#{pane_current_path}" -n "" From 4295e13c16717476e77619f956e7b4bb2e21aa23 Mon Sep 17 00:00:00 2001 From: Ricardo Madriz Date: Tue, 2 Mar 2021 21:33:02 -0600 Subject: [PATCH 4/7] fix colors in wsl --- dotfiles/.tmux.conf | 5 +++-- 1 file changed, 3 insertions(+), 2 deletions(-) diff --git a/dotfiles/.tmux.conf b/dotfiles/.tmux.conf index 8561549..e1eae87 100644 --- a/dotfiles/.tmux.conf +++ b/dotfiles/.tmux.conf @@ -21,10 +21,11 @@ set-option -g default-shell /bin/zsh # make default terminal 256 colors # gets around need to pass -2 to tmux at command line startup -set -g default-terminal "alacritty" +# set -g default-terminal "alacritty" +set-option -g default-terminal "screen-256color" # tmux-256color -set-option -sa terminal-overrides ',alacritty:Tc' +set-option -sa terminal-overrides ',xterm-256color:RGB' set-option -g focus-events on # Draw pane borders with ascii characters to avoid unicode pane border problems From eb89c2b023555a5ab30265e724f3d484f1e17288 Mon Sep 17 00:00:00 2001 From: Ricardo Madriz Date: Thu, 22 Jul 2021 22:58:21 -0600 Subject: [PATCH 5/7] Hide music info when in WSL --- dotfiles/.tmux.conf | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) diff --git a/dotfiles/.tmux.conf b/dotfiles/.tmux.conf index e1eae87..4d5b919 100644 --- a/dotfiles/.tmux.conf +++ b/dotfiles/.tmux.conf @@ -88,9 +88,9 @@ set -g status-left "#{prefix_highlight}#[fg=#f8f8f2,bg=#44475a] #S " # set -ag status-left "#[fg=colour255,bg=colour234]::" # Right side -set -g status-right "#[fg=#bd93f9]#(~/.config/tmux/scripts/music.sh) #[fg=#50fa7b]#{playerctl_short}" -set -ag status-right "#[fg=#6272a4] | " -set -ag status-right "#[fg=#f8f8f2,bold]%m.%d %R//#(~/.config/tmux/scripts/dst.sh) " +# set -g status-right "#[fg=#bd93f9]#(~/.config/tmux/scripts/music.sh) #[fg=#50fa7b]#{playerctl_short}" +# set -ag status-right "#[fg=#6272a4] | " +set -g status-right "#[fg=#f8f8f2,bold]%m.%d %R//#(~/.config/tmux/scripts/dst.sh) " set -ag status-right "#[fg=#f8f8f2,bold]#{online_status} " set -g status-right-length 100 From cd39ae8dc1aaacd28752167b8d49944c93cf92f5 Mon Sep 17 00:00:00 2001 From: Ricardo Madriz Date: Sat, 28 May 2022 21:13:23 -0600 Subject: [PATCH 6/7] Ignore annoying docker files --- dotfiles/.docker/.gitignore | 2 ++ 1 file changed, 2 insertions(+) create mode 100644 dotfiles/.docker/.gitignore diff --git a/dotfiles/.docker/.gitignore b/dotfiles/.docker/.gitignore new file mode 100644 index 0000000..d6b7ef3 --- /dev/null +++ b/dotfiles/.docker/.gitignore @@ -0,0 +1,2 @@ +* +!.gitignore From da3ffbaa515937f14c1f404da7e185243dd5f980 Mon Sep 17 00:00:00 2001 From: Ricardo Madriz Date: Sat, 28 May 2022 21:13:32 -0600 Subject: [PATCH 7/7] Add poetry bin to path --- dotfiles/.zshrc | 2 ++ 1 file changed, 2 insertions(+) diff --git a/dotfiles/.zshrc b/dotfiles/.zshrc index f5e18aa..eb6477e 100644 --- a/dotfiles/.zshrc +++ b/dotfiles/.zshrc @@ -511,3 +511,5 @@ include ~/.bash/sensitive # Extra swag: ----------------------------------------------------- {{{ fortune ~/.fortunes/zen | cowsay # }}} + +export PATH="$HOME/.poetry/bin:$PATH"