feat: set up 'stylix'

dots/.config/kitty/kitty.conf

@@ -163,5 +163,4 @@ map cmd+q
 
 #: }}}
 
-include ./themes/zenwritten_dark.conf
 include ./nvim.conf

dots/.config/kitty/themes/zenwritten_dark.conf

@@ -1,49 +0,0 @@
-# This file is auto-generated by shipwright.nvim
-# vim:ft=kitty
-## name: zenwritten_dark
-## author: Michael Chris Lopez
-## license: MIT
-## upstream: https://github.com/mcchrish/zenbones.nvim/raw/main/extras/kitty/zenwritten_dark.conf
-## blurb: A zenbones variant with zero hue and saturation.
-foreground                      #BBBBBB
-background                      #191919
-selection_foreground            #BBBBBB
-selection_background            #404040
-# Cursor colors
-cursor                          #C9C9C9
-cursor_text_color               #191919
-# URL underline color when hovering with mouse
-# kitty window border colors
-# OS Window titlebar colors
-# Tab bar colors
-active_tab_foreground           #BBBBBB
-active_tab_background           #65435E
-inactive_tab_foreground         #BBBBBB
-inactive_tab_background         #303030
-# Colors for marks (marked text in the terminal)
-# The basic 16 colors
-# black
-color0 #191919
-color8 #3D3839
-# red
-color1 #DE6E7C
-color9 #E8838F
-# green
-color2  #819B69
-color10 #8BAE68
-# yellow
-color3  #B77E64
-color11 #D68C67
-# blue
-color4  #6099C0
-color12 #61ABDA
-# magenta
-color5  #B279A7
-color13 #CF86C1
-# cyan
-color6  #66A5AD
-color14 #65B8C1
-# white
-color7  #BBBBBB
-color15 #8E8E8E
-# You can set the remaining 240 colors as color16 to color255.

dots/.config/kitty/themes/zenwritten_light.conf

@@ -1,49 +0,0 @@
-# This file is auto-generated by shipwright.nvim
-# vim:ft=kitty
-## name: zenwritten_light
-## author: Michael Chris Lopez
-## license: MIT
-## upstream: https://github.com/mcchrish/zenbones.nvim/raw/main/extras/kitty/zenwritten_light.conf
-## blurb: A zenbones variant with zero hue and saturation.
-foreground                      #353535
-background                      #EEEEEE
-selection_foreground            #353535
-selection_background            #D7D7D7
-# Cursor colors
-cursor                          #353535
-cursor_text_color               #EEEEEE
-# URL underline color when hovering with mouse
-# kitty window border colors
-# OS Window titlebar colors
-# Tab bar colors
-active_tab_foreground           #353535
-active_tab_background           #DEB9D6
-inactive_tab_foreground         #353535
-inactive_tab_background         #CFCFCF
-# Colors for marks (marked text in the terminal)
-# The basic 16 colors
-# black
-color0 #EEEEEE
-color8 #C6C3C3
-# red
-color1 #A8334C
-color9 #94253E
-# green
-color2  #4F6C31
-color10 #3F5A22
-# yellow
-color3  #944927
-color11 #803D1C
-# blue
-color4  #286486
-color12 #1D5573
-# magenta
-color5  #88507D
-color13 #7B3B70
-# cyan
-color6  #3B8992
-color14 #2B747C
-# white
-color7  #353535
-color15 #5C5C5C
-# You can set the remaining 240 colors as color16 to color255.

dots/.config/ncspot/config.toml

@@ -41,26 +41,5 @@ flip_status_indicators = true
 "Y" = "share selected"
 "U" = "update"
 
-[theme]
-primary="#aaaaaa"
-secondary="#555555"
-background="1a1a1a"
-title="#cccccc"
-title_secondary="#aaaaaa"
-playing="#ffffff"
-playing_bg="1a1a1a"
-playing_selected="#ffffff"
-highlight="#cccccc"
-highlight_bg="#333333"
-error="#ffffff"
-error_bg="#333333"
-statusbar="#cccccc"
-statusbar_bg="#1a1a1a"
-statusbar_progress="#cccccc"
-statusbar_progress_bg="#1a1a1a"
-cmdline="#cccccc"
-cmdline_bg="#1a1a1a"
-search_match="#ffffff"
-
 backend="pipe"
 notify="false"

home/modules/browser/firefox-base.nix

