tp3: update home config

elohmeier · Dec 29, 2024 · 14544c6 · 14544c6
1 parent 4fc76ef
commit 14544c6
Showing 1 changed file with 29 additions and 9 deletions.
diff --git a/modules/home/tp3.nix b/modules/home/tp3.nix
@@ -1,10 +1,13 @@
 { config, pkgs, ... }:
-{
 
-  nixpkgs.config = {
-    allowUnfree = true;
-    allowUnfreePredicate = _pkg: true; # https://github.com/nix-community/home-manager/issues/2942
-  };
+let
+  sshTpmAgentSocket = "/run/user/1000/gnupg/S.gpg-agent.ssh";
+in
+{
+  # nixpkgs.config = {
+  #   allowUnfree = true;
+  #   allowUnfreePredicate = _pkg: true; # https://github.com/nix-community/home-manager/issues/2942
+  # };
 
   home = {
     username = "gordon";
@@ -13,6 +16,12 @@
       "${config.home.homeDirectory}/.local/bin" # uv-managed
     ];
 
+    sessionVariables = {
+      EDITOR = "nvim";
+
+      SSH_AUTH_SOCK = sshTpmAgentSocket;
+    };
+
     packages = with pkgs; [
       age
       aichat
@@ -28,11 +37,14 @@
       libreoffice-fresh
       lutris
       nix-update
+      nixvim-full
       podman
       ripgrep
       samba
       skopeo
       sops
+      ssh-tpm-agent
+      syncthing
       transmission_4-gtk
       typst
       uv
@@ -42,6 +54,18 @@
     ];
   };
 
+  programs.fish.shellAliases = {
+    vi = "nvim";
+    vim = "nvim";
+  };
+
+  programs.ssh = {
+    enable = true;
+    extraConfig = ''
+      IdentityAgent ${sshTpmAgentSocket}
+    '';
+  };
+
   sops = {
     age.keyFile = "${config.home.homeDirectory}/.config/sops/age/keys.txt";
     defaultSopsFile = ../../secrets/tp3-home.yaml;
@@ -57,9 +81,5 @@
     # package = pkgs.wrapMpv (pkgs.mpv-unwrapped.override { ffmpeg_5 = pkgs.ffmpeg_5-full; }) { };
   };
 
-  programs.ssh.extraOptionOverrides = {
-    PKCS11Provider = "/run/current-system/sw/lib/libtpm2_pkcs11.so";
-  };
-
   programs.nix-index-database.comma.enable = true;
 }