From 9a7c681389cdfd282ba33c1b9c6b4c42874274c6 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Micha=C5=82=20Czy=C5=BC?= <mike@c2yz.com>
Date: Sat, 20 Apr 2024 13:43:24 +0200
Subject: [PATCH] more zsh fun

---
 home-manager/features/cli/zsh/default.nix     | 63 ++++++++-----------
 home-manager/features/desktop/dwm/.zprofile   |  3 +
 home-manager/features/desktop/dwm/default.nix |  3 +
 3 files changed, 31 insertions(+), 38 deletions(-)
 create mode 100644 home-manager/features/desktop/dwm/.zprofile

diff --git a/home-manager/features/cli/zsh/default.nix b/home-manager/features/cli/zsh/default.nix
index 3e1edaf..11bf7a7 100644
--- a/home-manager/features/cli/zsh/default.nix
+++ b/home-manager/features/cli/zsh/default.nix
@@ -2,9 +2,6 @@
   cli = import ../aliases.nix; 
 in {
   home.packages = with pkgs; [
-    zsh-autosuggestions
-    zsh-powerlevel10k
-    zsh-prezto
   ];
 
   programs.zsh = {
@@ -14,42 +11,32 @@ in {
     history.size = 10000000;
     history.path = "${config.xdg.dataHome}/zsh/history";
 
-    # shellAliases = cli.myAliases;
-    # 
-    # syntaxHighlighting = {
-    #   enable = true;
-    # };
-    #
-    # initExtra = ''
-    #   [[ ! -f ${./p10k.zsh} ]] || source ${./p10k.zsh}
-    #   eval "$(zoxide init --cmd cd zsh)"
-    # '';
-    # plugins = [
-    #   {
-    #     name = "powerlevel10k";
-    #     src = pkgs.zsh-powerlevel10k;
-    #     file = "share/zsh-powerlevel10k/powerlevel10k.zsh-theme";
-    #   }
-    # ];
+    shellAliases = cli.myAliases;
+    
+    plugins = [
+      {
+        name = "powerlevel10k";
+        src = pkgs.zsh-powerlevel10k;
+        file = "share/zsh-powerlevel10k/powerlevel10k.zsh-theme";
+      }
+    ];
+    
+    enableAutosuggestions = true;
 
-    # plug = {
-    #   enable = true;
-    #   plugins = [
-    #     { name = "zsh-users/zsh-autosuggestions"; }
-    #   ];
-    # };
+    syntaxHighlighting = {
+      enable = true;
+    };
+    
+    historySubstringSearch = {
+      enable = true;
+    };
 
-    # oh-my-zsh = {
-    #   enable = true;
-    #   plugins = [ "git" "vi-mode" ];
-    # };
-    # 
-    # prezto = {
-    #   enable = true;
-    #   tmux = {
-    #     autoStartLocal = true;
-    #     autoStartRemote = true;
-    #   };
-    # };
+    initExtra = ''
+      [[ ! -f ${./p10k.zsh} ]] || source ${./p10k.zsh}
+      eval "$(zoxide init --cmd cd zsh)"
+      if [ -x "$(command -v tmux)" ] && [ -n "$DISPLAY" ] && [ -z "$TMUX" ]; then
+        exec tmux new-session -A -s $USER >/dev/null 2>&1
+      fi
+    '';
   };
 }
diff --git a/home-manager/features/desktop/dwm/.zprofile b/home-manager/features/desktop/dwm/.zprofile
new file mode 100644
index 0000000..1aa1531
--- /dev/null
+++ b/home-manager/features/desktop/dwm/.zprofile
@@ -0,0 +1,3 @@
+if [ "$(tty)" = "/dev/tty1" ];then
+  exec startx
+fi
diff --git a/home-manager/features/desktop/dwm/default.nix b/home-manager/features/desktop/dwm/default.nix
index 0023c64..3d3b7d3 100644
--- a/home-manager/features/desktop/dwm/default.nix
+++ b/home-manager/features/desktop/dwm/default.nix
@@ -34,5 +34,8 @@
     ".xinitrc" = {
       source = ./.xinitrc;
     };
+    ".zprofile" = {
+      source = ./.zprofile; 
+    };
   };
 }