fix(cheetah)!: nixpkgs.overlays && gpg

Fix `gpg` as `ssh` setup (also add `openssh` to `home.packages`) Remove `j` (breaking, cannot build)
reo101 · Dec 26, 2023 · 02f7fe0 · 02f7fe0
1 parent 581b1d9
commit 02f7fe0
Show file tree

Hide file tree

Showing 4 changed files with 29 additions and 25 deletions.
diff --git a/flake.lock b/flake.lock
diff --git a/machines/nix-on-droid/aarch64-linux/cheetah/configuration.nix b/machines/nix-on-droid/aarch64-linux/cheetah/configuration.nix
@@ -18,7 +18,7 @@
   system.stateVersion = "22.11";
 
   nix.extraOptions = ''
-    experimental-features = nix-command flakes repl-flake
+    experimental-features = nix-command flakes repl-flake recursive-nix
     keep-outputs = true
     keep-derivations = true
   '';

diff --git a/machines/nix-on-droid/aarch64-linux/cheetah/home.nix b/machines/nix-on-droid/aarch64-linux/cheetah/home.nix
@@ -27,6 +27,7 @@
     # clang
     gcc
 
+    openssh
     diffutils
     findutils
     utillinux
@@ -72,7 +73,7 @@
     # emacs
 
     #
-    j
+    # j
   ];
 
   programs.neovim = {
@@ -104,6 +105,7 @@
     enable = true;
     username = "reo101";
     hostname = "cheetah";
+    atuin = true;
     direnv = true;
     zoxide = true;
   };
@@ -118,16 +120,18 @@
     enable = true;
     userName = "reo101";
     userEmail = "[email protected]";
+    signing = {
+      signByDefault = true;
+      key = "675AA7EF13964ACB";
+    };
   };
 
   services.gpg-agent = {
     enable = true;
-    defaultCacheTtl = 1800;
+    defaultCacheTtl = 86400;
+    maxCacheTtl = 86400;
+    pinentryFlavor = "tty";
     enableSshSupport = true;
+    sshKeys = ["CFDE97EDC2FDB2FD27020A084F1E3F40221BAFE7"];
   };
-
-  # Using nix-direnv
-  # services.lorri = {
-  #   enable = true;
-  # };
 }
diff --git a/util/default.nix b/util/default.nix
@@ -157,16 +157,17 @@ rec {
     modules = [
       (lib.path.append root "configuration.nix")
       { nix.registry.nixpkgs.flake = nixpkgs; }
-      {
-        nixpkgs.overlays = builtins.attrValues outputs.overlays;
-      }
       {
         home-manager = {
           config = (lib.path.append root "home.nix");
           backupFileExtension = "hm-bak";
           useGlobalPkgs = false;
           useUserPackages = true;
-          sharedModules = builtins.attrValues homeManagerModules;
+          sharedModules = builtins.attrValues homeManagerModules ++ [
+            {
+              nixpkgs.overlays = builtins.attrValues outputs.overlays;
+            }
+          ];
           extraSpecialArgs = {
             inherit inputs outputs;
             inherit hostname;