From 2e6cf2c456cca57bc678efccb32655998a640579 Mon Sep 17 00:00:00 2001
From: wo2wz <189177184+wo2wz@users.noreply.github.com>
Date: Sat, 18 Oct 2025 11:32:46 -0400
Subject: [PATCH] stylix: kill with hammers (its just kinda useless now and
 more annoying than anything) (also extra flake input)

---
 flake.lock                       | 320 +------------------------------
 flake.nix                        |   5 -
 modules/home/kitty.nix           |  59 ++++++
 modules/nixos/system/default.nix |   2 +-
 modules/nixos/system/fonts.nix   |   9 +
 modules/nixos/system/stylix.nix  |  44 -----
 6 files changed, 70 insertions(+), 369 deletions(-)
 create mode 100644 modules/nixos/system/fonts.nix
 delete mode 100755 modules/nixos/system/stylix.nix

diff --git a/flake.lock b/flake.lock
index f5bdff7..cb5e115 100755
--- a/flake.lock
+++ b/flake.lock
@@ -44,90 +44,6 @@
         "type": "github"
       }
     },
-    "base16": {
-      "inputs": {
-        "fromYaml": "fromYaml"
-      },
-      "locked": {
-        "lastModified": 1746562888,
-        "narHash": "sha256-YgNJQyB5dQiwavdDFBMNKk1wyS77AtdgDk/VtU6wEaI=",
-        "owner": "SenchoPens",
-        "repo": "base16.nix",
-        "rev": "806a1777a5db2a1ef9d5d6f493ef2381047f2b89",
-        "type": "github"
-      },
-      "original": {
-        "owner": "SenchoPens",
-        "repo": "base16.nix",
-        "type": "github"
-      }
-    },
-    "base16-fish": {
-      "flake": false,
-      "locked": {
-        "lastModified": 1754405784,
-        "narHash": "sha256-l9xHIy+85FN+bEo6yquq2IjD1rSg9fjfjpyGP1W8YXo=",
-        "owner": "tomyun",
-        "repo": "base16-fish",
-        "rev": "23ae20a0093dca0d7b39d76ba2401af0ccf9c561",
-        "type": "github"
-      },
-      "original": {
-        "owner": "tomyun",
-        "repo": "base16-fish",
-        "rev": "23ae20a0093dca0d7b39d76ba2401af0ccf9c561",
-        "type": "github"
-      }
-    },
-    "base16-helix": {
-      "flake": false,
-      "locked": {
-        "lastModified": 1748408240,
-        "narHash": "sha256-9M2b1rMyMzJK0eusea0x3lyh3mu5nMeEDSc4RZkGm+g=",
-        "owner": "tinted-theming",
-        "repo": "base16-helix",
-        "rev": "6c711ab1a9db6f51e2f6887cc3345530b33e152e",
-        "type": "github"
-      },
-      "original": {
-        "owner": "tinted-theming",
-        "repo": "base16-helix",
-        "type": "github"
-      }
-    },
-    "base16-vim": {
-      "flake": false,
-      "locked": {
-        "lastModified": 1732806396,
-        "narHash": "sha256-e0bpPySdJf0F68Ndanwm+KWHgQiZ0s7liLhvJSWDNsA=",
-        "owner": "tinted-theming",
-        "repo": "base16-vim",
-        "rev": "577fe8125d74ff456cf942c733a85d769afe58b7",
-        "type": "github"
-      },
-      "original": {
-        "owner": "tinted-theming",
-        "repo": "base16-vim",
-        "rev": "577fe8125d74ff456cf942c733a85d769afe58b7",
-        "type": "github"
-      }
-    },
-    "firefox-gnome-theme": {
-      "flake": false,
-      "locked": {
-        "lastModified": 1748383148,
-        "narHash": "sha256-pGvD/RGuuPf/4oogsfeRaeMm6ipUIznI2QSILKjKzeA=",
-        "owner": "rafaelmardojai",
-        "repo": "firefox-gnome-theme",
-        "rev": "4eb2714fbed2b80e234312611a947d6cb7d70caf",
-        "type": "github"
-      },
-      "original": {
-        "owner": "rafaelmardojai",
-        "repo": "firefox-gnome-theme",
-        "type": "github"
-      }
-    },
     "flake-compat": {
       "flake": false,
       "locked": {
@@ -162,27 +78,6 @@
         "type": "github"
       }
     },
