From d2871cb4c523cb9a79d5a7c9327000a447ead88c Mon Sep 17 00:00:00 2001
From: Adithya Nair <adtya@adtya.xyz>
Date: Sun, 24 Nov 2024 13:19:23 +0530
Subject: [PATCH] skipper: remove unused shell integrations

---
 home/programs/default.nix          |  6 ++++--
 home/programs/files.nix            |  1 +
 home/programs/zsh.nix              | 15 ++++-----------
 home/wm/addon/eww/default.nix      |  1 +
 hosts/skipper/programs/default.nix |  1 +
 5 files changed, 11 insertions(+), 13 deletions(-)

diff --git a/home/programs/default.nix b/home/programs/default.nix
index 8db8522..e18be71 100644
--- a/home/programs/default.nix
+++ b/home/programs/default.nix
@@ -44,9 +44,11 @@
   ];
 
   programs = {
-    fzf.enable = true;
+    fzf = {
+      enable = true;
+      enableZshIntegration = false;
+    };
     lazygit.enable = true;
-    nix-index.enable = true;
     zoxide.enable = true;
   };
 }
diff --git a/home/programs/files.nix b/home/programs/files.nix
index e7cfbc7..c7c03ef 100644
--- a/home/programs/files.nix
+++ b/home/programs/files.nix
@@ -6,6 +6,7 @@
     };
     yazi = {
       enable = true;
+      enableZshIntegration = false;
       settings = {
         manager = {
           sort_by = "natural";
diff --git a/home/programs/zsh.nix b/home/programs/zsh.nix
index e0d830b..030df77 100644
--- a/home/programs/zsh.nix
+++ b/home/programs/zsh.nix
@@ -1,11 +1,4 @@
-{ config
-, pkgs
-, ...
-}:
-let
-  gnome-keyring-daemon = "${pkgs.gnome-keyring}/bin/gnome-keyring-daemon";
-in
-{
+{ config, pkgs, lib, ... }: {
   programs.zsh = {
     enable = true;
     defaultKeymap = "viins";
@@ -15,13 +8,13 @@ in
     history = {
       expireDuplicatesFirst = true;
       extended = true;
+      ignoreDups = true;
+      ignoreSpace = true;
       path = "${config.xdg.dataHome}/zsh/zsh_history";
     };
+    envExtra = lib.optionalString config.services.gnome-keyring.enable ''export SSH_AUTH_SOCK="$XDG_RUNTIME_DIR/keyring/ssh"'';
     initExtra = ''
       bindkey -v '^?' backward-delete-char
-
-      eval $(${gnome-keyring-daemon} -s -d 2> /dev/null)
-      export SSH_AUTH_SOCK
     '';
     shellAliases = {
       cat = "${pkgs.bat}/bin/bat";
diff --git a/home/wm/addon/eww/default.nix b/home/wm/addon/eww/default.nix
index 12f2c8e..b3779ad 100644
--- a/home/wm/addon/eww/default.nix
+++ b/home/wm/addon/eww/default.nix
@@ -24,6 +24,7 @@ in
 {
   programs.eww = {
     enable = true;
+    enableZshIntegration = false;
     configDir = pkgs.callPackage configDir { };
   };
   systemd.user.services = {
diff --git a/hosts/skipper/programs/default.nix b/hosts/skipper/programs/default.nix
index 3af1858..1ae46c7 100644
--- a/hosts/skipper/programs/default.nix
+++ b/hosts/skipper/programs/default.nix
@@ -5,6 +5,7 @@ _: {
   ];
 
   programs = {
+    command-not-found.enable = false;
     dconf.enable = true;
     fuse.userAllowOther = true;
     git.enable = true;