dln/dotfiles
0
0
Code Issues Pull requests2 Activity

use new default gcr-ssh-agent support

Browse source
This commit is contained in:
Daniel Lundin 2025-06-22 16:00:48 +02:00
parent f35a73d19e
commit 04f32b5eac
Signed by: dln
SSH key fingerprint: SHA256:dQy1Xj3UiqJYpKR5ggQ2bxgz4jCH8IF+k3AB8o0kmdI
5 changed files with 34 additions and 45 deletions

5
common/base.nix
View file

@ -16,11 +16,6 @@
environment.TMPDIR = "/var/tmp";
};
system.switch = {
enable = false;
enableNg = true;
};
services.fstrim.enable = true;
services.fwupd.enable = true;

6
common/desktop.nix
View file

@ -66,9 +66,11 @@ in
];
};
services.gnome.gnome-keyring.enable = true;
systemd.user.services.gcr-ssh-agent.environment.SSH_ASKPASS = config.programs.ssh.askPassword;
programs.ssh.enableAskPassword = true;
programs.ssh.askPassword = "${pkgs.gnome-ssh-askpass4}/bin/gnome-ssh-askpass4";
programs.ssh.startAgent = true;
programs.steam = {
enable = true;
@ -77,8 +79,6 @@ in
localNetworkGameTransfers.openFirewall = true;
};
services.gnome.gnome-keyring.enable = true;
services.printing.enable = true;
services.displayManager.defaultSession = "gnome";

48
flake.lock generated
View file

