Temporarily disable keychain and pgp signing on hikari

home.nix

@@ -1,6 +1,9 @@
 { config, pkgs, lib, ... }:
 
-{
+let
+  ownLib = import ./home/packages/lib;
+
+in {
 
   imports = [
     ./home/modules/programs/cmus.nix
@@ -46,7 +49,7 @@
   };
 
   programs = import ./home/programs.nix {
-    inherit config pkgs;
+    inherit config pkgs ownLib;
   };
 
   fonts.fontconfig.enable = true;
@@ -56,7 +59,7 @@
   };
 
   xsession = import ./home/xsession.nix {
-    inherit config pkgs;
+    inherit config pkgs ownLib;
   };
 
   xdg = import ./home/xdg.nix {

home/programs.nix

@@ -1,4 +1,4 @@
-{ config, pkgs }:
+{ config, pkgs, ownLib }:
 
 let
 
@@ -14,7 +14,7 @@ in {
   };
 
   git = import ./programs/git.nix {
-    inherit pkgs;
+    inherit pkgs ownLib;
   };
 
   htop = import ./programs/htop.nix {
@@ -34,7 +34,7 @@ in {
   };
 
   keychain = import ./programs/keychain.nix {
-    inherit config pkgs;
+    inherit config pkgs ownLib;
   };
 
   gpg = import ./programs/gpg.nix {

home/programs/git.nix

@@ -1,4 +1,4 @@
-{ pkgs }:
+{ pkgs, ownLib }:
 
 {
   enable = true;
@@ -8,7 +8,7 @@
 
   signing = {
     key = "15560EF4";
-    signByDefault = true;
+    signByDefault = if ownLib.onHikari {} then false else true;
   };
 
   aliases = {

home/programs/keychain.nix

@@ -1,13 +1,10 @@
-{ config, pkgs }:
+{ config, pkgs, ownLib }:
 
 {
-  enable = true;
-  keys = [
-    "id_rsa"
-    "id_ed25519"
-  ];
+  enable = if ownLib.onHikari {} then false else true;
+  keys = if ownLib.onHikari {} then ["id_ed25519"] else ["id_rsa" "id_ed25519"];
   enableBashIntegration = false;
   enableFishIntegration = false;
-  enableZshIntegration = true;
+  enableZshIntegration = if ownLib.onHikari {} then false else true;
   enableXsessionIntegration = false;
 }

home/xsession.nix

@@ -1,8 +1,6 @@
-{ config, pkgs }:
+{ config, pkgs, ownLib }:
 
 let
-  ownLib = import ./packages/lib;
-
   initExtraHikari = ''
     xrandr --auto --output eDP-1 --brightness 1 --scale 1.25x1.25