From 8b16ca30b7cdb8b800bf90e99eda63a1dfe36a6e Mon Sep 17 00:00:00 2001
From: pagedMov <pagedMov@gmail.com>
Date: Mon, 14 Oct 2024 14:36:33 -0400
Subject: [PATCH] (desktop) Gen 487: fixed password-store directory issue

---
 flake.lock                                    | 20 +++++++++----------
 modules/home/default.nix                      |  2 +-
 modules/home/programs/password-store.nix      |  7 +++++--
 modules/home/scripts/default.nix              |  2 ++
 modules/home/scripts/wm-controls/hyprland.nix | 10 ++++++++++
 5 files changed, 28 insertions(+), 13 deletions(-)
 create mode 100644 modules/home/scripts/wm-controls/hyprland.nix

diff --git a/flake.lock b/flake.lock
index 64837b8..ee89fa7 100644
--- a/flake.lock
+++ b/flake.lock
@@ -346,11 +346,11 @@
         ]
       },
       "locked": {
-        "lastModified": 1728791962,
-        "narHash": "sha256-nr5QiXwQcZmf6/auC1UpX8iAtINMtdi2mH+OkqJQVmU=",
+        "lastModified": 1728903686,
+        "narHash": "sha256-ZHFrGNWDDriZ4m8CA/5kDa250SG1LiiLPApv1p/JF0o=",
         "owner": "nix-community",
         "repo": "home-manager",
-        "rev": "64c6325b28ebd708653dd41d88f306023f296184",
+        "rev": "e1aec543f5caf643ca0d94b6a633101942fd065f",
         "type": "github"
       },
       "original": {
@@ -442,11 +442,11 @@
         "xdph": "xdph"
       },
       "locked": {
-        "lastModified": 1728861919,
-        "narHash": "sha256-VTbYjwDEaYyALE73n4HaWqxy+3Mg+x2yvVGScZ72Zkk=",
+        "lastModified": 1728930677,
+        "narHash": "sha256-s0Nyh9m1u+xfnaELM3XRtJPUUyjyHS8kwhNYXFucUXM=",
         "ref": "refs/heads/main",
-        "rev": "e7fd0f5aec85c11a8eaf5e1abf8504f0a6d0710e",
-        "revCount": 5339,
+        "rev": "01c2ff34ddcb5995409c33c2b549e93b98b56d6b",
+        "revCount": 5343,
         "submodules": true,
         "type": "git",
         "url": "https://github.com/hyprwm/Hyprland"
@@ -825,11 +825,11 @@
     },
     "nur": {
       "locked": {
-        "lastModified": 1728897080,
-        "narHash": "sha256-aTXVDADO4CflvvnHNYmmcfmQNnJeOfOwqWoKwXKsWWQ=",
+        "lastModified": 1728930569,
+        "narHash": "sha256-OvKCDKpI8sHA07Ct+f5uotGr9ATrIJ/fUfwZZnD8Tmk=",
         "owner": "nix-community",
         "repo": "NUR",
-        "rev": "9fe98265f7f8beed5ab2a55263317fa492bd908c",
+        "rev": "96670f5e62fc211ff06be5ed7654c44318ddf7e2",
         "type": "github"
       },
       "original": {
diff --git a/modules/home/default.nix b/modules/home/default.nix
index 7d10d8c..80d7fd8 100644
--- a/modules/home/default.nix
+++ b/modules/home/default.nix
@@ -1,4 +1,4 @@
-{ host, nur, self, inputs, username, config, ... }:
+{ host, nur, self, inputs, username, config, home-manager, ... }:
 
 
 
diff --git a/modules/home/programs/password-store.nix b/modules/home/programs/password-store.nix
index ff26d6b..a7327d1 100644
--- a/modules/home/programs/password-store.nix
+++ b/modules/home/programs/password-store.nix
@@ -1,10 +1,13 @@
-{ ... }:
+{ username, ... }:
 
+let
+	home = "/home/${username}";
+in
 {
 	programs.password-store = {
 		enable = true;
 		settings = {
-			PASSWORD_STORE_DIR = "$XDG_DATA_HOME/.pass";
+			PASSWORD_STORE_DIR = "${home}/.password-store";
 		};
 	};
 }
diff --git a/modules/home/scripts/default.nix b/modules/home/scripts/default.nix
index f49f4eb..fe1b1b8 100644
--- a/modules/home/scripts/default.nix
+++ b/modules/home/scripts/default.nix
@@ -16,6 +16,7 @@ let
 	nsp = 			  (import ./nix/nsp.nix 					{ self = self; pkgs = pkgs;});
 	nixr = 			  (import ./nix/nixr.nix 					{ self = self; pkgs = pkgs;});
 	nixp = 			  (import ./nix/nixp.nix 					{ self = self; pkgs = pkgs;});
+	hyprland =        (import ./wm-controls/hyprland.nix        { pkgs=pkgs; });
 	lofi = 			  (import ./wm-controls/lofi.nix 			{ self = self; pkgs = pkgs;});
 	music = 		  (import ./wm-controls/music.nix 			{ self = self; pkgs = pkgs;});
 	shutdown-script = (import ./wm-controls/shutdown-script.nix { self = self; pkgs = pkgs;});
@@ -36,6 +37,7 @@ in
 		garbage-collect 
 		homep
 		homer
+		hyprland
 		invoke 
 		lofi
 		mcd 
diff --git a/modules/home/scripts/wm-controls/hyprland.nix b/modules/home/scripts/wm-controls/hyprland.nix
new file mode 100644
index 0000000..d8c9128
--- /dev/null
+++ b/modules/home/scripts/wm-controls/hyprland.nix
@@ -0,0 +1,10 @@
+{ pkgs, ... }:
+
+pkgs.writeShellScriptBin "hyprland" (''
+	export XDG_CONFIG_HOME="$HOME/.config"
+	export XDG_DATA_HOME="$HOME/.local/share"
+	export XDG_CACHE_HOME="$HOME/.cache"
+
+	exec Hyprland
+'')
+