1 files changed, 4 insertions, 63 deletions

diff --git a/hosts/skadhi/hw.nix b/hosts/skadhi/hw.nix
index 0eb16b7a..687f04d8 100644
--- a/hosts/skadhi/hw.nix
+++ b/hosts/skadhi/hw.nix
@@ -1,79 +1,20 @@
 { flake, flakeInputs, pkgs, config, lib, ... }:
 {
-  imports = with flake.nixosModules.systemProfiles; [
+  imports = [
     flakeInputs.nixos-hardware.nixosModules.framework-13-7040-amd
-    disko
   ];
 
   config = {
-    hardware.framework.laptop13.audioEnhancement.enable = true;
+    hardware.framework.laptop13.audioEnhancement.enable = false;
+    hardware.enableRedistributableFirmware = true;
     services.fstrim.enable = false;
 
     services.udev.extraRules = ''
-      ACTION=="add", SUBSYSTEM=="acpi", DRIVERS=="button", ATTRS{hid}=="PNP0C0D", ATTR{power/wakeup}="disabled"
+      ACTION=="add", SUBSYSTEM=="platform", DRIVER=="acpi-button", KERNEL=="PNP0C0D:00", ATTR{power/wakeup}="disabled"
       ACTION=="add", SUBSYSTEM=="serio", DRIVERS=="atkbd", ATTR{power/wakeup}="disabled"
       ACTION=="add", SUBSYSTEM=="i2c", DRIVERS=="i2c_hid_acpi", ATTRS{name}=="PIXA3854:00", ATTR{power/wakeup}="disabled"
    '';
 
     nixpkgs.system = "x86_64-linux";
-
-    disko.devices = {
-      disk.nvm = {
-        type = "disk";
-        device = "/dev/nvme0n1";
-        content = {
-          type = "gpt";
-          partitions = {
-            ESP = {
-              size = "512M";
-              type = "EF00";
-              content = {
-                type = "filesystem";
-                format = "vfat";
-                mountpoint = "/boot";
-                mountOptions = [
-                  "fmask=0033" "dmask=0022"
-                ];
-              };
-            };
-            luks = {
-              size = "100%";
-              content = {
-                type = "luks";
-                name = "nvm";
-                extraFormatArgs = [
-                  "--cipher" "aegis128-random"
-                  "--key-size" "128"
-                  "--integrity" "aead"
-                ];
-                content = {
-                  type = "btrfs";
-                  extraArgs = let
-                    subvols = ["/persistent"] ++ map (p: "/persistent/${p}") ["/nix" "/var/log"];
-                    restricted = map (p: "/persistent/${p}") ["/root"];
-                  in [
-                    "--csum" "blake2"
-                    "--compress" "zstd:15"
-                    "--rootdir" (toString (pkgs.runCommand "rootdir" {
-                    } ''
-                      mkdir $out
-                      install -d ${lib.concatMapStringsSep " " (p: "$out/${p}") subvols}
-                      install -m 0700 -d ${lib.concatMapStringsSep " " (p: "$out/${p}") restricted}
-                    ''))
-                  ] ++ lib.concatMap (p: ["--subvol" p]) subvols;
-                  subvolumes = {
-                    "/persistent".mountpoint = "/persistent";
-                    "/swap" = {
-                      mountpoint = "/.swap";
-                      swap.swapfile.size = "96G";
-                    };
-                  };
-                };
-              };
-            };
-          };
-        };
-      };
-    };
   };
 }