diff --git a/home/default.nix b/home/default.nix index 0bd95fb..a523270 100644 --- a/home/default.nix +++ b/home/default.nix @@ -10,7 +10,7 @@ let "git" "gpg" "gtk" - "keyring" + #"keyring" "syncthing" "tmux" "xdg" diff --git a/home/modules/git.nix b/home/modules/git.nix index 3b575b7..e89e62a 100644 --- a/home/modules/git.nix +++ b/home/modules/git.nix @@ -27,6 +27,7 @@ in gpg = { format = "ssh"; ssh.allowedSignersFile = "${allowedSigners}"; + ssh.program = "ssh-keygen"; }; tag.gpgSign = true; user = { diff --git a/nixos/gorgon/configuration.nix b/nixos/gorgon/configuration.nix index 96dbf42..0320d16 100644 --- a/nixos/gorgon/configuration.nix +++ b/nixos/gorgon/configuration.nix @@ -196,6 +196,8 @@ in # postUp = "${pkgs.iproute2}/bin/ip rule add to 193.27.14.66 lookup main"; #}; + services.gnome3.gnome-keyring.enable = lib.mkForce false; + hardware.opengl = { enable = true; extraPackages = with pkgs; [