flake.lock

@@ -314,6 +314,26 @@
         "type": "github"
       }
     },
+    "neovim": {
+      "inputs": {
+        "nixpkgs": [
+          "nixpkgs"
+        ]
+      },
+      "locked": {
+        "lastModified": 1729421151,
+        "narHash": "sha256-4vXBq3gKoRVvCO0LkzqYkurrRbCtiPooAanl1zGu5/o=",
+        "ref": "refs/heads/main",
+        "rev": "2b17334f38bf58b6d5f6545014eb0d41368dec32",
+        "revCount": 68,
+        "type": "git",
+        "url": "https://git.ccnlc.eu/Nydragon/neovim.git"
+      },
+      "original": {
+        "type": "git",
+        "url": "https://git.ccnlc.eu/Nydragon/neovim.git"
+      }
+    },
     "nixos-hardware": {
       "locked": {
         "lastModified": 1728056216,
@@ -462,6 +482,7 @@
         "home-manager": "home-manager_2",
         "hyprland": "hyprland",
         "hyprlock": "hyprlock",
+        "neovim": "neovim",
         "nixos-hardware": "nixos-hardware",
         "nixpkgs": "nixpkgs_2",
         "nysh": "nysh",

flake.nix

@@ -47,6 +47,11 @@
       url = "git+https://git.ccnlc.eu/Nydragon/flakey-rustypaste.git";
       inputs.nixpkgs.follows = "nixpkgs";
     };
+
+    neovim = {
+      url = "git+https://git.ccnlc.eu/Nydragon/neovim.git";
+      inputs.nixpkgs.follows = "nixpkgs";
+    };
   };
 
   outputs =

home/terminal/neovim/default.nix

@@ -1,4 +1,3 @@
-{ pkgs, ... }:
 {
   programs.neovim = {
     defaultEditor = true;
@@ -7,43 +6,5 @@
     enable = true;
     withPython3 = false;
     withRuby = false;
-
-    extraPackages = with pkgs; [
-      lua
-
-      # Language Servers
-      rust-analyzer
-      nil
-      pyright
-      bash-language-server
-      lua-language-server
-      zls
-      typescript
-      nodePackages_latest.typescript-language-server
-
-      kdePackages.qtdeclarative # QML formatter
-
-      # Formatter
-      python311Packages.black # Python formatter
-      clang-tools
-      nodePackages_latest.prettier # JSON, JS, TS formatter
-      yamlfmt # YAML formatter
-      taplo # TOML formatter
-      rustfmt # Rust formatter
-      shfmt # Shell, Bash etc.
-      nixfmt-rfc-style
-      stylua # lua formatter
-
-      # Misc
-      ripgrep
-      rustc
-      cargo
-      nodejs_22
-      clang
-      tree-sitter
-      fd
-      luajitPackages.luarocks
-      wl-clipboard
-    ];
   };
 }

hosts/marr/default.nix

@@ -10,7 +10,6 @@
   imports = [
     ./hardware-configuration.nix
     ./home.nix
-    ./disko.nix
   ];
 
   modules = {

hosts/marr/disko.nix

@@ -1,38 +0,0 @@
-{
-  disko.devices = {
-    disk.builtin = {
-      device = "/dev/nvme0n1";
-      type = "disk";
-      content = {
-        type = "gpt";
-        partitions = {
-          ESP = mkBoot "1G";
-          luks = {
-            size = "100%";
-            content = {
-              type = "luks";
-              name = "crypt";
-              settings = {
-                keyFile = "/tmp/secret.key";
-                allowDiscards = true;
-              };
-              content = {
-                type = "lvm_pv";
-                vg = "pool";
-              };
-            };
-          };
-        };
-      };
-    };
-    lvm_vg = {
-      pool = {
-        type = "lvm_vg";
-        lvs = {
-          swap = mkSwap "32G";
-          root = mkRoot "100%" "ext4";
-        };
-      };
-    };
-  };
-}

modules/nix/overlays.nix

@@ -37,6 +37,8 @@
       #xdg-desktop-portal-hyprland = inputs'.hyprland.packages.xdg-desktop-portal-hyprland;
 
       hyprlock = inputs'.hyprlock.packages.hyprlock;
+
+      neovim = inputs'.neovim.packages.default;
     })
     inputs.rustypaste.overlays.default
   ];

parts/lib/functions.nix

@@ -79,34 +79,4 @@ in
       inherit (lib.strings) sanitizeDerivationName;
     in
     str: (sanitizeDerivationName (lib.toLower str));
-
-  dikso = {
-    mkBoot = size: {
-      size = size;
-      type = "EF00";
-      content = {
-        type = "filesystem";
-        format = "vfat";
-        mountpoint = "/boot";
-        mountOptions = [ "umask=0077" ];
-      };
-    };
-    mkSwap = size: {
-      size = "32G";
-      content = {
-        type = "swap";
-        randomEncryption = true;
-        priority = 100;
-      };
-    };
-    mkRoot = size: format: {
-      inherit size;
-      content = {
-        inherit format;
-        type = "filesystem";
-        mountpoint = "/";
-        mountOptions = [ "defaults" ];
-      };
-    };
-  };
 }