From f1c3152a4618da13cc18dbafd177b847ff6d828a Mon Sep 17 00:00:00 2001 From: meml0rz Date: Tue, 12 Nov 2024 23:35:52 +0100 Subject: [PATCH] kekl --- modules/nix/nvim/alpha.nix | 37 ---------------------- modules/nix/nvim/default.nix | 1 + modules/nix/nvim/dev.nix | 9 ++++++ modules/nix/nvim/lsp.nix | 59 ++++++++++++++++++++++++++++++++++-- 4 files changed, 67 insertions(+), 39 deletions(-) create mode 100644 modules/nix/nvim/dev.nix diff --git a/modules/nix/nvim/alpha.nix b/modules/nix/nvim/alpha.nix index ee3a049..3535286 100644 --- a/modules/nix/nvim/alpha.nix +++ b/modules/nix/nvim/alpha.nix @@ -28,43 +28,6 @@ type = "padding"; val = 2; } - { - type = "group"; - val = [ - { - on_press = { - __raw = "function() vim.cmd[[ene]] end"; - }; - opts = { - shortcut = "n"; - }; - type = "button"; - val = " New file"; - } - { - on_press = { - __raw = "function() vim.cmd[[qa]] end"; - }; - opts = { - shortcut = "q"; - }; - type = "button"; - val = " Quit Neovim"; - } - ]; - } - { - type = "padding"; - val = 2; - } - { - opts = { - hl = "Keyword"; - position = "center"; - }; - type = "text"; - val = "Inspiring quote here."; - } ]; }; }; diff --git a/modules/nix/nvim/default.nix b/modules/nix/nvim/default.nix index b3102fd..b60cc68 100644 --- a/modules/nix/nvim/default.nix +++ b/modules/nix/nvim/default.nix @@ -8,6 +8,7 @@ ./opts.nix ./lualine.nix ./alpha.nix + ./dev.nix ]; programs.nixvim = { enable = true; diff --git a/modules/nix/nvim/dev.nix b/modules/nix/nvim/dev.nix new file mode 100644 index 0000000..5040e7f --- /dev/null +++ b/modules/nix/nvim/dev.nix @@ -0,0 +1,9 @@ +{ config, pkgs, nixvim, ... }: +{ + programs.nixvim = { + plugins = { + toggleterm.enable = true; + autoclose.enable = true; + }; + }; +} diff --git a/modules/nix/nvim/lsp.nix b/modules/nix/nvim/lsp.nix index 4f34860..891e682 100644 --- a/modules/nix/nvim/lsp.nix +++ b/modules/nix/nvim/lsp.nix @@ -1,8 +1,63 @@ { config, pkgs, nixvim, ... }: { programs.nixvim.plugins = { - lsp = { + rustaceanvim = { + settings = { + server = { + cmd = [ + "rustup" + "run" + "nightly" + "rust-analyzer" + ]; + default_settings = { + rust-analyzer = { + check = { + command = "clippy"; + }; + inlayHints = { + lifetimeElisionHints = { + enable = "always"; + }; + }; + }; + }; + standalone = false; + }; + }; + }; + lsp = { enable = true; - }; + servers = { + asm_lsp = { + enable = true; + autostart = true; + }; + clangd = { + enable = true; + autostart = true; + }; + gopls = { + enable = true; + autostart = true; + }; + lua_ls = { + enable = true; + autostart = true; + }; + nixd = { + enable = true; + autostart = true; + }; + pyright = { + enable = true; + autostart = true; + }; + rust_analyzer = { + enable = true; + autostart = true; + }; + }; + }; }; }