From 63422ffe6d4a85f8f691dd6aee8111e0c7e6ba11 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Max=20K=C3=A4nner?= <max.kaenner@gmail.com>
Date: Sat, 9 Mar 2024 21:24:44 +0100
Subject: [PATCH] 129 current  1970-01-01 01:00:00  24.05.20240303.b8697e5  
 6.6.19                          *

---
 hosts/MaxNixosLaptop/configuration.nix |  3 --
 hosts/MaxNixosLaptop/home.nix          |  2 +-
 modules/home-manager/zsh.nix           | 39 +++++++++++++-------------
 modules/nixos/rebuild.nix              |  4 +--
 4 files changed, 22 insertions(+), 26 deletions(-)

diff --git a/hosts/MaxNixosLaptop/configuration.nix b/hosts/MaxNixosLaptop/configuration.nix
index 060e907..8b99252 100644
--- a/hosts/MaxNixosLaptop/configuration.nix
+++ b/hosts/MaxNixosLaptop/configuration.nix
@@ -84,12 +84,9 @@
   # List packages installed in system profile. To search, run:
   # $ nix search wget
   environment.systemPackages = with pkgs; [
-    neovim
     wget
     fprintd
     home-manager
-    git
-    alejandra
   ];
 
   fonts.packages = with pkgs; [
diff --git a/hosts/MaxNixosLaptop/home.nix b/hosts/MaxNixosLaptop/home.nix
index b2952bc..5a67df2 100644
--- a/hosts/MaxNixosLaptop/home.nix
+++ b/hosts/MaxNixosLaptop/home.nix
@@ -63,7 +63,7 @@
   ];
 
   home.sessionVariables = {
-    EDITOR = "nvim";
+    EDITOR = "${pkgs.neovim}/bin/nvim";
   };
 
   xdg.enable = true;
diff --git a/modules/home-manager/zsh.nix b/modules/home-manager/zsh.nix
index 65ca023..eeeabe2 100644
--- a/modules/home-manager/zsh.nix
+++ b/modules/home-manager/zsh.nix
@@ -10,26 +10,25 @@
     historySubstringSearch.enable = true;
     shellAliases = {
       ls = "${pkgs.eza}/bin/eza --icons -a --group-directories-first";
-      diff = "diff --color=auto";
-      grep = "grep --color=auto";
-      ip = "ip --color=auto";
-      mkdir = "mkdir -p";
-      gst = "git status";
-      gc = "git commit";
-      ga = "git add";
-      gpl = "git pull";
-      gpu = "git push";
-      gd = "git diff";
-      gch = "git checkout";
-      gs = "git switch";
-      gre = "git restore";
-      gr = "git remote";
-      gcl = "git clone";
-      glg = "git log --graph --abbrev-commit --decorate --format=format:'%C(bold green)%h%C(reset) - %C(bold cyan)%aD%C(reset) %C(bold yellow)(%ar)%C(reset)%C(auto)%d%C(reset)%n''         %C(white)%s%C(reset) %C(dim white)- %an%C(reset)' --all";
-      gb = "git branch";
-      gm = "git merge";
-      gf = "git fetch";
-      rebuild = "~/dotfiles/nixos/rebuild.sh";
+      diff = "${pkgs.diffutils}/bin/diff --color=auto";
+      grep = "${pkgs.gnugrep}/bin/grep --color=auto";
+      ip = "${pkgs.iproute2}/bin/ip --color=auto";
+      mkdir = "${pkgs.coreutils}/bin/mkdir -p";
+      gst = "${pkgs.git}/bin/git status";
+      gc = "${pkgs.git}/bin/git commit";
+      ga = "${pkgs.git}/bin/git add";
+      gpl = "${pkgs.git}/bin/git pull";
+      gpu = "${pkgs.git}/bin/git push";
+      gd = "${pkgs.git}/bin/git diff";
+      gch = "${pkgs.git}/bin/git checkout";
+      gs = "${pkgs.git}/bin/git switch";
+      gre = "${pkgs.git}/bin/git restore";
+      gr = "${pkgs.git}/bin/git remote";
+      gcl = "${pkgs.git}/bin/git clone";
+      glg = "${pkgs.git}/bin/git log --graph --abbrev-commit --decorate --format=format:'%C(bold green)%h%C(reset) - %C(bold cyan)%aD%C(reset) %C(bold yellow)(%ar)%C(reset)%C(auto)%d%C(reset)%n''         %C(white)%s%C(reset) %C(dim white)- %an%C(reset)' --all";
+      gb = "${pkgs.git}/bin/git branch";
+      gm = "${pkgs.git}/bin/git merge";
+      gf = "${pkgs.git}/bin/git fetch";
     };
     syntaxHighlighting.enable = true;
     syntaxHighlighting.highlighters = ["main" "brackets"];
diff --git a/modules/nixos/rebuild.nix b/modules/nixos/rebuild.nix
index 865490b..4e67aad 100644
--- a/modules/nixos/rebuild.nix
+++ b/modules/nixos/rebuild.nix
@@ -5,13 +5,13 @@
     destination = "/bin/rebuild";
     executable = true;
     text = ''
-      #!/usr/bin/env bash
+      #!${pkgs.bash}/bin/bash
 
       # A rebuild script that commits on a successful build
       set -e
 
       # cd to your config dir
-      pushd ${../..}
+      pushd ~/dotfiles/nixos/
 
       # Edit your config
       $EDITOR