killed disko

flake.lock

@@ -1,27 +1,5 @@
 {
   "nodes": {
-    "ags": {
-      "inputs": {
-        "astal": "astal",
-        "nixpkgs": [
-          "hyprpanel",
-          "nixpkgs"
-        ]
-      },
-      "locked": {
-        "lastModified": 1736090999,
-        "narHash": "sha256-B5CJuHqfJrzPa7tObK0H9669/EClSHpa/P7B9EuvElU=",
-        "owner": "aylur",
-        "repo": "ags",
-        "rev": "5527c3c07d92c11e04e7fd99d58429493dba7e3c",
-        "type": "github"
-      },
-      "original": {
-        "owner": "aylur",
-        "repo": "ags",
-        "type": "github"
-      }
-    },
     "aquamarine": {
       "inputs": {
         "hyprutils": [
@@ -55,28 +33,6 @@
         "type": "github"
       }
     },
-    "astal": {
-      "inputs": {
-        "nixpkgs": [
-          "hyprpanel",
-          "ags",
-          "nixpkgs"
-        ]
-      },
-      "locked": {
-        "lastModified": 1735172721,
-        "narHash": "sha256-rtEAwGsHSppnkR3Qg3eRJ6Xh/F84IY9CrBBLzYabalY=",
-        "owner": "aylur",
-        "repo": "astal",
-        "rev": "6c84b64efc736e039a8a10774a4a1bf772c37aa2",
-        "type": "github"
-      },
-      "original": {
-        "owner": "aylur",
-        "repo": "astal",
-        "type": "github"
-      }
-    },
     "catppuccin": {
       "inputs": {
         "nixpkgs": "nixpkgs"
@@ -95,6 +51,27 @@
         "type": "github"
       }
     },
+    "disko": {
+      "inputs": {
+        "nixpkgs": [
+          "nixpkgs"
+        ]
+      },
+      "locked": {
+        "lastModified": 1736864502,
+        "narHash": "sha256-ItkIZyebGvNH2dK9jVGzJHGPtb6BSWLN8Gmef16NeY0=",
+        "owner": "nix-community",
+        "repo": "disko",
+        "rev": "0141aabed359f063de7413f80d906e1d98c0c123",
+        "type": "github"
+      },
+      "original": {
+        "owner": "nix-community",
+        "ref": "latest",
+        "repo": "disko",
+        "type": "github"
+      }
+    },
     "flake-compat": {
       "flake": false,
       "locked": {
@@ -473,27 +450,6 @@
         "type": "github"
       }
     },
-    "hyprpanel": {
-      "inputs": {
-        "ags": "ags",
-        "nixpkgs": [
-          "nixpkgs"
-        ]
-      },
-      "locked": {
-        "lastModified": 1740707241,
-        "narHash": "sha256-1lR/TFBGozLTTtOocp+zneLhZ7NLq7F0vG0g641ney8=",
-        "owner": "jas-singhfsu",
-        "repo": "hyprpanel",
-        "rev": "5075c94af274ca7e658680a7af69d32ddb79716e",
-        "type": "github"
-      },
-      "original": {
-        "owner": "jas-singhfsu",
-        "repo": "hyprpanel",
-        "type": "github"
-      }
-    },
     "hyprsysteminfo": {
       "inputs": {
         "hyprland-qt-support": "hyprland-qt-support_2",
@@ -757,10 +713,10 @@
     "root": {
       "inputs": {
         "catppuccin": "catppuccin",
+        "disko": "disko",
         "ghostty": "ghostty",
         "home-manager": "home-manager",
         "hyprland": "hyprland",
-        "hyprpanel": "hyprpanel",
         "hyprsysteminfo": "hyprsysteminfo",
         "nix-flatpak": "nix-flatpak",
         "nixpkgs": "nixpkgs_4"

flake.nix

@@ -13,9 +13,6 @@
 			url = "github:nix-community/home-manager";
 			inputs.nixpkgs.follows = "nixpkgs";
 		};
-
-		disko.url = "github:nix-community/disko/latest";
-		disko.inputs.nixpkgs.follows = "nixpkgs";
 	};
 
 	# Required by NixOS:
@@ -34,10 +31,8 @@
 				inputs.home-manager.nixosModules.default
 				inputs.catppuccin.nixosModules.catppuccin
 				inputs.nix-flatpak.nixosModules.nix-flatpak
-				inputs.disko.nixosModules.disko
 				./hosts/default/hardware-configuration.nix
 				./hosts/default/configuration.nix
-				./hosts/default/disko.nix
 			];
 		};
 		nixosConfigurations.fix_nixpkgs = nixpkgs.lib.nixosSystem {

hosts/default/disko.nix

@@ -1,73 +0,0 @@
-{
-	disko.devices = {
-		disk = {
-			main = {
-				type = "disk";
-				device = "/dev/disk/by-diskseq/1";
-				content = {
-					type = "gpt";
-					partitions = {
-						ESP = {
-							priority = 1;
-							name = "ESP";
-							start = "1M";
-							end = "1G";
-							type = "EF00";
-							content = {
-								type = "filesystem";
-								format = "vfat";
-								mountpoint = "/boot";
-								mountOptions = [ "umask=0077" ];
-							};
-						};
-						root = {
-							size = "100%";
-							content = {
-								type = "btrfs";
-								extraArgs = [ "-f" ]; # Override existing partition
-								# Subvolumes must set a mountpoint in order to be mounted,
-								# unless their parent is mounted
-								subvolumes = {
-									# Subvolume name is different from mountpoint
-									"/root" = {
-										mountpoint = "/";
-									};
-									# Subvolume name is the same as the mountpoint
-									"/home" = {
-										mountOptions = [ "compress=zstd" ];
-										mountpoint = "/home";
-									};
-									"/nix" = {
-										mountOptions = [
-											"compress=zstd"
-											"noatime"
-										];
-										mountpoint = "/nix";
-									};
-									"/swap" = {
-										mountpoint = "/swap";
-										swap = {
-											swapfile.size = "20M";
-											swapfile2.size = "20M";
-											swapfile2.path = "rel-path";
-										};
-									};
-								};
-
-								mountpoint = "/partition-root";
-								swap = {
-									swapfile = {
-										size = "20M";
-									};
-									swapfile1 = {
-										size = "20M";
-									};
-								};
-							};
-						};
-					};
-				};
-			};
-		};
-	};
-}