diff --git a/home/desktop/default.nix b/home/desktop/default.nix index a8cde11..e22cd02 100755 --- a/home/desktop/default.nix +++ b/home/desktop/default.nix @@ -32,7 +32,7 @@ config = { common."org.freedesktop.impl.portal.Secret" = [ "gnome-keyring" ]; common.default = [ "gtk" "gnome" ]; - sway.default = [ "gtk" "gnome" ]; + #sway.default = [ "gtk" "gnome" ]; hyprland.default = [ "hyprland" "gtk" "gnome" ]; }; configPackages = with pkgs; [ @@ -122,14 +122,14 @@ home = { - pointerCursor = { - gtk.enable = true; - package = pkgs.bibata-cursors; - name = "Bibata-Modern-Classic"; - size = 12; - }; + #pointerCursor = { + #gtk.enable = true; + #package = pkgs.bibata-cursors; + #name = "Bibata-Modern-Classic"; + #size = 12; + #}; - sessionVariables.GTK_THEME = "Adwaita-dark"; + #sessionVariables.GTK_THEME = "Adwaita-dark"; packages = with pkgs; [ ## auth/security diff --git a/home/desktop/gtk-qt.nix b/home/desktop/gtk-qt.nix index 1c317c9..afdb2e3 100755 --- a/home/desktop/gtk-qt.nix +++ b/home/desktop/gtk-qt.nix @@ -1,27 +1,27 @@ # GTK & QT theme configuration { config, pkgs, lib, ... }: let - accent = "#${config.theme.colors.color15}"; - foreground = "#${config.theme.colors.primary-fg}"; - background = "#${config.theme.colors.primary-bg}"; - background-alt = "#${config.theme.colors.alt-bg}"; + accent = "${config.theme.colors.color15}"; + foreground = "${config.theme.colors.primary-fg}"; + background = "${config.theme.colors.primary-bg}"; + background-alt = "${config.theme.colors.alt-bg}"; - c0 = "#${config.theme.colors.color0}"; - c1 = "#${config.theme.colors.color1}"; - c2 = "#${config.theme.colors.color2}"; - c3 = "#${config.theme.colors.color3}"; - c4 = "#${config.theme.colors.color4}"; - c5 = "#${config.theme.colors.color5}"; - c6 = "#${config.theme.colors.color6}"; - c7 = "#${config.theme.colors.color7}"; - c8 = "#${config.theme.colors.color8}"; - c9 = "#${config.theme.colors.color9}"; - c10 = "#${config.theme.colors.color10}"; - c11 = "#${config.theme.colors.color11}"; - c12 = "#${config.theme.colors.color12}"; - c13 = "#${config.theme.colors.color13}"; - c14 = "#${config.theme.colors.color14}"; - c15 = "#${config.theme.colors.color15}"; + c0 = "${config.theme.colors.color0}"; + c1 = "${config.theme.colors.color1}"; + c2 = "${config.theme.colors.color2}"; + c3 = "${config.theme.colors.color3}"; + c4 = "${config.theme.colors.color4}"; + c5 = "${config.theme.colors.color5}"; + c6 = "${config.theme.colors.color6}"; + c7 = "${config.theme.colors.color7}"; + c8 = "${config.theme.colors.color8}"; + c9 = "${config.theme.colors.color9}"; + c10 = "${config.theme.colors.color10}"; + c11 = "${config.theme.colors.color11}"; + c12 = "${config.theme.colors.color12}"; + c13 = "${config.theme.colors.color13}"; + c14 = "${config.theme.colors.color14}"; + c15 = "${config.theme.colors.color15}"; in { qt = { @@ -36,19 +36,26 @@ in { theme = lib.mkForce { name = "FlatColor"; }; iconTheme = { - package = pkgs.kora-icon-theme; - name = "Kora"; + package = pkgs.flat-remix-icon-theme; + name = "Flat-Remix-Grey-Darkest"; }; - font = { - name = "${config.theme.font}"; - }; + font = { name = "${config.theme.font}"; }; gtk3.extraConfig = { gtk-application-prefer-dark-theme = 1; }; gtk4.extraConfig = { gtk-application-prefer-dark-theme = 1; }; }; + sessionVariables.GTK_THEME = "FlatColor"; + + home.pointerCursor = { + gtk.enable = true; + package = pkgs.bibata-cursors; + name = "Bibata-Modern-Classic"; + size = 12; + }; + home.file = { ".local/share/themes/FlatColor" = { recursive = true;