diff options
Diffstat (limited to 'programs')
-rw-r--r-- | programs/init.vim | 1 | ||||
-rw-r--r-- | programs/neovim.nix | 11 | ||||
-rw-r--r-- | programs/tmux.nix | 2 |
3 files changed, 8 insertions, 6 deletions
diff --git a/programs/init.vim b/programs/init.vim index 8336db6..c62f419 100644 --- a/programs/init.vim +++ b/programs/init.vim | |||
@@ -176,4 +176,5 @@ lua << EOF | |||
176 | require 'lsp' | 176 | require 'lsp' |
177 | require 'treesitter' | 177 | require 'treesitter' |
178 | require 'completions' | 178 | require 'completions' |
179 | require 'leap' | ||
179 | EOF | 180 | EOF |
diff --git a/programs/neovim.nix b/programs/neovim.nix index 9585e37..0430868 100644 --- a/programs/neovim.nix +++ b/programs/neovim.nix | |||
@@ -13,7 +13,7 @@ | |||
13 | withPython3 = true; | 13 | withPython3 = true; |
14 | extraPackages = with pkgs; [ | 14 | extraPackages = with pkgs; [ |
15 | # gcc | 15 | # gcc |
16 | # python37Packages.yapf | 16 | python311Packages.yapf |
17 | # hlint | 17 | # hlint |
18 | # ocamlformat | 18 | # ocamlformat |
19 | ]; | 19 | ]; |
@@ -41,17 +41,16 @@ | |||
41 | # syntax | 41 | # syntax |
42 | rust-vim | 42 | rust-vim |
43 | haskell-vim | 43 | haskell-vim |
44 | elm-vim | ||
45 | vim-nix | 44 | vim-nix |
46 | vimtex | ||
47 | 45 | ||
48 | # handy | 46 | # handy |
49 | vim-gitgutter | ||
50 | tabular | 47 | tabular |
51 | emmet-vim | ||
52 | vimwiki | ||
53 | fzf-vim | 48 | fzf-vim |
49 | |||
50 | # motion | ||
51 | leap-nvim | ||
54 | ] ++ [ | 52 | ] ++ [ |
53 | # own | ||
55 | pkgs.better-text-objs | 54 | pkgs.better-text-objs |
56 | pkgs.vim-colors-plain | 55 | pkgs.vim-colors-plain |
57 | ]; | 56 | ]; |
diff --git a/programs/tmux.nix b/programs/tmux.nix index f061997..43778dd 100644 --- a/programs/tmux.nix +++ b/programs/tmux.nix | |||
@@ -72,6 +72,7 @@ in | |||
72 | set escape-time 20 | 72 | set escape-time 20 |
73 | set -g mouse on | 73 | set -g mouse on |
74 | 74 | ||
75 | |||
75 | set -g base-index 1 | 76 | set -g base-index 1 |
76 | setw -g pane-base-index 1 | 77 | setw -g pane-base-index 1 |
77 | 78 | ||
@@ -113,6 +114,7 @@ in | |||
113 | bind-key -T copy-mode-vi v send-keys -X begin-selection | 114 | bind-key -T copy-mode-vi v send-keys -X begin-selection |
114 | bind-key -T copy-mode-vi y send-keys -X copy-pipe "xclip -i -sel p -f | xclip -i -sel c " | 115 | bind-key -T copy-mode-vi y send-keys -X copy-pipe "xclip -i -sel p -f | xclip -i -sel c " |
115 | bind-key -T copy-mode-vi r send-keys -X rectangle-toggle | 116 | bind-key -T copy-mode-vi r send-keys -X rectangle-toggle |
117 | bind-key -T copy-mode-vi MouseDragEnd1Pane send-keys -X copy-pipe-no-clear "xclip -i -sel p -f | xclip -i -sel c " | ||
116 | bind P paste-buffer | 118 | bind P paste-buffer |
117 | 119 | ||
118 | set-window-option -g allow-rename off | 120 | set-window-option -g allow-rename off |