From aba25996735a0a163c717f594dd2edda06966a17 Mon Sep 17 00:00:00 2001
From: Chris Cochrun <chris@cochrun.xyz>
Date: Fri, 5 Sep 2025 15:26:48 -0500
Subject: [PATCH] updates to kaladin

---
 home/home.nix                              | 19 +++++++------------
 home/modules/niri.nix                      |  5 +++--
 systems/kaladin/hardware-configuration.nix | 20 +++++++++++++++++---
 3 files changed, 27 insertions(+), 17 deletions(-)

diff --git a/home/home.nix b/home/home.nix
index 3b27ba1..d24e76c 100644
--- a/home/home.nix
+++ b/home/home.nix
@@ -44,19 +44,14 @@ in {
     };
     portal = {
       enable = true;
-      configPackages = [ pkgs.cosmic-session pkgs.xdg-desktop-portal-cosmic ];
+      configPackages = [ pkgs.cosmic-session pkgs.xdg-desktop-portal-cosmic pkgs.kdePackages.kwallet ];
       config = {
         common = {
-          default = [ "cosmic" "kde" ];
+          default = [ "kde" ];
           "org.freedesktop.impl.portal.FileChooser" = [ "cosmic" "kde" ];
-          "org.freedesktop.impl.portal.OpenUri" = [ "cosmic" "kde" ];
-          "org.freedesktop.impl.portal.Secret" = [ "cosmic" "kde" ];
-        };
-        hyprland = {
-          default = [ "hyprland" ];
-          "org.freedesktop.impl.portal.FileChooser" = [ "cosmic" "kde" ];
-          "org.freedesktop.impl.portal.OpenUri" = [ "cosmic" "kde" ];
-          "org.freedesktop.impl.portal.Secret" = [ "cosmic" "kde" ];
+          "org.freedesktop.impl.portal.Access" = [ "kde" ];
+          "org.freedesktop.impl.portal.OpenUri" = [ "kde" ];
+          "org.freedesktop.impl.portal.Desktop" = [ "kde" ];
         };
       };
       extraPortals = [ pkgs.kdePackages.xdg-desktop-portal-kde pkgs.xdg-desktop-portal-gtk pkgs.xdg-desktop-portal-cosmic ];
@@ -1346,7 +1341,7 @@ in {
     };
     settings = {
       global = {
-        monitor = 2;
+        monitor = 1;
         follow = "none";
         width = "(0, 300)";
         height = "(0, 500)";
@@ -1364,7 +1359,7 @@ in {
         horizontal_padding = 8;
         text_icon_padding = 8;
         frame_width = 0;
-        frame_color = "#aaaaaa";
+        frame_color = "#282a36aa";
         gap_size = 8;
         separator_color = "frame";
         sort = "yes";
diff --git a/home/modules/niri.nix b/home/modules/niri.nix
index 27718d8..eaab588 100644
--- a/home/modules/niri.nix
+++ b/home/modules/niri.nix
@@ -174,8 +174,7 @@ in
         }
         {
           matches = [{app-id = "mpv";}];
-          open-on-workspace = "main";
-          open-on-output = "DP-1";
+          open-on-output = "DP-2";
         }
         {
           matches = [{app-id = "com.system76.CosmicFiles";}];
@@ -237,6 +236,7 @@ in
         "laptop" = {
           enable = true;
           name = "eDP-1";
+          focus-at-startup = true;
           mode = {
             height = 1504;
             width = 2256;
@@ -249,6 +249,7 @@ in
           scale = 1.5;
           position.x = 1080;
           position.y = 0;
+          focus-at-startup = true;
           mode = {
             height = 2160;
             width = 3640;
diff --git a/systems/kaladin/hardware-configuration.nix b/systems/kaladin/hardware-configuration.nix
index 6eb4ac7..cc3eb54 100644
--- a/systems/kaladin/hardware-configuration.nix
+++ b/systems/kaladin/hardware-configuration.nix
@@ -10,9 +10,23 @@
   boot.kernelModules = [ "kvm-intel" ];
   boot.extraModulePackages = [ ];
 
+
   fileSystems."/" =
-    { device = "/dev/disk/by-uuid/e5add982-fbdf-45e6-9e96-ea81c3ceff37";
-      fsType = "ext4";
+    { device = "/dev/disk/by-uuid/1ba185c4-8b74-46f3-95d8-9ccaab0be1ad";
+      fsType = "btrfs";
+      options = [ "subvol=@" "noatime" "compress=zstd:1" "space_cache=v2" "ssd" ];
+    };
+
+  fileSystems."/home" =
+    { device = "/dev/disk/by-uuid/1ba185c4-8b74-46f3-95d8-9ccaab0be1ad";
+      fsType = "btrfs";
+      options = [ "subvol=@home" "noatime" "compress=zstd:1" "space_cache=v2" "ssd" ];
+    };
+
+  fileSystems."/snapshots" =
+    { device = "/dev/disk/by-uuid/1ba185c4-8b74-46f3-95d8-9ccaab0be1ad";
+      fsType = "btrfs";
+      options = [ "subvol=@snapshots" "noatime" "compress=zstd:1" "space_cache=v2" "ssd" ];
     };
 
   fileSystems."/boot" =
@@ -24,7 +38,7 @@
   fileSystems."/run/media/chris/Storage" =
     { device = "/dev/disk/by-uuid/4c7d4273-7b72-4aa8-8e1c-e281543d06cb";
       fsType = "btrfs";
-      options = [ "noatime" "space_cache" "clear_cache" "compress=zstd" ];
+      options = [ "noatime" "space_cache=v2" "clear_cache" "compress=zstd:1" ];
     };
 
   fileSystems."/run/media/chris/backup" =