diff --git a/home/avizo/default.nix b/home/avizo/default.nix index 55d84238..3305ec66 100644 --- a/home/avizo/default.nix +++ b/home/avizo/default.nix @@ -5,15 +5,19 @@ }: { services.avizo = { enable = true; - settings.default = with config.lib.stylix; - with colors; let - opacity = kind: (toString config.stylix.opacity.${kind}); + settings.default = with config.stylix; + with config.lib.stylix.colors; let + accent = with config.lib.stylix; { + r = colors."${accentColour}-rgb-r"; + g = colors."${accentColour}-rgb-g"; + b = colors."${accentColour}-rgb-b"; + }; in { - background = "rgba(${base00-rgb-r}, ${base00-rgb-g}, ${base00-rgb-b}, ${opacity "popups"})"; - bar-bg-color = "rgba(${base00-rgb-r}, ${base00-rgb-g}, ${base00-rgb-b}, ${opacity "popups"})"; - bar-fg-color = "rgba(${base05-rgb-r}, ${base05-rgb-g}, ${base05-rgb-b}, ${opacity "desktop"})"; - border-color = "rgba(${colors."${accentColour}-rgb-r"}, ${colors."${accentColour}-rgb-g"}, ${colors."${accentColour}-rgb-b"}, ${opacity "desktop"})"; - image-opacity = opacity "desktop"; + background = "rgba(${base00-rgb-r}, ${base00-rgb-g}, ${base00-rgb-b}, ${toString opacity.popups})"; + bar-bg-color = "rgba(${base00-rgb-r}, ${base00-rgb-g}, ${base00-rgb-b}, ${toString opacity.popups})"; + bar-fg-color = "rgba(${base05-rgb-r}, ${base05-rgb-g}, ${base05-rgb-b}, 1.0)"; + border-color = "rgba(${accent.r}, ${accent.g}, ${accent.b}, 1.0)"; + image-opacity = "1.0"; }; }; } diff --git a/home/emacs/default.nix b/home/emacs/default.nix index 299a4ab5..59d826fe 100644 --- a/home/emacs/default.nix +++ b/home/emacs/default.nix @@ -6,7 +6,8 @@ imports = [../git/default.nix ../prog/default.nix]; programs.git.extraConfig.core.editor = "${config.programs.emacs.finalPackage}/bin/emacsclient -c"; programs.emacs = { - # Clone emacs config from https://git.xenia.me.uk/xenia/emacs.git + # Clone emacs config from https://git.xenia.me.uk/pixelifytica/emacs.git + # git clone https://git.xenia.me.uk/pixelifytica/emacs.git ~/.config/emacs enable = true; package = pkgs.emacs29-pgtk; extraConfig = with builtins; diff --git a/home/hyprland/default.nix b/home/hyprland/default.nix index 9a092061..97597e8e 100644 --- a/home/hyprland/default.nix +++ b/home/hyprland/default.nix @@ -368,7 +368,7 @@ monitor = path = screenshot blur_passes = 3 - color = 0xff${base00} + color = 0xff${accent} } # TIME diff --git a/home/rofi/default.nix b/home/rofi/default.nix index 429828fe..49278762 100644 --- a/home/rofi/default.nix +++ b/home/rofi/default.nix @@ -32,10 +32,12 @@ display-ssh = " 󰢹 SSH "; display-combi = " 󰛡 Combi "; }; - theme = with config.lib.stylix.colors; let + theme = with builtins; + with config.stylix; + with config.lib.stylix.colors; let inherit (config.lib.formats.rasi) mkLiteral; - bg = mkLiteral "rgba (${base00-rgb-r}, ${base00-rgb-g}, ${base00-rgb-b}, 50%)"; - bg2 = mkLiteral "rgba (${base01-rgb-r}, ${base01-rgb-g}, ${base01-rgb-b}, 80%)"; + bg = mkLiteral "rgba (${base00-rgb-r}, ${base00-rgb-g}, ${base00-rgb-b}, ${toString (floor (mul opacity.popups 100))}%)"; + bg2 = mkLiteral "rgba (${base01-rgb-r}, ${base01-rgb-g}, ${base01-rgb-b}, 100%)"; fg = mkLiteral withHashtag.base05; fg2 = mkLiteral withHashtag.base04; border = mkLiteral withHashtag.${accentColour}; diff --git a/home/swaync/default.nix b/home/swaync/default.nix index 9b45e3ad..3120866a 100644 --- a/home/swaync/default.nix +++ b/home/swaync/default.nix @@ -5,7 +5,8 @@ ... }: { home.packages = [pkgs.swaynotificationcenter]; - xdg.configFile."swaync/style.css".text = with config.lib.stylix.colors; '' + xdg.configFile."swaync/style.css".text = with config.stylix; + with config.lib.stylix.colors; '' * { all: unset; font-size: ${toString config.stylix.fonts.sizes.desktop}px; @@ -17,7 +18,7 @@ border-radius: 10px; border: 1px solid ${withHashtag.${accentColour}}; margin: 18px; - background-color: rgba(${base00-rgb-r}, ${base00-rgb-g}, ${base00-rgb-b}, 0.5); + background-color: rgba(${base00-rgb-r}, ${base00-rgb-g}, ${base00-rgb-b}, ${toString opacity.popups}); color: ${withHashtag.base05}; padding: 0; } @@ -140,7 +141,7 @@ border-radius: 10px; border: 1px solid ${withHashtag.${accentColour}}; margin: 18px; - background-color: rgba(${base00-rgb-r}, ${base00-rgb-g}, ${base00-rgb-b}, 0.5); + background-color: rgba(${base00-rgb-r}, ${base00-rgb-g}, ${base00-rgb-b}, ${toString opacity.popups}); color: ${withHashtag.base05}; padding: 14px; } diff --git a/home/swaync/style.css b/home/swaync/style.css deleted file mode 100644 index 7c125c58..00000000 --- a/home/swaync/style.css +++ /dev/null @@ -1,343 +0,0 @@ -* { - all: unset; - font-size: 20px; - font-family: "Iosevka Nerd Font"; - transition: 200ms; -} - -.floating-notifications.background .notification-row .notification-background { - border-radius: 10px; - border: 1px solid #b4befe; - margin: 18px; - background-color: rgba(13, 14, 28, 0.5); - color: #ffffff; - padding: 0; -} - -.floating-notifications.background - .notification-row - .notification-background - .notification { - padding: 7px; - border-radius: 10px; -} - -.floating-notifications.background - .notification-row - .notification-background - .notification - .notification-content { - margin: 7px; -} - -.floating-notifications.background - .notification-row - .notification-background - .notification - .notification-content - .summary { - color: #ffffff; -} - -.floating-notifications.background - .notification-row - .notification-background - .notification - .notification-content - .time { - color: #c6daff; -} - -.floating-notifications.background - .notification-row - .notification-background - .notification - .notification-content - .body { - color: #ffffff; -} - -.floating-notifications.background - .notification-row - .notification-background - .notification - > *:last-child - > * { - min-height: 3.4em; -} - -.floating-notifications.background - .notification-row - .notification-background - .notification - > *:last-child - > * - .notification-action { - border-radius: 10px; - background-color: #292d48; - color: #ffffff; - margin: 7px; -} - -.floating-notifications.background - .notification-row - .notification-background - .notification - > *:last-child - > * - .notification-action:hover { - background-color: #484d67; - color: #ffffff; -} - -.floating-notifications.background - .notification-row - .notification-background - .notification - > *:last-child - > * - .notification-action:active { - background-color: #74c7ec; - color: #000000; -} - -.floating-notifications.background - .notification-row - .notification-background - .close-button { - margin: 7px; - padding: 2px; - border-radius: 10px; - background-color: #f38ba8; - color: #000000; -} - -.floating-notifications.background - .notification-row - .notification-background - .close-button:hover { - background-color: #eba0ac; - color: #000000; -} - -.floating-notifications.background - .notification-row - .notification-background - .close-button:active { - background-color: #f38ba8; - color: #000000; -} - -.control-center { - border-radius: 10px; - border: 1px solid #b4befe; - margin: 18px; - background-color: rgba(13, 14, 28, 0.5); - color: #ffffff; - padding: 14px; -} - -.control-center .widget-title { - color: #ffffff; - font-size: 1.3em; -} - -.control-center .widget-title button { - border-radius: 7px; - background-color: #292d48; - color: #ffffff; - padding: 8px; -} - -.control-center .widget-title button:hover { - background-color: #484d67; - color: #ffffff; -} - -.control-center .widget-title button:active { - background-color: #74c7ec; - color: #000000; -} - -.control-center .notification-row .notification-background { - border-radius: 10px; - background-color: #1d2235; - color: #ffffff; - margin-top: 14px; -} - -.control-center .notification-row .notification-background .notification { - padding: 7px; - border-radius: 7px; -} - -.control-center - .notification-row - .notification-background - .notification - .notification-content { - margin: 7px; -} - -.control-center - .notification-row - .notification-background - .notification - .notification-content - .summary { - color: #ffffff; -} - -.control-center - .notification-row - .notification-background - .notification - .notification-content - .time { - color: #989898; -} - -.control-center - .notification-row - .notification-background - .notification - .notification-content - .body { - color: #ffffff; -} - -.control-center - .notification-row - .notification-background - .notification - > *:last-child - > * { - min-height: 3.4em; -} - -.control-center - .notification-row - .notification-background - .notification - > *:last-child - > * - .notification-action { - border-radius: 7px; - background-color: #292d48; - color: #ffffff; - margin: 7px; -} - -.control-center - .notification-row - .notification-background - .notification - > *:last-child - > * - .notification-action:hover { - background-color: #484d67; - color: #ffffff; -} - -.control-center - .notification-row - .notification-background - .notification - > *:last-child - > * - .notification-action:active { - background-color: #74c7ec; - color: #000000; -} - -.control-center .notification-row .notification-background .close-button { - margin: 7px; - padding: 2px; - border-radius: 6.3px; - background-color: #eba0ac; - color: #000000; -} - -.control-center .notification-row .notification-background .close-button:hover { - background-color: #f38ba8; - color: #000000; -} - -.control-center - .notification-row - .notification-background - .close-button:active { - background-color: #f38ba8; - color: #000000; -} - -.control-center .notification-row .notification-background:hover { - background-color: #1d2235; - color: #ffffff; -} - -.control-center .notification-row .notification-background:active { - background-color: #74c7ec; - color: #000000; -} - -progressbar, -progress, -trough { - border-radius: 12.6px; -} - -.notification.critical progress { - background-color: #f38ba8; -} - -.notification.low progress, -.notification.normal progress { - background-color: #89b4fa; -} - -trough { - background-color: #0d0e1c; -} - -.control-center trough { - background-color: #1d2235; -} - -.control-center-dnd { - margin-top: 5px; - border-radius: 8px; - background: #0d0e1c; - border: 1px solid #1d2235; -} - -.control-center-dnd:checked { - background: #0d0e1c; -} - -.control-center-dnd slider { - background: #1d2235; - border-radius: 8px; -} - -.widget-dnd { - margin: 0px; - font-size: 1.1rem; -} - -.widget-dnd > switch { - font-size: initial; - border-radius: 8px; - background: #0d0e1c; - border: 1px solid #1d2235; -} - -.widget-dnd > switch:checked { - background: #0d0e1c; -} - -.widget-dnd > switch slider { - background: #1d2235; - border-radius: 8px; - border: 1px solid #b4befe; -} diff --git a/home/waybar/default.nix b/home/waybar/default.nix index 9df5d551..51638d82 100644 --- a/home/waybar/default.nix +++ b/home/waybar/default.nix @@ -235,8 +235,8 @@ window > box { color: ${base05}; - background: alpha(${base00}, 0.5); - margin: 0px 10px 10px; + background: alpha(${base00}, ${toString opacity.desktop}); + margin: 0px 10px 5px; padding: 0px; border: 1px solid ${accent}; border-radius: 10px; @@ -244,8 +244,7 @@ tooltip { color: ${base05}; - /* Temp set alpha to 1.0 until I can sort out blurls issue */ - background: alpha(${base00}, 1); + background: alpha(${base00}, ${toString opacity.popups}); border: 1px solid ${accent}; border-radius: 10px; padding: 5px; diff --git a/system/stylix.nix b/system/stylix.nix index 9ea09520..22dea711 100644 --- a/system/stylix.nix +++ b/system/stylix.nix @@ -13,11 +13,13 @@ }; image = ../wallpapers/default.jpg; polarity = "dark"; - opacity = { - applications = 0.85; - desktop = 1.0; - popups = 0.5; - terminal = 0.85; + opacity = let + default = 0.65; + in { + applications = default; + desktop = default; + popups = default; + terminal = default; }; cursor = let variant = "${lib.strings.toLower catppuccinVariant}Dark";