From 27bc6d99e00de116e7b35caaa7e7e12705dee96f Mon Sep 17 00:00:00 2001
From: fwastring <fredrik@wastring.com>
Date: Mon, 2 Mar 2026 18:44:34 +0100
Subject: [PATCH] fix till styrelsen

---
 flake.nix                                     |  4 ----
 maskiner/styrelsen/configuration.nix          |  2 +-
 maskiner/styrelsen/hardware-configuration.nix | 17 ++++++++++++++++-
 3 files changed, 17 insertions(+), 6 deletions(-)

diff --git a/flake.nix b/flake.nix
index bd9c832..2796068 100644
--- a/flake.nix
+++ b/flake.nix
@@ -99,15 +99,11 @@
           };
           modules = [
             ./maskiner/styrelsen/configuration.nix
-            ./maskiner/styrelsen/laptop-disk.nix
             stylix.nixosModules.stylix
             home-manager.nixosModules.home-manager
             sops-nix.nixosModules.sops
             catppuccin.nixosModules.catppuccin
-            confetti.nixosModules.default
-            # bbk.nixosModules.default
             nixvim.nixosModules.default
-            disko.nixosModules.disko
           ];
         };
         node = nixpkgs.lib.nixosSystem {
diff --git a/maskiner/styrelsen/configuration.nix b/maskiner/styrelsen/configuration.nix
index 0bef57b..27f44fa 100644
--- a/maskiner/styrelsen/configuration.nix
+++ b/maskiner/styrelsen/configuration.nix
@@ -112,7 +112,7 @@ in
 
   services.displayManager.sddm = {
     enable = true;
-	wayland.enable = true;
+    wayland.enable = true;
   };
 
   environment.systemPackages = with pkgs; [
diff --git a/maskiner/styrelsen/hardware-configuration.nix b/maskiner/styrelsen/hardware-configuration.nix
index e41d1fc..8248cfd 100644
--- a/maskiner/styrelsen/hardware-configuration.nix
+++ b/maskiner/styrelsen/hardware-configuration.nix
@@ -8,11 +8,26 @@
     [ (modulesPath + "/installer/scan/not-detected.nix")
     ];
 
-  boot.initrd.availableKernelModules = [ "xhci_pci" "ahci" "nvme" "usb_storage" "sd_mod" ];
+  boot.initrd.availableKernelModules = [ "xhci_pci" "thunderbolt" "nvme" "usb_storage" "sd_mod" ];
   boot.initrd.kernelModules = [ ];
   boot.kernelModules = [ "kvm-intel" ];
   boot.extraModulePackages = [ ];
 
+  fileSystems."/" =
+    { device = "/dev/disk/by-uuid/a6e54609-7417-4bce-9cb8-d7bc180474f4";
+      fsType = "ext4";
+    };
+
+  fileSystems."/boot" =
+    { device = "/dev/disk/by-uuid/92E0-BAFF";
+      fsType = "vfat";
+      options = [ "fmask=0077" "dmask=0077" ];
+    };
+
+  swapDevices =
+    [ { device = "/dev/disk/by-uuid/00eac17b-fc20-417f-9bd4-f68b4d7d66c0"; }
+    ];
+
   nixpkgs.hostPlatform = lib.mkDefault "x86_64-linux";
   hardware.cpu.intel.updateMicrocode = lib.mkDefault config.hardware.enableRedistributableFirmware;
 }