revamp with nix flakes + desktop config

5 files changed, 70 insertions, 49 deletions

diff --git a/common/commandline/dircolors.nix b/common/commandline/dircolors.nix
index 7ef3a4d..f7bdae1 100644
--- a/common/commandline/dircolors.nix
+++ b/common/commandline/dircolors.nix
@@ -1,4 +1,6 @@
-{ config, ... }:
+inputs:
+
+{ config, lib, ... }:
 
 {
   home-manager.users.minijackson = { ... }:
@@ -69,6 +71,7 @@
 
   home-manager.users.root = { ... }:
   {
-    programs.dircolors = config.home-manager.users.minijackson.programs.dircolors;
+    programs.dircolors =
+      lib.mkDefault config.home-manager.users.minijackson.programs.dircolors;
   };
 }
diff --git a/common/commandline/git.nix b/common/commandline/git.nix
index 597ef64..e231356 100644
--- a/common/commandline/git.nix
+++ b/common/commandline/git.nix
@@ -1,58 +1,61 @@
-{ config, pkgs, ... }:
+inputs:
+
+{ config, pkgs, lib, ... }:
 
 {
   # TODO: add signing
-  home-manager.users.minijackson = { ... }:
-  {
+  home-manager.users.minijackson = { ... }: {
     programs.git = {
       enable = true;
       package = pkgs.gitAndTools.gitFull;
       userEmail = "minijackson@riseup.net";
       userName = "Minijackson";
 
-      extraConfig = let
-        deltaCommand = "${pkgs.gitAndTools.delta}/bin/delta";
-      in {
-        core = {
-          whitespace = "trailing-space,space-before-tab";
-          pager = deltaCommand;
-          interactive.diffFilter = "${deltaCommand} --color-only";
-        };
-        merge = { tool = "nvimdiff"; };
-        "mergetool \"nvimdiff\"" = { cmd = "nvim -d \"$LOCAL\" \"$MERGED\" \"$REMOTE\""; };
-
-        delta = with config.theme.colors; {
-          features = "line-numbers decorations";
-          whitespace-error-style = "22 reverse";
-          decorations = {
-            minus-style = "normal red";
-            minus-non-emph-style = "normal red";
-            minus-emph-style = "normal brightred";
-            minus-empty-line-marker-style = "normal red";
-
-            plus-style = "reverse green";
-            plus-non-emph-style = "reverse green";
-            plus-emph-style = "reverse brightgreen";
-            plus-empty-line-marker-style = "reverse green";
-
-            whitespace-error-style = "reverse green";
-
-            line-numbers-minus-style = "brightred";
-            line-numbers-zero-style = "brightblack";
-            line-numbers-plus-style = "brightgreen";
-
-            file-style = "bright${dominantName}";
-            line-numbers-left-style = dominantName;
-            line-numbers-right-style = dominantName;
+      extraConfig =
+        let
+          deltaCommand = "${pkgs.gitAndTools.delta}/bin/delta";
+        in
+        {
+          core = {
+            whitespace = "trailing-space,space-before-tab";
+            pager = deltaCommand;
+            interactive.diffFilter = "${deltaCommand} --color-only";
+          };
+          merge = { tool = "nvimdiff"; };
+          "mergetool \"nvimdiff\"" = { cmd = "nvim -d \"$LOCAL\" \"$MERGED\" \"$REMOTE\""; };
+
+          delta = with config.theme.colors; {
+            features = "line-numbers decorations";
+            whitespace-error-style = "22 reverse";
+            decorations = {
+              minus-style = "normal red";
+              minus-non-emph-style = "normal red";
+              minus-emph-style = "normal brightred";
+              minus-empty-line-marker-style = "normal red";
+
+              plus-style = "reverse green";
+              plus-non-emph-style = "reverse green";
+              plus-emph-style = "reverse brightgreen";
+              plus-empty-line-marker-style = "reverse green";
+
+              whitespace-error-style = "reverse green";
+
+              line-numbers-minus-style = "brightred";
+              line-numbers-zero-style = "brightblack";
+              line-numbers-plus-style = "brightgreen";
+
+              file-style = "bright${dominantName}";
+              line-numbers-left-style = dominantName;
+              line-numbers-right-style = dominantName;
+            };
           };
-        };
 
-      };
+        };
     };
   };
 
-  home-manager.users.root = { ... }:
-  {
-    programs.git = config.home-manager.users.minijackson.programs.git;
+  home-manager.users.root = { ... }: {
+    programs.git =
+      lib.mkDefault config.home-manager.users.minijackson.programs.git;
   };
 }
diff --git a/common/commandline/htop.nix b/common/commandline/htop.nix
index f9732a6..95763a0 100644
--- a/common/commandline/htop.nix
+++ b/common/commandline/htop.nix
@@ -1,3 +1,5 @@
+inputs:
+
 { config, ... }:
 
 {
diff --git a/common/commandline/tmux.nix b/common/commandline/tmux.nix
index aa4de9c..84d2cc8 100644
--- a/common/commandline/tmux.nix
+++ b/common/commandline/tmux.nix
@@ -1,3 +1,5 @@
+inputs:
+
 { config, pkgs, ... } :
 
 let
diff --git a/common/commandline/zsh.nix b/common/commandline/zsh.nix
index 3376321..28899b1 100644
--- a/common/commandline/zsh.nix
+++ b/common/commandline/zsh.nix
@@ -1,3 +1,5 @@
+inputs:
+
 { config, lib, pkgs, ... }:
 
 with import ../../lib/theme.nix { inherit lib; };
@@ -13,9 +15,6 @@ in
       source "${pkgs.grml-zsh-config}/etc/zsh/zshrc"
       is4 && xsource "${pkgs.grml-zsh-config}/etc/zsh/keephack"
 
-      PATH="${pkgs.pazi}/bin:$PATH"
-      eval "$(pazi init zsh)"
-
       source "${pkgs.zsh-history-substring-search}/share/zsh-history-substring-search/zsh-history-substring-search.zsh"
 
       function () {
@@ -30,8 +29,6 @@ in
         (mapAttrsToList
           (variable: value: "${variable}=\"${value}\"")
           config.programs.less.envVariables)}
-
-      #eval "$(${pkgs.starship}/bin/starship init zsh)"
     '';
 
     # otherwise it'll override the grml prompt
@@ -56,4 +53,18 @@ in
   };
 
   users.defaultUserShell = pkgs.zsh;
+
+  home-manager.users.minijackson = { ... }: {
+    # Allows zsh config from home-manager
+    programs.zsh = {
+      enable = true;
+      # Completion is already handled by the GRML conf
+      enableCompletion = false;
+    };
+  };
+
+  home-manager.users.root = { ... }: {
+    programs.zsh =
+      lib.mkDefault config.home-manager.users.minijackson.programs.zsh;
+  };
 }