diff --git a/modules/aspects/roles.nix b/modules/aspects/roles.nix index 70b4063..9ecf65b 100644 --- a/modules/aspects/roles.nix +++ b/modules/aspects/roles.nix @@ -76,7 +76,6 @@ ]; developer.features = [ - "jujutsu" "developer-cli" "editor-neovim" "containers-podman" diff --git a/modules/features/desktop/pass.nix b/modules/features/desktop/pass.nix index 391b1b2..e4d3037 100644 --- a/modules/features/desktop/pass.nix +++ b/modules/features/desktop/pass.nix @@ -8,7 +8,7 @@ enable = true; package = pkgs.pass.withExtensions (exts: [ exts.pass-otp ]); settings = { - PASSWORD_STORE_DIR = "$HOME/.local/share/password-store"; + PASSWORD_STORE_DIR = "$XDG_DATA_HOME/password-store"; }; }; diff --git a/modules/features/desktop/zk.nix b/modules/features/desktop/zk.nix index 8a8dc67..e82d2bf 100644 --- a/modules/features/desktop/zk.nix +++ b/modules/features/desktop/zk.nix @@ -2,7 +2,7 @@ { config.dendritic.features.zk.homeModules = [ ( - { ... }: + { pkgs, ... }: { home.sessionVariables = { diff --git a/modules/features/programs/cli/vc-jujutsu.nix b/modules/features/programs/cli/vc-jujutsu.nix deleted file mode 100644 index deaaf28..0000000 --- a/modules/features/programs/cli/vc-jujutsu.nix +++ /dev/null @@ -1,119 +0,0 @@ -{ ... }: -{ - config.dendritic.features.jujutsu = { - homeModules = [ - ( - { pkgs, ... }: - { - programs.jujutsu = { - enable = true; - settings = { - user = { - email = "gwg313@pm.me"; - name = "gwg313"; - }; - signing = { - behavior = "own"; - backend = "gpg"; - }; - aliases = { - c = [ "commit" ]; - ci = [ - "commit" - "--interactive" - ]; - e = [ "edit" ]; - i = [ - "git" - "init" - "--colocate" - ]; - tug = [ - "bookmark" - "move" - "--from" - "closest_bookmark(@-)" - "--to" - "@-" - ]; - log-recent = [ - "log" - "-r" - "default() & recent()" - ]; - nb = [ - "bookmark" - "create" - "-r" - "@-" - ]; # new bookmark - upmain = [ - "bookmark" - "set" - "main" - ]; - squash-desc = [ - "squash" - "::@" - "-d" - "@" - ]; - rebase-main = [ - "rebase" - "-d" - "main" - ]; - amend = [ - "describe" - "-m" - ]; - pushall = [ - "git" - "push" - "--all" - ]; - push = [ - "git" - "push" - "--allow-new" - ]; - pull = [ - "git" - "fetch" - ]; - dmain = [ - "diff" - "-r" - "main" - ]; - l = [ - "log" - "-T" - "builtin_log_compact" - ]; - lf = [ - "log" - "-r" - "all()" - ]; - r = [ "rebase" ]; - s = [ "squash" ]; - si = [ - "squash" - "--interactive" - ]; - }; - }; - }; - - home.packages = with pkgs; [ - lazyjj - meld - ]; - - } - ) - ]; - - }; -}