configs/neovim: switch to neoformat for code formatting
remove nixfmt while here
This commit is contained in:
parent
11cf9b11c1
commit
d4047fef14
@ -73,7 +73,7 @@ lspc.lua_ls.setup {
|
||||
settings = {
|
||||
Lua = {
|
||||
diagnostics = {
|
||||
globals = {'vim'},
|
||||
globals = { 'vim' },
|
||||
},
|
||||
},
|
||||
},
|
||||
@ -116,6 +116,7 @@ vim.keymap.set('n', '<space>e', vim.diagnostic.open_float)
|
||||
vim.keymap.set('n', '[d', vim.diagnostic.goto_prev)
|
||||
vim.keymap.set('n', ']d', vim.diagnostic.goto_next)
|
||||
vim.keymap.set('n', '<space>q', vim.diagnostic.setloclist)
|
||||
vim.keymap.set('n', '<space>f', ':Neoformat<CR>')
|
||||
|
||||
vim.api.nvim_create_autocmd('LspAttach', {
|
||||
group = vim.api.nvim_create_augroup('UserLspConfig', {}),
|
||||
@ -125,9 +126,9 @@ vim.api.nvim_create_autocmd('LspAttach', {
|
||||
vim.keymap.set('n', '<space>D', vim.lsp.buf.type_definition, opts)
|
||||
vim.keymap.set('n', '<space>rn', vim.lsp.buf.rename, opts)
|
||||
vim.keymap.set('n', 'gr', vim.lsp.buf.references, opts)
|
||||
vim.keymap.set('n', '<space>f', function()
|
||||
vim.lsp.buf.format { async = true }
|
||||
end, opts)
|
||||
--vim.keymap.set('n', '<space>f', function()
|
||||
-- vim.lsp.buf.format { async = true }
|
||||
--end, opts)
|
||||
end,
|
||||
})
|
||||
|
||||
|
@ -112,6 +112,7 @@ with pkgs; let
|
||||
fugitive
|
||||
fzf-vim
|
||||
haskell-vim
|
||||
neoformat
|
||||
nvim-compe
|
||||
nvim-lspconfig
|
||||
nvim-tree-lua
|
||||
|
@ -162,7 +162,6 @@ in {
|
||||
minisign
|
||||
mosh
|
||||
nix-diff
|
||||
nixfmt
|
||||
nix-index
|
||||
nix-top
|
||||
pass
|
||||
|
@ -155,7 +155,6 @@ in {
|
||||
nixpkgs.config.allowUnfree = true;
|
||||
|
||||
environment.systemPackages = with pkgs; [
|
||||
nixfmt
|
||||
tmux
|
||||
mosh
|
||||
apg
|
||||
|
@ -62,7 +62,6 @@ in {
|
||||
go
|
||||
mosh
|
||||
neovim
|
||||
nixfmt
|
||||
nmap
|
||||
rage
|
||||
statix
|
||||
|
@ -42,7 +42,7 @@ in {
|
||||
};
|
||||
|
||||
# neovim will overwrite my neovim!!
|
||||
environment.systemPackages = with pkgs; [neovim nixfmt jq];
|
||||
environment.systemPackages = with pkgs; [neovim jq];
|
||||
|
||||
services.openssh = {
|
||||
enable = true;
|
||||
|
@ -102,7 +102,7 @@ in {
|
||||
'';
|
||||
boot.tmp.cleanOnBoot = true;
|
||||
|
||||
environment.systemPackages = with pkgs; [apg inetutils nixfmt];
|
||||
environment.systemPackages = with pkgs; [apg inetutils];
|
||||
|
||||
environment.interactiveShellInit = ''
|
||||
alias vi=nvim
|
||||
|
Loading…
Reference in New Issue
Block a user