diff --git a/users/modules/config/impermanence.nix b/users/modules/config/impermanence.nix index 9e68789..27ca1f3 100644 --- a/users/modules/config/impermanence.nix +++ b/users/modules/config/impermanence.nix @@ -6,13 +6,9 @@ }: let inherit (lib) optionals; in { - home.persistence."/state".files = - [ - # nothing yet ... - ] - ++ optionals config.programs.ssh.enable [ - ".ssh/known_hosts" - ]; + home.persistence."/state".files = optionals config.programs.ssh.enable [ + ".ssh/known_hosts" + ]; home.persistence."/state".directories = [ diff --git a/users/myuser/git.nix b/users/myuser/git.nix index 213c9f1..fe905c8 100644 --- a/users/myuser/git.nix +++ b/users/myuser/git.nix @@ -20,6 +20,8 @@ tags = "tag -l"; t = "tag -s -m ''"; fixup = ''!f() { TARGET=$(git rev-parse "$1"); git commit --fixup=$TARGET ''${@:2} && EDITOR=true git rebase -i --gpg-sign --autostash --autosquash $TARGET^; }; f''; + # An alias that uses the previous commit message by default. + # Useful when you mess up entering the signing password and git aborts. commit-reuse-message = ''!git commit --edit --file "$(git rev-parse --git-dir)"/COMMIT_EDITMSG''; }; };