Move configure-gtk script setting to gtk expression

This commit is contained in:
Evie Litherland-Smith 2023-09-07 09:36:42 +01:00
parent ec95c63f42
commit bd4746ff14
2 changed files with 30 additions and 25 deletions

View file

@ -1,24 +1,6 @@
{ config, lib, pkgs, hyprland, anyrun, wallpapers, catppuccin-themes, ... }:
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}'
'';
};
in {
{
imports = [
hyprland.homeManagerModules.default
../alacritty/tiling.nix
@ -29,7 +11,7 @@ in {
./swaylock.nix
./gtk.nix
];
home.packages = with pkgs; [ libsForQt5.polkit-kde-agent configure-gtk ];
home.packages = [ pkgs.libsForQt5.polkit-kde-agent ];
programs = {
emacs.package = pkgs.emacs29-pgtk;
firefox.package = pkgs.firefox-wayland;

View file

@ -1,7 +1,30 @@
{ pkgs, ... }:
{
home.packages = with pkgs; [ glib gnome.adwaita-icon-theme papirus-folders ];
{ config, 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}'
'';
};
in {
home.packages = with pkgs; [
glib
configure-gtk
gnome.adwaita-icon-theme
papirus-folders
];
gtk = {
enable = true;
cursorTheme = {