init nvim

This commit is contained in:
2023-04-02 13:46:42 +03:00
parent 3bceb62c33
commit 3d1c72039a
19 changed files with 33 additions and 33 deletions

Binary file not shown.

6
flake.lock generated
View File

@@ -17,11 +17,11 @@
}, },
"nixpkgs": { "nixpkgs": {
"locked": { "locked": {
"lastModified": 1679319606, "lastModified": 1680273054,
"narHash": "sha256-wyEMIZB6BnsmJWInEgDZu66hXVMGJEZFl5uDsn27f9M=", "narHash": "sha256-Bs6/5LpvYp379qVqGt9mXxxx9GSE789k3oFc+OAL07M=",
"owner": "nixos", "owner": "nixos",
"repo": "nixpkgs", "repo": "nixpkgs",
"rev": "8bc6945b1224a1cfa679d6801580b1054dba1a5c", "rev": "3364b5b117f65fe1ce65a3cdd5612a078a3b31e3",
"type": "github" "type": "github"
}, },
"original": { "original": {

View File

@@ -69,7 +69,7 @@
pkgs.neovim-unwrapped pkgs.neovim-unwrapped
{buildInputs = dependencies;} {buildInputs = dependencies;}
]; ];
packages.nvim = pkgs.wrapNeovim neovim-augmented { packages.pwnvim = pkgs.wrapNeovim neovim-augmented {
viAlias = true; viAlias = true;
vimAlias = true; vimAlias = true;
withNodeJs = false; withNodeJs = false;
@@ -188,15 +188,15 @@
}; };
}; };
}; };
apps.nvim = flake-utils.lib.mkApp { apps.pwnvim = flake-utils.lib.mkApp {
drv = packages.nvim; drv = packages.pwnvim;
name = "nvim"; name = "pwnvim";
exePath = "/bin/nvim"; exePath = "/bin/nvim";
}; };
packages.default = packages.nvim; packages.default = packages.pwnvim;
apps.default = apps.nvim; apps.default = apps.pwnvim;
devShell = pkgs.mkShell { devShell = pkgs.mkShell {
buildInputs = with pkgs; [packages.nvim] ++ dependencies; buildInputs = with pkgs; [packages.pwnvim] ++ dependencies;
}; };
}); });
} }

View File

@@ -6,14 +6,14 @@ else
end end
require('impatient') require('impatient')
require('impatient').enable_profile() require('impatient').enable_profile()
require('nvim.filetypes').config() require('pwnvim.filetypes').config()
require('nvim.options').defaults() require('pwnvim.options').defaults()
require('nvim.options').gui() require('pwnvim.options').gui()
require('nvim.mappings') require('pwnvim.mappings')
require('nvim.abbreviations') require('pwnvim.abbreviations')
require('nvim.plugins').ui() require('pwnvim.plugins').ui()
require('nvim.plugins').diagnostics() require('pwnvim.plugins').diagnostics()
require('nvim.plugins').telescope() require('pwnvim.plugins').telescope()
require('nvim.plugins').completions() require('pwnvim.plugins').completions()
require('nvim.plugins').notes() require('pwnvim.plugins').notes()
require('nvim.plugins').misc() require('pwnvim.plugins').misc()

View File

@@ -270,18 +270,18 @@ M.diagnostics = function()
.make_client_capabilities(), .make_client_capabilities(),
cmp_nvim_lsp.default_capabilities()); cmp_nvim_lsp.default_capabilities());
require('rust-tools').setup({ -- require('rust-tools').setup({
server = { -- server = {
on_attach = attached, -- on_attach = attached,
capabilities = capabilities, -- capabilities = capabilities,
standalone = false -- standalone = false
}, -- },
tools = { -- tools = {
autoSetHints = true, -- autoSetHints = true,
inlay_hints = { auto = true, only_current_line = true }, -- inlay_hints = { auto = true, only_current_line = true },
runnables = { use_telescope = true } -- runnables = { use_telescope = true }
} -- }
}) -- })
require('crates').setup {} require('crates').setup {}
require('cmp-npm').setup({}) require('cmp-npm').setup({})
lspconfig.tsserver.setup { capabilities = capabilities, on_attach = attached } lspconfig.tsserver.setup { capabilities = capabilities, on_attach = attached }