From 970cf4aaace319c8934e9f5cf20d31516166ca45 Mon Sep 17 00:00:00 2001
From: Noa Aarts <itepastra@gmail.com>
Date: Fri, 15 Mar 2024 20:01:04 +0100
Subject: [PATCH] add stuff to flakes

---
 flake.lock                     | 33 +++++++++++++++++++++++++++------
 flake.nix                      |  8 +++++++-
 hosts/server/configuration.nix |  5 ++++-
 3 files changed, 38 insertions(+), 8 deletions(-)

diff --git a/flake.lock b/flake.lock
index b952f60..5901dce 100644
--- a/flake.lock
+++ b/flake.lock
@@ -58,6 +58,26 @@
         "type": "github"
       }
     },
+    "disko": {
+      "inputs": {
+        "nixpkgs": [
+          "nixpkgs"
+        ]
+      },
+      "locked": {
+        "lastModified": 1710427903,
+        "narHash": "sha256-sV0Q5ndvfjK9JfCg/QM/HX/fcittohvtq8dD62isxdM=",
+        "owner": "nix-community",
+        "repo": "disko",
+        "rev": "21d89b333ca300bef82c928c856d48b94a9f997c",
+        "type": "github"
+      },
+      "original": {
+        "owner": "nix-community",
+        "repo": "disko",
+        "type": "github"
+      }
+    },
     "flake-compat": {
       "locked": {
         "lastModified": 1696426674,
@@ -174,11 +194,11 @@
         ]
       },
       "locked": {
-        "lastModified": 1710506163,
-        "narHash": "sha256-Xpl2LzbAIUHcTkAZ08UZM0USxVaQn194I8ma9c8wnAA=",
+        "lastModified": 1710527391,
+        "narHash": "sha256-3uM8+g/nb7ROgzSmJwOrKefctZpjR5uBJtUz4lpwWJI=",
         "owner": "nix-community",
         "repo": "home-manager",
-        "rev": "dc2f3812b41f825ed466c24c4211160d75cb890c",
+        "rev": "c781b28add41b74423ab2e64496d4fc91192e13a",
         "type": "github"
       },
       "original": {
@@ -245,11 +265,11 @@
         "xdph": "xdph"
       },
       "locked": {
-        "lastModified": 1710519433,
-        "narHash": "sha256-KODRuf2tf2SueqCEcj6Pu5cpBy8WcXsM0DkEeR5noBk=",
+        "lastModified": 1710528257,
+        "narHash": "sha256-DpKAky4UH1hovUq35MxIHikBKVxIw6KXrXkyFjn8I74=",
         "owner": "hyprwm",
         "repo": "Hyprland",
-        "rev": "a958884b5259ec5d6a2c97078b373c722ae20c39",
+        "rev": "72d78eff95948a3eb3260791cfdf625c0102d33a",
         "type": "github"
       },
       "original": {
@@ -475,6 +495,7 @@
     "root": {
       "inputs": {
         "automapaper": "automapaper",
+        "disko": "disko",
         "home-manager": "home-manager",
         "hyprland": "hyprland",
         "nix-colors": "nix-colors",
diff --git a/flake.nix b/flake.nix
index f4d5329..291d114 100644
--- a/flake.nix
+++ b/flake.nix
@@ -30,9 +30,14 @@
 	# inputs.nixpkgs.follows = "nixpkgs";
     };
 
+    disko = {
+	url = "github:nix-community/disko";
+	inputs.nixpkgs.follows = "nixpkgs";
+    };
+
   };
 
-  outputs = { self, nixpkgs, nix-colors, automapaper, ... }@inputs:
+  outputs = { self, nixpkgs, nix-colors, automapaper, disko, ... }@inputs:
     {
       nixosConfigurations = {
         default = nixpkgs.lib.nixosSystem {
@@ -52,6 +57,7 @@
 	    inherit nix-colors;
 	  };
 	  modules = [ 
+	    disko.nixosModules.disko
 	    ./hosts/server/configuration.nix
 	    inputs.home-manager.nixosModules.default
 	  ];
diff --git a/hosts/server/configuration.nix b/hosts/server/configuration.nix
index 57b040a..da61a9b 100644
--- a/hosts/server/configuration.nix
+++ b/hosts/server/configuration.nix
@@ -2,13 +2,16 @@
 # your system. Help is available in the configuration.nix(5) man page, on
 # https://search.nixos.org/options and in the NixOS manual (`nixos-help`).
 
-{ pkgs, inputs, nix-colors, ... }:
+{ modulesPath, pkgs, inputs, nix-colors, ... }:
 
 {
 	imports =
 	[ # Include the results of the hardware scan.
 		./hardware-configuration.nix
 		inputs.home-manager.nixosModules.default
+		./disk-config.nix    
+		(modulesPath + "/installer/scan/not-detected.nix")
+		(modulesPath + "/profiles/qemu-guest.nix")
 	];
 
 	# Use the systemd-boot EFI boot loader.