flake.nix

@@ -29,14 +29,14 @@
     tt-schemes,
     ...
   }: let
-    catppuccinVariant = "Latte";
     defaultExtraSpecialArgs = {
       system ? "x86_64-linux",
       hostname ? "Atlas",
       ...
     }: rec {
-      inherit hostname catppuccinVariant;
+      inherit hostname;
       accentColour = "base07"; # catppuccin lavender
+      catppuccinVariant = "Mocha";
       iosevkaCustom = {
         packages = iosevka-custom.outputs.packages.${system};
         names = iosevka-custom.outputs.names;
@@ -66,9 +66,9 @@
     }: [
       base16.homeManagerModule
       ./home/${hostname}.nix
-      ({lib, ...}: {
+      ({...}: {
         home = {inherit username;};
-        scheme = "${tt-schemes}/base16/catppuccin-${lib.strings.toLower catppuccinVariant}.yaml";
+        scheme = "${tt-schemes}/base16/catppuccin-mocha.yaml";
       })
     ];
   in {

home/default.nix

@@ -2,7 +2,6 @@
   config,
   lib,
   pkgs,
-  catppuccinVariant ? "Mocha",
   ...
 }: {
   imports = [
@@ -37,11 +36,7 @@
   };
   gtk = with lib.strings; let
     accent = "Lavender";
-    variant = catppuccinVariant;
+    variant = "Mocha";
-    type =
-      if variant == "Latte"
-      then "Light"
-      else "Dark";
   in {
     enable = true;
     iconTheme = {
@@ -52,8 +47,8 @@
       name = "Papirus-Dark";
     };
     cursorTheme = {
-      package = pkgs.catppuccin-cursors."${toLower variant}${type}";
+      package = pkgs.catppuccin-cursors."${toLower variant}Dark";
-      name = "Catppuccin-${variant}-${type}-Cursors";
+      name = "Catppuccin-${variant}-Dark-Cursors";
       size = 32;
     };
     theme = let
@@ -64,7 +59,7 @@
         size = toLower size;
         variant = toLower variant;
       };
-      name = "Catppuccin-${variant}-${size}-${accent}-${type}";
+      name = "Catppuccin-${variant}-${size}-${accent}-Dark";
     };
   };
   xdg = {

home/work.nix

@@ -22,7 +22,7 @@
     awayOnSystemIdle = true;
     closeAppOnCross = true;
     electronCLIFlags = lib.mkIf config.wayland.windowManager.sway.enable [["ozone-platform" "wayland"]];
-    followSystemTheme = false;
+    followSystemTheme = true;
     notificationMethod = "electron";
     optInTeamsV2 = true;
     spellCheckerLanguages = ["en_GB"];

programs/desktop/default.nix

@@ -15,7 +15,7 @@
   home.packages = with pkgs; [
     swaybg
     (writeShellScriptBin "set-background" ''
-      ${swaybg}/bin/swaybg -m fill -i ${./wallpapers/landscapes/tropic_island_day.jpg}
+      ${swaybg}/bin/swaybg -m fill -i ${./wallpapers/default.jpg}
     '')
     (writeShellScriptBin "protonmail-setup-bridge" ''
       pkill -9 -f protonmail-bridge

programs/desktop/swaylock/default.nix

@@ -22,20 +22,30 @@
       effect-vignette = "0.5:0.5";
       grace = 2;
       fade-in = 0.2;
+      # color = base00;
       bs-hl-color = base06;
       caps-lock-bs-hl-color = base06;
       caps-lock-key-hl-color = green;
-      inside-color = "${base00}cc";
+      # inside-color = 00000000;
+      # inside-clear-color = 00000000;
+      # inside-caps-lock-color = 00000000;
+      # inside-ver-color = 00000000;
+      # inside-wrong-color = 00000000;
       key-hl-color = green;
-      layout-bg-color = "${base00}cc";
+      # layout-bg-color = 00000000;
-      layout-border-color = config.scheme.${accentColour};
+      # layout-border-color = 00000000;
       layout-text-color = base05;
+      # line-color = 00000000;
+      # line-clear-color = 00000000;
+      # line-caps-lock-color = 00000000;
+      # line-ver-color = 00000000;
+      # line-wrong-color = 00000000;
       ring-color = config.scheme.${accentColour};
       ring-clear-color = base06;
       ring-caps-lock-color = base09;
       ring-ver-color = blue;
       ring-wrong-color = red;
-      separator-color = base01;
+      # separator-color = 00000000;
       text-color = base05;
       text-clear-color = base06;
       text-caps-lock-color = base09;

programs/firefox/default.nix

@@ -54,10 +54,6 @@
             installation_mode = "force_installed";
             install_url = "https://addons.mozilla.org/firefox/downloads/latest/simplelogin/latest.xpi";
           };
-          "{bc6fdbef-4c18-4967-9899-7803fdcaf3b4}" = {
-            installation_mode = "force_installed";
-            install_url = "https://addons.mozilla.org/firefox/downloads/latest/catppuccin-latte-lavender-git/latest.xpi";
-          };
           "{8446b178-c865-4f5c-8ccc-1d7887811ae3}" = {
             installation_mode = "force_installed";
             install_url = "https://addons.mozilla.org/firefox/downloads/latest/catppuccin-mocha-lavender-git/latest.xpi";
@@ -113,7 +109,7 @@
           "browser.warnOnQuitShortcut" = false;
           "distribution.searchplugins.defaultLocale" = "en-GB";
           "doh-rollout.home-region" = "GB";
-          "extensions.activeThemeID" = "{bc6fdbef-4c18-4967-9899-7803fdcaf3b4}";
+          "extensions.activeThemeID" = "{c6698fd1-fe9b-4eae-95d5-fe1703820469}";
           "extensions.formautofill.creditCards.enabled" = false;
           "general.useragent.locale" = "en-GB";
           "intl.accept_languages" = "en-gb,en";

programs/shell/default.nix

@@ -1,7 +1,6 @@
 {
   lib,
   pkgs,
-  catppuccinVariant ? "Mocha",
   ...
 }: {
   imports = [
@@ -27,7 +26,7 @@
     bat = {
       enable = true;
       config = {
-        theme = "catppuccin${catppuccinVariant}";
+        theme = "catppuccinMocha";
         style = "plain,numbers,changes";
       };
     };