swarsel/.dotfiles
1
0
Fork 0
mirror of https://github.com/Swarsel/.dotfiles.git synced 2025-12-06 09:07:21 +01:00
Code Issues Projects Releases Packages Wiki Activity Actions

refactor: make gpg-agent a common setting

Browse source
This commit is contained in:
Swarsel 2024-07-25 14:41:23 +02:00
parent 5e2aae9558
commit 414ff779b6
Signed by: swarsel
GPG key ID: 26A54C31F2A4FD84
10 changed files with 54 additions and 82 deletions
Download patch file Download diff file Expand all files Collapse all files

65
SwarselSystems.org
View file

@ -264,18 +264,6 @@ I also enable the extra socket here for ssh agent forwarding. But I have not ful
#+begin_src nix :tangle no :noweb-ref gpgagent
services.gpg-agent = {
enable = true;
enableSshSupport = true;
enableExtraSocket = true;
pinentryPackage = pkgs.pinentry.gtk2;
defaultCacheTtl = 600;
maxCacheTtl = 7200;
extraConfig = ''
allow-loopback-pinentry
allow-emacs-pinentry
'';
};
#+end_src
@ -2165,7 +2153,6 @@ Mostly just sets some opened ports for several games, enables virtualbox (which
# kernelPackages = pkgs.linuxPackages_latest;
};
sops.age.sshKeyPaths = [ "${config.users.users.swarsel.home}/.ssh/sops" ];
networking = {
hostName = "fourside"; # Define your hostname.
@ -2270,9 +2257,6 @@ This is basically just adjusted to the core count, path to the =hwmon= (this was
{ config, pkgs, lib, ... }: with lib;
{
<<gpgagent>>
sops.age.sshKeyPaths = [ "${config.home.homeDirectory}/.ssh/sops" ];
# waybar config - TEMPLATE - update for cores and temp
programs.waybar.settings.mainBar = {
# temperature.hwmon-path = "/sys/devices/pci0000:00/0000:00:18.3/hwmon/hwmon4/temp1_input";
@ -5110,6 +5094,7 @@ I use sops-nix to handle secrets that I want to have available on my machines at
{
sops = {
age.sshKeyPaths = [ "${config.users.users.swarsel.home}/.ssh/sops" ];
defaultSopsFile = "${config.users.users.swarsel.home}/.dotfiles/secrets/general/secrets.yaml";
validateSopsFiles = false;
@ -5566,6 +5551,7 @@ This section sets up all the imports that are used in the home-manager section.
./kdeconnect.nix
./mako.nix
./sway.nix
./gpg-agent.nix
];
nix = {
@ -5954,20 +5940,21 @@ I use sops-nix to handle secrets that I want to have available on my machines at
Since we are using the home-manager implementation here, we need to specify the runtime path.
#+begin_src nix :tangle profiles/common/home/sops.nix
{ config, ... }:
{
sops = {
defaultSopsFile = "${config.home.homeDirectory}/.dotfiles/secrets/general/secrets.yaml";
validateSopsFiles = false;
secrets = {
mrswarsel = { path = "/run/user/1000/secrets/mrswarsel"; };
nautilus = { path = "/run/user/1000/secrets/nautilus"; };
leon = { path = "/run/user/1000/secrets/leon"; };
swarselmail = { path = "/run/user/1000/secrets/swarselmail"; };
caldav = { path = "${config.home.homeDirectory}/.emacs.d/.caldav"; };
{ config, ... }:
{
sops = {
age.sshKeyPaths = [ "${config.home.homeDirectory}/.ssh/sops" ];
defaultSopsFile = "${config.home.homeDirectory}/.dotfiles/secrets/general/secrets.yaml";
validateSopsFiles = false;
secrets = {
mrswarsel = { path = "/run/user/1000/secrets/mrswarsel"; };
nautilus = { path = "/run/user/1000/secrets/nautilus"; };
leon = { path = "/run/user/1000/secrets/leon"; };
swarselmail = { path = "/run/user/1000/secrets/swarselmail"; };
caldav = { path = "${config.home.homeDirectory}/.emacs.d/.caldav"; };
};
};
};
}
}
#+end_src
*** SSH Machines
@ -7532,6 +7519,26 @@ Currently, I am too lazy to explain every option here, but most of it is very se
}
#+end_src
*** gpg-agent
#+begin_src nix :tangle profiles/common/home/gpg-agent.nix
{ pkgs, ... }:
{
services.gpg-agent = {
enable = true;
enableSshSupport = true;
enableExtraSocket = true;
pinentryPackage = pkgs.pinentry.gtk2;
defaultCacheTtl = 600;
maxCacheTtl = 7200;
extraConfig = ''
allow-loopback-pinentry
allow-emacs-pinentry
'';
};
}
#+end_src
** flake.nix template
:PROPERTIES:
:CUSTOM_ID: h:aee5ec75-7ca6-40d8-b6ac-a3e7e33a474b

12
profiles/TEMPLATE/home.nix
View file

@ -3,18 +3,6 @@
{
services.gpg-agent = {
enable = true;
enableSshSupport = true;
enableExtraSocket = true;
pinentryPackage = pkgs.pinentry.gtk2;
defaultCacheTtl = 600;
maxCacheTtl = 7200;
extraConfig = ''
allow-loopback-pinentry
allow-emacs-pinentry
'';
};
home = {
username = "TEMPLATE";

1
profiles/common/home/default.nix
View file

@ -26,6 +26,7 @@
./kdeconnect.nix
./mako.nix
./sway.nix
./gpg-agent.nix
];
nix = {

15
profiles/common/home/gpg-agent.nix Normal file
View file

@ -0,0 +1,15 @@
{ pkgs, ... }:
{
services.gpg-agent = {
enable = true;
enableSshSupport = true;
enableExtraSocket = true;
pinentryPackage = pkgs.pinentry.gtk2;
defaultCacheTtl = 600;
maxCacheTtl = 7200;
extraConfig = ''
allow-loopback-pinentry
allow-emacs-pinentry
'';
};
}

1
profiles/common/home/sops.nix
View file

@ -1,6 +1,7 @@
{ config, ... }:
{
sops = {
age.sshKeyPaths = [ "${config.home.homeDirectory}/.ssh/sops" ];
defaultSopsFile = "${config.home.homeDirectory}/.dotfiles/secrets/general/secrets.yaml";
validateSopsFiles = false;
secrets = {

1
profiles/common/nixos/sops.nix
View file

@ -2,6 +2,7 @@
{
sops = {
age.sshKeyPaths = [ "${config.users.users.swarsel.home}/.ssh/sops" ];
defaultSopsFile = "${config.users.users.swarsel.home}/.dotfiles/secrets/general/secrets.yaml";
validateSopsFiles = false;

16
profiles/fourside/home.nix
View file

@ -1,22 +1,6 @@
{ config, pkgs, lib, ... }: with lib;
{
services.gpg-agent = {
enable = true;
enableSshSupport = true;
enableExtraSocket = true;
pinentryPackage = pkgs.pinentry.gtk2;
defaultCacheTtl = 600;
maxCacheTtl = 7200;
extraConfig = ''
allow-loopback-pinentry
allow-emacs-pinentry
'';
};
sops.age.sshKeyPaths = [ "${config.home.homeDirectory}/.ssh/sops" ];
# waybar config - TEMPLATE - update for cores and temp
programs.waybar.settings.mainBar = {
# temperature.hwmon-path = "/sys/devices/pci0000:00/0000:00:18.3/hwmon/hwmon4/temp1_input";

1
profiles/fourside/nixos.nix
View file

@ -13,7 +13,6 @@
# kernelPackages = pkgs.linuxPackages_latest;
};
sops.age.sshKeyPaths = [ "${config.users.users.swarsel.home}/.ssh/sops" ];
networking = {
hostName = "fourside"; # Define your hostname.

12
profiles/threed/home.nix
View file

@ -3,18 +3,6 @@
{
services.gpg-agent = {
enable = true;
enableSshSupport = true;
enableExtraSocket = true;
pinentryPackage = pkgs.pinentry.gtk2;
defaultCacheTtl = 600;
maxCacheTtl = 7200;
extraConfig = ''
allow-loopback-pinentry
allow-emacs-pinentry
'';
};
home = {

12
profiles/winters/home.nix
View file

@ -3,18 +3,6 @@
{
services.gpg-agent = {
enable = true;
enableSshSupport = true;
enableExtraSocket = true;
pinentryPackage = pkgs.pinentry.gtk2;
defaultCacheTtl = 600;
maxCacheTtl = 7200;
extraConfig = ''
allow-loopback-pinentry
allow-emacs-pinentry
'';
};
home = {
username = "swarsel";