diff options
Diffstat (limited to 'programs')
-rw-r--r-- | programs/init.vim | 29 | ||||
-rw-r--r-- | programs/neovim.nix | 2 | ||||
-rw-r--r-- | programs/st/config.h | 2 | ||||
-rw-r--r-- | programs/tmux.nix | 1 |
4 files changed, 14 insertions, 20 deletions
diff --git a/programs/init.vim b/programs/init.vim index 3dbd4b5..e7a70c1 100644 --- a/programs/init.vim +++ b/programs/init.vim | |||
@@ -100,7 +100,7 @@ let g:netrw_banner=0 | |||
100 | let g:netrw_browsex_viewer="xdg-open" | 100 | let g:netrw_browsex_viewer="xdg-open" |
101 | let g:netrw_winsize=30 | 101 | let g:netrw_winsize=30 |
102 | 102 | ||
103 | colorscheme plain | 103 | colorscheme agila |
104 | 104 | ||
105 | set shiftwidth=4 " indent = 4 spaces | 105 | set shiftwidth=4 " indent = 4 spaces |
106 | set expandtab | 106 | set expandtab |
@@ -132,34 +132,24 @@ cab bfd bufdo | |||
132 | " man pages | 132 | " man pages |
133 | let g:ft_man_open_mode = 'tab' | 133 | let g:ft_man_open_mode = 'tab' |
134 | 134 | ||
135 | let g:gitgutter_override_sign_column_highlight = 0 | ||
136 | let g:gitgutter_sign_added = '+' | ||
137 | let g:gitgutter_sign_modified = '~' | ||
138 | let g:gitgutter_sign_removed = '-' | ||
139 | let g:gitgutter_sign_removed_first_line = '-' | ||
140 | let g:gitgutter_sign_modified_removed = '~' | ||
141 | |||
142 | let g:fzf_colors = | 135 | let g:fzf_colors = |
143 | \ { 'fg': ['fg', 'Noise'], | 136 | \ { 'fg': ['fg', 'Normal'], |
144 | \ 'bg': ['bg', 'Noise'], | 137 | \ 'bg': ['bg', 'Normal'], |
145 | \ 'hl': ['fg', 'Statement'], | 138 | \ 'hl': ['fg', 'Normal'], |
146 | \ 'fg+': ['fg', 'CursorLine', 'CursorColumn', 'Normal'], | 139 | \ 'fg+': ['fg', 'StatusLine'], |
147 | \ 'bg+': ['bg', 'CursorLine', 'CursorColumn'], | 140 | \ 'bg+': ['bg', 'Normal'], |
148 | \ 'hl+': ['fg', 'Statement'], | 141 | \ 'hl+': ['fg', 'Normal'], |
142 | \ 'gutter': ['bg', 'Normal'], | ||
149 | \ 'info': ['fg', 'PreProc'], | 143 | \ 'info': ['fg', 'PreProc'], |
150 | \ 'border': ['fg', 'Ignore'], | 144 | \ 'border': ['fg', 'Ignore'], |
151 | \ 'prompt': ['fg', 'Conditional'], | 145 | \ 'prompt': ['fg', 'Conditional'], |
152 | \ 'pointer': ['fg', 'Exception'], | 146 | \ 'pointer': ['fg', 'Directory'], |
153 | \ 'marker': ['fg', 'Keyword'], | 147 | \ 'marker': ['fg', 'Keyword'], |
154 | \ 'spinner': ['fg', 'Label'], | 148 | \ 'spinner': ['fg', 'Label'], |
155 | \ 'header': ['fg', 'Comment'] } | 149 | \ 'header': ['fg', 'Comment'] } |
156 | let g:fzf_layout = { 'down': '40%' } | 150 | let g:fzf_layout = { 'down': '40%' } |
157 | let g:fzf_preview_window = [] | 151 | let g:fzf_preview_window = [] |
158 | 152 | ||
159 | highlight GitGutterAdd ctermfg=8 | ||
160 | highlight GitGutterChange ctermfg=8 | ||
161 | highlight GitGutterDelete ctermfg=8 | ||
162 | |||
163 | let g:rustfmt_autosave = 0 | 153 | let g:rustfmt_autosave = 0 |
164 | 154 | ||
165 | let g:latex_view_general_viewer = "zathura" | 155 | let g:latex_view_general_viewer = "zathura" |
@@ -180,4 +170,5 @@ require 'lsp' | |||
180 | require 'treesitter' | 170 | require 'treesitter' |
181 | require 'completions' | 171 | require 'completions' |
182 | require 'leap' | 172 | require 'leap' |
173 | require 'clipboard' | ||
183 | EOF | 174 | EOF |
diff --git a/programs/neovim.nix b/programs/neovim.nix index 08a1ada..6a09ba4 100644 --- a/programs/neovim.nix +++ b/programs/neovim.nix | |||
@@ -42,7 +42,9 @@ | |||
42 | # syntax | 42 | # syntax |
43 | rust-vim | 43 | rust-vim |
44 | haskell-vim | 44 | haskell-vim |
45 | typescript-vim | ||
45 | vim-nix | 46 | vim-nix |
47 | vim-javascript | ||
46 | 48 | ||
47 | # handy | 49 | # handy |
48 | tabular | 50 | tabular |
diff --git a/programs/st/config.h b/programs/st/config.h index e7f79e3..d6402f9 100644 --- a/programs/st/config.h +++ b/programs/st/config.h | |||
@@ -46,7 +46,7 @@ int allowaltscreen = 1; | |||
46 | 46 | ||
47 | /* allow certain non-interactive (insecure) window operations such as: | 47 | /* allow certain non-interactive (insecure) window operations such as: |
48 | setting the clipboard text */ | 48 | setting the clipboard text */ |
49 | int allowwindowops = 0; | 49 | int allowwindowops = 1; |
50 | 50 | ||
51 | /* | 51 | /* |
52 | * draw latency range in ms - from new content/keypress/etc until drawing. | 52 | * draw latency range in ms - from new content/keypress/etc until drawing. |
diff --git a/programs/tmux.nix b/programs/tmux.nix index bfda915..10cbf5f 100644 --- a/programs/tmux.nix +++ b/programs/tmux.nix | |||
@@ -118,6 +118,7 @@ in | |||
118 | bind-key -T copy-mode-vi y send-keys -X copy-pipe "${copy}" | 118 | bind-key -T copy-mode-vi y send-keys -X copy-pipe "${copy}" |
119 | bind-key -T copy-mode-vi r send-keys -X rectangle-toggle | 119 | bind-key -T copy-mode-vi r send-keys -X rectangle-toggle |
120 | bind-key -T copy-mode-vi MouseDragEnd1Pane send-keys -X copy-pipe-no-clear "${copy}" | 120 | bind-key -T copy-mode-vi MouseDragEnd1Pane send-keys -X copy-pipe-no-clear "${copy}" |
121 | set -s set-clipboard on | ||
121 | bind P paste-buffer | 122 | bind P paste-buffer |
122 | 123 | ||
123 | set-window-option -g allow-rename off | 124 | set-window-option -g allow-rename off |