feat: use whiskers; make file naming consistent (#14)

README.md

@@ -63,7 +63,7 @@ add flags to lazygit which will merge it from our presets.
 2. Choose the accent you want from within the flavor directory.
 3. Replace the `theme` section of `<config-dir>/config.yml` with the theme you want to use (from `themes`).
 
-    For example, if you want to use the catppuccin **mocha** theme, with the **blue** accent, then copy the contents of [`themes/mocha/mocha-blue.yml`](./themes/mocha/mocha-blue.yml) and paste them directly into your lazygit `config.yml` as follows:
+    For example, if you want to use the catppuccin **mocha** theme, with the **blue** accent, then copy the contents of [`themes/mocha/blue.yml`](./themes/mocha/blue.yml) and paste them directly into your lazygit `config.yml` as follows:
     <details>
     <summary>config.yml</summary>
 

flake.nix

@@ -2,17 +2,19 @@
   inputs = {
     nixpkgs.url = "github:nixos/nixpkgs/nixos-22.11";
     flake-utils.url = "github:numtide/flake-utils";
+    catppuccin-toolbox.url = "github:catppuccin/toolbox";
   };
 
   description = "Development shell flake";
-  outputs = { self, nixpkgs, flake-utils }: flake-utils.lib.eachDefaultSystem (system: {
+  outputs = { self, nixpkgs, flake-utils, catppuccin-toolbox }: flake-utils.lib.eachDefaultSystem (system: {
     devShell = let 
       pkgs = nixpkgs.legacyPackages.${system};
     in 
       pkgs.mkShell {
         packages = with pkgs; [
-          deno
+          just
+          catppuccin-toolbox.packages.${system}.whiskers
         ];
       };
   });
-}
+}

justfile

@@ -0,0 +1,45 @@
+# Default help menu
+_default:
+  @just --list
+
+whiskers_cmd := "whiskers"
+template_path := "lazygit.hbs"
+other_template_path := "lazygit-mergeable.hbs"
+
+output_base := "themes"
+other_output_base := "themes-mergable"
+
+# Generate an accent / flavor combination. Minified name for line brevity
+_a flavor accent: 
+	@{{whiskers_cmd}} {{template_path}} {{flavor}} --override accent="{{accent}}" > {{output_base}}/{{flavor}}/{{accent}}.yml
+	@{{whiskers_cmd}} {{other_template_path}} {{flavor}} --override accent="{{accent}}" > {{other_output_base}}/{{flavor}}/{{accent}}.yml
+
+# Generate a flavor with all its accents
+_gen f: (_a f "rosewater") (_a f "flamingo") (_a f "pink") (_a f "mauve") (_a f "red") (_a f "maroon") (_a f "peach") (_a f "yellow") (_a f "green") (_a f "teal") (_a f "sky") (_a f "sapphire") (_a f "blue") (_a f "lavender")
+
+# Port tasks start
+
+# Setup the output location
+setup:
+  mkdir -p {{output_base}}
+  mkdir -p {{output_base}}/mocha
+  mkdir -p {{output_base}}/macchiato
+  mkdir -p {{output_base}}/latte
+  mkdir -p {{output_base}}/frappe
+
+  mkdir -p {{other_output_base}}
+  mkdir -p {{other_output_base}}/mocha
+  mkdir -p {{other_output_base}}/macchiato
+  mkdir -p {{other_output_base}}/latte
+  mkdir -p {{other_output_base}}/frappe
+
+# Teardown the output location
+clean:
+  rm -r {{output_base}}
+  rm -r {{other_output_base}}
+
+# Generate a single flavor with its accents
+generate flavor: (_gen flavor)
+
+# Generate all flavors with their accents
+all: setup (_gen "latte") (_gen "frappe") (_gen "macchiato") (_gen "mocha")

themes-mergable/frappe/frappe-blue.yml → lazygit-mergeable.hbs

@@ -1,23 +1,26 @@
+---
+accent: "NO ACCENT SET"
+---
 gui:
   theme:
     activeBorderColor:
-      - '#8caaee'
+      - '#{{ accent }}'
       - bold
     inactiveBorderColor:
-      - '#a5adce'
+      - '#{{ subtext0 }}'
     optionsTextColor:
-      - '#8caaee'
+      - '#{{ blue }}'
     selectedLineBgColor:
-      - '#414559'
+      - '#{{ surface0 }}'
     selectedRangeBgColor:
-      - '#414559'
+      - '#{{ surface0 }}'
     cherryPickedCommitBgColor:
-      - '#51576d'
+      - '#{{ surface1 }}'
     cherryPickedCommitFgColor:
-      - '#8caaee'
+      - '#{{ accent }}'
     unstagedChangesColor:
-      - '#e78284'
+      - '#{{ red }}'
     defaultFgColor:
-      - '#c6d0f5'
+      - '#{{ text }}'
     searchingActiveBorderColor:
-      - '#e5c890'
+      - '#{{ yellow }}'

themes/frappe/frappe-blue.yml → lazygit.hbs

@@ -1,22 +1,25 @@
+---
+accent: "NO ACCENT SET"
+---
 theme:
   activeBorderColor:
-    - '#8caaee'
+    - '#{{ accent }}'
     - bold
   inactiveBorderColor:
-    - '#a5adce'
+    - '#{{ subtext0 }}'
   optionsTextColor:
-    - '#8caaee'
+    - '#{{ blue }}'
   selectedLineBgColor:
-    - '#414559'
+    - '#{{ surface0 }}'
   selectedRangeBgColor:
-    - '#414559'
+    - '#{{ surface0 }}'
   cherryPickedCommitBgColor:
-    - '#51576d'
+    - '#{{ surface1 }}'
   cherryPickedCommitFgColor:
-    - '#8caaee'
+    - '#{{ accent }}'
   unstagedChangesColor:
-    - '#e78284'
+    - '#{{ red }}'
   defaultFgColor:
-    - '#c6d0f5'
+    - '#{{ text }}'
   searchingActiveBorderColor:
-    - '#e5c890'
+    - '#{{ yellow }}'

themes-mergable/frappe/blue.yml

@@ -20,4 +20,4 @@ gui:
     defaultFgColor:
       - '#c6d0f5'
     searchingActiveBorderColor:
-      - '#e5c890'
+      - '#e5c890'

themes-mergable/frappe/flamingo.yml

@@ -20,4 +20,4 @@ gui:
     defaultFgColor:
       - '#c6d0f5'
     searchingActiveBorderColor:
-      - '#e5c890'
+      - '#e5c890'