this repo has no description
LSP fix, and some formatting for home.nix
+18
-12
+13
-7
home.nix
+13
-7
home.nix
···
40
40
};
41
41
meta.homepage = "https://github.com/vijaymarupudi/nvim-fzf";
42
42
};
43
-
in {
43
+
in
44
+
{
44
45
# Let Home Manager install and manage itself.
45
46
programs.home-manager.enable = true;
46
47
···
83
84
enable = true;
84
85
viAlias = true;
85
86
plugins = with pkgs.vimPlugins; [
86
-
{ plugin = gitsigns-nvim;
87
-
config = "lua require('gitsigns').setup()"; }
87
+
{
88
+
plugin = gitsigns-nvim;
89
+
config = "lua require('gitsigns').setup()";
90
+
}
88
91
{ plugin = nvim-fzf; }
89
92
{ plugin = fzf-lua; }
90
93
91
-
{ plugin = nvim-comment;
92
-
config = "lua require('nvim_comment').setup()"; }
94
+
{
95
+
plugin = nvim-comment;
96
+
config = "lua require('nvim_comment').setup()";
97
+
}
93
98
{ plugin = vim-closer; }
94
99
{ plugin = nvim-tree-lua; }
95
100
···
156
161
plugins = [
157
162
"git"
158
163
"vi-mode"
164
+
# TODO: some way to know i'm in a nix shell?
159
165
];
160
166
};
161
167
};
···
169
175
EDITOR = "nvim";
170
176
ZSH_DISABLE_COMPFIX = "true";
171
177
};
172
-
178
+
173
179
home.file = {
174
180
".tigrc".source = config.lib.file.mkOutOfStoreSymlink ./tigrc;
175
181
···
180
186
# ".vifm/colors/solarized-light".source = config.lib.file.mkOutOfStoreSymlink ./vifm/solarized-light.vifm;
181
187
# ".vifm/vifmrc".source = config.lib.file.mkOutOfStoreSymlink ./vifm/vifmrc;
182
188
};
183
-
189
+
184
190
# TODO: obsidian config
185
191
# TODO: font-iosevka-nerd-font (not available I think, could script download though?)
186
192
}
+5
-5
nvim/init.vim
+5
-5
nvim/init.vim
···
119
119
-- after the language server attaches to the current buffer
120
120
local on_attach = function(client, bufnr)
121
121
local function buf_set_keymap(...) vim.api.nvim_buf_set_keymap(bufnr, ...) end
122
+
local function buf_set_option(...) vim.api.nvim_buf_set_option(bufnr, ...) end
122
123
124
+
buf_set_option('omnifunc', 'v:lua.vim.lsp.omnifunc')
123
125
-- TODO: Open file outline/search symbols
124
126
-- TODO: Search workspace symbols?
125
127
126
128
buf_set_keymap('n', 'gD', '<cmd>lua vim.lsp.buf.declaration()<CR>', opts)
127
-
buf_set_keymap('n', 'gd', '<cmd>lua vim.lsp.buf.implementation()<CR>', opts)
129
+
buf_set_keymap('n', 'gd', '<cmd>lua vim.lsp.buf.definition()<CR>', opts)
128
130
buf_set_keymap('n', 'gr', '<cmd>lua vim.lsp.buf.references()<CR>', opts)
129
131
buf_set_keymap('n', 'K', '<cmd>lua vim.lsp.buf.hover()<CR>', opts)
130
132
buf_set_keymap('n', 'gi', '<cmd>lua vim.lsp.buf.implementation()<CR>', opts)
···
139
141
buf_set_keymap('n', '[d', '<cmd>lua vim.lsp.diagnostic.goto_prev()<CR>', opts)
140
142
buf_set_keymap('n', ']d', '<cmd>lua vim.lsp.diagnostic.goto_next()<CR>', opts)
141
143
buf_set_keymap('n', '<leader>q', '<cmd>lua vim.lsp.diagnostic.set_loclist()<CR>', opts)
142
-
buf_set_keymap('n', '<leader>f', '<cmd>lua vim.lsp.buf.formatting()<CR>', opts)
144
+
buf_set_keymap('n', '<leader>ff', '<cmd>lua vim.lsp.buf.formatting()<CR>', opts)
143
145
end
144
146
145
147
local servers = {'gopls', 'rls', 'tsserver', 'hie', 'rnix'}
146
148
for _, lsp in ipairs(servers) do
147
149
nvim_lsp[lsp].setup {
148
150
on_attach = on_attach,
149
-
flags = {
150
-
debounce_text_changes = 150,
151
-
}
151
+
flags = { debounce_text_changes = 150 },
152
152
}
153
153
end
154
154
EOF