From 3649a2228749dfb97f93015ef6ed84f862f438fc Mon Sep 17 00:00:00 2001
From: Alexander Kobjolke <me@failco.de>
Date: Sun, 2 Jul 2023 10:49:15 +0200
Subject: [PATCH 1/4] cli: Enable zsh plugins fzf, z and fd

---
 home/cli.nix | 3 ++-
 1 file changed, 2 insertions(+), 1 deletion(-)

diff --git a/home/cli.nix b/home/cli.nix
index 60dad03..3395faa 100644
--- a/home/cli.nix
+++ b/home/cli.nix
@@ -50,6 +50,7 @@ in {
     dua # ncdu but better
     bat # better cat
     exa # better ls
+    fzf
 
     gcc
     cmake
@@ -107,7 +108,7 @@ in {
       shellAliases = { e = "emacsclient -c $@"; };
       oh-my-zsh = {
         enable = true;
-        plugins = [ "git" ];
+        plugins = [ "git" "fzf" "fd" "z" ];
         theme = "simple";
       };
     };

From cbbc252230f82edb38c3ac927d6d13b01144bb63 Mon Sep 17 00:00:00 2001
From: Alexander Kobjolke <me@failco.de>
Date: Sun, 2 Jul 2023 10:49:58 +0200
Subject: [PATCH 2/4] cli: Define some usefull shell aliases

---
 home/cli.nix | 6 +++++-
 1 file changed, 5 insertions(+), 1 deletion(-)

diff --git a/home/cli.nix b/home/cli.nix
index 3395faa..c49d362 100644
--- a/home/cli.nix
+++ b/home/cli.nix
@@ -105,7 +105,11 @@ in {
       enable = true;
       enableAutosuggestions = true;
       #      enableSyntaxHighlighting = true;
-      shellAliases = { e = "emacsclient -c $@"; };
+      shellAliases = {
+        e = "emacsclient -c $@";
+        ls = "exa $@";
+        t = "exa -T $@";
+      };
       oh-my-zsh = {
         enable = true;
         plugins = [ "git" "fzf" "fd" "z" ];

From c34946321f9519b3f6faa06573db989611b0358a Mon Sep 17 00:00:00 2001
From: Alexander Kobjolke <me@failco.de>
Date: Sun, 2 Jul 2023 10:50:36 +0200
Subject: [PATCH 3/4] cli: Enable starship shell prompt

---
 home/cli.nix | 4 ++++
 1 file changed, 4 insertions(+)

diff --git a/home/cli.nix b/home/cli.nix
index c49d362..6510e2c 100644
--- a/home/cli.nix
+++ b/home/cli.nix
@@ -117,6 +117,10 @@ in {
       };
     };
 
+    starship = {
+      enable = true;
+    };
+
     # better cat
     bat.enable = true;
 

From 737d5a5877510d36ec88e6385a4b3df8952a77f2 Mon Sep 17 00:00:00 2001
From: Alexander Kobjolke <me@failco.de>
Date: Sun, 2 Jul 2023 22:22:12 +0200
Subject: [PATCH 4/4] cli: Move shellAlias to environment config

---
 home/cli.nix | 20 ++++++--------------
 1 file changed, 6 insertions(+), 14 deletions(-)

diff --git a/home/cli.nix b/home/cli.nix
index 6510e2c..0b74e4c 100644
--- a/home/cli.nix
+++ b/home/cli.nix
@@ -58,23 +58,16 @@ in {
     plantuml
     gnuplot
 
-    #    pass
     pandoc
     hledger
     hledger-web
-    #hledger-iadd
     hledger-ui
-    #smos
-    #haskellPackages.patat # terminal based presentations using pandoc
 
     nix-prefetch-git
   ];
   home.extraOutputsToInstall = [ "doc" "info" "devdoc" ];
 
   xdg.enable = true;
-  # xdg.configFile = {
-  #   "emacs".source = ./emacs.d;
-  # };
 
   xdg.configFile.tmux = {
     target = "tmux/tmux.conf";
@@ -98,18 +91,18 @@ in {
     '';
   };
 
+  environment.shellAliases = {
+    e = "emacsclient -c $@";
+    ls = "exa $@";
+    t = "exa -T $@";
+  };
+
   programs = {
     bash = { enable = true; };
 
     zsh = {
       enable = true;
       enableAutosuggestions = true;
-      #      enableSyntaxHighlighting = true;
-      shellAliases = {
-        e = "emacsclient -c $@";
-        ls = "exa $@";
-        t = "exa -T $@";
-      };
       oh-my-zsh = {
         enable = true;
         plugins = [ "git" "fzf" "fd" "z" ];
@@ -163,7 +156,6 @@ in {
 
     password-store = {
       enable = true;
-      #      package = pkgs.pass.withExtensions (exts: [ exts.pass-otp ]);
       package = pkgs.gopass;
       settings = { PASSWORD_STORE_DIR = "$HOME/.local/share/password-store"; };
     };