4 files changed, 49 insertions, 5 deletions

diff --git a/accounts/gkleen@sif/default.nix b/accounts/gkleen@sif/default.nix
index 2d2e25cb..7a2095ad 100644
--- a/accounts/gkleen@sif/default.nix
+++ b/accounts/gkleen@sif/default.nix
@@ -504,6 +504,10 @@ in {
           [Unit]
           After=graphical-session.target
         '';
+        "systemd/user/home-manager.service.d/before-graphical-session.conf".text = ''
+          [Unit]
+          Before=graphical-session-pre.target
+        '';
       };
 
       xdg.dataFile = {
@@ -645,6 +649,39 @@ in {
           color-scheme = "prefer-dark";
         };
       };
+
+      home.persistence."/.bcachefs/home/gkleen" = {
+        directories = [
+          "documents" "scad" "projects" "screenshots" "Downloads"
+          "media"
+
+          { directory = ".local/share/Steam"; method = "symlink"; }
+
+          ".mozilla" ".local/share/direnv" ".local/share/nix"
+          ".local/share/libvirt" ".local/share/remmina"
+          ".local/share/documents.unison" ".local/share/etesync-dav"
+          ".pki" ".wallpapers" ".thunderbird" ".zoom" ".gnupg" ".cups"
+          ".ssh" ".config/sops" ".config/freerdp" ".config/libvirt"
+          ".config/rclone" ".config/OpenSCAD"
+          ".config/var/lib/swtpm-localca" ".config/xournalpp"
+          ".config/borg" ".config/keepassxc" ".config/obs-studio"
+          ".config/remmina" ".config/glab-cli" ".config/google-chrome"
+          ".config/google-chrome-rainbow" ".config/Element"
+          ".config/Element-lmu" ".config/worktime" ".config/gh"
+          ".config/Youtube Music Desktop App"
+          ".config/emacs/auto-save-list" ".cache/worktime"
+        ];
+        files = [
+          "store.kdbx" "rz.kdbx"
+
+          ".config/swtpm-localca.options" ".config/swtpm-localca.conf"
+          ".config/swtpm_setup.conf" ".config/synadm.yaml"
+          ".config/zoom.conf" ".config/zoomus.conf" ".netrc"
+          ".store.kdbx.json" ".zsh_history"
+          ".config/gtk-2.0/gtkfilechooser.ini"
+        ];
+        allowOther = true;
+      };
     };
   };
 }
diff --git a/accounts/gkleen@sif/niri/default.nix b/accounts/gkleen@sif/niri/default.nix
index 93acc7d7..bf124211 100644
--- a/accounts/gkleen@sif/niri/default.nix
+++ b/accounts/gkleen@sif/niri/default.nix
@@ -19,7 +19,7 @@ let
 
       workspaces_json="$(niri msg -j workspaces)"
       workspace_output="$(jq -r --arg workspace_name "$workspace_name" '.[] | select(.name == $workspace_name) | .output' <<<"$workspaces_json")"
-      active_workspace="$(jq -r --arg workspace_output "$workspace_output" '.[] | select(.output == $workspace_output and .is_active) | .id' <<<"$workspaces_json")"
+      # active_workspace="$(jq -r --arg workspace_output "$workspace_output" '.[] | select(.output == $workspace_output and .is_active) | .id' <<<"$workspaces_json")"
       active_output="$(jq -r '.[] | select(.is_focused) | .output' <<<"$workspaces_json")"
       if [[ $workspace_output != "$active_output" ]]; then
         niri msg action move-workspace-to-monitor --reference "$workspace_name" "$active_output"
diff --git a/hosts/sif/default.nix b/hosts/sif/default.nix
index 9de16de3..1cc88034 100644
--- a/hosts/sif/default.nix
+++ b/hosts/sif/default.nix
@@ -470,16 +470,16 @@ in {
         exportConfiguration = true;
       };
       libinput.enable = true;
-    };
 
-    programs.niri.enable = true;
+      envfs.enable = false;
+    };
 
     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 = "Niri";
+        user_to_last_sess.gkleen = "niri";
       });
     };
 
@@ -680,6 +680,8 @@ in {
       light.enable = true;
       wireshark.enable = true;
       dconf.enable = true;
+      niri.enable = true;
+      fuse.userAllowOther = true;
     };
 
     services.pcscd.enable = true;
@@ -711,6 +713,12 @@ in {
       };
     };
 
+    systemd.user.services.home-manager = {
+      before = [ "basic.target" ];
+      requiredBy = [ "basic.target" ];
+      unitConfig.DefaultDependencies = false;
+    };
+
     environment.persistence."/.bcachefs" = {
       hideMounts = true;
       directories = [
@@ -720,7 +728,6 @@ in {
         "/var/lib/sops-nix"
         "/var/lib/nixos"
         "/var/lib/systemd"
-        "/home"
         "/var/lib/chrony"
         "/var/lib/fprint"
         "/var/lib/bluetooth"
diff --git a/hosts/sif/greetd/wallpaper.png b/hosts/sif/greetd/wallpaper.png
index f6f6c818..20fc761a 100644
--- a/hosts/sif/greetd/wallpaper.png
+++ b/hosts/sif/greetd/wallpaper.png