From 8ed3dfc9ebc52a50c3e6d4623204847822944422 Mon Sep 17 00:00:00 2001 From: Franck Cuny Date: Sat, 12 Feb 2022 13:47:59 -0800 Subject: move configurations and modules around Sorry, this is a mess, hopefully the last one. --- hosts/commons/default.nix | 11 +---------- hosts/commons/desktop/default.nix | 8 ++++++++ hosts/commons/desktop/fonts.nix | 18 ++++++++++++++++++ hosts/commons/desktop/sound.nix | 20 ++++++++++++++++++++ hosts/commons/desktop/xserver.nix | 23 +++++++++++++++++++++++ hosts/commons/network.nix | 19 ------------------- hosts/commons/system/boot.nix | 8 ++++++++ hosts/commons/system/default.nix | 20 ++++++++++++++++++++ hosts/commons/system/motd.nix | 12 ++++++++++++ hosts/commons/system/network.nix | 19 +++++++++++++++++++ hosts/commons/system/nix.nix | 18 ++++++++++++++++++ hosts/commons/system/software.nix | 29 +++++++++++++++++++++++++++++ hosts/commons/system/ssh.nix | 5 +++++ hosts/commons/system/users.nix | 25 +++++++++++++++++++++++++ modules/desktop/default.nix | 8 -------- modules/desktop/fonts.nix | 18 ------------------ modules/desktop/sound.nix | 20 -------------------- modules/desktop/xserver.nix | 34 ---------------------------------- modules/systems/default.nix | 21 --------------------- modules/systems/motd.nix | 12 ------------ modules/systems/nix.nix | 18 ------------------ modules/systems/software.nix | 29 ----------------------------- modules/systems/ssh.nix | 5 ----- modules/systems/users.nix | 25 ------------------------- users/fcuny/desktop/default.nix | 15 +++++++++++++++ users/fcuny/desktop/gtk.nix | 4 ++-- users/fcuny/desktop/pass.nix | 8 -------- users/fcuny/desktop/trust/default.nix | 10 ++++++++++ users/fcuny/desktop/trust/git.nix | 8 ++++++++ users/fcuny/desktop/trust/keyring.nix | 5 +++++ users/fcuny/desktop/trust/pass.nix | 8 ++++++++ users/fcuny/desktop/trust/pgp.nix | 14 ++++++++++++++ 32 files changed, 268 insertions(+), 229 deletions(-) create mode 100644 hosts/commons/desktop/default.nix create mode 100644 hosts/commons/desktop/fonts.nix create mode 100644 hosts/commons/desktop/sound.nix create mode 100644 hosts/commons/desktop/xserver.nix delete mode 100644 hosts/commons/network.nix create mode 100644 hosts/commons/system/boot.nix create mode 100644 hosts/commons/system/default.nix create mode 100644 hosts/commons/system/motd.nix create mode 100644 hosts/commons/system/network.nix create mode 100644 hosts/commons/system/nix.nix create mode 100644 hosts/commons/system/software.nix create mode 100644 hosts/commons/system/ssh.nix create mode 100644 hosts/commons/system/users.nix delete mode 100644 modules/desktop/default.nix delete mode 100644 modules/desktop/fonts.nix delete mode 100644 modules/desktop/sound.nix delete mode 100644 modules/desktop/xserver.nix delete mode 100644 modules/systems/default.nix delete mode 100644 modules/systems/motd.nix delete mode 100644 modules/systems/nix.nix delete mode 100644 modules/systems/software.nix delete mode 100644 modules/systems/ssh.nix delete mode 100644 modules/systems/users.nix delete mode 100644 users/fcuny/desktop/pass.nix create mode 100644 users/fcuny/desktop/trust/default.nix create mode 100644 users/fcuny/desktop/trust/git.nix create mode 100644 users/fcuny/desktop/trust/keyring.nix create mode 100644 users/fcuny/desktop/trust/pass.nix create mode 100644 users/fcuny/desktop/trust/pgp.nix diff --git a/hosts/commons/default.nix b/hosts/commons/default.nix index 4f35a15..0361d27 100644 --- a/hosts/commons/default.nix +++ b/hosts/commons/default.nix @@ -2,15 +2,6 @@ { imports = [ - ./network.nix + ./system ]; - - environment = { - # Activate home-manager environment, if not already enabled - loginShellInit = '' - [ -d "$HOME/.nix-profile" ] || /nix/var/nix/profiles/per-user/$USER/home-manager/activate &> /dev/null - ''; - homeBinInPath = true; - localBinInPath = true; - }; } diff --git a/hosts/commons/desktop/default.nix b/hosts/commons/desktop/default.nix new file mode 100644 index 0000000..f150066 --- /dev/null +++ b/hosts/commons/desktop/default.nix @@ -0,0 +1,8 @@ +{lib, config, pkgs, ...}: +{ + imports = [ + ./fonts.nix + ./sound.nix + ./xserver.nix + ]; +} diff --git a/hosts/commons/desktop/fonts.nix b/hosts/commons/desktop/fonts.nix new file mode 100644 index 0000000..a840582 --- /dev/null +++ b/hosts/commons/desktop/fonts.nix @@ -0,0 +1,18 @@ +{ pkgs, config, lib, ... }: + +{ + fonts = { + fontconfig.enable = true; + fonts = with pkgs; [ + noto-fonts-emoji + dejavu_fonts + source-code-pro + source-sans-pro + source-serif-pro + ]; + + fontconfig.defaultFonts = { + monospace = [ "Source Code Pro" ]; + }; + }; +} diff --git a/hosts/commons/desktop/sound.nix b/hosts/commons/desktop/sound.nix new file mode 100644 index 0000000..95c7c75 --- /dev/null +++ b/hosts/commons/desktop/sound.nix @@ -0,0 +1,20 @@ +{pkgs, config, lib, ...}: + +{ + sound.enable = true; + + environment.systemPackages = with pkgs; [ + # We install it to get access to pactl. It isn't enabled or run as a service. + pulseaudio + ]; + + services.pipewire = { + enable = true; + # Compatibility shims, adjust according to your needs + alsa.enable = true; + alsa.support32Bit = true; + pulse.enable = true; + jack.enable = true; + }; + hardware.pulseaudio.enable = false; +} diff --git a/hosts/commons/desktop/xserver.nix b/hosts/commons/desktop/xserver.nix new file mode 100644 index 0000000..7537863 --- /dev/null +++ b/hosts/commons/desktop/xserver.nix @@ -0,0 +1,23 @@ +{ config, pkgs, lib, ... }: + +{ + services.xserver = { + enable = true; + layout = "us"; + xkbOptions = "eurosign:e,ctrl:swapcaps"; + libinput.enable = true; + + desktopManager = { + xterm.enable = false; + }; + + displayManager = { + lightdm.enable = true; + defaultSession = "none+i3"; + }; + + windowManager = { + i3.enable = true; + }; + }; +} diff --git a/hosts/commons/network.nix b/hosts/commons/network.nix deleted file mode 100644 index df5aa27..0000000 --- a/hosts/commons/network.nix +++ /dev/null @@ -1,19 +0,0 @@ -{ config, pkgs, lib, hostname, ... }: - -{ - networking = { - hostName = hostname; - useNetworkd = true; - wireless.enable = false; - useDHCP = false; - }; - - services.nscd.enable = false; - system.nssModules = lib.mkForce [ ]; - - # Use systemd-resolved - services.resolved = { - enable = true; - dnssec = "false"; - }; -} diff --git a/hosts/commons/system/boot.nix b/hosts/commons/system/boot.nix new file mode 100644 index 0000000..974b072 --- /dev/null +++ b/hosts/commons/system/boot.nix @@ -0,0 +1,8 @@ +{ pkgs, config, lib, ... }: + +{ + boot = { + kernelPackages = pkgs.linuxPackages_latest; + tmpOnTmpfs = true; + }; +} diff --git a/hosts/commons/system/default.nix b/hosts/commons/system/default.nix new file mode 100644 index 0000000..64cb51b --- /dev/null +++ b/hosts/commons/system/default.nix @@ -0,0 +1,20 @@ +{pkgs, ... }: + +{ + imports = [ + ./boot.nix + ./motd.nix + ./network.nix + ./nix.nix + ./software.nix + ./ssh.nix + ./users.nix + ]; + + # Select internationalisation properties. + i18n.defaultLocale = "en_US.UTF-8"; + console = { + font = "Lat2-Terminus16"; + keyMap = "us"; + }; +} diff --git a/hosts/commons/system/motd.nix b/hosts/commons/system/motd.nix new file mode 100644 index 0000000..898d03f --- /dev/null +++ b/hosts/commons/system/motd.nix @@ -0,0 +1,12 @@ +{config, ...}: +{ + users.motd = '' + Welcome + - This machine is managed with nix + + Hostname: ${config.networking.hostName} + OS: NixOS ${config.system.nixos.release} (${config.system.nixos.codeName}) + Version: ${config.system.nixos.version} + Kernel: ${config.boot.kernelPackages.kernel.version} + ''; +} diff --git a/hosts/commons/system/network.nix b/hosts/commons/system/network.nix new file mode 100644 index 0000000..df5aa27 --- /dev/null +++ b/hosts/commons/system/network.nix @@ -0,0 +1,19 @@ +{ config, pkgs, lib, hostname, ... }: + +{ + networking = { + hostName = hostname; + useNetworkd = true; + wireless.enable = false; + useDHCP = false; + }; + + services.nscd.enable = false; + system.nssModules = lib.mkForce [ ]; + + # Use systemd-resolved + services.resolved = { + enable = true; + dnssec = "false"; + }; +} diff --git a/hosts/commons/system/nix.nix b/hosts/commons/system/nix.nix new file mode 100644 index 0000000..48379a4 --- /dev/null +++ b/hosts/commons/system/nix.nix @@ -0,0 +1,18 @@ +{ lib, pkgs, ... }: + +{ + # Enable flakes and new 'nix' command + nix = { + package = pkgs.nixFlakes; + extraOptions = '' + experimental-features = nix-command flakes + ''; + autoOptimiseStore = true; + trustedUsers = [ "root" "@wheel" ]; + + gc = { + automatic = true; + options = "--delete-older-than 14d"; + }; + }; +} diff --git a/hosts/commons/system/software.nix b/hosts/commons/system/software.nix new file mode 100644 index 0000000..fa919ae --- /dev/null +++ b/hosts/commons/system/software.nix @@ -0,0 +1,29 @@ +{pkgs, config, lib, ...}: + +{ + environment.systemPackages = with pkgs; [ + curl + dmidecode + git + htop + hwdata + iftop + iptraf-ng + lm_sensors + lsb-release + mg + mtr + openssl + parted + pciutils + rsync + strace + tcpdump + tmux + traceroute + unzip + usbutils + vim + wget + ]; +} diff --git a/hosts/commons/system/ssh.nix b/hosts/commons/system/ssh.nix new file mode 100644 index 0000000..0ecca80 --- /dev/null +++ b/hosts/commons/system/ssh.nix @@ -0,0 +1,5 @@ +{ + # Enable the OpenSSH daemon. + services.openssh.enable = true; + services.openssh.permitRootLogin = "yes"; +} diff --git a/hosts/commons/system/users.nix b/hosts/commons/system/users.nix new file mode 100644 index 0000000..2b769c4 --- /dev/null +++ b/hosts/commons/system/users.nix @@ -0,0 +1,25 @@ +{ lib, pkgs, ... }: + +rec { + users.mutableUsers = false; + + users.groups.fcuny = { gid = 1000; }; + users.users.fcuny = { + isNormalUser = true; + uid = 1000; + group = "fcuny"; + home = "/home/fcuny"; + shell = pkgs.zsh; + extraGroups = [ "users" "wheel" ]; + hashedPassword = "$6$i.z1brxtb44JAEco$fDD2Izl.zRR9vBCB2VBKPScChGw38EEl7QEiBTJ/EwgP3oSL0X3ZHq0PJ.RtqzBsWTPUjl4F3MKOBMhnaAPr6."; + openssh.authorizedKeys.keys = [ + # aptops (laptop) + "ssh-rsa AAAAB3NzaC1yc2EAAAADAQABAAACAQC1rWKrdSHxlAZnRv1F5jUsHgXSNmr1KzllWEn+JqA7p3zxmSEPBbfIUGxSzkFIQrSbKizJLdH6hGA8DcIm+e+ldQ2RYOdiYBxIkPm+aHB6dw7QGNbnSSdkr9gKThy65j0YOOcmuDExjqxfq6O/8AVstmPH36sUXEIks5F/+WiF+5ehzoJVFqClB1di6w1lml86d0ShrUacgM/ieFPe1vKrzW8ZOM+LaUoGWBTLla1y6UkIqnb7OinmgPu6QAzF6GA7tYJMoHkyV7Axzc2j1/VxVIrUrfY4b0k8lGAzi2GfByq+fXEHzePbaqi8Cy8Trn9eN/ls1WBMUQfSChQi3tM2Vx2BuiOpx/QkXsdgqwe7bTCijcQS7GoREL1qd8tR9sWWd4WMPUiC9kmzvyja5F39xHPgm0A5MtYY7GvQaUPbtBc6g8YuFLLnkqFVEKHSLFiGYP5jIDNvMd5rSSsBUrepCIzWdpprwnKxAjebw5Cyl5p/0MY2zppQRW7AZXehQa7Bv+OClbutEjBa+ioeUxBhezu2rB61XSenTbbUVB5DncD8ceD5AbL9aFz/Bcw6q0kAOGmR1G1MOLgxVHlqcnI5x0E1K2WMKWgQb+1BMek1p5+l3xWNDF4URhLqLupnP5CMrK9ifBOe/76zqyMVrA/mc6tNC58KHhME1IynC1zaLw== franck@fcuny.net" + ]; + }; + + users.users.root = { + hashedPassword = null; + openssh.authorizedKeys.keys = users.users.fcuny.openssh.authorizedKeys.keys; + }; +} diff --git a/modules/desktop/default.nix b/modules/desktop/default.nix deleted file mode 100644 index f150066..0000000 --- a/modules/desktop/default.nix +++ /dev/null @@ -1,8 +0,0 @@ -{lib, config, pkgs, ...}: -{ - imports = [ - ./fonts.nix - ./sound.nix - ./xserver.nix - ]; -} diff --git a/modules/desktop/fonts.nix b/modules/desktop/fonts.nix deleted file mode 100644 index a840582..0000000 --- a/modules/desktop/fonts.nix +++ /dev/null @@ -1,18 +0,0 @@ -{ pkgs, config, lib, ... }: - -{ - fonts = { - fontconfig.enable = true; - fonts = with pkgs; [ - noto-fonts-emoji - dejavu_fonts - source-code-pro - source-sans-pro - source-serif-pro - ]; - - fontconfig.defaultFonts = { - monospace = [ "Source Code Pro" ]; - }; - }; -} diff --git a/modules/desktop/sound.nix b/modules/desktop/sound.nix deleted file mode 100644 index 95c7c75..0000000 --- a/modules/desktop/sound.nix +++ /dev/null @@ -1,20 +0,0 @@ -{pkgs, config, lib, ...}: - -{ - sound.enable = true; - - environment.systemPackages = with pkgs; [ - # We install it to get access to pactl. It isn't enabled or run as a service. - pulseaudio - ]; - - services.pipewire = { - enable = true; - # Compatibility shims, adjust according to your needs - alsa.enable = true; - alsa.support32Bit = true; - pulse.enable = true; - jack.enable = true; - }; - hardware.pulseaudio.enable = false; -} diff --git a/modules/desktop/xserver.nix b/modules/desktop/xserver.nix deleted file mode 100644 index 1b96d03..0000000 --- a/modules/desktop/xserver.nix +++ /dev/null @@ -1,34 +0,0 @@ -{ config, pkgs, lib, ... }: - -{ - services.xserver = { - enable = true; - layout = "us"; - xkbOptions = "eurosign:e,ctrl:swapcaps"; - libinput.enable = true; - - desktopManager = { - xterm.enable = false; - }; - - displayManager = { - lightdm.enable = true; - defaultSession = "none+i3"; - }; - - windowManager = { - i3.enable = true; - }; - }; - - programs.gnupg.agent = { - enable = true; - enableSSHSupport = true; - }; - - environment.sessionVariables.TERMINAL = [ "alacritty" ]; - environment.sessionVariables.TERM = [ "xterm-256color" ]; - - services.gnome.gnome-keyring.enable = true; - services.gvfs.enable = true; -} diff --git a/modules/systems/default.nix b/modules/systems/default.nix deleted file mode 100644 index 27fb53b..0000000 --- a/modules/systems/default.nix +++ /dev/null @@ -1,21 +0,0 @@ -{pkgs, ... }: - -{ - imports = [ - ./motd.nix - ./nix.nix - ./software.nix - ./ssh.nix - ./users.nix - ]; - - boot.kernelPackages = pkgs.linuxPackages_latest; - boot.tmpOnTmpfs = true; - - # Select internationalisation properties. - i18n.defaultLocale = "en_US.UTF-8"; - console = { - font = "Lat2-Terminus16"; - keyMap = "us"; - }; -} diff --git a/modules/systems/motd.nix b/modules/systems/motd.nix deleted file mode 100644 index 898d03f..0000000 --- a/modules/systems/motd.nix +++ /dev/null @@ -1,12 +0,0 @@ -{config, ...}: -{ - users.motd = '' - Welcome - - This machine is managed with nix - - Hostname: ${config.networking.hostName} - OS: NixOS ${config.system.nixos.release} (${config.system.nixos.codeName}) - Version: ${config.system.nixos.version} - Kernel: ${config.boot.kernelPackages.kernel.version} - ''; -} diff --git a/modules/systems/nix.nix b/modules/systems/nix.nix deleted file mode 100644 index 48379a4..0000000 --- a/modules/systems/nix.nix +++ /dev/null @@ -1,18 +0,0 @@ -{ lib, pkgs, ... }: - -{ - # Enable flakes and new 'nix' command - nix = { - package = pkgs.nixFlakes; - extraOptions = '' - experimental-features = nix-command flakes - ''; - autoOptimiseStore = true; - trustedUsers = [ "root" "@wheel" ]; - - gc = { - automatic = true; - options = "--delete-older-than 14d"; - }; - }; -} diff --git a/modules/systems/software.nix b/modules/systems/software.nix deleted file mode 100644 index fa919ae..0000000 --- a/modules/systems/software.nix +++ /dev/null @@ -1,29 +0,0 @@ -{pkgs, config, lib, ...}: - -{ - environment.systemPackages = with pkgs; [ - curl - dmidecode - git - htop - hwdata - iftop - iptraf-ng - lm_sensors - lsb-release - mg - mtr - openssl - parted - pciutils - rsync - strace - tcpdump - tmux - traceroute - unzip - usbutils - vim - wget - ]; -} diff --git a/modules/systems/ssh.nix b/modules/systems/ssh.nix deleted file mode 100644 index 0ecca80..0000000 --- a/modules/systems/ssh.nix +++ /dev/null @@ -1,5 +0,0 @@ -{ - # Enable the OpenSSH daemon. - services.openssh.enable = true; - services.openssh.permitRootLogin = "yes"; -} diff --git a/modules/systems/users.nix b/modules/systems/users.nix deleted file mode 100644 index 2b769c4..0000000 --- a/modules/systems/users.nix +++ /dev/null @@ -1,25 +0,0 @@ -{ lib, pkgs, ... }: - -rec { - users.mutableUsers = false; - - users.groups.fcuny = { gid = 1000; }; - users.users.fcuny = { - isNormalUser = true; - uid = 1000; - group = "fcuny"; - home = "/home/fcuny"; - shell = pkgs.zsh; - extraGroups = [ "users" "wheel" ]; - hashedPassword = "$6$i.z1brxtb44JAEco$fDD2Izl.zRR9vBCB2VBKPScChGw38EEl7QEiBTJ/EwgP3oSL0X3ZHq0PJ.RtqzBsWTPUjl4F3MKOBMhnaAPr6."; - openssh.authorizedKeys.keys = [ - # aptops (laptop) - "ssh-rsa AAAAB3NzaC1yc2EAAAADAQABAAACAQC1rWKrdSHxlAZnRv1F5jUsHgXSNmr1KzllWEn+JqA7p3zxmSEPBbfIUGxSzkFIQrSbKizJLdH6hGA8DcIm+e+ldQ2RYOdiYBxIkPm+aHB6dw7QGNbnSSdkr9gKThy65j0YOOcmuDExjqxfq6O/8AVstmPH36sUXEIks5F/+WiF+5ehzoJVFqClB1di6w1lml86d0ShrUacgM/ieFPe1vKrzW8ZOM+LaUoGWBTLla1y6UkIqnb7OinmgPu6QAzF6GA7tYJMoHkyV7Axzc2j1/VxVIrUrfY4b0k8lGAzi2GfByq+fXEHzePbaqi8Cy8Trn9eN/ls1WBMUQfSChQi3tM2Vx2BuiOpx/QkXsdgqwe7bTCijcQS7GoREL1qd8tR9sWWd4WMPUiC9kmzvyja5F39xHPgm0A5MtYY7GvQaUPbtBc6g8YuFLLnkqFVEKHSLFiGYP5jIDNvMd5rSSsBUrepCIzWdpprwnKxAjebw5Cyl5p/0MY2zppQRW7AZXehQa7Bv+OClbutEjBa+ioeUxBhezu2rB61XSenTbbUVB5DncD8ceD5AbL9aFz/Bcw6q0kAOGmR1G1MOLgxVHlqcnI5x0E1K2WMKWgQb+1BMek1p5+l3xWNDF4URhLqLupnP5CMrK9ifBOe/76zqyMVrA/mc6tNC58KHhME1IynC1zaLw== franck@fcuny.net" - ]; - }; - - users.users.root = { - hashedPassword = null; - openssh.authorizedKeys.keys = users.users.fcuny.openssh.authorizedKeys.keys; - }; -} diff --git a/users/fcuny/desktop/default.nix b/users/fcuny/desktop/default.nix index 9f0bcf3..3a1e21a 100644 --- a/users/fcuny/desktop/default.nix +++ b/users/fcuny/desktop/default.nix @@ -9,6 +9,7 @@ ./terminal.nix ./gtk.nix ./xdg.nix + ./trust ]; home.packages = [ @@ -17,4 +18,18 @@ pkgs.gnome3.nautilus pkgs.transmission-remote-gtk ]; + + environment = { + sessionVariables = { + TERMINAL = [ "alacritty" ]; + TERM = [ "xterm-256color" ]; + }; + + # Activate home-manager environment, if not already enabled + loginShellInit = '' + [ -d "$HOME/.nix-profile" ] || /nix/var/nix/profiles/per-user/$USER/home-manager/activate &> /dev/null + ''; + homeBinInPath = true; + localBinInPath = true; + }; } diff --git a/users/fcuny/desktop/gtk.nix b/users/fcuny/desktop/gtk.nix index 492c331..8bc11a2 100644 --- a/users/fcuny/desktop/gtk.nix +++ b/users/fcuny/desktop/gtk.nix @@ -16,7 +16,6 @@ gtk2 = { extraConfig = '' - gtk-application-prefer-dark-theme = true gtk-xft-antialias = 1 gtk-xft-hinting = 1 gtk-xft-hintstyle = "hintslight" @@ -26,11 +25,12 @@ gtk3 = { extraConfig = { - gtk-application-prefer-dark-theme = true; gtk-xft-antialias = 1; gtk-xft-hinting = 1; gtk-xft-hintstyle = "hintslight"; }; }; }; + + services.gvfs.enable = true; } diff --git a/users/fcuny/desktop/pass.nix b/users/fcuny/desktop/pass.nix deleted file mode 100644 index d430ec8..0000000 --- a/users/fcuny/desktop/pass.nix +++ /dev/null @@ -1,8 +0,0 @@ -{ pkgs, config, ... }: - -{ - programs.password-store.enable = true; - - programs.password-store.settings.PASSWORD_STORE_DIR = - "${config.xdg.dataHome}/password-store"; -} diff --git a/users/fcuny/desktop/trust/default.nix b/users/fcuny/desktop/trust/default.nix new file mode 100644 index 0000000..d881926 --- /dev/null +++ b/users/fcuny/desktop/trust/default.nix @@ -0,0 +1,10 @@ +{ config, lib, pkgs, ... }: + +{ + imports = [ + ./git.nix + ./keyring.nix + ./pass.nix + ./pgp.nix + ]; +} diff --git a/users/fcuny/desktop/trust/git.nix b/users/fcuny/desktop/trust/git.nix new file mode 100644 index 0000000..52607a3 --- /dev/null +++ b/users/fcuny/desktop/trust/git.nix @@ -0,0 +1,8 @@ +{ + programs.git = { + signing = { + signByDefault = true; + key = "23348B57F01D4234B5CFBA0923208AC01EB6EEA1"; + }; + }; +} diff --git a/users/fcuny/desktop/trust/keyring.nix b/users/fcuny/desktop/trust/keyring.nix new file mode 100644 index 0000000..222448a --- /dev/null +++ b/users/fcuny/desktop/trust/keyring.nix @@ -0,0 +1,5 @@ +{ config, lib, pkgs, ... }: + +{ + services.gnome.gnome-keyring.enable = true; +} diff --git a/users/fcuny/desktop/trust/pass.nix b/users/fcuny/desktop/trust/pass.nix new file mode 100644 index 0000000..d430ec8 --- /dev/null +++ b/users/fcuny/desktop/trust/pass.nix @@ -0,0 +1,8 @@ +{ pkgs, config, ... }: + +{ + programs.password-store.enable = true; + + programs.password-store.settings.PASSWORD_STORE_DIR = + "${config.xdg.dataHome}/password-store"; +} diff --git a/users/fcuny/desktop/trust/pgp.nix b/users/fcuny/desktop/trust/pgp.nix new file mode 100644 index 0000000..0d59837 --- /dev/null +++ b/users/fcuny/desktop/trust/pgp.nix @@ -0,0 +1,14 @@ +{ config, lib, pkgs, ... }: + +{ + services.gpg-agent = { + enable = true; + enableSshSupport = true; + pinentryFlavor = "gnome3"; + }; + + programs.gpg = { + enable = true; + }; +} + -- cgit 1.4.1