Merge branch 'danth:master' into master

i-am-logger · Oct 13, 2024 · d12ce29 · d12ce29
2 parents aff52a5 + f95022b
commit d12ce29
Show file tree

Hide file tree

Showing 20 changed files with 395 additions and 145 deletions.
diff --git a/flake.lock b/flake.lock
diff --git a/flake.nix b/flake.nix
@@ -5,26 +5,11 @@
       url = "github:tomyun/base16-fish";
     };
 
-    base16-foot = {
-      flake = false;
-      url = "github:tinted-theming/base16-foot";
-    };
-
     base16-helix = {
       flake = false;
       url = "github:tinted-theming/base16-helix";
     };
 
-    base16-tmux = {
-      flake = false;
-      url = "github:tinted-theming/base16-tmux";
-    };
-
-    base16-kitty = {
-      flake = false;
-      url = "github:kdrag0n/base16-kitty";
-    };
-
     base16-vim = {
       flake = false;
       url = "github:tinted-theming/base16-vim";
@@ -61,6 +46,29 @@
 
     # Interface flake systems.
     systems.url = "github:nix-systems/default";
+
+    tinted-foot = {
+      flake = false;
+      url = "github:tinted-theming/tinted-foot";
+    };
+
+    tinted-tmux = {
+      flake = false;
+      url = "github:tinted-theming/tinted-tmux";
+    };
+
+    tinted-kitty = {
+      flake = false;
+
+      # Lock the tinted-kitty input to prevent upstream breaking changes.
+      #
+      # Considering that Stylix eventually re-implements this input's
+      # functionality [1], it might be easiest to lock this input to avoid
+      # wasted maintenance effort.
+      #
+      # [1]: https://github.com/danth/stylix/issues/534
+      url = "github:tinted-theming/tinted-kitty/eb39e141db14baef052893285df9f266df041ff8";
+    };
   };
 
   outputs =

diff --git a/modules/bat/base16-stylix.mustache b/modules/bat/base16-stylix.mustache
@@ -134,7 +134,7 @@
                 <key>name</key>
                 <string>Classes</string>
                 <key>scope</key>
-                <string>support.class, entity.name.class, entity.name.type.class</string>
+                <string>support.class, entity.name.class, entity.name.type.class, entity.name</string>
                 <key>settings</key>
                 <dict>
                     <key>foreground</key>
@@ -299,7 +299,7 @@
                 <key>name</key>
                 <string>Headings</string>
                 <key>scope</key>
-                <string>markup.heading punctuation.definition.heading, entity.name.section</string>
+                <string>markup.heading, punctuation.definition.heading, entity.name.section</string>
                 <key>settings</key>
                 <dict>
                     <key>fontStyle</key>

diff --git a/modules/foot/hm.nix b/modules/foot/hm.nix
@@ -4,7 +4,7 @@ let
   cfg = config.stylix.targets.foot;
 
   theme = config.lib.stylix.colors {
-    templateRepo = config.lib.stylix.templates.base16-foot;
+    templateRepo = config.lib.stylix.templates.tinted-foot;
   };
 
 in {

diff --git a/modules/forge/hm.nix b/modules/forge/hm.nix
@@ -0,0 +1,13 @@
+{ config, lib, ... }:
+
+{
+  options.stylix.targets.forge.enable =
+    config.lib.stylix.mkEnableTarget "Forge" true;
+
+  config = lib.mkIf (config.stylix.enable && config.stylix.targets.forge.enable) {
+    xdg.configFile."forge/stylesheet/forge/stylesheet.css".source = config.lib.stylix.colors {
+      template = ./stylesheet.css.mustache;
+      extension = ".css";
+    };
+  };
+}
diff --git a/modules/forge/stylesheet.css.mustache b/modules/forge/stylesheet.css.mustache
@@ -0,0 +1,140 @@
+.tiled {
+  color: #{{base0D-hex}};
+  opacity: 1;
+  border-width: 3px;
+}
+
+.split {
+  color: #{{base0D-hex}};
+  opacity: 1;
+  border-width: 3px;
+}
+
+.stacked {
+  color: #{{base0D-hex}};
+  opacity: 1;
+  border-width: 3px;
+}
+
+.tabbed {
+  color: #{{base0D-hex}};
+  opacity: 1;
+  border-width: 3px;
+}
+
+.floated {
+  color: #{{base0D-hex}};
+  border-width: 3px;
+  opacity: 1;
+}
+
+.window-tiled-border {
+  border-width: 3px;
+  border-color: #{{base0D-hex}};
+  border-style: solid;
+  border-radius: 14px;
+}
+
+.window-split-border {
+  border-width: 3px;
+  border-color: #{{base0D-hex}};
+  border-style: solid;
+  border-radius: 14px;
+}
+
+.window-split-horizontal {
+  border-left-width: 0;
+  border-top-width: 0;
+  border-bottom-width: 0;
+}
+
+.window-split-vertical {
+  border-left-width: 0;
+  border-top-width: 0;
+  border-right-width: 0;
+}
+
+.window-stacked-border {
+  border-width: 3px;
+  border-color: #{{base0D-hex}};
+  border-style: solid;
+  border-radius: 14px;
+}
+
+.window-tabbed-border {
+  border-width: 3px;
+  border-color: #{{base0D-hex}};
+  border-style: solid;
+  border-radius: 14px;
+}
+
+.window-tabbed-bg {
+  border-radius: 8px;
+}
+
+.window-tabbed-tab {
+  background-color: rgba(54, 47, 45, 1);
+  border-color: #{{base0D-hex}}9A;
+  border-width: 1px;
+  border-radius: 8px;
+  color: white;
+  margin: 1px;
+  box-shadow: 0 0 0 1px rgba(1px 0, 0, 0, 0.2);
+}
+
+.window-tabbed-tab-active {
+  background-color: #{{base0D-hex}};
+  color: black;
+  box-shadow: 0 0 0 1px rgba(1px 0, 0, 0, 0.2);
+}
+
+.window-tabbed-tab-close {
+  padding: 3px;
+  margin: 4px;
+  border-radius: 16px;
+  width: 16px;
+  background-color: #{{base08-hex}};
+}
+
+.window-tabbed-tab-icon {
+  margin: 3px;
+}
+
+.window-floated-border {
+  border-width: 3px;
+  border-color: #{{base0D-hex}};
+  border-style: solid;
+  border-radius: 14px;
+}
+
+.window-tilepreview-tiled {
+  border-width: 1px;
+  border-color: #{{base0D-hex}}4D;
+  border-style: solid;
+  border-radius: 14px;
+  background-color: #{{base0D-hex}}33;
+}
+
+.window-tilepreview-stacked {
+  border-width: 1px;
+  border-color: #{{base0D-hex}}66;
+  border-style: solid;
+  border-radius: 14px;
+  background-color: #{{base0D-hex}}4D;
+}
+
+.window-tilepreview-swap {
+  border-width: 1px;
+  border-color: #{{base0D-hex}}4D;
+  border-style: solid;
+  border-radius: 14px;
+  background-color: #{{base0D-hex}}4D;
+}
+
+.window-tilepreview-tabbed {
+  border-width: 1px;
+  border-color: #{{base0D-hex}}4D;
+  border-style: solid;
+  border-radius: 14px;
+  background-color: #{{base0D-hex}}4D;
+}