From 04e98c48d1df6baa7b3798212d5441b9bdcebc4e Mon Sep 17 00:00:00 2001
From: DerGrumpf <p.keier@beyerstedt-it.de>
Date: Wed, 26 Mar 2025 13:54:00 +0100
Subject: [PATCH] Changed: Neovim Conf

---
 flake.nix                          |  9 ++++++--
 home/neovim/configs/lazy-lock.json | 34 ------------------------------
 home/neovim/default.nix            | 29 +++++++++++++++----------
 modules/nvchad.nix                 | 10 +++++++++
 4 files changed, 35 insertions(+), 47 deletions(-)
 delete mode 100644 home/neovim/configs/lazy-lock.json
 create mode 100644 modules/nvchad.nix

diff --git a/flake.nix b/flake.nix
index 8ea43c7..c61f2da 100644
--- a/flake.nix
+++ b/flake.nix
@@ -21,7 +21,7 @@
   };
 
   inputs = {
-    nixpkgs.url = "github:nixos/nixpkgs/nixos-24.05";
+    nixpkgs.url = "github:nixos/nixpkgs/nixos-unstable";
     hyprland.url = "github:hyprwm/Hyprland";
 
     home-manager.url = "github:nix-community/home-manager/release-24.05";
@@ -36,6 +36,11 @@
       url = "github:catppuccin/bat";
       flake = false;
     };
