(desktop) Gen 487: fixed password-store directory issue

This commit is contained in:
pagedMov
2024-10-14 14:36:33 -04:00
parent 694e373b94
commit 8b16ca30b7
5 changed files with 28 additions and 13 deletions

20
flake.lock generated
View File

@@ -346,11 +346,11 @@
] ]
}, },
"locked": { "locked": {
"lastModified": 1728791962, "lastModified": 1728903686,
"narHash": "sha256-nr5QiXwQcZmf6/auC1UpX8iAtINMtdi2mH+OkqJQVmU=", "narHash": "sha256-ZHFrGNWDDriZ4m8CA/5kDa250SG1LiiLPApv1p/JF0o=",
"owner": "nix-community", "owner": "nix-community",
"repo": "home-manager", "repo": "home-manager",
"rev": "64c6325b28ebd708653dd41d88f306023f296184", "rev": "e1aec543f5caf643ca0d94b6a633101942fd065f",
"type": "github" "type": "github"
}, },
"original": { "original": {
@@ -442,11 +442,11 @@
"xdph": "xdph" "xdph": "xdph"
}, },
"locked": { "locked": {
"lastModified": 1728861919, "lastModified": 1728930677,
"narHash": "sha256-VTbYjwDEaYyALE73n4HaWqxy+3Mg+x2yvVGScZ72Zkk=", "narHash": "sha256-s0Nyh9m1u+xfnaELM3XRtJPUUyjyHS8kwhNYXFucUXM=",
"ref": "refs/heads/main", "ref": "refs/heads/main",
"rev": "e7fd0f5aec85c11a8eaf5e1abf8504f0a6d0710e", "rev": "01c2ff34ddcb5995409c33c2b549e93b98b56d6b",
"revCount": 5339, "revCount": 5343,
"submodules": true, "submodules": true,
"type": "git", "type": "git",
"url": "https://github.com/hyprwm/Hyprland" "url": "https://github.com/hyprwm/Hyprland"
@@ -825,11 +825,11 @@
}, },
"nur": { "nur": {
"locked": { "locked": {
"lastModified": 1728897080, "lastModified": 1728930569,
"narHash": "sha256-aTXVDADO4CflvvnHNYmmcfmQNnJeOfOwqWoKwXKsWWQ=", "narHash": "sha256-OvKCDKpI8sHA07Ct+f5uotGr9ATrIJ/fUfwZZnD8Tmk=",
"owner": "nix-community", "owner": "nix-community",
"repo": "NUR", "repo": "NUR",
"rev": "9fe98265f7f8beed5ab2a55263317fa492bd908c", "rev": "96670f5e62fc211ff06be5ed7654c44318ddf7e2",
"type": "github" "type": "github"
}, },
"original": { "original": {

View File

@@ -1,4 +1,4 @@
{ host, nur, self, inputs, username, config, ... }: { host, nur, self, inputs, username, config, home-manager, ... }:

View File

@@ -1,10 +1,13 @@
{ ... }: { username, ... }:
let
home = "/home/${username}";
in
{ {
programs.password-store = { programs.password-store = {
enable = true; enable = true;
settings = { settings = {
PASSWORD_STORE_DIR = "$XDG_DATA_HOME/.pass"; PASSWORD_STORE_DIR = "${home}/.password-store";
}; };
}; };
} }

View File

@@ -16,6 +16,7 @@ let
nsp = (import ./nix/nsp.nix { self = self; pkgs = pkgs;}); nsp = (import ./nix/nsp.nix { self = self; pkgs = pkgs;});
nixr = (import ./nix/nixr.nix { self = self; pkgs = pkgs;}); nixr = (import ./nix/nixr.nix { self = self; pkgs = pkgs;});
nixp = (import ./nix/nixp.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;}); lofi = (import ./wm-controls/lofi.nix { self = self; pkgs = pkgs;});
music = (import ./wm-controls/music.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;}); shutdown-script = (import ./wm-controls/shutdown-script.nix { self = self; pkgs = pkgs;});
@@ -36,6 +37,7 @@ in
garbage-collect garbage-collect
homep homep
homer homer
hyprland
invoke invoke
lofi lofi
mcd mcd

View File

@@ -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
'')