zsh linux and zsh darwin, also add some tools for linux

5 files changed, 104 insertions, 20 deletions

diff --git a/common-darwin.nix b/common-darwin.nix
index c4b49ac..e98a33c 100644
--- a/common-darwin.nix
+++ b/common-darwin.nix
@@ -6,7 +6,7 @@
   ...
 }: {
   imports = [
-    ./zsh.nix
+    ./zsh-darwin.nix
     ./vim.nix
     ./irc.nix
   ];
@@ -27,8 +27,6 @@
     passExtensions.pass-update
     nh
     nix-output-monitor
-    fzf
-    zoxide
     jq
     btop
     tealdeer
diff --git a/common-linux.nix b/common-linux.nix
index 9b7884e..945fa0f 100644
--- a/common-linux.nix
+++ b/common-linux.nix
@@ -2,10 +2,12 @@
   config,
   pkgs,
   inputs,
+  username,
   ...
 }: {
   imports = [
     ./bash.nix
+    ./zsh-linux.nix
     ./irc.nix
   ];
 
@@ -48,13 +50,23 @@
   # List packages installed in system profile. To search, run:
   # $ nix search wget
   environment.systemPackages = with pkgs; [
+    ffmpeg
+
     wget
-    nixfmt
+    curl
+    jq
+
+    lazygit
     fastfetch
     pamixer
+    btop
+    tealdeer
+
+    nixfmt
     gcc
     alejandra
     gnumake
+
     nh
     nix-output-monitor
   ];
@@ -84,7 +96,7 @@
     config = {
       user = {
         name = "Skullheadx";
-        email = "admonty1@protonmail.com";
+        email = "andrew@montgomery.systems";
       };
       pull.rebase = true;
       url = {
@@ -99,6 +111,11 @@
     # programs here, NOT in environment.systemPackages
   ];
 
+  environment.variables = {
+    EDITOR = "nvim";
+    VISUAL = "nvim";
+  };
+
   environment.sessionVariables = {
   };
 
diff --git a/hosts/nepsis/configuration.nix b/hosts/nepsis/configuration.nix
index 3c59824..a7f1c9e 100644
--- a/hosts/nepsis/configuration.nix
+++ b/hosts/nepsis/configuration.nix
@@ -102,7 +102,7 @@
     enable = true;
     startWithGraphical = config.services.xserver.enable;
     install = true;
-    defaultEditor = true;
+    # defaultEditor = true;
   };
 
   programs.firefox = {
@@ -111,20 +111,6 @@
     package = pkgs.librewolf;
   };
 
-  programs.git = {
-    enable = true;
-    config = {
-      user = {
-        name = "Skullheadx";
-        email = "admonty1@protonmail.com";
-      };
-      pull.rebase = true;
-      url = {
-        "git@github.com:".insteadOf = "https://github.com/";
-      };
-    };
-  };
-
   programs.steam = {
     enable = true;
     remotePlay.openFirewall = true; # Open ports in the firewall for Steam Remote Play
diff --git a/zsh.nix b/zsh-darwin.nix
index 5c25b07..74e164f 100644
--- a/zsh.nix
+++ b/zsh-darwin.nix
@@ -3,6 +3,12 @@
   pkgs,
   ...
 }: {
+  environment.systemPackages = with pkgs; [
+    direnv
+    fzf
+    zoxide
+  ];
+
   programs.zsh = {
     enable = true;
     enableAutosuggestions = true;
diff --git a/zsh-linux.nix b/zsh-linux.nix
new file mode 100644
index 0000000..70524a5
--- /dev/null
+++ b/zsh-linux.nix
@@ -0,0 +1,77 @@
+{
+  config,
+  pkgs,
+  username,
+  ...
+}: {
+  environment.systemPackages = with pkgs; [
+    fzf
+  ];
+
+  programs.fzf = {
+    keybindings = true;
+    fuzzyCompletion = true;
+  };
+
+  programs.direnv = {
+    enable = true;
+    enableZshIntegration = true;
+    loadInNixShell = true;
+    nix-direnv = {
+      enable = true;
+    };
+    silent = true;
+  };
+
+  programs.zoxide = {
+    enable = true;
+    enableZshIntegration = true;
+  };
+
+  programs.zsh = {
+    enable = true;
+    autosuggestions = {
+      enable = true;
+      async = true;
+      highlightStyle = "fg=cyan";
+      strategy = [
+        "history"
+        "completion"
+      ];
+    };
+    enableBashCompletion = true;
+    enableCompletion = true;
+    enableGlobalCompInit = true;
+    enableLsColors = true;
+    syntaxHighlighting = {
+      enable = true;
+      highlighters = [
+        "main"
+        "brackets"
+        "pattern"
+        "cursor"
+        "regexp"
+        "root"
+        "line"
+      ];
+    };
+    vteIntegration = true;
+    # enableFzfCompletion = true;
+    # enableFzfGit = true;
+    # enableFzfHistory = true;
+    histFile = "$HOME/.zsh_history";
+    histSize = 100000;
+    promptInit = ''
+      PROMPT=$'%{\e[97m%}[%{\e[m%}%{\e[92m%}%n%{\e[m%}%{\e[32m%}@%{\e[m%}%{\e[92m%}%m%{\e[m%}:%{\e[92m%}%~%{\e[m%}%{\e[97m%}]%{\e[m%}%{\e[97m%}%#%{\e[m%} '
+    '';
+    interactiveShellInit = ''
+      setopt autocd extendedglob nomatch notify
+
+      bindkey -v
+      export KEYTIMEOUT=20
+    '';
+  };
+
+  users.defaultUserShell = pkgs.zsh;
+  users.users.${username}.shell = pkgs.zsh;
+}