From b3714ed696acec825630fb63d1e958cabf44a451 Mon Sep 17 00:00:00 2001 From: Bryan Ramos Date: Sun, 12 May 2024 10:45:09 -0400 Subject: [PATCH] neovim update --- src/system/machines/desktop/home.nix | 2 +- src/user/modules/gui/modules/default.nix | 1 - src/user/modules/utils/modules/default.nix | 1 + .../modules/neovim/config/lazyvim/init.lua | 0 .../neovim/config/lazyvim/lua/config/autocmds.lua | 3 --- .../neovim/config/lazyvim/lua/config/keymaps.lua | 0 .../modules/neovim/config/lazyvim/lua/config/lazy.lua | 2 +- .../neovim/config/lazyvim/lua/config/options.lua | 0 .../modules/neovim/config/lazyvim/lua/plugins/core.lua | 0 .../modules/neovim/config/pkgs.nix} | 9 ++++++--- .../modules/{gui => utils}/modules/neovim/default.nix | 10 +++------- 11 files changed, 12 insertions(+), 16 deletions(-) rename src/user/modules/{gui => utils}/modules/neovim/config/lazyvim/init.lua (100%) rename src/user/modules/{gui => utils}/modules/neovim/config/lazyvim/lua/config/autocmds.lua (98%) rename src/user/modules/{gui => utils}/modules/neovim/config/lazyvim/lua/config/keymaps.lua (100%) rename src/user/modules/{gui => utils}/modules/neovim/config/lazyvim/lua/config/lazy.lua (95%) rename src/user/modules/{gui => utils}/modules/neovim/config/lazyvim/lua/config/options.lua (100%) rename src/user/modules/{gui => utils}/modules/neovim/config/lazyvim/lua/plugins/core.lua (100%) rename src/user/modules/{gui/modules/neovim/config/servers.nix => utils/modules/neovim/config/pkgs.nix} (81%) rename src/user/modules/{gui => utils}/modules/neovim/default.nix (54%) diff --git a/src/system/machines/desktop/home.nix b/src/system/machines/desktop/home.nix index 50a2669..f8d4f5a 100644 --- a/src/system/machines/desktop/home.nix +++ b/src/system/machines/desktop/home.nix @@ -29,6 +29,7 @@ enable = true; dev.enable = true; irc.enable = true; + neovim.enable = true; vim.enable = false; }; @@ -38,7 +39,6 @@ browsers.enable = true; corn.enable = true; fun.enable = true; - neovim.enable = true; utils.enable = true; writing.enable = true; }; diff --git a/src/user/modules/gui/modules/default.nix b/src/user/modules/gui/modules/default.nix index 55c23db..86e7558 100644 --- a/src/user/modules/gui/modules/default.nix +++ b/src/user/modules/gui/modules/default.nix @@ -5,7 +5,6 @@ ./corn ./fun ./utils - ./neovim ./writing ]; } diff --git a/src/user/modules/utils/modules/default.nix b/src/user/modules/utils/modules/default.nix index c3ca23c..1d5ea42 100644 --- a/src/user/modules/utils/modules/default.nix +++ b/src/user/modules/utils/modules/default.nix @@ -3,6 +3,7 @@ ./dev ./email ./irc + ./neovim ./vim ]; } diff --git a/src/user/modules/gui/modules/neovim/config/lazyvim/init.lua b/src/user/modules/utils/modules/neovim/config/lazyvim/init.lua similarity index 100% rename from src/user/modules/gui/modules/neovim/config/lazyvim/init.lua rename to src/user/modules/utils/modules/neovim/config/lazyvim/init.lua diff --git a/src/user/modules/gui/modules/neovim/config/lazyvim/lua/config/autocmds.lua b/src/user/modules/utils/modules/neovim/config/lazyvim/lua/config/autocmds.lua similarity index 98% rename from src/user/modules/gui/modules/neovim/config/lazyvim/lua/config/autocmds.lua rename to src/user/modules/utils/modules/neovim/config/lazyvim/lua/config/autocmds.lua index 026bc41..1464cb0 100644 --- a/src/user/modules/gui/modules/neovim/config/lazyvim/lua/config/autocmds.lua +++ b/src/user/modules/utils/modules/neovim/config/lazyvim/lua/config/autocmds.lua @@ -66,10 +66,8 @@ lsp.setup_servers({ "diagnosticls", "lua_ls", "marksman", - "purescriptls", "tailwindcss", "bashls", - "dhall_lsp_server", "volar", "clangd", }) @@ -81,7 +79,6 @@ lsp.setup() local cmp_nvim_lsp = require "cmp_nvim_lsp" require("lspconfig").clangd.setup { - on_attach = on_attach, capabilities = cmp_nvim_lsp.default_capabilities(), cmd = { "clangd", diff --git a/src/user/modules/gui/modules/neovim/config/lazyvim/lua/config/keymaps.lua b/src/user/modules/utils/modules/neovim/config/lazyvim/lua/config/keymaps.lua similarity index 100% rename from src/user/modules/gui/modules/neovim/config/lazyvim/lua/config/keymaps.lua rename to src/user/modules/utils/modules/neovim/config/lazyvim/lua/config/keymaps.lua diff --git a/src/user/modules/gui/modules/neovim/config/lazyvim/lua/config/lazy.lua b/src/user/modules/utils/modules/neovim/config/lazyvim/lua/config/lazy.lua similarity index 95% rename from src/user/modules/gui/modules/neovim/config/lazyvim/lua/config/lazy.lua rename to src/user/modules/utils/modules/neovim/config/lazyvim/lua/config/lazy.lua index ce1a465..51350ad 100644 --- a/src/user/modules/gui/modules/neovim/config/lazyvim/lua/config/lazy.lua +++ b/src/user/modules/utils/modules/neovim/config/lazyvim/lua/config/lazy.lua @@ -25,7 +25,7 @@ require("lazy").setup({ -- version = "*", -- try installing the latest stable version for plugins that support semver }, install = { colorscheme = { "github-theme" } }, - checker = { enabled = true }, -- automatically check for plugin updates + checker = { enabled = false }, -- automatically check for plugin updates performance = { rtp = { -- disable some rtp plugins diff --git a/src/user/modules/gui/modules/neovim/config/lazyvim/lua/config/options.lua b/src/user/modules/utils/modules/neovim/config/lazyvim/lua/config/options.lua similarity index 100% rename from src/user/modules/gui/modules/neovim/config/lazyvim/lua/config/options.lua rename to src/user/modules/utils/modules/neovim/config/lazyvim/lua/config/options.lua diff --git a/src/user/modules/gui/modules/neovim/config/lazyvim/lua/plugins/core.lua b/src/user/modules/utils/modules/neovim/config/lazyvim/lua/plugins/core.lua similarity index 100% rename from src/user/modules/gui/modules/neovim/config/lazyvim/lua/plugins/core.lua rename to src/user/modules/utils/modules/neovim/config/lazyvim/lua/plugins/core.lua diff --git a/src/user/modules/gui/modules/neovim/config/servers.nix b/src/user/modules/utils/modules/neovim/config/pkgs.nix similarity index 81% rename from src/user/modules/gui/modules/neovim/config/servers.nix rename to src/user/modules/utils/modules/neovim/config/pkgs.nix index 4fabb5d..b212c6d 100644 --- a/src/user/modules/gui/modules/neovim/config/servers.nix +++ b/src/user/modules/utils/modules/neovim/config/pkgs.nix @@ -7,7 +7,6 @@ let sumneko-lua-language-server stylua haskell-language-server hlint nodePackages."@tailwindcss/language-server" - dhall-lsp-server ]; lsp' = with pkgs.nodePackages; [ @@ -16,9 +15,13 @@ let bash-language-server diagnostic-languageserver pyright - purescript-language-server volar ]; + extraPackages = with pkgs; [ + lazygit + gcc + ]; + in - lsp ++ lsp' + extraPackages ++ lsp ++ lsp' diff --git a/src/user/modules/gui/modules/neovim/default.nix b/src/user/modules/utils/modules/neovim/default.nix similarity index 54% rename from src/user/modules/gui/modules/neovim/default.nix rename to src/user/modules/utils/modules/neovim/default.nix index 13d0a87..b1019f4 100644 --- a/src/user/modules/gui/modules/neovim/default.nix +++ b/src/user/modules/utils/modules/neovim/default.nix @@ -2,26 +2,22 @@ with lib; let - cfg = config.modules.user.gui.neovim; + cfg = config.modules.user.utils.neovim; in -{ options.modules.user.gui.neovim = { enable = mkEnableOption "user.gui.neovim"; }; +{ options.modules.user.utils.neovim = { enable = mkEnableOption "user.utils.neovim"; }; config = mkIf cfg.enable { programs.neovim = { enable = true; defaultEditor = true; vimAlias = true; vimdiffAlias = true; - extraPackages = import ./config/servers.nix { inherit pkgs; }; + extraPackages = import ./config/pkgs.nix { inherit pkgs; }; }; home.file.".config/nvim" = { source = ./config/lazyvim; recursive = true; }; - home.packages = with pkgs; [ - lazygit - #gcc - ]; }; }