Stop asking for keychain at startup, don't mess with nvim repo state in Makefile
This commit is contained in:
parent
95e1d72932
commit
dcc5b92e5f
1
Makefile
1
Makefile
|
@ -7,7 +7,6 @@ SUBMODULES := $(CONFIG_DIR)/nvim
|
||||||
.PHONY: default clean nixos home /etc/nixos/config
|
.PHONY: default clean nixos home /etc/nixos/config
|
||||||
|
|
||||||
default: $(SUBMODULES)
|
default: $(SUBMODULES)
|
||||||
git -C ./nvim pull --ff-only
|
|
||||||
command -v nix > /dev/null || exit 1
|
command -v nix > /dev/null || exit 1
|
||||||
[ -e /etc/nixos/ ] && make nixos || make home
|
[ -e /etc/nixos/ ] && make nixos || make home
|
||||||
bat cache --build
|
bat cache --build
|
||||||
|
|
2
home/env/keychain.nix
vendored
2
home/env/keychain.nix
vendored
|
@ -1,7 +1,7 @@
|
||||||
{...}: {
|
{...}: {
|
||||||
programs.keychain = {
|
programs.keychain = {
|
||||||
enable = true;
|
enable = true;
|
||||||
extraFlags = ["--quiet" "--ignore-missing"];
|
extraFlags = ["--quiet" "--noask" "--ignore-missing"];
|
||||||
keys = ["id_rsa" "id_ed25519"];
|
keys = ["id_rsa" "id_ed25519"];
|
||||||
enableXsessionIntegration = true;
|
enableXsessionIntegration = true;
|
||||||
};
|
};
|
||||||
|
|
Loading…
Reference in a new issue