aboutsummaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorjakobst1n <jakob.stendahl@outlook.com>2021-09-04 12:28:10 +0200
committerjakobst1n <jakob.stendahl@outlook.com>2021-09-04 12:28:10 +0200
commit661605170322a3f7eff49f733fa2e0b25038ef22 (patch)
treed4df4004e7257dcfd8b3301f0a15b1b3f5493da6
parent80dc0a70c336adaa0ec8fd3e556c09a28fdcfa15 (diff)
parent1b3e150d482e9e9e95c566f8f68ae833032c28f0 (diff)
downloaddotfiles-661605170322a3f7eff49f733fa2e0b25038ef22.tar.gz
dotfiles-661605170322a3f7eff49f733fa2e0b25038ef22.zip
Merge branch 'master' of github.com:JakobST1n/dotfiles
-rw-r--r--Cheatsheet.md15
-rw-r--r--Common/vimrc4
-rw-r--r--mac/tmux.conf16
3 files changed, 28 insertions, 7 deletions
diff --git a/Cheatsheet.md b/Cheatsheet.md
index ae2cec1..e19765f 100644
--- a/Cheatsheet.md
+++ b/Cheatsheet.md
@@ -1,5 +1,18 @@
# Cheatsheet
-Cheatsheets for different terminal things.
+Cheatsheets for different things in this repo.
+
+## ZSH
+
+These are things that are in my zshrc file and such.
+
+#### Aliases
+
+- `lsp` `ps -ax | grep `
+- `lsa` `ls -la`
+- `lsg` `ls | grep`
+- `lsag` `ls -la | grep `
+
+On linux `pbcopy` and `pbpase` behaves the same as they do on MacOS (given that `xsel` is installed).
## Vim
diff --git a/Common/vimrc b/Common/vimrc
index acc8747..2a84124 100644
--- a/Common/vimrc
+++ b/Common/vimrc
@@ -128,6 +128,9 @@ set foldcolumn=1
" Show leader commands
set showcmd
+" Show color column
+set colorcolumn=80
+
"""""""""""""""""""""""""""""""""""""""""""""""""""""""""""""""
" => Colors and Fonts
"""""""""""""""""""""""""""""""""""""""""""""""""""""""""""""""
@@ -417,6 +420,7 @@ Plug 'terryma/vim-multiple-cursors'
Plug 'preservim/nerdcommenter'
Plug 'neoclide/coc.nvim', {'branch': 'release'}
Plug 'dense-analysis/ale'
+Plug 'evanleck/vim-svelte', {'branch': 'main'}
Plug 'preservim/tagbar'
Plug 'evanleck/vim-svelte', {'branch': 'main'}
diff --git a/mac/tmux.conf b/mac/tmux.conf
index 15ac4b7..1f00d5d 100644
--- a/mac/tmux.conf
+++ b/mac/tmux.conf
@@ -42,11 +42,17 @@ bind -n M-Right select-pane -R
bind -n M-Up select-pane -U
bind -n M-Down select-pane -D
+# Set copying settings
+setw -g mode-keys vi
+set-option -s set-clipboard off
bind P paste-buffer
-bind-key -Tcopy-mode-vi 'v' send -X begin-selection
-bind-key -Tcopy-mode-vi 'y' send -X copy-selection
-bind-key -Tcopy-mode-vi 'r' send -X rectangle-toggle
-bind-key -Tcopy-mode-vi 'y' send -X copy-pipe-and-cancel 'xclip -sel clip -i'`
+bind-key -T copy-mode-vi 'v' send -X begin-selection
+bind-key -T copy-mode-vi 'r' send -X rectangle-toggle
+bind-key -T copy-mode-vi 'y' send -X copy-pipe-and-cancel 'xclip -sel clip -i'`
+unbind -T copy-mode-vi Enter
+bind-key -T copy-mode-vi Enter send-keys -X copy-pipe-and-cancel 'xclip -se c -i'
+bind-key -T copy-mode-vi MouseDragEnd1Pane send-keys -X copy-pipe-and-cancel 'xclip -se c -ind-key -T copy-mode-vi Enter send-keys -X copy-pipe-and-cancel 'xclip -se c -i'
+bind-key -T copy-mode-vi MouseDragEnd1Pane send-keys -X copy-pipe-and-cancel 'xclip -se c -i''
bind-key S-Left swap-window -t -1
bind-key S-Right swap-window -t +1
@@ -59,8 +65,6 @@ set -g bell-action any
set -g terminal-overrides 'xterm*:smcup@:rmcup@'
#set -wg xterm-keys 1
set -g mouse on
-#set-option -s set-clipboard off
-