From 8ab590b6dca479a5b58a040a86547f488e62adc8 Mon Sep 17 00:00:00 2001
From: DerGrumpf <p.keier@beyerstedt-it.de>
Date: Sat, 28 Mar 2026 22:25:52 +0100
Subject: [PATCH] Added: fzf support; Need to be refined later; bunch of
 catppuccin theming

---
 home/default.nix    | 10 ++++++++++
 home/desktop/qt.nix |  5 +----
 home/git.nix        | 41 +++++++++++++++++++++++------------------
 home/shell.nix      | 41 ++++++++++++++++++++++-------------------
 4 files changed, 56 insertions(+), 41 deletions(-)

diff --git a/home/default.nix b/home/default.nix
index 572d256..b5ca214 100644
--- a/home/default.nix
+++ b/home/default.nix
@@ -35,6 +35,7 @@
 
     eza.enable = true;
     fzf.enable = true;
+    bat.enable = true;
 
     element-desktop = {
       enable = true;
@@ -48,6 +49,9 @@
       transparent = true;
     };
 
+    kitty.enable = true;
+    lazygit.enable = true;
+
     cursors = {
       enable = true;
       accent = "sapphire";
@@ -67,7 +71,13 @@
       mode = "createLink";
     };
 
+    mako.enable = true;
+
     gtk.icon.enable = true;
+    kvantum = {
+      enable = true;
+      apply = true;
+    };
 
   };
 
diff --git a/home/desktop/qt.nix b/home/desktop/qt.nix
index d0e4187..1ef26f5 100644
--- a/home/desktop/qt.nix
+++ b/home/desktop/qt.nix
@@ -2,11 +2,8 @@
 {
   qt = {
     enable = true;
+    style.name = "kvantum";
     platformTheme.name = "kvantum";
-    style = {
-      name = "kvantum";
-      package = pkgs.catppuccin-kvantum;
-    };
   };
   home.packages = with pkgs; [
     kdePackages.qt6ct
diff --git a/home/git.nix b/home/git.nix
index 3b75199..a530dda 100644
--- a/home/git.nix
+++ b/home/git.nix
@@ -6,25 +6,30 @@
     gnupg
   ];
 
-  programs.git = {
-    enable = true;
-    settings = {
-      github = {
-        user = primaryUser;
+  programs = {
+    git = {
+      enable = true;
+      settings = {
+        github = {
+          user = primaryUser;
+        };
+        init = {
+          defaultBranch = "main";
+        };
+        user = {
+          name = "DerGrumpf"; # TODO replace
+          email = "p.keier@beyerstedt-it.de"; # TODO replace
+        };
       };
-      init = {
-        defaultBranch = "main";
-      };
-      user = {
-        name = "DerGrumpf"; # TODO replace
-        email = "p.keier@beyerstedt-it.de"; # TODO replace
-      };
-    };
 
-    lfs.enable = true;
-    ignores = [
-      "**/.DS_STORE"
-      "result"
-    ];
+      lfs.enable = true;
+      ignores = [
+        "**/.DS_STORE"
+        "result"
+      ];
+    };
+    lazygit = {
+      enable = true;
+    };
   };
 }
diff --git a/home/shell.nix b/home/shell.nix
index ab6f10b..36e2d8b 100644
--- a/home/shell.nix
+++ b/home/shell.nix
@@ -2,13 +2,14 @@
 {
   home.packages = with pkgs; [
     eza # ls replacement
-    fzf # FuzzyFinder
     tdf # terminal pdf viewer
     jq # json parser
-    tree
     fastfetch # system stats
     tabiew # Table viewer
     glow # MD Viewer
+    fd # find alternative
+    bat # cat alternative
+    ripgrep # grep alternative
 
     # LLM in the Terminal
     (pkgs.llm.withPlugins { llm-groq = true; })
@@ -21,7 +22,6 @@
 
   programs.kitty = {
     enable = true;
-    themeFile = "Catppuccin-Mocha";
 
     font = {
       name = "Fira Code Nerd Font";
@@ -85,30 +85,33 @@
     };
   };
 
-  programs.zsh = {
+  programs.fzf = {
     enable = true;
-    enableCompletion = true;
-    autosuggestion.enable = true;
-    syntaxHighlighting.enable = true;
-
-    shellAliases = {
-      ls = "eza";
-      la = "eza -la";
-      f = "fzf";
-      i = "kitty +kitten icat";
-      "nix-switch" = "sudo darwin-rebuild switch --flake ~/.config/nix#cyper-mac";
-    };
+    enableBashIntegration = true;
+    enableZshIntegration = true;
+    enableFishIntegration = true;
+    defaultCommand = "fd --type f --strip-cwd-prefix --hidden --exclued .git";
+    fileWidgetCommand = "fd --type f --strip-cwd-prefix --hidden --exclued .git";
+    defaultOptions = [
+      "--height 100%"
+      "--border sharp"
+      "--layout=reverse"
+      "--inline-info"
+      "--preview 'bat --color=always --style=numbers {}'"
+    ];
   };
 
   programs.fish = {
     enable = true;
 
     shellAliases = {
-      ls = "eza";
-      la = "eza -la";
-      f = "fzf";
+      ls = "eza --icons=always";
+      la = "eza -la --icons=always";
+      f = "nvim $(fzf)";
+      tree = "eza --icons=always -T";
       i = "kitty +kitten icat";
-      "nix-switch" = "sudo nixos-rebuild switch --flake ~/.config/nix#$(hostname)";
+      cat = "bat --color=always --style=numbers";
+      grep = "ripgrep";
     };
 
     interactiveShellInit = ''