move disko input up the tree

2024-10-18 19:30:32 -05:00
parent 50f4f37a8c
commit 782086e95a
3 changed files with 18 additions and 34 deletions
--- a/system/flake.nix
+++ b/system/flake.nix
@@ -9,7 +9,9 @@

        prgms.url = "./programs";

-        diskoConfig.url = "./disko";
+        nixpkgs.url = "github:nixos/nixpkgs/nixos-24.05";
+        disko.url = "github:nix-community/disko";
+        disko.inputs.nixpkgs.follows = "nixpkgs";

        impermanence.url = "github:nix-community/impermanence";

@@ -21,7 +23,8 @@
            imports = [ 
                ./configuration
                ./configuration/${core_inputs.host}/hardware-configuration.nix
-                inputs.diskoConfig.module
+                ./disko
+                inputs.disko.nixosModules.default
                ./impermanence
                inputs.impermanence.nixosModules.impermanence
                inputs.srvcs.module