From beb898562a419c7d84b8049456dcab85c0f20966 Mon Sep 17 00:00:00 2001
From: Hunter Haugen <hunter@haugens.org>
Date: Tue, 6 May 2025 15:08:51 -0700
Subject: [PATCH] Add encrypted swap, restic, pass, hypr

---
 framework/configuration.nix          | 19 ++++++++++++++++---
 framework/hardware-configuration.nix |  6 +++---
 2 files changed, 19 insertions(+), 6 deletions(-)

diff --git a/framework/configuration.nix b/framework/configuration.nix
index cc73c5e..9c6e408 100644
--- a/framework/configuration.nix
+++ b/framework/configuration.nix
@@ -22,8 +22,8 @@ in
   boot = {
     loader.systemd-boot.enable = true;
     loader.efi.canTouchEfiVariables = true;
-    #initrd.luks.devices."cryptroot".device = "/dev/disk/by-partlabel/cryptroot";
-    #initrd.luks.devices."cryptswap".device = "/dev/disk/by-partlabel/cryptswap";
+    #initrd.luks.devices."cryptroot".device = "/dev/disk/by-partlabel/disk-nvme0n1-cryptroot";
+    initrd.luks.devices."cryptswap".device = "/dev/disk/by-partlabel/disk-nvme0n1-swap";
 
     resumeDevice = "/dev/nvme0n1p2";
     kernelParams = [
@@ -31,6 +31,9 @@ in
       "mem_sleep_default=deep"
     ];
   };
+  swapDevices = [ {
+    device = "/dev/mapper/cryptswap";
+  } ];
   services.fwupd.enable = true;
   hardware.framework.enableKmod = true;
 
@@ -99,6 +102,7 @@ in
     enable = true;
     extraOptions = "--storage-driver=overlay2";
   };
+  programs.hyprland.enable = true;
   programs.zsh.enable = true;
   services.openssh.enable = true;
   services.openssh.settings.PermitRootLogin = "yes";
@@ -110,6 +114,8 @@ in
 
   # Enable the GNOME Desktop Environment.
   services.xserver.displayManager.gdm.enable = true;
+  services.xserver.displayManager.gdm.wayland = true;
+  services.xserver.displayManager.gdm.autoSuspend = true;
   services.xserver.desktopManager.gnome.enable = true;
 
   services.xserver.windowManager.xmonad = {
@@ -152,7 +158,8 @@ in
   };
 
   # Enable touchpad support (enabled default in most desktopManager).
-  # services.xserver.libinput.enable = true;
+  services.libinput.enable = true;
+  services.touchegg.enable = true;
 
   # Define a user account. Don't forget to set a password with 'passwd'.
   users.users.hunner = {
@@ -174,6 +181,8 @@ in
       obs-studio
       mplayer
       ffmpeg
+      jetbrains-toolbox
+      pass
     ];
   };
   systemd.user.services = {
@@ -245,6 +254,10 @@ in
     hp15c
     #nonpareil
     unstable.framework-tool
+    kitty # for Hyprland
+    unstable._1password-gui
+    unstable._1password-cli
+    restic
   ];
 
   services.clipmenu.enable = true;
diff --git a/framework/hardware-configuration.nix b/framework/hardware-configuration.nix
index 2cba214..b974d37 100644
--- a/framework/hardware-configuration.nix
+++ b/framework/hardware-configuration.nix
@@ -56,9 +56,9 @@
       options = [ "subvol=var/log" ];
     };
 
-  swapDevices =
-    [ { device = "/dev/disk/by-uuid/4ad150c5-5d21-422c-8038-18952e1d999d"; }
-    ];
+  #swapDevices =
+  #  [ { device = "/dev/disk/by-uuid/4ad150c5-5d21-422c-8038-18952e1d999d"; }
+  #  ];
 
   # Enables DHCP on each ethernet and wireless interface. In case of scripted networking
   # (the default) this is the recommended approach. When using systemd-networkd it's