refactor(nvim): clean up directory structure

homeManagerModules/neovim/default.nix

@@ -7,10 +7,10 @@ self: {
   inherit (lib) mkOption types;
 in {
   imports = [
-    ./git.nix
+    ./git
-    ./treesitter.nix
+
     (import ./langs self)
-    (import ./theme.nix self)
+    (import ./theme self)
   ];
 
   options.programs.neovim = {

homeManagerModules/neovim/langs/default.nix

@@ -9,19 +9,19 @@ self: {
   cfg = config.programs.neovim;
 in {
   imports = [
-    ./bash.nix
+    ./bash
-    ./clang.nix
+    ./c-lang
-    ./hyprlang.nix
+    ./hyprlang
-    ./java.nix
+    ./java
-    ./json.nix
+    ./json
-    ./lua.nix
+    ./lua
-    ./python.nix
+    ./python
-    ./rust.nix
+    ./rust
 
-    (import ./csharp.nix self)
+    (import ./csharp self)
-    (import ./markdown.nix self)
+    (import ./markdown self)
-    (import ./nix.nix self)
+    (import ./nix-lang self)
-    (import ./web.nix self)
+    (import ./web self)
   ];
 
   # FIXME: try making LSPs and stuff only available through devShells
@@ -79,7 +79,7 @@ in {
           {
             plugin = pkgs.vimPlugins.nvim-cmp;
             type = "lua";
-            config = fileContents ../plugins/cmp.lua;
+            config = fileContents ./config/cmp.lua;
           }
 
           {

homeManagerModules/neovim/theme/default.nix

@@ -9,6 +9,8 @@ self: {
 
   cfg = config.programs.neovim;
 in {
+  imports = [./treesitter.nix];
+
   config.programs.neovim = {
     extraPackages = attrValues {
       inherit (pkgs) bat;
@@ -96,14 +98,14 @@ in {
         {
           plugin = pkgs.vimPlugins.heirline-nvim;
           type = "lua";
-          config = fileContents ./plugins/heirline.lua;
+          config = fileContents ./config/heirline.lua;
         }
       ]
       ++ optionals cfg.enableIde [
         {
           plugin = pkgs.vimPlugins.neo-tree-nvim;
           type = "lua";
-          config = fileContents ./plugins/neotree.lua;
+          config = fileContents ./config/neotree.lua;
         }
         {
           plugin = pkgs.vimPlugins.codewindow-nvim;