fix: i forgor

sioodmy · Jun 12, 2024 · eeeda32 · eeeda32
1 parent dbee38d
commit eeeda32
Show file tree

Hide file tree

Showing 4 changed files with 44 additions and 126 deletions.
diff --git a/flake.lock b/flake.lock
diff --git a/flake.nix b/flake.nix
@@ -47,15 +47,14 @@
             env = extra.shellEnv;
             packages = with pkgs; [
               inputs'.agenix.packages.default # provide agenix CLI within flake shell
-              # inputs'.catppuccinifier.packages.cli
+              inputs'.disko.packages.disko-install
               config.treefmt.build.wrapper # treewide formatter
               nil # nix ls
               alejandra # nix formatter
               git # flakes require git, and so do I
               glow # markdown viewer
               statix # lints and suggestions
               deadnix # clean up unused nix code
-              # some python stuff for waybar scripting
             ];
           };
 
@@ -110,8 +109,9 @@
       url = "github:numtide/devshell";
       inputs.nixpkgs.follows = "nixpkgs";
     };
-    helix = {
-      url = "github:SoraTenshi/helix/new-daily-driver";
+
+    disko = {
+      url = "github:nix-community/disko";
       inputs.nixpkgs.follows = "nixpkgs";
     };
 

diff --git a/hosts/calypso/default.nix b/hosts/calypso/default.nix
@@ -15,7 +15,7 @@
   '';
   inherit (lib) mkDefault;
 in {
-  imports = [./hardware-configuration.nix];
+  imports = [./hardware-configuration.nix ./disko.nix];
   environment.systemPackages = with pkgs; [
     acpi
     powertop

diff --git a/hosts/default.nix b/hosts/default.nix
@@ -11,9 +11,10 @@
   wayland = ../system/wayland;
   hw = inputs.nixos-hardware.nixosModules;
   agenix = inputs.agenix.nixosModules.age;
+  disko = inputs.disko.nixosModules.default;
   hmModule = inputs.home-manager.nixosModules.home-manager;
 
-  shared = [core agenix];
+  shared = [core agenix disko];
 
   home-manager = {
     useUserPackages = true;