diff --git a/flake.nix b/flake.nix index 62a904e..8398dab 100644 --- a/flake.nix +++ b/flake.nix @@ -29,14 +29,14 @@ tt-schemes, ... }: let + catppuccinVariant = "Latte"; defaultExtraSpecialArgs = { system ? "x86_64-linux", hostname ? "Atlas", ... }: rec { - inherit hostname; + inherit hostname catppuccinVariant; 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-mocha.yaml"; + scheme = "${tt-schemes}/base16/catppuccin-${lib.strings.toLower catppuccinVariant}.yaml"; }) ]; in { diff --git a/programs/desktop/default.nix b/programs/desktop/default.nix index 01db451..81e5849 100644 --- a/programs/desktop/default.nix +++ b/programs/desktop/default.nix @@ -15,7 +15,7 @@ home.packages = with pkgs; [ swaybg (writeShellScriptBin "set-background" '' - ${swaybg}/bin/swaybg -m fill -i ${./wallpapers/default.jpg} + ${swaybg}/bin/swaybg -m fill -i ${./wallpapers/landscapes/tropic_island_day.jpg} '') (writeShellScriptBin "protonmail-setup-bridge" '' pkill -9 -f protonmail-bridge diff --git a/programs/firefox/default.nix b/programs/firefox/default.nix index b8060d3..621e950 100644 --- a/programs/firefox/default.nix +++ b/programs/firefox/default.nix @@ -54,6 +54,10 @@ 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"; @@ -109,7 +113,7 @@ "browser.warnOnQuitShortcut" = false; "distribution.searchplugins.defaultLocale" = "en-GB"; "doh-rollout.home-region" = "GB"; - "extensions.activeThemeID" = "{c6698fd1-fe9b-4eae-95d5-fe1703820469}"; + "extensions.activeThemeID" = "{bc6fdbef-4c18-4967-9899-7803fdcaf3b4}"; "extensions.formautofill.creditCards.enabled" = false; "general.useragent.locale" = "en-GB"; "intl.accept_languages" = "en-gb,en";