From 4356ae0f36a571c85cc13f993dd1f7d80316e93d Mon Sep 17 00:00:00 2001
From: Bruno BELANYI <bruno@belanyi.fr>
Date: Wed, 2 Mar 2022 16:59:26 +0100
Subject: [PATCH] home: zsh: refactor 'mkIf' block

---
 home/zsh/default.nix | 156 ++++++++++++++++++++++---------------------
 1 file changed, 79 insertions(+), 77 deletions(-)

diff --git a/home/zsh/default.nix b/home/zsh/default.nix
index 0cd56d5..266f5be 100644
--- a/home/zsh/default.nix
+++ b/home/zsh/default.nix
@@ -7,87 +7,89 @@ in
     enable = mkDisableOption "zsh configuration";
   };
 
-  config.programs.zsh = lib.mkIf cfg.enable {
-    enable = true;
-    dotDir = ".config/zsh"; # Don't clutter $HOME
-    enableCompletion = true;
+  config = lib.mkIf cfg.enable {
+    programs.zsh = {
+      enable = true;
+      dotDir = ".config/zsh"; # Don't clutter $HOME
+      enableCompletion = true;
 
-    history = {
-      size = 500000;
-      save = 500000;
-      extended = false;
-      ignoreSpace = true;
-      ignoreDups = true;
-      share = false;
-      path = "${config.xdg.dataHome}/zsh/zsh_history";
-    };
+      history = {
+        size = 500000;
+        save = 500000;
+        extended = false;
+        ignoreSpace = true;
+        ignoreDups = true;
+        share = false;
+        path = "${config.xdg.dataHome}/zsh/zsh_history";
+      };
 
-    plugins = with pkgs; [
-      {
-        name = "fast-syntax-highlighting";
-        file = "share/zsh/site-functions/fast-syntax-highlighting.plugin.zsh";
-        src = pkgs.zsh-fast-syntax-highlighting;
-      }
-      {
-        name = "agkozak-zsh-prompt";
-        src = fetchFromGitHub {
-          owner = "agkozak";
-          repo = "agkozak-zsh-prompt";
-          rev = "v3.9.0";
-          sha256 = "sha256-VTRL+8ph2eI7iPht15epkLggAgtLGxB3DORFTW5GrhE=";
-        };
-      }
-    ];
-
-    # Modal editing is life, but CLI benefits from emacs gymnastics
-    defaultKeymap = "emacs";
-
-    # Make those happen early to avoid doing double the work
-    initExtraFirst =
-      lib.optionalString config.my.home.tmux.enable ''
-        # Launch tmux unless already inside one
-        if [ -z "$TMUX" ]; then
-          exec tmux new-session
-        fi
-      ''
-    ;
-
-    initExtra = lib.concatMapStrings builtins.readFile [
-      ./completion-styles.zsh
-      ./extra-mappings.zsh
-      ./options.zsh
-    ];
-
-    localVariables = {
-      # I like having the full path
-      AGKOZAK_PROMPT_DIRTRIM = 0;
-      # Because I *am* from EPITA
-      AGKOZAK_PROMPT_CHAR = [ "42sh$" "42sh#" ":" ];
-      # Easy on the eyes
-      AGKOZAK_COLORS_BRANCH_STATUS = "magenta";
-      # I don't like moving my eyes
-      AGKOZAK_LEFT_PROMPT_ONLY = 1;
-    };
-
-    shellAliases = {
-      # Sometime `gpg-agent` errors out...
-      reset-agent = "gpg-connect-agent updatestartuptty /bye";
-    };
-
-    # Enable VTE integration when using one of the affected shells
-    enableVteIntegration =
-      builtins.any (name: config.my.home.terminal.program == name) [
-        "termite"
+      plugins = with pkgs; [
+        {
+          name = "fast-syntax-highlighting";
+          file = "share/zsh/site-functions/fast-syntax-highlighting.plugin.zsh";
+          src = pkgs.zsh-fast-syntax-highlighting;
+        }
+        {
+          name = "agkozak-zsh-prompt";
+          src = fetchFromGitHub {
+            owner = "agkozak";
+            repo = "agkozak-zsh-prompt";
+            rev = "v3.9.0";
+            sha256 = "sha256-VTRL+8ph2eI7iPht15epkLggAgtLGxB3DORFTW5GrhE=";
+          };
+        }
       ];
-  };
 
-  # Fuzzy-wuzzy
-  config.programs.fzf = lib.mkIf cfg.enable {
-    enable = true;
-    enableZshIntegration = true;
-  };
+      # Modal editing is life, but CLI benefits from emacs gymnastics
+      defaultKeymap = "emacs";
 
-  config.programs.dircolors = lib.mkIf cfg.enable {
-    enable = true;
+      # Make those happen early to avoid doing double the work
+      initExtraFirst =
+        lib.optionalString config.my.home.tmux.enable ''
+          # Launch tmux unless already inside one
+          if [ -z "$TMUX" ]; then
+            exec tmux new-session
+          fi
+        ''
+      ;
+
+      initExtra = lib.concatMapStrings builtins.readFile [
+        ./completion-styles.zsh
+        ./extra-mappings.zsh
+        ./options.zsh
+      ];
+
+      localVariables = {
+        # I like having the full path
+        AGKOZAK_PROMPT_DIRTRIM = 0;
+        # Because I *am* from EPITA
+        AGKOZAK_PROMPT_CHAR = [ "42sh$" "42sh#" ":" ];
+        # Easy on the eyes
+        AGKOZAK_COLORS_BRANCH_STATUS = "magenta";
+        # I don't like moving my eyes
+        AGKOZAK_LEFT_PROMPT_ONLY = 1;
+      };
+
+      shellAliases = {
+        # Sometime `gpg-agent` errors out...
+        reset-agent = "gpg-connect-agent updatestartuptty /bye";
+      };
+
+      # Enable VTE integration when using one of the affected shells
+      enableVteIntegration =
+        builtins.any (name: config.my.home.terminal.program == name) [
+          "termite"
+        ];
+    };
+
+    # Fuzzy-wuzzy
+    programs.fzf = {
+      enable = true;
+      enableZshIntegration = true;
+    };
+
+    programs.dircolors = {
+      enable = true;
+    };
   };
 }