syncthing

home/default.nix

@@ -10,6 +10,7 @@
     ./git.nix
     ./gpg.nix
     ./helix.nix
+    ./hyprland
     ./packages.nix
     ./playerctld.nix
     ./rofi.nix

home/hyprland/default.nix

@@ -1,10 +1,12 @@
-{...}: {
+{ system-config, lib, ...}: {
   imports = [
-    ./hyprgrass.nix
-    ./utils.nix
+#    ./hyprgrass.nix
+#    ./utils.nix
   ];
 
-  wayland.windowManager.hyprland = {
+  wayland.windowManager = let 
+  
+  hyprDefaults = {
     enable = true;
 
     xwayland.enable = true;
@@ -16,8 +18,7 @@
       "$fileManager" = "alacritty -e ranger";
 
       monitor = [
-        "eDP-1, 1920x1080, 0x0, 1"
-        ",preferred,auto,1"
+        ",preferred,1"
       ];
 
       exec-once = [
@@ -55,8 +56,8 @@
         gaps_in = 5;
         gaps_out = 5;
         border_size = 2;
-        "col.active_border" = "rgba(5bcefaee) rgba(f5a9b8ee) 45deg";
-        "col.inactive_border" = "rgba(595959aa)";
+#        "col.active_border" = "rgba(5bcefaee) rgba(f5a9b8ee) 45deg";
+#        "col.inactive_border" = "rgba(595959aa)";
 
         layout = "dwindle";
 
@@ -75,7 +76,7 @@
         drop_shadow = true;
         shadow_range = 4;
         shadow_render_power = 3;
-        "col.shadow" = "rgba(1a1a1aee)";
+#         "col.shadow" = "rgba(1a1a1aee)";
       };
 
       animations = {
@@ -170,4 +171,7 @@
       ];
     };
   };
+  in {
+    hyprland = lib.recursiveUpdate hyprDefaults system-config.hyprlandOverrides;
+  };
 }

home/persist.nix

@@ -1,16 +1,15 @@
-{
-  lib,
-  config,
-  ...
-}: {
+{lib, config}: {
   data = {
     directories = [
       ".config/syncthing"
+      ".config/sops"
       ".gnupg"
       ".local/share/PrismLauncher/instances"
       ".ssh"
 
       "nixos"
+      "sync"
+      "code"
     ];
     files = [];
   };
@@ -22,18 +21,13 @@
       ".cargo"
       ".config/obsidian"
       ".config/spotify"
-      (
-        lib.optional
-        config.gaming.enable
-        ".local/share/PrismLauncher"
-      )
-      (
-        lib.optional
-        config.gaming.enable
-        ".local/share/Steam"
-      )
       ".local/state/wireplumber"
       ".thunderbird"
+      "tmp"
+    ] ++ lib.optionals config.gaming.enable [
+       ".local/share/PrismLauncher"
+       ".local/share/Steam"
+       ".steam"
     ];
     files = [];
   };

home/sops.nix

@@ -5,6 +5,6 @@
 }: {
   imports = [sops-nix.homeManagerModules.sops];
   sops = {
-    age.keyFile = "/persist/data${conf.home}/.config/sops/age/keys.txt";
+    age.keyFile = /persist/data${conf.home}/.config/sops/age/keys.txt;
   };
 }