@@ -23,8 +23,10 @@ in
         "extensions.autoDisableScopes" = 0;
       };
       extensions = {
+        force = true;
         packages = with inputs.firefox-addons.packages.${pkgs.system}; [
           duckduckgo-privacy-essentials
+          firefox-color
           istilldontcareaboutcookies
           libredirect
           keepassxc-browser

home/modules/fuzzel/default.nix

@@ -1,11 +1,8 @@
-{ lib, ... }:
-
 {
   programs.fuzzel = {
     enable = true;
     settings = {
       main = {
-        font = lib.mkForce "Iosevka Term SS08";
         horizontal-pad = 0;
         vertical-pad = 0;
       };

home/modules/k8s/default.nix

@@ -13,6 +13,11 @@
     upbound
   ];
 
+  programs.kubecolor = {
+    enable = true;
+    enableAlias = true;
+  };
+
   imports = [
     ./helm.nix
     ./k9s.nix

home/modules/kitty.nix

@@ -7,18 +7,16 @@
 
 {
   config = {
-    home.packages = [ (config.nixgl.wrap pkgs.kitty) ];
     programs.bash.shellAliases = {
       icat = "kitty +kitten icat";
     };
 
-    home.file = {
+    programs.kitty = {
-      ".config/kitty/kitty.conf".source = dotsPath + "/.config/kitty/kitty.conf";
+      enable = true;
-      ".config/kitty/nvim.conf".source = dotsPath + "/.config/kitty/nvim.conf";
+      package = config.nixgl.wrap pkgs.kitty;
-      ".config/kitty/themes/zenwritten_light.conf".source =
+      extraConfig = builtins.readFile (dotsPath + "/.config/kitty/kitty.conf");
-        dotsPath + "/.config/kitty/themes/zenwritten_light.conf";
-      ".config/kitty/themes/zenwritten_dark.conf".source =
-        dotsPath + "/.config/kitty/themes/zenwritten_dark.conf";
     };
+
+    home.file.".config/kitty/nvim.conf".source = dotsPath + "/.config/kitty/nvim.conf";
   };
 }

home/modules/mako/default.nix

@@ -5,7 +5,6 @@
     enable = true;
     settings = {
       border-color = lib.mkForce "#bbbbbb";
-      font = lib.mkForce "Iosevka Term SS08 10";
     };
   };
 }

home/modules/music/default.nix

@@ -17,11 +17,11 @@ let
 in
 {
   home.packages = with pkgs; [
-    ncspot
     spotifyWithWayland
   ];
 
-  home.file = {
+  programs.ncspot = {
-    ".config/ncspot/config.toml".source = dotsPath + "/.config/ncspot/config.toml";
+    enable = true;
+    settings = builtins.fromTOML (builtins.readFile (dotsPath + "/.config/ncspot/config.toml"));
   };
 }

home/modules/stylix.nix

@@ -1,4 +1,5 @@
 {
+  config,
   inputs,
   pkgs,
   ...
@@ -10,7 +11,7 @@
   stylix = {
     enable = true;
     polarity = "dark";
-    base16Scheme = ../../stylix/zenwritten-dark.yaml;
+    base16Scheme = ../../modules/stylix/zenwritten-dark.yaml;
     image = pkgs.runCommand "solid-bg.png" { nativeBuildInputs = [ pkgs.imagemagick ]; } ''
       magick -size 1x1 xc:#191919 $out
     '';
@@ -19,22 +20,21 @@
         package = pkgs.iosevka-bin.override { variant = "SS08"; };
         name = "Iosevka Term SS08";
       };
-      serif = {
+      serif = config.stylix.fonts.monospace;
-        package = pkgs.dejavu_fonts;
+      sansSerif = config.stylix.fonts.monospace;
-        name = "DejaVu Serif";
+      emoji = config.stylix.fonts.monospace;
-      };
-      sansSerif = {
-        package = pkgs.dejavu_fonts;
-        name = "DejaVu Sans";
-      };
     };
     targets = {
-      firefox.profileNames = [ "default" ];
+      firefox = {
+        profileNames = [ "default" ];
+        colorTheme.enable = true;
+      };
       gnome.enable = false;
       gtk.enable = false;
-      kitty.enable = false;
+      kitty = {
+        variant256Colors = true;
+      };
       nixvim.enable = false;
-      waybar.enable = false;
     };
   };
 }

home/modules/waybar/config.jsonc

@@ -1,57 +0,0 @@
-[
-  {
-    "height": 16,
-    "spacing": 4,
-    "modules-left": ["niri/workspaces"],
-    "modules-right": [
-      "pulseaudio",
-      "memory",
-      "cpu",
-      "network",
-      "clock",
-      "battery",
-    ],
-    "clock": {
-      "format": "W{:%V %d %b %H:%M}",
-      "tooltip-format": "{calendar}",
-      "format-alt": "{:%Y-%m-%d %H:%M:%S}",
-    },
-    "battery": {
-      "bat": "BAT0",
-      "adapter": "ADP1",
-      "interval": 5,
-      "full-at": 99,
-      "states": {
-        "good": 80,
-        "warning": 20,
-        "critical": 10,
-      },
-      "format": "{capacity}%--",
-      "format-charging": "{capacity}%++",
-      "format-plugged": "{capacity}%",
-      "format-alt": "{time} {power}W",
-    },
-    "pulseaudio": {
-      "format": "VOL {volume}%",
-      "format-muted": "muted",
-      "on-click": "pavucontrol",
-    },
-    "memory": {
-      "interval": 2,
-      "format": "RAM {percentage}%",
-      "format-alt": "RAM {used:0.1f}G/{total:0.1f}G",
-    },
-    "cpu": {
-      "interval": 2,
-      "format": "CPU {usage}%",
-      "format-alt": "CPU {avg_frequency}GHz",
-    },
-    "network": {
-      "interval": 5,
-      "format-wifi": "{ifname} {ipaddr} {essid}",
-      "format-ethernet": "{ifname} {ipaddr}",
-      "format-disconnected": "{ifname} disconnected",
-      "tooltip-format": "{ifname}: {ipaddr}/{cidr}",
-    },
-  },
-]

home/modules/waybar/default.nix

@@ -1,8 +1,68 @@
+{
+  lib,
+  ...
+}:
+
 {
   programs.waybar = {
     enable = true;
+    settings = [
+      {
+        height = 16;
+        spacing = 4;
+        modules-left = [ "niri/workspaces" ];
+        modules-right = [
+          "pulseaudio"
+          "memory"
+          "cpu"
+          "network"
+          "clock"
+          "battery"
+        ];
+        clock = {
+          format = "W{:%V %d %b %H:%M}";
+          tooltip-format = "{calendar}";
+          format-alt = "{:%Y-%m-%d %H:%M:%S}";
+        };
+        battery = {
+          bat = "BAT0";
+          adapter = "ADP1";
+          interval = 5;
+          full-at = 99;
+          states = {
+            good = 80;
+            warning = 20;
+            critical = 10;
+          };
+          format = "{capacity}%--";
+          format-charging = "{capacity}%++";
+          format-plugged = "{capacity}%";
+          format-alt = "{time} {power}W";
+        };
+        pulseaudio = {
+          format = "VOL {volume}%";
+          format-muted = "muted";
+          on-click = "pavucontrol";
+        };
+        memory = {
+          interval = 2;
+          format = "RAM {percentage}%";
+          format-alt = "RAM {used:0.1f}G/{total:0.1f}G";
+        };
+        cpu = {
+          interval = 2;
+          format = "CPU {usage}%";
+          format-alt = "CPU {avg_frequency}GHz";
+        };
+        network = {
+          interval = 5;
+          format-wifi = "{ifname} {ipaddr} {essid}";
+          format-ethernet = "{ifname} {ipaddr}";
+          format-disconnected = "{ifname} disconnected";
+          tooltip-format = "{ifname}: {ipaddr}/{cidr}";
+        };
+      }
+    ];
+    style = lib.readFile ./style.css;
   };
-
-  home.file.".config/waybar/config.jsonc".source = ./config.jsonc;
-  home.file.".config/waybar/style.css".source = ./style.css;
 }

home/modules/waybar/style.css

@@ -1,8 +1,4 @@
 * {
-  font-family:
-    Iosevka Term SS08,
-    monospace;
-  font-size: 12px;
   border-radius: 0px;
 }
 
@@ -27,16 +23,16 @@ window#waybar.hidden {
 }
 
 #workspaces button:hover {
-  background: #000000;
+  background: @base00;
 }
 
 #workspaces button.focused,
 #workspaces button.active {
-  background-color: #111111;
+  background-color: @base01;
 }
 
 #workspaces button.urgent {
