diff --git a/home/apps/gtk.nix b/home/apps/gtk.nix index d6e4d0d..d317c51 100644 --- a/home/apps/gtk.nix +++ b/home/apps/gtk.nix @@ -1,14 +1,18 @@ { config, + lib, pkgs, ... -}: rec { - gtk = { +}: let + inherit (pkgs.stdenv) isLinux; +in { + home.pointerCursor = lib.mkIf isLinux { + name = "macOS-Monterey"; + package = pkgs.nur.repos.nekowinston.apple-cursor; + size = 24; + }; + gtk = lib.mkIf isLinux { enable = true; - cursorTheme = { - name = "Numix-Cursor"; - package = pkgs.numix-cursor-theme; - }; iconTheme = { name = "Papirus-Dark"; package = pkgs.catppuccin-papirus-folders.override { @@ -40,13 +44,14 @@ }; xdg = let - themeDir = "${gtk.theme.package}/share/themes/${gtk.theme.name}"; - in { - configFile."gtk-4.0/assets" = { - source = "${themeDir}/gtk-4.0/assets"; - recursive = true; + themeDir = "${config.gtk.theme.package}/share/themes/${config.gtk.theme.name}"; + in + lib.mkIf config.gtk.enable { + configFile."gtk-4.0/assets" = { + source = "${themeDir}/gtk-4.0/assets"; + recursive = true; + }; + configFile."gtk-4.0/gtk.css".source = "${themeDir}/gtk-4.0/gtk.css"; + configFile."gtk-4.0/gtk-dark.css".source = "${themeDir}/gtk-4.0/gtk-dark.css"; }; - configFile."gtk-4.0/gtk.css".source = "${themeDir}/gtk-4.0/gtk.css"; - configFile."gtk-4.0/gtk-dark.css".source = "${themeDir}/gtk-4.0/gtk-dark.css"; - }; } diff --git a/machines/common/linux/greeter.nix b/machines/common/linux/greeter.nix index 4970863..ecb713c 100644 --- a/machines/common/linux/greeter.nix +++ b/machines/common/linux/greeter.nix @@ -9,7 +9,7 @@ scale 2 } exec "dbus-update-activation-environment --systemd DISPLAY WAYLAND_DISPLAY SWAYSOCK XDG_CURRENT_DESKTOP" - seat seat0 xcursor_theme "Numix-Cursor" 24 + seat seat0 xcursor_theme "macOS Monterey" 24 xwayland disable exec "${lib.getExe config.programs.regreet.package}; swaymsg exit" ''; @@ -23,7 +23,7 @@ in { }; GTK = { font_name = "IBM Plex Mono 16"; - cursor_theme_name = "Numix-Cursor"; + cursor_theme_name = "macOS Monterey"; icon_theme_name = "Papirus-Dark"; theme_name = "Catppuccin-Mocha-Compact-Pink-Dark"; }; @@ -78,7 +78,7 @@ in { flavor = "mocha"; accent = "pink"; }) - numix-cursor-theme + pkgs.nur.repos.nekowinston.apple-cursor xorg.xprop ]; }