+
+    nvchad4nix = {
+        url = "github:nix-community/nix4nvchad";
+        inputs.nixpkgs.follows = "nixpkgs";
+    };
   };
 
   outputs = inputs @ {
@@ -57,7 +62,7 @@
 
       m920q = let
         username = "phil";
-        specialArgs = {inherit username;};
+        specialArgs = {inherit username; inherit system; inherit inputs;};
       in
         nixpkgs.lib.nixosSystem {
           inherit specialArgs;
diff --git a/home/neovim/configs/lazy-lock.json b/home/neovim/configs/lazy-lock.json
deleted file mode 100644
index 6a483ed..0000000
--- a/home/neovim/configs/lazy-lock.json
+++ /dev/null
@@ -1,34 +0,0 @@
-{
-  "LuaSnip": { "branch": "master", "commit": "c9b9a22904c97d0eb69ccb9bab76037838326817" },
-  "NvChad": { "branch": "v2.5", "commit": "6f25b2739684389ca69ea8229386c098c566c408" },
-  "base46": { "branch": "v3.0", "commit": "59566882e09a8a77dbdb33b678a93680c36ae089" },
-  "cmp-buffer": { "branch": "main", "commit": "3022dbc9166796b644a841a02de8dd1cc1d311fa" },
-  "cmp-nvim-lsp": { "branch": "main", "commit": "99290b3ec1322070bcfb9e846450a46f6efa50f0" },
-  "cmp-nvim-lua": { "branch": "main", "commit": "f12408bdb54c39c23e67cab726264c10db33ada8" },
-  "cmp-path": { "branch": "main", "commit": "91ff86cd9c29299a64f968ebb45846c485725f23" },
-  "cmp_luasnip": { "branch": "master", "commit": "98d9cb5c2c38532bd9bdb481067b20fea8f32e90" },
-  "conform.nvim": { "branch": "master", "commit": "db8a4a9edb217067b1d7a2e0362c74bfe9cc944d" },
-  "friendly-snippets": { "branch": "main", "commit": "efff286dd74c22f731cdec26a70b46e5b203c619" },
-  "fzf.vim": { "branch": "master", "commit": "245eaf8e50fe440729056ce8d4e7e2bb5b1ff9c9" },
-  "gitsigns.nvim": { "branch": "main", "commit": "4c40357994f386e72be92a46f41fc1664c84c87d" },
-  "indent-blankline.nvim": { "branch": "master", "commit": "e10626f7fcd51ccd56d7ffc00883ba7e0aa28f78" },
-  "lazy.nvim": { "branch": "main", "commit": "6c3bda4aca61a13a9c63f1c1d1b16b9d3be90d7a" },
-  "mason-conform.nvim": { "branch": "main", "commit": "1983f353b29d8716751665c18d57e1ac0473a59a" },
-  "mason-lspconfig.nvim": { "branch": "main", "commit": "1a31f824b9cd5bc6f342fc29e9a53b60d74af245" },
-  "mason.nvim": { "branch": "main", "commit": "fc98833b6da5de5a9c5b1446ac541577059555be" },
-  "menu": { "branch": "main", "commit": "7769b17c2a131108c02b10e9f844e504aa605cc2" },
-  "minty": { "branch": "main", "commit": "aafc9e8e0afe6bf57580858a2849578d8d8db9e0" },
-  "nvim-autopairs": { "branch": "master", "commit": "68f0e5c3dab23261a945272032ee6700af86227a" },
-  "nvim-cmp": { "branch": "main", "commit": "c27370703e798666486e3064b64d59eaf4bdc6d5" },
-  "nvim-lint": { "branch": "master", "commit": "6e9dd545a1af204c4022a8fcd99727ea41ffdcc8" },
-  "nvim-lspconfig": { "branch": "master", "commit": "8a1529e46eef5efc86c34c8d9bdd313abc2ecba0" },
-  "nvim-tree.lua": { "branch": "master", "commit": "c09ff35de503a41fa62465c6b4ae72d96e7a7ce4" },
-  "nvim-treesitter": { "branch": "master", "commit": "1a314a58d6d7695d226b56f6b61b1596993d5ac7" },
-  "nvim-web-devicons": { "branch": "master", "commit": "ab4cfee554e501f497bce0856788d43cf2eb93d7" },
-  "openscad.nvim": { "branch": "main", "commit": "58baf76fd2f9e2fe2ca83ea120d56084edb8871e" },
-  "plenary.nvim": { "branch": "master", "commit": "857c5ac632080dba10aae49dba902ce3abf91b35" },
-  "telescope.nvim": { "branch": "master", "commit": "814f102cd1da3dc78c7d2f20f2ef3ed3cdf0e6e4" },
-  "ui": { "branch": "v3.0", "commit": "57d403c219353b1f8e4cd635d058fbfcd9d647ea" },
-  "volt": { "branch": "main", "commit": "21a2351697abfed26d4469b88d3ab124d55a1b3f" },
-  "which-key.nvim": { "branch": "main", "commit": "370ec46f710e058c9c1646273e6b225acf47cbed" }
-}
diff --git a/home/neovim/default.nix b/home/neovim/default.nix
index 8255088..7af9fa7 100644
--- a/home/neovim/default.nix
+++ b/home/neovim/default.nix
@@ -1,19 +1,26 @@
 {
   pkgs,
   config,
+  inputs,
   ...
 }: {
-    programs.neovim = {
+    programs.nvchad = {
         enable = true;
-        defaultEditor = true;
-        viAlias = true;
-        vimAlias = true;
-        vimdiffAlias = true;
-    };
-
-    home.file.".config/nvim" = {
-        source = ./configs;
-        # copy the scripts directory recursively
-        recursive = true;
+        neovim = pkgs.neovim;
+        extraPackages = with pkgs; [
+          nodePackages.bash-language-server
+          docker-compose-language-service
+          dockerfile-language-server-nodejs
+          emmet-language-server
+          nixd
+          (python3.withPackages(ps: with ps; [
+            python-lsp-server
+            flake8
+          ]))
+        ];
+        hm-activation = true;
+        backup = true;
     };
+    
+    environment.variables.EDITOR = "nvim";
 }
diff --git a/modules/nvchad.nix b/modules/nvchad.nix
new file mode 100644
index 0000000..9447fd7
--- /dev/null
+++ b/modules/nvchad.nix
@@ -0,0 +1,10 @@
+{config, pkgs, inputs, ...}: {
+
+    nixpkgs = {
+        overlays = [
+            (final: prev: {
+                nvchad = inputs.nvchad4nix.packages."${pkgs.system}".nvchad;
+             })
+        ];
+    };
+}