switch to base16 project-wide

home/apps/default.nix

@@ -3,6 +3,6 @@
     ./discord.nix
     ./librewolf.nix
     ./mpv.nix
-    ./vscode.nix
+    # ./vscode.nix
   ];
 }

home/apps/discord.nix

@@ -4,19 +4,17 @@
   ...
 }:
 let
-  catppuccin-discord = "${pkgs.catppuccin-discord}/share/catppuccin-discord/catppuccin-${config.catppuccin.flavor}-${config.catppuccin.accent}.theme.css";
-
   mergedThemes = pkgs.runCommand "mergedConfig" { } ''
     mkdir -p $out
-    cp ${catppuccin-discord} $out/catppuccin.css
+    cp ${pkgs.base16-discord-git}/base16.css $out/theme.css
   '';
 
   vesktopSettings = {
     discordBranch = "stable";
     minimizeToTray = true;
     arRPC = true;
-    splashColor = "${pkgs.catppuccin.rgb.${config.catppuccin.flavor}.text}";
-    splashBackground = "${pkgs.catppuccin.rgb.${config.catppuccin.flavor}.base}";
+    splashColor = config.scheme.withHashtag.base05;
+    splashBackground = config.scheme.withHashtag.base00;
     spellCheckLanguages = [
       "en-US"
       "en"
@@ -47,12 +45,31 @@ in
     force = true;
   };
 
-  home.file.".config/vesktop/settings/quickCss.css" = {
+  home.file.".config/vesktop/settings/quickCss.css" = with config.scheme.withHashtag; {
     text = ''
       * {
         font-family: "${config.userOptions.fontSans.name}" !important;
         font-size: ${toString config.userOptions.fontSans.size}px;
       }
+
+      :root {
+        --base00: ${base00};
+        --base01: ${base01};
+        --base02: ${base02};
+        --base03: ${base03};
+        --base04: ${base04};
+        --base05: ${base05};
+        --base06: ${base06};
+        --base07: ${base07};
+        --base08: ${base08};
+        --base09: ${base09};
+        --base0A: ${base0A};
+        --base0B: ${base0B};
+        --base0C: ${base0C};
+        --base0D: ${base0D};
+        --base0E: ${base0E};
+        --base0F: ${base0F};
+      }
     '';
     force = true;
   };

home/apps/librewolf.nix

@@ -12,45 +12,40 @@
     recursive = true;
   };
 
-  home.file.".librewolf/default/chrome/colors.css" =
-    let
-      color = pkgs.catppuccin.rgb.${config.catppuccin.flavor};
-      accent = color.${config.catppuccin.accent};
-    in
-    {
-      text = ''
-        * {
-          --accent: ${accent};
-          --rosewater: ${color.rosewater};
-          --flamingo: ${color.flamingo};
-          --pink: ${color.pink};
-          --mauve: ${color.mauve};
-          --red: ${color.red};
-          --maroon: ${color.maroon};
-          --peach: ${color.peach};
-          --yellow: ${color.yellow};
-          --green: ${color.green};
-          --teal: ${color.teal};
-          --sky: ${color.sky};
-          --sapphire: ${color.sapphire};
-          --blue: ${color.blue};
-          --lavender: ${color.lavender};
-          --text: ${color.text};
-          --subtext1: ${color.subtext1};
-          --subtext0: ${color.subtext0};
-          --overlay2: ${color.overlay2};
-          --overlay1: ${color.overlay1};
-          --overlay0: ${color.overlay0};
-          --surface2: ${color.surface2};
-          --surface1: ${color.surface1};
-          --surface0: ${color.surface0};
-          --base: ${color.base};
-          --mantle: ${color.mantle};
-          --crust: ${color.crust};
-        }
-      '';
-      force = true;
-    };
+  home.file.".librewolf/default/chrome/colors.css" = with config.scheme.withHashtag; {
+    text = ''
+      * {
+        --accent: ${base09};
+        --rosewater: ${base06};
+        --flamingo: ${base0F};
+        --pink: ${base17};
+        --mauve: ${base0E};
+        --red: ${base08};
+        --maroon: ${base12};
+        --peach: ${base09};
+        --yellow: ${base0A};
+        --green: ${base0B};
+        --teal: ${base0C};
+        --sky: ${base15};
+        --sapphire: ${base16};
+        --blue: ${base0D};
+        --lavender: ${base07};
+        --text: ${base05};
+        --subtext1: ${base04};
+        --subtext0: ${base04};
+        --overlay2: ${base03};
+        --overlay1: ${base03};
+        --overlay0: ${base03};
+        --surface2: ${base02};
+        --surface1: ${base01};
+        --surface0: ${base01};
+        --base: ${base00};
+        --mantle: ${base10};
+        --crust: ${base11};
+      }
+    '';
+    force = true;
+  };
 
   home.file.".local/share/firefoxpwa/profiles/01KEYXH9TC4B54J5CTPNE75JP0/prefs.js" = {
     text = ''

home/apps/mpv.nix

@@ -3,14 +3,6 @@
   pkgs,
   ...
 }:
-let
-  mergedConfig = pkgs.runCommand "mergedConfig" { } ''
-    mkdir -p $out
-    ${pkgs.gnused}/bin/sed 's/${pkgs.catppuccin.${config.catppuccin.flavor}.base}/#000000/g' \
-      ${pkgs.catppuccin-mpv-git}/themes/${config.catppuccin.flavor}/${config.catppuccin.accent}.conf \
-      > $out/mpv.conf
-  '';
-in
 {
   home.packages = with pkgs; [
     (mpv.override {
@@ -21,9 +13,31 @@ in
       ];
     })
   ];
-  home.file.".config/mpv" = {
-    source = mergedConfig;
-    recursive = true;
+  home.file.".config/mpv/mpv.conf" = {
+    text = with config.scheme; ''
+      # Credit to https://github.com/catppuccin/mpv
+      # Main mpv options
+      background-color='#000000'
+      osd-back-color='${config.scheme.withHashtag.base11}'
+      osd-border-color='${config.scheme.withHashtag.base11}'
+      osd-color='${config.scheme.withHashtag.base05}'
+      osd-shadow-color='${config.scheme.withHashtag.base00}'
+
+      # Stats script options
+      # Options are on separate lines for clarity
+      # Colors are in #BBGGRR format
+      script-opts-append=stats-border_color=${base08}
+      script-opts-append=stats-font_color=${base06}
+      script-opts-append=stats-plot_bg_border_color=${base16}
+      script-opts-append=stats-plot_bg_color=${base08}
+      script-opts-append=stats-plot_color=${base16}
+
+      # External script options
+      # It is fine to leave these here even if one does not use these scripts because they are just ignored unless a script uses them
+
+      # UOSC options
+      script-opts-append=uosc-color=foreground=${base09},foreground_text=${base01},background=${base00},background_text=${base05},curtain=${base10},success=${base0B},error=${base08}
+    '';
     force = true;
   };
 }

home/apps/vencord.nix

@@ -4,7 +4,7 @@
   useQuickCss = true;
   themeLinks = [ ];
   eagerPatches = false;
-  enabledThemes = [ "catppuccin.css" ];
+  enabledThemes = [ "theme.css" ];
   enableReactDevtools = false;
   frameless = false;
   transparent = true;