flake.lock

@@ -186,11 +186,11 @@
     },
     "nixpkgs_3": {
       "locked": {
-        "lastModified": 1704295289,
-        "narHash": "sha256-9WZDRfpMqCYL6g/HNWVvXF0hxdaAgwgIGeLYiOhmes8=",
+        "lastModified": 1703992652,
+        "narHash": "sha256-C0o8AUyu8xYgJ36kOxJfXIroy9if/G6aJbNOpA5W0+M=",
         "owner": "NixOS",
         "repo": "nixpkgs",
-        "rev": "b0b2c5445c64191fd8d0b31f2b1a34e45a64547d",
+        "rev": "32f63574c85fbc80e4ba1fbb932cde9619bad25e",
         "type": "github"
       },
       "original": {

flake.nix

@@ -5,10 +5,6 @@
     nixpkgs.url = "nixpkgs/nixos-23.11";
     agenix.url = "github:ryantm/agenix";
     deploy-rs.url = "github:serokell/deploy-rs";
-    disko = {
-      url = "github:nix-community/disko";
-      inputs.nixpkgs.follows = "nixpkgs";
-    };
     home-manager = {
       url = "github:nix-community/home-manager/release-23.11";
       inputs.nixpkgs.follows = "nixpkgs";
@@ -28,7 +24,7 @@
     };
   };
 
-  outputs = inputs @ { self, nixpkgs, agenix, deploy-rs, disko, home-manager, nixos-hardware, secrets, ... }:
+  outputs = inputs @ { self, nixpkgs, agenix, deploy-rs, home-manager, nixos-hardware, secrets, ... }:
     let
       nixpkgsForSystem = system: inputs.nixpkgs;
       overlays = [
@@ -37,7 +33,6 @@
       ];
       commonModules = [
         agenix.nixosModules.age
-        disko.nixosModules.disko
         home-manager.nixosModule
         ./modules
       ];
@@ -71,7 +66,6 @@
         atlas = nixosSystem { system = "x86_64-linux"; name = "atlas"; };
         eos = nixosSystem { system = "x86_64-linux"; name = "eos"; };
         helios = nixosSystem { system = "x86_64-linux"; name = "helios"; };
-        hypnos = nixosSystem { system = "x86_64-linux"; name = "hypnos"; };
         odyssey = nixosSystem { system = "x86_64-linux"; name = "odyssey"; };
         pi = nixosSystem { system = "aarch64-linux"; name = "pi"; extraModules = [ nixos-hardware.nixosModules.raspberry-pi-4 ]; };
       };

hosts/hypnos/default.nix

@@ -3,7 +3,6 @@
 {
   imports = [
     ./hardware-configuration.nix
-    ./disko-config.nix
     ../desktop.nix
   ];
 
@@ -15,6 +14,7 @@
   networking = {
     hostName = "hypnos";
     hostId = "cf791898";
+    networkmanager.enable = true;
   };
 
   nix = {

hosts/hypnos/disko-config.nix

@@ -1,4 +1,3 @@
-{ lib, ... }:
 {
   disko.devices = {
     disk = {
@@ -40,16 +39,15 @@
           dnodesize = "auto";
           xattr = "sa";
         };
+        mountpoint = "/";
         postCreateHook = "zfs snapshot rpool@blank";
         datasets = {
           local = {
-            type = "zfs_fs";
             options = {
               mountpoint = "none";
             };
           };
           "local/nix" = {
-            type = "zfs_fs";
             mountpoint = "/nix";
             options = {
               atime = "off";
@@ -57,7 +55,6 @@
             };
           };
           "local/tmp" = {
-            type = "zfs_fs";
             mountpoint = "/tmp";
             options = {
               setuid = "off";
@@ -66,21 +63,24 @@
             };
           };
           system = {
-            type = "zfs_fs";
-            mountpoint = "/";
             options = {
-              mountpoint = "legacy";
+              mountpoint = "none";
+              encryption = "aes-256-gcm";
+              keyformat = "passphrase";
+              keylocation = "file:///tmp/secret.key";
             };
+            # use this to read the key during boot
+            postCreateHook = ''
+              zfs set keylocation="prompt" "rpool/$name";
+            '';
           };
           "system/var" = {
-            type = "zfs_fs";
             mountpoint = "/var";
             options = {
               mountpoint = "legacy";
             };
           };
           "system/var/tmp" = {
-            type = "zfs_fs";
             mountpoint = "/var/tmp";
             options = {
               devices = "off";
@@ -88,7 +88,6 @@
             };
           };
           "system/var/log" = {
-            type = "zfs_fs";
             mountpoint = "/var/log";
             options = {
               compression = "on";
@@ -97,7 +96,6 @@
             };
           };
           user = {
-            type = "zfs_fs";
             options = {
               mountpoint = "none";
               encryption = "aes-256-gcm";
@@ -110,7 +108,6 @@
             '';
           };
           "user/home" = {
-            type = "zfs_fs";
             mountpoint = "/home";
             options = {
               setuid = "off";

hosts/hypnos/hardware-configuration.nix

@@ -6,7 +6,7 @@
   ];
 
   boot = {
-    initrd.availableKernelModules = [ "xhci_pci" "ahci" "usbhid" "usb_storage" "sd_mod" ];
+    initrd.availableKernelModules = [ "xhci_pci" "achi" "usbhid" "usb_storage" "sd_mod" ];
     initrd.kernelModules = [ ];
     kernelModules = [ "kvm-intel" "wl" ];
     extraModulePackages = [ config.boot.kernelPackages.broadcom_sta ];

modules/desktop/gnome.nix

@@ -102,9 +102,6 @@ in {
         picture-uri = "file://${pkgs.gnome.gnome-backgrounds}/share/backgrounds/gnome/adwaita-l.jpg";
         picture-uri-dark = "file://${pkgs.gnome.gnome-backgrounds}/share/backgrounds/gnome/adwaita-d.jpg";
       };
-      "org/gnome/peripherals/touchpad" = {
-        tap-to-click = true;
-      };
       "org/gtk/settings/file-chooser" = {
         show-hidden = true;
         sort-directories-first = true;

modules/networking/wireless.nix

@@ -23,7 +23,6 @@ in {
     };
 
     networking = {
-      networkmanager.unmanaged = [ "*" ];
       wireless = {
         enable = true;
         interfaces = cfg.interfaces;