Merge remote-tracking branch 'prism/master'

3 files changed, 9 insertions, 13 deletions

diff --git a/makefu/2configs/home-manager/cli.nix b/makefu/2configs/home-manager/cli.nix
index 6b5d26111..5d5673b81 100644
--- a/makefu/2configs/home-manager/cli.nix
+++ b/makefu/2configs/home-manager/cli.nix
@@ -1,15 +1,6 @@
 {pkgs, ... }: {
   imports = [ ./zsh.nix ];
   home-manager.users.makefu = {
-    services.gpg-agent = {
-      enable = true;
-      defaultCacheTtl = 900;
-      maxCacheTtl = 7200;
-      defaultCacheTtlSsh = 3600;
-      maxCacheTtlSsh = 86400;
-      enableSshSupport = true;
-      enableScDaemon = true;
-    };
     programs.direnv = {
       stdlib = ''
 use_nix() {
diff --git a/makefu/2configs/home-manager/desktop.nix b/makefu/2configs/home-manager/desktop.nix
index 406f7f0d1..cf20af1b1 100644
--- a/makefu/2configs/home-manager/desktop.nix
+++ b/makefu/2configs/home-manager/desktop.nix
@@ -7,7 +7,6 @@
     programs.browserpass = { browsers = [ "firefox" ] ; enable = true; };
     programs.firefox = {
       enable = true;
-      enableIcedTea = true;
     };
     programs.obs-studio.enable = true;
     xdg.enable = true;
diff --git a/makefu/2configs/home-manager/zsh.nix b/makefu/2configs/home-manager/zsh.nix
index 4cd9becc7..f972e98b4 100644
--- a/makefu/2configs/home-manager/zsh.nix
+++ b/makefu/2configs/home-manager/zsh.nix
@@ -1,5 +1,12 @@
 { pkgs, ... }:
 {
+  programs = {
+    ssh.startAgent = false;
+    gnupg.agent = {
+      enable = true;
+      enableSSHSupport = true;
+    };
+  };
   imports = [
     { #direnv
       home-manager.users.makefu.home.packages = [ pkgs.direnv pkgs.nur.repos.kalbasit.nixify ];
@@ -8,7 +15,8 @@
     { # bat
     home-manager.users.makefu.home.packages = [ pkgs.bat ];
       home-manager.users.makefu.programs.zsh.shellAliases = {
-        cat = "bat";
+        cat = "bat --style=header,snip";
+        mirage = "sxiv"; # only available when tools/extra-gui is in use
         catn = "${pkgs.coreutils}/bin/cat";
         ncat = "${pkgs.coreutils}/bin/cat";
       };
@@ -53,8 +61,6 @@
         setopt HIST_IGNORE_SPACE
         setopt HIST_FIND_NO_DUPS
 
-        unset SSH_AGENT_PID
-        export SSH_AUTH_SOCK="/run/user/$UID/gnupg/S.gpg-agent.ssh"
         compdef _pass brain
         zstyle ':completion::complete:brain::' prefix "$HOME/brain"
         compdef _pass secrets