-    "flake-parts_2": {
-      "inputs": {
-        "nixpkgs-lib": [
-          "stylix",
-          "nixpkgs"
-        ]
-      },
-      "locked": {
-        "lastModified": 1749398372,
-        "narHash": "sha256-tYBdgS56eXYaWVW3fsnPQ/nFlgWi/Z2Ymhyu21zVM98=",
-        "owner": "hercules-ci",
-        "repo": "flake-parts",
-        "rev": "9305fe4e5c2a6fcf5ba6a3ff155720fbe4076569",
-        "type": "github"
-      },
-      "original": {
-        "owner": "hercules-ci",
-        "repo": "flake-parts",
-        "type": "github"
-      }
-    },
     "flake-utils": {
       "inputs": {
         "systems": [
@@ -204,39 +99,6 @@
         "type": "github"
       }
     },
-    "fromYaml": {
-      "flake": false,
-      "locked": {
-        "lastModified": 1731966426,
-        "narHash": "sha256-lq95WydhbUTWig/JpqiB7oViTcHFP8Lv41IGtayokA8=",
-        "owner": "SenchoPens",
-        "repo": "fromYaml",
-        "rev": "106af9e2f715e2d828df706c386a685698f3223b",
-        "type": "github"
-      },
-      "original": {
-        "owner": "SenchoPens",
-        "repo": "fromYaml",
-        "type": "github"
-      }
-    },
-    "gnome-shell": {
-      "flake": false,
-      "locked": {
-        "lastModified": 1744584021,
-        "narHash": "sha256-0RJ4mJzf+klKF4Fuoc8VN8dpQQtZnKksFmR2jhWE1Ew=",
-        "owner": "GNOME",
-        "repo": "gnome-shell",
-        "rev": "52c517c8f6c199a1d6f5118fae500ef69ea845ae",
-        "type": "github"
-      },
-      "original": {
-        "owner": "GNOME",
-        "ref": "48.1",
-        "repo": "gnome-shell",
-        "type": "github"
-      }
-    },
     "home-manager": {
       "inputs": {
         "nixpkgs": [
@@ -473,32 +335,6 @@
         "type": "github"
       }
     },
-    "nur": {
-      "inputs": {
-        "flake-parts": [
-          "stylix",
-          "flake-parts"
-        ],
-        "nixpkgs": [
-          "stylix",
-          "nixpkgs"
-        ],
-        "treefmt-nix": "treefmt-nix"
-      },
-      "locked": {
-        "lastModified": 1751320053,
-        "narHash": "sha256-3m6RMw0FbbaUUa01PNaMLoO7D99aBClmY5ed9V3vz+0=",
-        "owner": "nix-community",
-        "repo": "NUR",
-        "rev": "cbde1735782f9c2bb2c63d5e05fba171a14a4670",
-        "type": "github"
-      },
-      "original": {
-        "owner": "nix-community",
-        "repo": "NUR",
-        "type": "github"
-      }
-    },
     "pyproject-build-systems": {
       "inputs": {
         "nixpkgs": [
@@ -560,8 +396,7 @@
         "nixpkgs-pin": "nixpkgs-pin",
         "nixpkgs-unstable": "nixpkgs-unstable",
         "sops-nix": "sops-nix",
-        "spicetify-nix": "spicetify-nix",
-        "stylix": "stylix"
+        "spicetify-nix": "spicetify-nix"
       }
     },
     "sops-nix": {
@@ -605,41 +440,6 @@
         "type": "github"
       }
     },
-    "stylix": {
-      "inputs": {
-        "base16": "base16",
-        "base16-fish": "base16-fish",
-        "base16-helix": "base16-helix",
-        "base16-vim": "base16-vim",
-        "firefox-gnome-theme": "firefox-gnome-theme",
-        "flake-parts": "flake-parts_2",
-        "gnome-shell": "gnome-shell",
-        "nixpkgs": [
-          "nixpkgs"
-        ],
-        "nur": "nur",
-        "systems": "systems_3",
-        "tinted-foot": "tinted-foot",
-        "tinted-kitty": "tinted-kitty",
-        "tinted-schemes": "tinted-schemes",
-        "tinted-tmux": "tinted-tmux",
-        "tinted-zed": "tinted-zed"
-      },
-      "locked": {
-        "lastModified": 1760478648,
-        "narHash": "sha256-Y4l+Y3zUvqIDbyLrtOrzNvp1o50Fp9TYK+iwtwweFU4=",
-        "owner": "nix-community",
-        "repo": "stylix",
-        "rev": "1ec254101285777db13922303cc47ded06e10bb3",
-        "type": "github"
-      },
-      "original": {
-        "owner": "nix-community",
-        "ref": "release-25.05",
-        "repo": "stylix",
-        "type": "github"
-      }
-    },
     "systems": {
       "locked": {
         "lastModified": 1689347949,
@@ -670,124 +470,6 @@
         "type": "github"
       }
     },
-    "systems_3": {
-      "locked": {
-        "lastModified": 1681028828,
-        "narHash": "sha256-Vy1rq5AaRuLzOxct8nz4T6wlgyUR7zLU309k9mBC768=",
-        "owner": "nix-systems",
-        "repo": "default",
-        "rev": "da67096a3b9bf56a91d16901293e51ba5b49a27e",
-        "type": "github"
-      },
-      "original": {
-        "owner": "nix-systems",
-        "repo": "default",
-        "type": "github"
-      }
-    },
-    "tinted-foot": {
-      "flake": false,
-      "locked": {
-        "lastModified": 1726913040,
-        "narHash": "sha256-+eDZPkw7efMNUf3/Pv0EmsidqdwNJ1TaOum6k7lngDQ=",
-        "owner": "tinted-theming",
-        "repo": "tinted-foot",
-        "rev": "fd1b924b6c45c3e4465e8a849e67ea82933fcbe4",
-        "type": "github"
-      },
-      "original": {
-        "owner": "tinted-theming",
-        "repo": "tinted-foot",
-        "rev": "fd1b924b6c45c3e4465e8a849e67ea82933fcbe4",
-        "type": "github"
-      }
-    },
-    "tinted-kitty": {
-      "flake": false,
-      "locked": {
-        "lastModified": 1735730497,
-        "narHash": "sha256-4KtB+FiUzIeK/4aHCKce3V9HwRvYaxX+F1edUrfgzb8=",
-        "owner": "tinted-theming",
-        "repo": "tinted-kitty",
-        "rev": "de6f888497f2c6b2279361bfc790f164bfd0f3fa",
-        "type": "github"
-      },
-      "original": {
-        "owner": "tinted-theming",
-        "repo": "tinted-kitty",
-        "type": "github"
-      }
-    },
-    "tinted-schemes": {
-      "flake": false,
-      "locked": {
-        "lastModified": 1750770351,
-        "narHash": "sha256-LI+BnRoFNRa2ffbe3dcuIRYAUcGklBx0+EcFxlHj0SY=",
-        "owner": "tinted-theming",
-        "repo": "schemes",
-        "rev": "5a775c6ffd6e6125947b393872cde95867d85a2a",
-        "type": "github"
-      },
-      "original": {
-        "owner": "tinted-theming",
-        "repo": "schemes",
-        "type": "github"
-      }
-    },
-    "tinted-tmux": {
-      "flake": false,
-      "locked": {
-        "lastModified": 1751159871,
-        "narHash": "sha256-UOHBN1fgHIEzvPmdNMHaDvdRMgLmEJh2hNmDrp3d3LE=",
-        "owner": "tinted-theming",
-        "repo": "tinted-tmux",
-        "rev": "bded5e24407cec9d01bd47a317d15b9223a1546c",
-        "type": "github"
-      },
-      "original": {
-        "owner": "tinted-theming",
-        "repo": "tinted-tmux",
-        "type": "github"
-      }
-    },
-    "tinted-zed": {
-      "flake": false,
-      "locked": {
-        "lastModified": 1751158968,
-        "narHash": "sha256-ksOyv7D3SRRtebpXxgpG4TK8gZSKFc4TIZpR+C98jX8=",
-        "owner": "tinted-theming",
-        "repo": "base16-zed",
-        "rev": "86a470d94204f7652b906ab0d378e4231a5b3384",
-        "type": "github"
-      },
-      "original": {
-        "owner": "tinted-theming",
-        "repo": "base16-zed",
-        "type": "github"
-      }
-    },
-    "treefmt-nix": {
-      "inputs": {
-        "nixpkgs": [
-          "stylix",
-          "nur",
-          "nixpkgs"
-        ]
-      },
-      "locked": {
-        "lastModified": 1733222881,
-        "narHash": "sha256-JIPcz1PrpXUCbaccEnrcUS8jjEb/1vJbZz5KkobyFdM=",
-        "owner": "numtide",
-        "repo": "treefmt-nix",
-        "rev": "49717b5af6f80172275d47a418c9719a31a78b53",
-        "type": "github"
-      },
-      "original": {
-        "owner": "numtide",
-        "repo": "treefmt-nix",
-        "type": "github"
-      }
-    },
     "uv2nix": {
       "inputs": {
         "nixpkgs": [
diff --git a/flake.nix b/flake.nix
index e3cb5b6..103aaf3 100755
--- a/flake.nix
+++ b/flake.nix
@@ -25,11 +25,6 @@
       inputs.nixpkgs.follows = "nixpkgs";
     };
 
-    stylix = {
-      url = "github:nix-community/stylix/release-25.05";
-      inputs.nixpkgs.follows = "nixpkgs";
-    };
-
     niri = {
       url = "github:sodiboo/niri-flake";
       inputs.nixpkgs.follows = "nixpkgs";
diff --git a/modules/home/kitty.nix b/modules/home/kitty.nix
index 5a50213..645d040 100755
--- a/modules/home/kitty.nix
+++ b/modules/home/kitty.nix
@@ -7,6 +7,65 @@
       tab_bar_style = "powerline";
       tab_powerline_style = "round";
       confirm_os_window_close = -1;
+
+      font_size = 12;
+
+      # The basic colors
+      background = "#1a1b26";
+      foreground = "#a9b1d6";
+      selection_background = "#444b6a";
+      selection_foreground = "#a9b1d6";
+
+      # Cursor colors
+      cursor = "#a9b1d6";
+      cursor_text_color = "#1a1b26";
+
+      # URL underline color when hovering with mouse
+      url_color = "#787c99";
+
+      # Kitty window border colors
+      active_border_color = "#444b6a";
+      inactive_border_color = "#16161e";
+
+      # OS Window titlebar colors
+      wayland_titlebar_color = "#1a1b26";
+      macos_titlebar_color = "#1a1b26";
+
+      # Tab bar colors
+      active_tab_background = "#1a1b26";
+      active_tab_foreground = "#a9b1d6";
+      inactive_tab_background = "#16161e";
+      inactive_tab_foreground = "#787c99";
+      tab_bar_background = "#16161e";
+
+      # The 16 terminal colors
+      # normal
+      color0 = "#1a1b26";
+      color1 = "#c0caf5";
+      color2 = "#9ece6a";
+      color3 = "#0db9d7";
+      color4 = "#2ac3de";
+      color5 = "#bb9af7";
+      color6 = "#b4f9f8";
+      color7 = "#a9b1d6";
+
+      # bright
+      color8 = "#2f3549";
+      color9 = "#c0caf5";
+      color10 = "#9ece6a";
+      color11 = "#0db9d7";
+      color12 = "#2ac3de";
+      color13 = "#bb9af7";
+      color14 = "#b4f9f8";
+      color15 = "#d5d6db";
+
+      # extended base16 colors
+      color16 = "#a9b1d6";
+      color17 = "#f7768e";
+      color18 = "#16161e";
+      color19 = "#2f3549";
+      color20 = "#787c99";
+      color21 = "#cbccd1";
     };
   };
 }
\ No newline at end of file
diff --git a/modules/nixos/system/default.nix b/modules/nixos/system/default.nix
index e57fd46..874fdf4 100644
--- a/modules/nixos/system/default.nix
+++ b/modules/nixos/system/default.nix
@@ -3,9 +3,9 @@
 {
   imports = [
     ./desktop.nix
+    ./fonts.nix
     ./home-manager.nix
     ./scx.nix
-    ./stylix.nix
     ./swap.nix
     ./yubikey.nix
   ];
diff --git a/modules/nixos/system/fonts.nix b/modules/nixos/system/fonts.nix
new file mode 100644
index 0000000..daa3ff5
--- /dev/null
+++ b/modules/nixos/system/fonts.nix
@@ -0,0 +1,9 @@
+{ config, pkgs, ... }:
+
+{
+  fonts = {
+    packages = [ pkgs.nerd-fonts.hack ];
+
+    fontconfig.defaultFonts.monospace = [ "Hack Nerd Font" ];
+  };
+}
\ No newline at end of file
diff --git a/modules/nixos/system/stylix.nix b/modules/nixos/system/stylix.nix
deleted file mode 100755
index 3c57a9b..0000000
--- a/modules/nixos/system/stylix.nix
+++ /dev/null
@@ -1,44 +0,0 @@
-{ inputs, config, pkgs, ... }:
-
-{
-  imports = [ inputs.stylix.nixosModules.stylix ];
-
-  stylix = {
-    enable = true;
-    base16Scheme = "${pkgs.base16-schemes}/share/themes/tokyo-night-dark.yaml";
-    targets = {
-      fontconfig.enable = false;
-      font-packages.enable = false;
-    };
-    fonts = {
-      sizes = {
-        applications = 12;
-        desktop = 10;
-        popups = 10;
-        terminal = 12;
-      };
-
-      monospace = {
-        package = pkgs.nerd-fonts.hack;
-        name = "Hack Nerd Font";
-      };
-      emoji = {
-        package = pkgs.noto-fonts-color-emoji;
-        name = "Noto Color Emoji";
-      };
-    };
-  };
-
-  home-manager.users.wo2w.stylix = {
-    enable = true;
-    targets = {
-      btop.enable = false;
-      spicetify.enable = false;
-      vesktop.enable = false;
-      vscode.enable = false;
-      fontconfig.enable = false;
-      font-packages.enable = false;
-      librewolf.profileNames = [ "wo2w" ];
-    };
-  };
-}
\ No newline at end of file