-  background-color: #eb4d4b;
+  background-color: @base08;
 }
 
 #clock,
@@ -46,8 +42,8 @@ window#waybar.hidden {
 #cpu,
 #network {
   padding: 0 4px;
-  color: #ffffff;
+  color: @base07;
-  background-color: #111111;
+  background-color: @base01;
 }
 
 #window,

hosts/andromache/default.nix

@@ -35,6 +35,7 @@ in
     ../../modules/localization
     ../../modules/fonts
     ../../modules/ssh/hardened-openssh.nix
+    ../../modules/stylix
     (import ../../modules/secrets { inherit lib inputs config; })
     ../../modules/docker
     ../../modules/syncthing

hosts/astyanax/default.nix

@@ -36,6 +36,7 @@ in
     ../../modules/localization
     ../../modules/fonts
     ../../modules/ssh/hardened-openssh.nix
+    ../../modules/stylix
     # ../../modules/vpn/wireguard.nix
     (import ../../modules/secrets { inherit lib inputs config; })
     ../../modules/docker

modules/common/default.nix

@@ -8,7 +8,6 @@
 {
   imports = [
     inputs.home-manager.nixosModules.default
-    ../stylix.nix
   ];
 
   system.stateVersion = "25.05";

modules/stylix/default.nix

@@ -1,4 +1,5 @@
 {
+  config,
   inputs,
   pkgs,
   ...
@@ -19,14 +20,9 @@
         package = pkgs.iosevka-bin.override { variant = "SS08"; };
         name = "Iosevka Term SS08";
       };
-      serif = {
+      serif = config.stylix.fonts.monospace;
-        package = pkgs.dejavu_fonts;
+      sansSerif = config.stylix.fonts.monospace;
-        name = "DejaVu Serif";
+      emoji = config.stylix.fonts.monospace;
-      };
-      sansSerif = {
-        package = pkgs.dejavu_fonts;
-        name = "DejaVu Sans";
-      };
     };
     autoEnable = true;
   };
@@ -36,7 +32,6 @@
       stylix.targets = {
         firefox.profileNames = [ "default" ];
         kitty.enable = false;
-        # waybar.enable = false;
       };
     }
   ];