diff --git a/home/hyprland/gtk.nix b/home/hyprland/gtk.nix index dbd69010..a4e15ea0 100644 --- a/home/hyprland/gtk.nix +++ b/home/hyprland/gtk.nix @@ -1,23 +1,5 @@ -{ config, pkgs, ... }: +{ pkgs, ... }: let - configure-gtk = pkgs.writeTextFile { - name = "configure-gtk"; - destination = "/bin/configure-gtk"; - executable = true; - text = let - schema = pkgs.gsettings-desktop-schemas; - datadir = "${schema}/share/gsettings-schemas/${schema.name}"; - gtk-theme = config.gtk.theme.name; - icon-theme = config.gtk.iconTheme.name; - cursor-theme = config.gtk.cursorTheme.name; - in '' - export XDG_DATA_DIRS=${datadir}:$XDG_DATA_DIRS - gnome_schema=org.gnome.desktop.interface - gsettings set $gnome_schema gtk-theme '${gtk-theme}' - gsettings set $gnome_schema icon-theme '${icon-theme}' - gsettings set $gnome_schema cursor-theme '${cursor-theme}' - ''; - }; catppuccin-gtk-lavender = pkgs.catppuccin-gtk.override { accents = [ "lavender" ]; size = "standard"; @@ -25,7 +7,11 @@ let variant = "mocha"; }; in { - home.packages = [ configure-gtk ]; + home.packages = with pkgs; [ + gnome.adwaita-icon-theme + libsForQt5.breeze-gtk + hicolor-icon-theme + ]; gtk = { enable = true; cursorTheme = { @@ -33,8 +19,8 @@ in { name = "Catppuccin-Mocha-Dark-Cursors"; }; iconTheme = { - package = pkgs.catppuccin-papirus-folders; - name = "Papirus-Dark"; + package = pkgs.callPackage ./pkgs/delta-icon-theme { }; + name = "Delta"; }; theme = { package = catppuccin-gtk-lavender; diff --git a/home/hyprland/pkgs/delta-icon-theme/default.nix b/home/hyprland/pkgs/delta-icon-theme/default.nix index 52316f59..78530796 100644 --- a/home/hyprland/pkgs/delta-icon-theme/default.nix +++ b/home/hyprland/pkgs/delta-icon-theme/default.nix @@ -1,21 +1,17 @@ -{ - stdenvNoCC, - fetchFromGitHub, - gtk3, -}: +{ stdenvNoCC, fetchFromGitHub, gtk3, }: stdenvNoCC.mkDerivation rec { pname = "delta-icon-theme"; - version = "194df98e422c0a81912194808b76712bf5d78803"; + version = "7b5bc269516845518da5095ed8b8cbbc34d68edb"; dontBuild = true; src = fetchFromGitHub { owner = "Delta-Icons"; repo = "linux"; rev = version; - sha256 = "sha256-SSkI5Aj/TTHfDRYCWe7Ell6cWvPmBUeO/AC4xRrEUvU="; + sha256 = "sha256-/QraIVlgCT4AH+LU5gMtBmIZo3TBdwyeXRyBUxP8KJA="; }; - nativeBuildInputs = [gtk3]; + nativeBuildInputs = [ gtk3 ]; dontDropIconThemeCache = true; diff --git a/hosts/desktop.nix b/hosts/desktop.nix index 1838cfa9..eea61bc2 100644 --- a/hosts/desktop.nix +++ b/hosts/desktop.nix @@ -6,11 +6,6 @@ libnotify glib gsettings-desktop-schemas - gnome.adwaita-icon-theme - papirus-folders - catppuccin-cursors - catppuccin-papirus-folders - catppuccin-gtk ]; security.rtkit.enable = true; sound.enable = true;