3 files changed, 42 insertions, 13 deletions
diff --git a/hosts/editors.nix b/hosts/editors.nix
index fec5580..c9228c0 100644
--- a/hosts/editors.nix
+++ b/hosts/editors.nix
@@ -4,6 +4,7 @@
   ...
 }: {
   environment.variables.EDITOR = "hx";
+  environment.variables.F = "hx";
   environment.systemPackages = [
     pkgs.neovim
     # inputs.helix.packages.${pkgs.system}.helix
diff --git a/hosts/gpg.nix b/hosts/gpg.nix
new file mode 100644
index 0000000..019e05c
--- /dev/null
+++ b/hosts/gpg.nix
@@ -0,0 +1,22 @@
+{
+  pkgs,
+  unstablePkgs,
+  ...
+}: {
+  # allow unfree
+  environment.systemPackages = with pkgs; [
+    pinentry
+    yubikey-personalization
+    yubikey-personalization-gui
+    openssl
+    pass
+    #bitwarden-cli
+  ];
+  services.udev.packages = [pkgs.yubikey-personalization];
+
+  #gpg
+  programs.gnupg.agent = {
+    enable = true;
+    enableSSHSupport = true;
+  };
+}
diff --git a/hosts/local/s15/configuration.nix b/hosts/local/s15/configuration.nix
index 410033c..c41eb9c 100644
--- a/hosts/local/s15/configuration.nix
+++ b/hosts/local/s15/configuration.nix
@@ -1,30 +1,36 @@
 # Edit this configuration file to define what should be installed on
 # your system. Help is available in the configuration.nix(5) man page, on
 # https://search.nixos.org/options and in the NixOS manual (`nixos-help`).
-
 # NixOS-WSL specific options are documented on the NixOS-WSL repository:
 # https://github.com/nix-community/NixOS-WSL
-
-{ config, lib, pkgs, ... }:
-
 {
+  inputs,
+  config,
+  lib,
+  pkgs,
+  ...
+}: let
+  wrappers =
+    inputs.wrapper-manager.lib.build
+    {
+      inherit pkgs;
+      modules = [
+        ../../../wrappers/aerc
+      ];
+    };
+in {
   wsl.enable = true;
   wsl.defaultUser = "y";
   imports = [
     ../../base.nix
     ../../users.nix
+    ../../editors.nix
     ../../pkgs.nix
+    ../../gpg.nix
   ];
-  environment.systemPackages = with pkgs;[
-    busybox
-    git
-    lazygit
-    tmux
-    wget
-    helix
-    iptables
+  environment.systemPackages = [
+    wrappers
   ];
-  services.tailscale.enable = true;
   # This value determines the NixOS release from which the default
   # settings for stateful data, like file locations and database versions
   # on your system were taken. It's perfectly fine and recommended to leave