From 340d17811104bbd2e0996743468055bf6cd05055 Mon Sep 17 00:00:00 2001 From: 514fpv Date: Sun, 28 Jan 2024 10:38:29 +0800 Subject: [PATCH] feat(gui): switch to papirus icon theme --- global/gpu/greetd.nix | 4 ++-- home/gui/home.nix | 18 +++++++++--------- home/gui/nixos.nix | 2 +- 3 files changed, 12 insertions(+), 12 deletions(-) diff --git a/global/gpu/greetd.nix b/global/gpu/greetd.nix index 507e9a36..ed9231da 100644 --- a/global/gpu/greetd.nix +++ b/global/gpu/greetd.nix @@ -5,7 +5,7 @@ cfg = config.global.gpu; in mkIf (cfg.enable && cfg.session) { programs.regreet = { - enable = true; + enable = mkDefault true; cageArgs = [ "-s" "-d" "-m" "last" ]; settings = { background.path = ../../share/54345906_p0.jpg; @@ -13,7 +13,7 @@ in mkIf (cfg.enable && cfg.session) { GTK = { application_prefer_dark_theme = true; cursor_theme_name = "Bibata-Modern-Classic"; - icon_theme_name = "WhiteSur-dark"; + icon_theme_name = "Papirus-Dark"; theme_name = "WhiteSur-Dark"; }; }; diff --git a/home/gui/home.nix b/home/gui/home.nix index b6aca66f..db833554 100644 --- a/home/gui/home.nix +++ b/home/gui/home.nix @@ -4,26 +4,26 @@ , ... }: with lib; mkIf config.passthrough.gui { # cursor theme home.pointerCursor = { - package = pkgs.bibata-cursors; - name = "Bibata-Modern-Classic"; + package = mkDefault pkgs.bibata-cursors; + name = mkDefault "Bibata-Modern-Classic"; size = 24; }; # gtk theme gtk.theme = { - package = pkgs.whitesur-gtk-theme; - name = "WhiteSur-Dark"; + package = mkDefault pkgs.whitesur-gtk-theme; + name = mkDefault "WhiteSur-Dark"; }; # gtk icons gtk.iconTheme = { - package = pkgs.whitesur-icon-theme; - name = "WhiteSur-dark"; + package = mkDefault pkgs.papirus-icon-theme; + name = mkDefault "Papirus-Dark"; }; # unify qt theme - qt.platformTheme = "gtk"; + qt.platformTheme = mkDefault "gtk"; - gtk.enable = true; - qt.enable = true; + gtk.enable = mkDefault true; + qt.enable = mkDefault true; } diff --git a/home/gui/nixos.nix b/home/gui/nixos.nix index 605e5acb..abde0634 100644 --- a/home/gui/nixos.nix +++ b/home/gui/nixos.nix @@ -14,7 +14,7 @@ in { # themes and icons environment.systemPackages = with pkgs; mkIf gui [ whitesur-gtk-theme whitesur-icon-theme - bibata-cursors + papirus-icon-theme bibata-cursors ]; fonts.enableDefaultPackages = mkIf gui true;