Feat(treewide): Switch to nixvim and tweak nvim config

4 files changed, 183 insertions, 165 deletions

diff --git a/flake.lock b/flake.lock
index a805a87..08ac18d 100644
--- a/flake.lock
+++ b/flake.lock
@@ -1,5 +1,28 @@
 {
   "nodes": {
+    "beautysh": {
+      "inputs": {
+        "nixpkgs": [
+          "nixvim",
+          "nixpkgs"
+        ],
+        "poetry2nix": "poetry2nix",
+        "utils": "utils"
+      },
+      "locked": {
+        "lastModified": 1680308980,
+        "narHash": "sha256-aUEHV0jk2qIFP3jlsWYWhBbm+w/N9gzH3e4I5DcdB5s=",
+        "owner": "lovesegfault",
+        "repo": "beautysh",
+        "rev": "9845efc3ea3e86cc0d41465d720a47f521b2799c",
+        "type": "github"
+      },
+      "original": {
+        "owner": "lovesegfault",
+        "repo": "beautysh",
+        "type": "github"
+      }
+    },
     "crane": {
       "inputs": {
         "flake-compat": [
@@ -64,7 +87,7 @@
     },
     "crane_3": {
       "inputs": {
-        "flake-compat": "flake-compat_4",
+        "flake-compat": "flake-compat_5",
         "flake-utils": "flake-utils_5",
         "nixpkgs": [
           "yambar_memory",
@@ -150,6 +173,22 @@
         "type": "github"
       }
     },
+    "flake-compat_5": {
+      "flake": false,
+      "locked": {
+        "lastModified": 1673956053,
+        "narHash": "sha256-4gtG9iQuiKITOjNQQeQIpoIB6b16fm+504Ch3sNKLd8=",
+        "owner": "edolstra",
+        "repo": "flake-compat",
+        "rev": "35bb57c0c8d8b62bbfd284272c928ceb64ddbde9",
+        "type": "github"
+      },
+      "original": {
+        "owner": "edolstra",
+        "repo": "flake-compat",
+        "type": "github"
+      }
+    },
     "flake-parts": {
       "inputs": {
         "nixpkgs-lib": [
@@ -232,11 +271,11 @@
         "systems": "systems_2"
       },
       "locked": {
-        "lastModified": 1689068808,
-        "narHash": "sha256-6ixXo3wt24N/melDWjq70UuHQLxGV8jZvooRanIHXw0=",
+        "lastModified": 1685518550,
+        "narHash": "sha256-o2d0KcvaXzTrPRIo0kOLV0/QXHhDQ5DTi+OxcjO8xqY=",
         "owner": "numtide",
         "repo": "flake-utils",
-        "rev": "919d646de7be200f3bf08cb76ae1f09402b6f9b4",
+        "rev": "a1720a10a6cfe8234c0e93907ffe81be440f4cef",
         "type": "github"
       },
       "original": {
@@ -332,6 +371,28 @@
     "gitignore_2": {
       "inputs": {
         "nixpkgs": [
+          "nixvim",
+          "pre-commit-hooks",
+          "nixpkgs"
+        ]
+      },
+      "locked": {
+        "lastModified": 1660459072,
+        "narHash": "sha256-8DFJjXG8zqoONA1vXtgeKXy68KdJL5UaXR8NtVMUbx8=",
+        "owner": "hercules-ci",
+        "repo": "gitignore.nix",
+        "rev": "a20de23b925fd8264fd7fad6454652e142fd7f73",
+        "type": "github"
+      },
+      "original": {
+        "owner": "hercules-ci",
+        "repo": "gitignore.nix",
+        "type": "github"
+      }
+    },
+    "gitignore_3": {
+      "inputs": {
+        "nixpkgs": [
           "prismlauncher",
           "pre-commit-hooks",
           "nixpkgs"
@@ -429,100 +490,6 @@
         "type": "github"
       }
     },
-    "nix-flake-tests": {
-      "locked": {
-        "lastModified": 1677844186,
-        "narHash": "sha256-ErJZ/Gs1rxh561CJeWP5bohA2IcTq1rDneu1WT6CVII=",
-        "owner": "antifuchs",
-        "repo": "nix-flake-tests",
-        "rev": "bbd9216bd0f6495bb961a8eb8392b7ef55c67afb",
-        "type": "github"
-      },
-      "original": {
-        "owner": "antifuchs",
-        "repo": "nix-flake-tests",
-        "type": "github"
-      }
-    },
-    "nix-github-actions": {
-      "inputs": {
-        "nixpkgs": [
-          "nixneovim",
-          "nixneovimplugins",
-          "poetry2nix",
-          "nixpkgs"
-        ]
-      },
-      "locked": {
-        "lastModified": 1688870561,
-        "narHash": "sha256-4UYkifnPEw1nAzqqPOTL2MvWtm3sNGw1UTYTalkTcGY=",
-        "owner": "nix-community",
-        "repo": "nix-github-actions",
-        "rev": "165b1650b753316aa7f1787f3005a8d2da0f5301",
-        "type": "github"
-      },
-      "original": {
-        "owner": "nix-community",
-        "repo": "nix-github-actions",
-        "type": "github"
-      }
-    },
-    "nixneovim": {
-      "inputs": {
-        "flake-utils": [
-          "flake-utils"
-        ],
-        "home-manager": [
-          "home-manager"
-        ],
-        "nix-flake-tests": "nix-flake-tests",
-        "nixneovimplugins": "nixneovimplugins",
-        "nixpkgs": [
-          "nixpkgs"
-        ],
-        "nmd": "nmd",
-        "nmt": "nmt"
-      },
-      "locked": {
-        "lastModified": 1691677340,
-        "narHash": "sha256-LK5DszyF7MeD5Umjia5u6U4uJY/rCZcE+KZ48WnbZTI=",
-        "owner": "nixneovim",
-        "repo": "nixneovim",
-        "rev": "8ac26b17ebf4ea49dc260b1fd237c0032a18317f",
-        "type": "github"
-      },
-      "original": {
-        "owner": "nixneovim",
-        "repo": "nixneovim",
-        "type": "github"
-      }
-    },
-    "nixneovimplugins": {
-      "inputs": {
-        "flake-utils": [
-          "nixneovim",
-          "flake-utils"
-        ],
-        "nixpkgs": [
-          "nixneovim",
-          "nixpkgs"
-        ],
-        "poetry2nix": "poetry2nix"
-      },
-      "locked": {
-        "lastModified": 1691677231,
-        "narHash": "sha256-4DZltL8s/JPhryIDWYICBIOmxD2dXcsLJr83T0r5lxI=",
-        "owner": "nixneovim",
-        "repo": "nixneovimplugins",
-        "rev": "6e3b5ce2de8cb43feca1ec84e586e268285ce079",
-        "type": "github"
-      },
-      "original": {
-        "owner": "nixneovim",
-        "repo": "nixneovimplugins",
-        "type": "github"
-      }
-    },
     "nixpkgs": {
       "locked": {
         "lastModified": 1691654369,
@@ -573,6 +540,22 @@
         "type": "github"
       }
     },
+    "nixpkgs-stable_2": {
+      "locked": {
+        "lastModified": 1685801374,
+        "narHash": "sha256-otaSUoFEMM+LjBI1XL/xGB5ao6IwnZOXc47qhIgJe8U=",
+        "owner": "NixOS",
+        "repo": "nixpkgs",
+        "rev": "c37ca420157f4abc31e26f436c1145f8951ff373",
+        "type": "github"
+      },
+      "original": {
+        "owner": "NixOS",
+        "ref": "nixos-23.05",
+        "repo": "nixpkgs",
+        "type": "github"
+      }
+    },
     "nixpkgs_2": {
       "locked": {
         "lastModified": 1691218994,
@@ -589,54 +572,50 @@
         "type": "github"
       }
     },
-    "nmd": {
-      "flake": false,
-      "locked": {
-        "lastModified": 1687627428,
-        "narHash": "sha256-7zGfXuNS5RHqhpEdz2fwrtqvF86JRo5U1hrxZSYgcm8=",
-        "owner": "~rycee",
-        "repo": "nmd",
-        "rev": "824a380546b5d0d0eb701ff8cd5dbafb360750ff",
-        "type": "sourcehut"
+    "nixvim": {
+      "inputs": {
+        "beautysh": "beautysh",
+        "flake-utils": [
+          "flake-utils"
+        ],
+        "nixpkgs": [
+          "nixpkgs"
+        ],
+        "pre-commit-hooks": "pre-commit-hooks"
       },
-      "original": {
-        "owner": "~rycee",
-        "repo": "nmd",
-        "type": "sourcehut"
-      }
-    },
-    "nmt": {
-      "flake": false,
       "locked": {
-        "lastModified": 1683843030,
-        "narHash": "sha256-2K9tFpypgSORyUTRAL7MFRKCXU4GykmhIDrrIydtPdI=",
-        "owner": "jooooscha",
-        "repo": "nmt",
-        "rev": "f30b96093eb056f1bcc60199545344b4e4a72c5a",
+        "lastModified": 1692003012,
+        "narHash": "sha256-mlC24IAPQzpeHOLtDnSeox1uhnCy8rX1LSMK/AvU1GM=",
+        "owner": "nix-community",
+        "repo": "nixvim",
+        "rev": "791e32ed3dc26221f53cee00b8d6a24d8fb85dfe",
         "type": "github"
       },
       "original": {
-        "owner": "jooooscha",
-        "repo": "nmt",
+        "owner": "nix-community",
+        "repo": "nixvim",
         "type": "github"
       }
     },
     "poetry2nix": {
       "inputs": {
-        "flake-utils": "flake-utils_3",
-        "nix-github-actions": "nix-github-actions",
+        "flake-utils": [
+          "nixvim",
+          "beautysh",
+          "utils"
+        ],
         "nixpkgs": [
-          "nixneovim",
-          "nixneovimplugins",
+          "nixvim",
+          "beautysh",
           "nixpkgs"
         ]
       },
       "locked": {
-        "lastModified": 1689849924,
-        "narHash": "sha256-d259Z2S7CS7Na04qQNQ6LYQILuI7cf4Rpe76qc4mz40=",
+        "lastModified": 1658665240,
+        "narHash": "sha256-/wkx7D7enyBPRjIkK0w7QxLQhzEkb3UxNQnjyc3FTUI=",
         "owner": "nix-community",
         "repo": "poetry2nix",
-        "rev": "1d7eda9336f336392d24e9602be5cb9be7ae405c",
+        "rev": "8b8edc85d24661d5a6d0d71d6a7011f3e699780f",
         "type": "github"
       },
       "original": {
@@ -647,27 +626,21 @@
     },
     "pre-commit-hooks": {
       "inputs": {
-        "flake-compat": [
-          "prismlauncher",
-          "flake-compat"
-        ],
-        "flake-utils": "flake-utils_4",
+        "flake-compat": "flake-compat_3",
+        "flake-utils": "flake-utils_3",
         "gitignore": "gitignore_2",
         "nixpkgs": [
-          "prismlauncher",
+          "nixvim",
           "nixpkgs"
         ],
-        "nixpkgs-stable": [
-          "prismlauncher",
-          "nixpkgs"
-        ]
+        "nixpkgs-stable": "nixpkgs-stable_2"
       },
       "locked": {
-        "lastModified": 1691256628,
-        "narHash": "sha256-M0YXHemR3zbyhM7PvJa5lzGhWVf6kM/fpZ4cWe/VIhI=",
+        "lastModified": 1691747570,
+        "narHash": "sha256-J3fnIwJtHVQ0tK2JMBv4oAmII+1mCdXdpeCxtIsrL2A=",
         "owner": "cachix",
         "repo": "pre-commit-hooks.nix",
-        "rev": "3139c4d1f7732cab89f06492bdd4677b877e3785",
+        "rev": "c5ac3aa3324bd8aebe8622a3fc92eeb3975d317a",
         "type": "github"
       },
       "original": {
@@ -707,13 +680,44 @@
         "type": "github"
       }
     },
+    "pre-commit-hooks_2": {
+      "inputs": {
+        "flake-compat": [
+          "prismlauncher",
+          "flake-compat"
+        ],
+        "flake-utils": "flake-utils_4",
+        "gitignore": "gitignore_3",
+        "nixpkgs": [
+          "prismlauncher",
+          "nixpkgs"
+        ],
+        "nixpkgs-stable": [
+          "prismlauncher",
+          "nixpkgs"
+        ]
+      },
+      "locked": {
+        "lastModified": 1691256628,
+        "narHash": "sha256-M0YXHemR3zbyhM7PvJa5lzGhWVf6kM/fpZ4cWe/VIhI=",
+        "owner": "cachix",
+        "repo": "pre-commit-hooks.nix",
+        "rev": "3139c4d1f7732cab89f06492bdd4677b877e3785",
+        "type": "github"
+      },
+      "original": {
+        "owner": "cachix",
+        "repo": "pre-commit-hooks.nix",
+        "type": "github"
+      }
+    },
     "prismlauncher": {
       "inputs": {
-        "flake-compat": "flake-compat_3",
+        "flake-compat": "flake-compat_4",
         "flake-parts": "flake-parts_2",
         "libnbtplusplus": "libnbtplusplus",
         "nixpkgs": "nixpkgs_2",
-        "pre-commit-hooks": "pre-commit-hooks"
+        "pre-commit-hooks": "pre-commit-hooks_2"
       },
       "locked": {
         "lastModified": 1691833081,
@@ -769,8 +773,8 @@
         "home-manager": "home-manager",
         "impermanence": "impermanence",
         "lanzaboote": "lanzaboote",
-        "nixneovim": "nixneovim",
         "nixpkgs": "nixpkgs",
+        "nixvim": "nixvim",
         "prismlauncher": "prismlauncher",
         "river_init_lesser": "river_init_lesser",
         "rust-overlay": "rust-overlay_2",
@@ -959,6 +963,21 @@
         "type": "github"
       }
     },
+    "utils": {
+      "locked": {
+        "lastModified": 1678901627,
+        "narHash": "sha256-U02riOqrKKzwjsxc/400XnElV+UtPUQWpANPlyazjH0=",
+        "owner": "numtide",
+        "repo": "flake-utils",
+        "rev": "93a2b84fc4b70d9e089d029deacc3583435c2ed6",
+        "type": "github"
+      },
+      "original": {
+        "owner": "numtide",
+        "repo": "flake-utils",
+        "type": "github"
+      }
+    },
     "yambar_cpu": {
       "inputs": {
         "crane": [
diff --git a/flake.nix b/flake.nix
index 5e99b1e..ce95a03 100644
--- a/flake.nix
+++ b/flake.nix
@@ -12,12 +12,11 @@
     impermanence.url = "github:nix-community/impermanence";
 
     # inputs for following
-    nixneovim = {
-      url = "github:nixneovim/nixneovim";
+    nixvim = {
+      url = "github:nix-community/nixvim";
       inputs = {
         nixpkgs.follows = "nixpkgs";
         flake-utils.follows = "flake-utils";
-        home-manager.follows = "home-manager";
       };
     };
     lanzaboote = {
@@ -112,14 +111,14 @@
     #grades,
     prismlauncher,
     lanzaboote,
-    nixneovim,
+    nixvim,
     impermanence,
     ...
   } @ attrs: let
     system = "x86_64-linux";
     pkgs = import nixpkgs {
       inherit system;
-      overlays = [nixneovim.overlays.default];
+      #overlays = [nixvim.overlays.default];
     };
     sysLib = shell_library.lib.${system};
     defaultModules = [
@@ -131,7 +130,7 @@
           useGlobalPkgs = true;
           useUserPackages = true;
           users.sils = import ./users/sils;
-          extraSpecialArgs = {inherit pkgs system sysLib river_init_lesser yambar_cpu yambar_memory prismlauncher nixneovim impermanence;};
+          extraSpecialArgs = {inherit pkgs system sysLib river_init_lesser yambar_cpu yambar_memory prismlauncher nixvim impermanence;};
         };
       }
     ];
diff --git a/users/sils/default.nix b/users/sils/default.nix
index 48e5dd5..8483819 100644
--- a/users/sils/default.nix
+++ b/users/sils/default.nix
@@ -1,4 +1,4 @@
-{nixneovim, ...}: {
+{nixvim, ...}: {
   imports = [
     ./direnv
     #./eww
@@ -8,7 +8,7 @@
     ./hyfetch
     ./hyprland
     ./mako
-    ./nixneovim
+    ./nixvim
     ./packages
     #./river #TODO Update Shell Library
     ./ssh
@@ -17,7 +17,7 @@
     #./yambar #TODO Update Shell Library
     ./waybar
     ./zsh
-    nixneovim.nixosModules.default
+    nixvim.homeManagerModules.nixvim
   ];
 
   home = {
diff --git a/users/sils/nixneovim/default.nix b/users/sils/nixvim/default.nix
index db12279..a35ab35 100644
--- a/users/sils/nixneovim/default.nix
+++ b/users/sils/nixvim/default.nix
@@ -1,5 +1,5 @@
 {...}: {
-  programs.nixneovim = {
+  programs.nixvim = {
     enable = true;
     options = {
       number = true;
@@ -8,7 +8,7 @@
       tabstop = 2;
       scrolloff = 999;
     };
-    colorschemes.gruvbox-baby.enable = true;
+    colorschemes.gruvbox.enable = true;
     plugins = {
       airline = {
         enable = true;
@@ -19,18 +19,15 @@
         enable = true;
         autoHide = true;
       };
-      nvim-cmp = {
+      coq-nvim = {
         enable = true;
-        snippet = {
-          luasnip = {
-            enable = true;
-          };
-        };
+        autoStart = "shut-up";
+        installArtifacts = true;
       };
       lsp = {
         enable = true;
         servers = {
-          nil.enable = true;
+          nil_ls.enable = true;
           rust-analyzer.enable = true;
           ltex.enable = true;
         };
@@ -42,9 +39,12 @@
       mini = {
         enable = true;
       };
-      nvim-tree = {
+      #nvim-tree = {
+      #  enable = true;
+      #  git.enable = true;
+      #};
+      neo-tree = {
         enable = true;
-        git.enable = true;
       };
     };
   };