@ -148,11 +148,11 @@
]
},
"locked": {
"lastModified": 1750127463,
"narHash": "sha256-K2xFtlD3PcKAZriOE3LaBLYmVfGQu+rIF4Jr1RFYR0Q=",
"lastModified": 1750304462,
"narHash": "sha256-Mj5t4yX05/rXnRqJkpoLZTWqgStB88Mr/fegTRqyiWc=",
"owner": "nix-community",
"repo": "home-manager",
"rev": "28eef8722d1af18ca13e687dbf485e1c653a0402",
"rev": "863842639722dd12ae9e37ca83bcb61a63b36f6c",
"type": "github"
},
"original": {
@ -172,11 +172,11 @@
"treefmt-nix": "treefmt-nix"
},
"locked": {
"lastModified": 1750119416,
"narHash": "sha256-wGa5HXzU9lK4Q7ODv8/n5oY/QbIl8R2wUyDxcLsV3B4=",
"lastModified": 1750596737,
"narHash": "sha256-2OVWqGafUCdWMi6ovywsujGbZ0wnz+GVhPO8ZKoY88w=",
"owner": "nix-community",
"repo": "neovim-nightly-overlay",
"rev": "5b231a9c0efd15547569bd753dbec420b90c8c98",
"rev": "dedc205032e4b5feec0df661682f87849ea8ef20",
"type": "github"
},
"original": {
@ -188,11 +188,11 @@
"neovim-src": {
"flake": false,
"locked": {
"lastModified": 1750116292,
"narHash": "sha256-JTG1BFIIKmFfuT+sIhwrphAIjREgV4FfRcyuztr89P0=",
"lastModified": 1750546491,
"narHash": "sha256-/HKWV8gRHn4mVg8/j3RAoGvQ8dRKvh4n6o+H8WCbq1w=",
"owner": "neovim",
"repo": "neovim",
"rev": "3e984cf02bdcebe2d4f31792505b6a3784fd1b1b",
"rev": "0980617c0df7095ad3dfcbd0ef0b3a250c87139f",
"type": "github"
},
"original": {
@ -208,11 +208,11 @@
]
},
"locked": {
"lastModified": 1749960154,
"narHash": "sha256-EWlr9MZDd+GoGtZB4QsDzaLyaDQPGnRY03MFp6u2wSg=",
"lastModified": 1750565152,
"narHash": "sha256-A6ZIoIgaPPkzIVxKuaxwEJicPOeTwC/MD9iuC3FVhDM=",
"owner": "nix-community",
"repo": "nix-index-database",
"rev": "424a40050cdc5f494ec45e46462d288f08c64475",
"rev": "78cd697acc2e492b4e92822a4913ffad279c20e6",
"type": "github"
},
"original": {
@ -223,11 +223,11 @@
},
"nixpkgs": {
"locked": {
"lastModified": 1749903597,
"narHash": "sha256-jp0D4vzBcRKwNZwfY4BcWHemLGUs4JrS3X9w5k/JYDA=",
"lastModified": 1750386251,
"narHash": "sha256-1ovgdmuDYVo5OUC5NzdF+V4zx2uT8RtsgZahxidBTyw=",
"owner": "NixOS",
"repo": "nixpkgs",
"rev": "41da1e3ea8e23e094e5e3eeb1e6b830468a7399e",
"rev": "076e8c6678d8c54204abcb4b1b14c366835a58bb",
"type": "github"
},
"original": {
@ -239,11 +239,11 @@
},
"nixpkgs-stable": {
"locked": {
"lastModified": 1750005367,
"narHash": "sha256-h/aac1dGLhS3qpaD2aZt25NdKY7b+JT0ZIP2WuGsJMU=",
"lastModified": 1750400657,
"narHash": "sha256-3vkjFnxCOP6vm5Pm13wC/Zy6/VYgei/I/2DWgW4RFeA=",
"owner": "nixos",
"repo": "nixpkgs",
"rev": "6c64dabd3aa85e0c02ef1cdcb6e1213de64baee3",
"rev": "b2485d56967598da068b5a6946dadda8bfcbcd37",
"type": "github"
},
"original": {
@ -255,11 +255,11 @@
},
"nixpkgs-unstable": {
"locked": {
"lastModified": 1749903597,
"narHash": "sha256-jp0D4vzBcRKwNZwfY4BcWHemLGUs4JrS3X9w5k/JYDA=",
"lastModified": 1750386251,
"narHash": "sha256-1ovgdmuDYVo5OUC5NzdF+V4zx2uT8RtsgZahxidBTyw=",
"owner": "nixos",
"repo": "nixpkgs",
"rev": "41da1e3ea8e23e094e5e3eeb1e6b830468a7399e",
"rev": "076e8c6678d8c54204abcb4b1b14c366835a58bb",
"type": "github"
},
"original": {
@ -271,11 +271,11 @@
},
"nixpkgs_2": {
"locked": {
"lastModified": 1749794982,
"narHash": "sha256-Kh9K4taXbVuaLC0IL+9HcfvxsSUx8dPB5s5weJcc9pc=",
"lastModified": 1750365781,
"narHash": "sha256-XE/lFNhz5lsriMm/yjXkvSZz5DfvKJLUjsS6pP8EC50=",
"owner": "nixos",
"repo": "nixpkgs",
"rev": "ee930f9755f58096ac6e8ca94a1887e0534e2d81",
"rev": "08f22084e6085d19bcfb4be30d1ca76ecb96fe54",
"type": "github"
},
"original": {

13
hosts/nemo/default.nix
View file

@ -170,7 +170,7 @@
lm_sensors
pam_rssh
openconnect
tpm2-tools
# tpm2-tools
v4l-utils
];
@ -178,11 +178,12 @@
OTEL_EXPORTER_OTLP_ENDPOINT = "https://otel.aarn.patagia.net";
};
security.tpm2 = {
enable = true;
pkcs11.enable = true;
tctiEnvironment.enable = true;
};
# FIXME: Uncomment when pytss2 patch is merged
# security.tpm2 = {
# enable = true;
# pkcs11.enable = true;
# tctiEnvironment.enable = true;
# };
users.users.dln = {
isNormalUser = true;

7
overlays/default.nix
View file

@ -4,13 +4,6 @@
additions = final: _prev: import ../pkgs final.pkgs;
modifications = final: prev: {
# https://discourse.nixos.org/t/disable-ssh-agent-from-gnome-keyring-on-gnome/28176/5
gnome-keyring = prev.gnome-keyring.overrideAttrs (oldAttrs: {
mesonFlags = (builtins.filter (flag: flag != "-Dssh-agent=true") oldAttrs.mesonFlags) ++ [
"-Dssh-agent=false"
];
});
};
unstable-packages = final: _prev: {