diff --git a/modules/home-manager/desktops/hyprland/default.nix b/modules/home-manager/desktops/hyprland/default.nix index 6e4af6e..ebe43d8 100644 --- a/modules/home-manager/desktops/hyprland/default.nix +++ b/modules/home-manager/desktops/hyprland/default.nix @@ -32,8 +32,8 @@ general = { layout = "master"; resize_on_border = true; - extend_border_grab_area = 2; - border_size = 2; + extend_border_grab_area = 4; + border_size = 1; gaps_in = 12; gaps_out = 24; }; @@ -83,13 +83,15 @@ # Flameshot fixes "float,class:^(flameshot)$" "animation fade,class:^(flameshot)$" + + "float,class:^(zenity)$" ]; xwayland.force_zero_scaling = true; misc = { layers_hog_keyboard_focus = false; disable_splash_rendering = true; disable_hyprland_logo = true; - background_color = "0x000000"; + background_color = "rgb(000000)"; force_default_wallpaper = 0; vrr = 2; }; @@ -195,8 +197,6 @@ gtk = { enable = true; - #gtk3.extraCss = builtins.readFile ./gtk.css; - #gtk4.extraCss = builtins.readFile ./gtk.css; iconTheme = { name = "Tela"; package = pkgs.tela-icon-theme; diff --git a/modules/nixos/theming/anyrun.css b/modules/nixos/theming/anyrun.css index 1c73e6e..5e9134b 100644 --- a/modules/nixos/theming/anyrun.css +++ b/modules/nixos/theming/anyrun.css @@ -1,4 +1,7 @@ box#main { - background: rgba({{colors.surface.default.red}}, {{colors.surface.default.green}}, {{colors.surface.default.blue}}, 0.4); + background: alpha({{colors.surface.default.hex}}, 0.4); +} + +* { color: {{colors.on_surface.default.hex}}; } diff --git a/modules/nixos/theming/discord-b.css b/modules/nixos/theming/discord-b.css new file mode 100644 index 0000000..47223e2 --- /dev/null +++ b/modules/nixos/theming/discord-b.css @@ -0,0 +1,47 @@ +/** + * @name Matugen + * @author Theaninova + * @version 6.9.0 + * @description reactive material theme + */ + +@import url(https://mwittrien.github.io/BetterDiscordAddons/Themes/BasicBackground/BasicBackground.css); + +:root { + --transparencycolor: {{colors.surface.default.red}}, {{colors.surface.default.green}}, {{colors.surface.default.blue}}; + --transparencyalpha: 0.8; + --messagetransparency: 0; + --guildchanneltransparency: 0; + --chatinputtransparency: 0; + --memberlisttransparency: 0; + --accentcolor: {{colors.surface_variant.default.red}}, {{colors.surface_variant.default.green}}, {{colors.surface_variant.default.blue}}; + + --settingsicons: 1; + --font: "NotoSans Nerd Font"; + --textshadow: transparent; + + --background: transparent; + --backgroundposition: center; + --backgroundsize: cover; + --backgroundblur: 0; + + --popout: var(--background); + --popoutposition: var(--backgroundposition); + --popoutsize: var(--backgroundsize); + --popoutblur: var(--backgroundblur); + + --backdrop: rgba({{colors.surface.default.red}}, {{colors.surface.default.green}}, {{colors.surface.default.blue}}, 0.8); + --backdropposition: center; + --backdropsize: cover: --backdropblur: 0; + + --textbrightest: {{colors.primary.default.red}}, {{colors.primary.default.green}}, {{colors.primary.default.blue}}; + --textbrighter: {{colors.on_surface.default.red}}, {{colors.on_surface.default.green}}, {{colors.on_surface.default.blue}}; + --textbright: {{colors.tertiary.default.red}}, {{colors.tertiary.default.green}}, {{colors.tertiary.default.blue}}; + --textdark: {{colors.on_surface_variant.default.red}}, {{colors.on_surface_variant.default.green}}, {{colors.on_surface_variant.default.blue}}; + --textdarker: {{colors.secondary.default.red}}, {{colors.secondary.default.green}}, {{colors.secondary.default.blue}}; + --textdarkest: {{colors.outline.default.red}}, {{colors.outline.default.green}}, {{colors.outline.default.blue}}; + + --text-link: {{colors.primary.default.red}}, {{colors.primary.default.green}}, {{colors.primary.default.blue}}; + + --version1_0_5: none; /* DO NOT CHANGE THIS VARIABLE , USED TO HIDE UPDATE NOTICE */ +} diff --git a/modules/nixos/theming/discord.css b/modules/nixos/theming/discord.css new file mode 100644 index 0000000..88b575a --- /dev/null +++ b/modules/nixos/theming/discord.css @@ -0,0 +1,83 @@ +/** + * @name Matugen + * @author Theaninova + * @version 6.9.0 + * @description reactive material theme + */ + +@import url("https://clearvision.github.io/ClearVision-v6/main.css"); + +:root { + --text-normal: {{colors.on_surface.default.hex}}; + --main-color: {{colors.primary.default.hex}}; + --hover-color: {{colors.tertiary.default.hex}}; + --success-color: {{colors.ok.default.hex}}; + --danger-color: {{colors.error.default.hex}}; + --url-color: var(--main-color); + --background-image: transparent; + --background-shading: 0%; + --background-position: center; + --background-size: cover; + --background-repeat: no-repeat; + --background-attachment: fixed; + --background-brightness: 100%; + --background-contrast: 100%; + --background-saturation: 100%; + --background-grayscale: 0%; + --background-invert: 0%; + --background-blur: 0px; + --background-overlay: rgba({{colors.surface.default.red}}, {{colors.surface.default.green}}, {{colors.surface.default.blue}}, 0.8); + --user-popout-image: url("https://clearvision.github.io/images/sapphire.jpg"); + --user-popout-position: center; + --user-popout-size: cover; + --user-popout-repeat: no-repeat; + --user-popout-attachment: fixed; + --user-popout-brightness: 100%; + --user-popout-contrast: 100%; + --user-popout-saturation: 100%; + --user-popout-grayscale: 0%; + --user-popout-invert: 0%; + --user-popout-blur: 3px; + --user-modal-image: url("https://clearvision.github.io/images/sapphire.jpg"); + --user-modal-position: center; + --user-modal-size: cover; + --user-modal-repeat: no-repeat; + --user-modal-attachment: fixed; + --user-modal-brightness: 100%; + --user-modal-contrast: 100%; + --user-modal-saturation: 100%; + --user-modal-grayscale: 0%; + --user-modal-invert: 0%; + --user-modal-blur: 3px; + --home-icon: url("https://clearvision.github.io/icons/discord.svg"); + --home-position: center; + --home-size: 40px; + --channel-unread: var(--main-color); + --channel-color: {{colors.on_surface.default.hex}}; + --muted-color: {{colors.outline.default.hex}}; + --online-color: {{colors.green.default.hex}}; + --idle-color: {{colors.yellow.default.hex}}; + --dnd-color: {{colors.red.default.hex}}; + --streaming-color: {{colors.magenta.default.hex}}; + --offline-color: {{colors.outline.default.hex}}; + --main-font: NotoSans Nerd Font; + --code-font: FiraCode Nerd Font; + --channels-width: 220px; + --members-width: 240px; + --backdrop-overlay: rgba({{colors.surface.default.red}}, {{colors.surface.default.green}}, {{colors.surface.default.blue}}, 0.8); + --backdrop-image: var(--background-image); + --backdrop-position: var(--background-position); + --backdrop-size: var(--background-size); + --backdrop-repeat: var(--background-repeat); + --backdrop-attachment: var(--background-attachment); + --backdrop-brightness: var(--background-brightness); + --backdrop-contrast: var(--background-contrast); + --backdrop-saturation: var(--background-saturation); + --backdrop-invert: var(--background-invert); + --backdrop-grayscale: var(--background-grayscale); + --backdrop-sepia: var(--background-sepia); + --backdrop-blur: var(--background-blur); + --bd-blue: var(--main-color); + --bd-blue-hover: var(--hover-color); + --bd-blue-active: var(--hover-color); +} diff --git a/modules/nixos/theming/gtk.css b/modules/nixos/theming/gtk.css new file mode 100644 index 0000000..87a17bd --- /dev/null +++ b/modules/nixos/theming/gtk.css @@ -0,0 +1,34 @@ +@define-color accent_color {{colors.primary.default.hex}}; +@define-color accent_bg_color {{colors.primary_container.default.hex}}; +@define-color accent_fg_color {{colors.on_primary.default.hex}}; + +@define-color destructive_color {{colors.error.default.hex}}; +@define-color destructive_bg_color {{colors.error_container.default.hex}}; +@define-color destructive_fg_color {{colors.on_error.default.hex}}; + +@define-color success_color {{colors.ok.default.hex}}; +@define-color success_bg_color {{colors.ok_container.default.hex}}; +@define-color success_fg_color {{colors.on_ok.default.hex}}; + +@define-color warning_color {{colors.warn.default.hex}}; +@define-color warning_bg_color {{colors.warn_container.default.hex}}; +@define-color warning_fg_color {{colors.on_warn.default.hex}}; + +@define-color error_color {{colors.error.default.hex}}; +@define-color error_bg_color {{colors.error_container.default.hex}}; +@define-color error_fg_color {{colors.on_error.default.hex}}; + +@define-color window_bg_color alpha({{colors.surface.default.hex}}, 0.8); +@define-color window_fg_color {{colors.on_surface.default.hex}}; + +@define-color view_bg_color @window_bg_color; +@define-color view_fg_color @window_fg_color; + +@define-color headerbar_bg_color @window_bg_color; +@define-color headerbar_fg_color @window_fg_color; +@define-color headerbar_backdrop_color alpha({{colors.surface_variant.default.hex}}, 0.2); + +@define-color sidebar_bg_color alpha({{colors.surface_variant.default.hex}}, 0.2); +@define-color sidebar_fg_color {{colors.on_surface_variant.default.hex}}; +@define-color sidebar_backdrop_color alpha({{colors.surface_variant.default.hex}}, 0.2); + diff --git a/modules/nixos/theming/matugen.nix b/modules/nixos/theming/matugen.nix index e03bc1d..0492771 100644 --- a/modules/nixos/theming/matugen.nix +++ b/modules/nixos/theming/matugen.nix @@ -76,9 +76,9 @@ in else GTK_THEME="adw-gtk3-dark" fi + matugen image "$WALLPAPER" --mode "$MODE" dconf write /org/gnome/desktop/interface/gtk-theme "'$GTK_THEME'" dconf write /org/gnome/desktop/interface/color-scheme "'prefer-$MODE'" - matugen image "$WALLPAPER" --mode "$MODE" for i in $(pgrep -u "$USER" -x nvim); do kill -USR1 "$i" @@ -97,6 +97,11 @@ in include ${homeCfg.xdg.configHome}/kitty/theme.conf ''; + gtk = { + gtk3.extraCss = "@import './theme.css';"; + gtk4.extraCss = "@import './theme.css';"; + }; + xdg.configFile."matugen/config.toml".source = (pkgs.formats.toml { }).generate "matugen" { config = { reload_apps = true; @@ -146,6 +151,18 @@ in input_path = ./anyrun.css; output_path = "${homeCfg.xdg.configHome}/anyrun/theme.css"; }; + gtk3 = { + input_path = ./gtk.css; + output_path = "${homeCfg.xdg.configHome}/gtk-3.0/theme.css"; + }; + gtk4 = { + input_path = ./gtk.css; + output_path = "${homeCfg.xdg.configHome}/gtk-4.0/theme.css"; + }; + vesktop = { + input_path = ./discord-b.css; + output_path = "${homeCfg.xdg.configHome}/vesktop/themes/matugen.theme.css"; + }; }; }; };