1 files changed, 33 insertions, 19 deletions

diff --git a/hosts/sif/default.nix b/hosts/sif/default.nix
index 7c8da63a..655b2e9c 100644
--- a/hosts/sif/default.nix
+++ b/hosts/sif/default.nix
@@ -13,8 +13,7 @@ in {
   imports = with flake.nixosModules.systemProfiles; [
     ./hw.nix
     ./mail ./libvirt
-    tmpfs-root bcachefs initrd-all-crypto-modules default-locale openssh rebuild-machines
-    networkmanager
+    tmpfs-root bcachefs initrd-all-crypto-modules default-locale openssh rebuild-machines niri-unstable networkmanager
     flakeInputs.nixos-hardware.nixosModules.lenovo-thinkpad-p1
     flakeInputs.impermanence.nixosModules.impermanence
     flakeInputs.nixVirt.nixosModules.default
@@ -27,6 +26,9 @@ in {
         allowUnfree = true;
         pulseaudio = true;
       };
+      extraOverlays = [
+        flakeInputs.niri-flake.overlays.niri
+      ];
     };
 
     time.timeZone = null;
@@ -34,7 +36,6 @@ in {
     boot = {
       initrd = {
         systemd = {
-          enable = false;
           emergencyAccess = config.users.users.root.hashedPassword;
         };
         luks.devices = {
@@ -62,15 +63,20 @@ in {
       plymouth.enable = true;
 
       kernelPackages = pkgs.linuxPackages_latest;
-      extraModulePackages = with config.boot.kernelPackages; [ v4l2loopback ];
-      kernelModules = ["v4l2loopback"];
       kernelPatches = [
         { name = "edac-config";
           patch = null;
-          extraConfig = ''
-            EDAC y
-            EDAC_IE31200 y
-          '';
+          extraStructuredConfig = with lib.kernel; {
+            EDAC = yes;
+            EDAC_IE31200 = yes;
+          };
+        }
+        { name = "zswap-default";
+          patch = null;
+          extraStructuredConfig = with lib.kernel; {
+            ZSWAP_DEFAULT_ON = yes;
+            ZSWAP_SHRINKER_DEFAULT_ON = yes;
+          };
         }
       ];
 
@@ -439,7 +445,7 @@ in {
       };
 
       xserver = {
-        enable = true;
+        enable = false;
 
         xkb = {
           layout = "us";
@@ -497,14 +503,14 @@ in {
         GTK.application_prefer_dark_theme = true;
       };
     };
-    programs.hyprland.enable = true;
+    programs.niri.enable = true;
 
     systemd.tmpfiles.settings = {
       "10-localtime"."/etc/localtime".L.argument = "/.bcachefs/etc/localtime";
 
       "10-regreet"."/var/cache/regreet/cache.toml".C.argument = toString ((pkgs.formats.toml {}).generate "cache.toml" {
         last_user = "gkleen";
-        user_to_last_sess.gkleen = "Hyprland";
+        user_to_last_sess.gkleen = "Niri";
       });
     };
 
@@ -616,7 +622,7 @@ in {
       nvidia = {
         open = true;
         modesetting.enable = true;
-        powerManagement.enable = true;
+        powerManagement.enable = false;
         prime = {
           nvidiaBusId = "PCI:1:0:0";
           intelBusId = "PCI:0:2:0";
@@ -706,12 +712,6 @@ in {
       dconf.enable = true;
     };
 
-    zramSwap = {
-      enable = true;
-      algorithm = "zstd";
-      writebackDevice = "/dev/disk/by-label/swap";
-    };
-
     services.pcscd.enable = true;
 
     sops.secrets.gkleen-rclone = {
@@ -729,6 +729,16 @@ in {
     environment.sessionVariables."GTK_USE_PORTAL" = "1";
     xdg.portal = {
       enable = true;
+      extraPortals = with pkgs; [ xdg-desktop-portal-gtk ];
+      config.niri = {
+        default = ["gnome" "gtk"];
+        "org.freedesktop.impl.portal.FileChooser" = ["gtk"];
+        "org.freedesktop.impl.portal.OpenFile" = ["gtk"];
+        "org.freedesktop.impl.portal.Access" = ["gtk"];
+        "org.freedesktop.impl.portal.Notification" = ["gtk"];
+        "org.freedesktop.impl.portal.Secret" = ["gnome-keyring"];
+        "org.freedesktop.impl.portal.Inhibit" = ["none"];
+      };
     };
 
     environment.persistence."/.bcachefs" = {
@@ -769,6 +779,10 @@ in {
 
     home-manager.sharedModules = [ flakeInputs.nixVirt.homeModules.default ];
 
+    environment.pathsToLink = [
+      "share/zsh"
+    ];
+
     system.stateVersion = "24.11";
   };
 }