Fix SSH/GPG agent conflicts and remove redundant catppuccin import
This commit is contained in:
parent
ab6217a4c7
commit
e20d791a78
4 changed files with 9 additions and 14 deletions
|
|
@ -116,20 +116,20 @@
|
||||||
tray.enable = true;
|
tray.enable = true;
|
||||||
};
|
};
|
||||||
ssh-agent = {
|
ssh-agent = {
|
||||||
enable = true;
|
enable = false;
|
||||||
};
|
};
|
||||||
gpg-agent = {
|
gpg-agent = {
|
||||||
enable = true;
|
enable = true;
|
||||||
defaultCacheTtl = 1800;
|
defaultCacheTtl = 1800;
|
||||||
# enableSshSupport = true;
|
enableSshSupport = true;
|
||||||
};
|
};
|
||||||
};
|
};
|
||||||
programs.go.enable = true;
|
programs.go.enable = true;
|
||||||
programs.keychain = {
|
# programs.keychain = {
|
||||||
enable = true;
|
# enable = true;
|
||||||
enableBashIntegration = true;
|
# enableBashIntegration = true;
|
||||||
keys = "id_aur id_dsa id_ed25519 git C7E41C9F79C846984163693FCCD8E76F07EA701B";
|
# keys = "id_aur id_dsa id_ed25519 git C7E41C9F79C846984163693FCCD8E76F07EA701B";
|
||||||
};
|
# };
|
||||||
home.file.".links/links.cfg".source = files/links.cfg;
|
home.file.".links/links.cfg".source = files/links.cfg;
|
||||||
xdg.configFile."nix/nix.conf".text = ''
|
xdg.configFile."nix/nix.conf".text = ''
|
||||||
extra-experimental-features = flakes nix-command
|
extra-experimental-features = flakes nix-command
|
||||||
|
|
|
||||||
|
|
@ -50,11 +50,6 @@
|
||||||
enableSshSupport = true;
|
enableSshSupport = true;
|
||||||
};
|
};
|
||||||
};
|
};
|
||||||
programs.keychain = {
|
|
||||||
enable = true;
|
|
||||||
enableBashIntegration = true;
|
|
||||||
keys = "id_aur id_dsa id_ed25519 git C7E41C9F79C846984163693FCCD8E76F07EA701B";
|
|
||||||
};
|
|
||||||
home.file.".links/links.cfg".source = files/links.cfg;
|
home.file.".links/links.cfg".source = files/links.cfg;
|
||||||
xdg.configFile."nix/nix.conf".text = ''
|
xdg.configFile."nix/nix.conf".text = ''
|
||||||
extra-experimental-features = flakes nix-command
|
extra-experimental-features = flakes nix-command
|
||||||
|
|
|
||||||
|
|
@ -7,7 +7,7 @@
|
||||||
}: {
|
}: {
|
||||||
services = {
|
services = {
|
||||||
gnome-keyring = {enable = true;};
|
gnome-keyring = {enable = true;};
|
||||||
ssh-agent = {enable = true;};
|
ssh-agent = {enable = lib.mkForce false;};
|
||||||
wlsunset = {
|
wlsunset = {
|
||||||
enable = true;
|
enable = true;
|
||||||
latitude = 29.7;
|
latitude = 29.7;
|
||||||
|
|
|
||||||
|
|
@ -16,7 +16,7 @@
|
||||||
users = {
|
users = {
|
||||||
don = {
|
don = {
|
||||||
imports = [
|
imports = [
|
||||||
inputs.catppuccin.homeModules.catppuccin
|
# inputs.catppuccin.homeModules.catppuccin
|
||||||
./common/pi-server.nix
|
./common/pi-server.nix
|
||||||
];
|
];
|
||||||
home = {
|
home = {
|
||||||
|
|
|
||||||
Loading…
Add table
Add a link
Reference in a new issue