diff --git a/nixcfgs/modules/home/linux.nix b/nixcfgs/modules/home/linux.nix new file mode 100644 index 0000000..a0b00af --- /dev/null +++ b/nixcfgs/modules/home/linux.nix @@ -0,0 +1,5 @@ +{config, ...}: { + systemd.user.tmpfiles.rules = [ + "d ${config.xdg.dataHome}/gnupg 0700 ${config.home.username} users -" + ]; +} diff --git a/nixcfgs/modules/home/programs/zoxide.nix b/nixcfgs/modules/home/programs/zoxide.nix index cfc3992..0aa07ca 100644 --- a/nixcfgs/modules/home/programs/zoxide.nix +++ b/nixcfgs/modules/home/programs/zoxide.nix @@ -1,11 +1,18 @@ -{...}: let +{config, ...}: let zoxideAliases = { ".." = "z .."; "..." = "z ../.."; "...." = "z ../../.."; "....." = "z ../../../.."; "......" = "z ../../../../.."; + # Compatibility with cjk dots + "。。" = "z .."; + "。。。" = "z ../.."; + "。。。。" = "z ../../.."; + "。。。。。" = "z ../../../.."; + "。。。。。。" = "z ../../../../.."; }; + home = "/home/${config.home.username}"; in { programs.zoxide = { enable = true; @@ -16,5 +23,5 @@ in { programs.fish.shellAliases = zoxideAliases; programs.bash.shellAliases = zoxideAliases; programs.zsh.shellAliases = zoxideAliases; - home.sessionVariables._ZO_EXCLUDE_DIRS = "/sys/*:/nix/*:/dev/*:/tmp/*:/proc/*"; + home.sessionVariables._ZO_EXCLUDE_DIRS = "/sys/*:/nix/*:/dev/*:/tmp/*:/proc/*:/home/${home}/.cache/*"; } diff --git a/nixcfgs/modules/nixos/desktop/diskutil.nix b/nixcfgs/modules/nixos/desktop/diskutil.nix index e9c068b..cd26703 100644 --- a/nixcfgs/modules/nixos/desktop/diskutil.nix +++ b/nixcfgs/modules/nixos/desktop/diskutil.nix @@ -6,5 +6,6 @@ environment.systemPackages = [ pkgs.smartmontools ]; + # davfs2 is for WebDAV mounts. services.davfs2.enable = true; } diff --git a/nixcfgs/secrets/secrets.yaml b/nixcfgs/secrets/secrets.yaml index 1bdc43f..36e8572 100644 --- a/nixcfgs/secrets/secrets.yaml +++ b/nixcfgs/secrets/secrets.yaml @@ -24,7 +24,7 @@ sops: MlBBYzA4bWkyOFNzWlFWbWhDMU9VSG8KJGAr3Gjg6+1OUC+d8+Yu+AW+zzfQ2MtX 7RzIvGv4R3YtAHlX79BcIT6XwGMXVIF86Fu2QOoU7u8o4wpyAt0CXA== -----END AGE ENCRYPTED FILE----- - lastmodified: "2026-03-08T19:00:23Z" - mac: ENC[AES256_GCM,data:SYfoNENCAn7PaztjBB4NeES+gFulDTpFieaaP1Jzi8Td7xfUOFqfTT1DdO0dBdbE66sU/nsDgucNln+92y7BGaE2sCkbUtB9213QTi+gq+A44gzxvibeX4SueakjLC8KwgQxbRZAYYvlLEUVuJ7qIslOqrTPm0APCOxoTMxrgxg=,iv:UlPucS8Y4OFyzI/NVx+OcWYVxBOb+ribbFRc5hmLd80=,tag:5jZ72WV5aqjxL+qzGqB1fQ==,type:str] + lastmodified: "2026-03-09T19:34:30Z" + mac: ENC[AES256_GCM,data:N4OIhOvaXF08PCjiAz7ZdGj9h9JXqafgoasBy3mnLTthfNM0PH0KYMMqfVdXgD41d0zGlnUgrV9YQLifOBTfeTgQLCjbdp8tdZ+681/misf3NfxlPd18C7NIEjbfhuNh5LwKcU+wKrdD5RXokuG6UkkszGis12yDkvhr2reVH5Y=,iv:t//1+iS+328K5GtwAF+epDJJ/xJ8lHIBGQTXusSU8jU=,tag:QvIuTFvUNEn+1FU4EVez0w==,type:str] unencrypted_suffix: _unencrypted version: 3.12.1 diff --git a/nixcfgs/users/js0ny/packages/cli.nix b/nixcfgs/users/js0ny/packages/cli.nix index 48fc2a9..a7ee6b1 100644 --- a/nixcfgs/users/js0ny/packages/cli.nix +++ b/nixcfgs/users/js0ny/packages/cli.nix @@ -1,5 +1,9 @@ # ~/.config/nix-config/common/packages-headless.nix -{pkgs, ...}: { +{ + pkgs, + config, + ... +}: { programs.bat.enable = true; programs.btop.enable = true; programs.delta.enable = true; @@ -67,6 +71,8 @@ opencode p7zip visidata + proton-pass-cli + pass ] ++ ( if pkgs.stdenv.isDarwin @@ -81,4 +87,8 @@ programs.nix-index.enable = true; programs.nix-index.symlinkToCacheHome = true; programs.nix-index-database.comma.enable = true; + + home.sessionVariables = { + PASSWORD_STORE_DIR = "${config.xdg.dataHome}/password-store"; + }; } diff --git a/nixcfgs/users/js0ny/zephyrus.nix b/nixcfgs/users/js0ny/zephyrus.nix index 76f53c3..96a16e7 100644 --- a/nixcfgs/users/js0ny/zephyrus.nix +++ b/nixcfgs/users/js0ny/zephyrus.nix @@ -1,4 +1,3 @@ -# ~/.config/nixcfgs/users/js0ny/default.nix { pkgs, config, @@ -105,6 +104,8 @@ in { # Development setup ../../modules/home/dev/nix.nix + + ../../modules/home/linux.nix ]; nixpkgs.config.allowUnfree = true;