refactor: remove modules folder, fully split home and system modules

2 files changed, 65 insertions, 67 deletions

diff --git a/home/neovim/config.nix b/home/neovim/config.nix
index b775e77..be86c9b 100644
--- a/home/neovim/config.nix
+++ b/home/neovim/config.nix
@@ -53,14 +53,14 @@ in
     };
     # list of lsp servers to load
     lsps =
-      optionalAttrs config.development.c {
+      optionalAttrs config.development.c.enable {
         clangd = {};
       }
-      // optionalAttrs config.development.java {
+      // optionalAttrs config.development.java.enable {
         jdtls = {};
         kotlin_language_server = {};
       }
-      // optionalAttrs config.development.lua {
+      // optionalAttrs config.development.lua.enable {
         lua_ls = {
           Lua = {
             diagnostics = {
@@ -69,14 +69,14 @@ in
           };
         };
       }
-      // optionalAttrs config.development.rust {
+      // optionalAttrs config.development.rust.enable {
         rust_analyzer = {};
       }
-      // optionalAttrs config.development.web {
+      // optionalAttrs config.development.web.enable {
         ts_ls = {};
         phpactor = {};
       }
-      // optionalAttrs config.development.zig {
+      // optionalAttrs config.development.zig.enable {
         zls = {};
       };
     highlight = {
diff --git a/home/neovim/default.nix b/home/neovim/default.nix
index 66d2625..36e1575 100644
--- a/home/neovim/default.nix
+++ b/home/neovim/default.nix
@@ -7,70 +7,68 @@
   lua_cfg = import ./config.nix {inherit lib config;};
   lua = builtins.readFile ./init.lua;
 in {
-  environment.variables.EDITOR = "nvim";
+  home.sessionVariables.EDITOR = "nvim";
 
-  home-manager.users.${config.user} = {
-    programs.neovim = {
-      enable = true;
-      viAlias = true;
-      vimAlias = true;
+  programs.neovim = {
+    enable = true;
+    viAlias = true;
+    vimAlias = true;
 
-      extraLuaConfig = ''
-        local config = ${lua_cfg}
+    extraLuaConfig = ''
+      local config = ${lua_cfg}
 
-        ${lua}
-      '';
+      ${lua}
+    '';
 
-      plugins = with pkgs.vimPlugins; [
-        # Dependencies
-        vim-devicons
-        nvim-web-devicons
-        plenary-nvim
-        # Colorscheme
-        base16-nvim
-        # Mode line
-        lualine-nvim
-        # Buffer line
-        bufferline-nvim
-        # File browser
-        nvim-tree-lua
-        # Undo tree
-        undotree
-        # Trouble (error menu)
-        trouble-nvim
-        # Telescope (buffers/find/grep/help)
-        telescope-nvim
-        # Snippets
-        vim-vsnip
-        vim-vsnip-integ
-        friendly-snippets
-        # Completion
-        cmp-buffer
-        cmp-nvim-lsp
-        cmp-vsnip
-        nvim-cmp
-        # Sourround delimiters
-        nvim-surround
-        # Comment functions
-        nerdcommenter
-        # Treesitter
-        nvim-treesitter.withAllGrammars
-        # Syntax hilighting
-        vim-illuminate
-        vim-table-mode
-        nvim-highlight-colors
-        colorful-menu-nvim
-        # Todo comments
-        todo-comments-nvim
-        # Lsp server
-        nvim-lspconfig
-        # Notifications
-        fidget-nvim
-        # Auto indentation
-        indent-o-matic
-        # 80 column width
-        virt-column-nvim
-      ];
-    };
+    plugins = with pkgs.vimPlugins; [
+      # Dependencies
+      vim-devicons
+      nvim-web-devicons
+      plenary-nvim
+      # Colorscheme
+      base16-nvim
+      # Mode line
+      lualine-nvim
+      # Buffer line
+      bufferline-nvim
+      # File browser
+      nvim-tree-lua
+      # Undo tree
+      undotree
+      # Trouble (error menu)
+      trouble-nvim
+      # Telescope (buffers/find/grep/help)
+      telescope-nvim
+      # Snippets
+      vim-vsnip
+      vim-vsnip-integ
+      friendly-snippets
+      # Completion
+      cmp-buffer
+      cmp-nvim-lsp
+      cmp-vsnip
+      nvim-cmp
+      # Sourround delimiters
+      nvim-surround
+      # Comment functions
+      nerdcommenter
+      # Treesitter
+      nvim-treesitter.withAllGrammars
+      # Syntax hilighting
+      vim-illuminate
+      vim-table-mode
+      nvim-highlight-colors
+      colorful-menu-nvim
+      # Todo comments
+      todo-comments-nvim
+      # Lsp server
+      nvim-lspconfig
+      # Notifications
+      fidget-nvim
+      # Auto indentation
+      indent-o-matic
+      # 80 column width
+      virt-column-nvim
+    ];
   };
 }