chvp/nixos-config
1
0
Fork 0
Code Issues Pull requests Projects Releases Packages Wiki Activity Actions

Fix gtk and cursor theme
All checks were successful
Cachix / build (elendel) (push) Successful in 2m51s
Details
Cachix / build (kholinar) (push) Successful in 8m7s
Details
Cachix / build (marabethia) (push) Successful in 4m27s
Details

Browse source
This commit is contained in:
Charlotte Van Petegem 2025-04-26 18:21:10 +02:00
parent 17471e92c3
commit 0415c86f9f
Signed by: chvp
SSH key fingerprint: SHA256:s9rb8jBVfdahqWHuBAcHCBP1wmj4eYQXZfqgz4H3E9E
2 changed files with 51 additions and 64 deletions
Download patch file Download diff file Expand all files Collapse all files

3
modules/nixos/graphical/compositor/default.nix
View file

@ -30,7 +30,6 @@ let
export GDK_SCALE=1 export GDK_SCALE=1
export GDK_DPI_SCALE=1 export GDK_DPI_SCALE=1
export MOZ_ENABLE_WAYLAND=1 export MOZ_ENABLE_WAYLAND=1
export XCURSOR_SIZE=24
export _JAVA_AWT_WM_NONREPARENTING=1 export _JAVA_AWT_WM_NONREPARENTING=1
if [ "$DBUS_SESSION_BUS_ADDRESS" ]; then if [ "$DBUS_SESSION_BUS_ADDRESS" ]; then
export DBUS_SESSION_BUS_ADDRESS export DBUS_SESSION_BUS_ADDRESS
@ -152,7 +151,7 @@ let
riverctl focus-follows-cursor normal riverctl focus-follows-cursor normal
riverctl hide-cursor when-typing enabled riverctl hide-cursor when-typing enabled
riverctl set-cursor-warp on-output-change riverctl set-cursor-warp on-output-change
riverctl xcursor-theme Catppuccin-Latte-Light-Cursors 24 riverctl xcursor-theme ${config.home-manager.users.charlotte.home.pointerCursor.name} ${toString config.home-manager.users.charlotte.home.pointerCursor.size}
riverctl keyboard-layout -variant altgr-intl -options compose:caps us riverctl keyboard-layout -variant altgr-intl -options compose:caps us

112
modules/nixos/graphical/theme/default.nix
View file

@ -1,5 +1,8 @@
{ config, lib, pkgs, ... }: { config, lib, pkgs, ... }:
let
gtkTheme = pkgs.colloid-gtk-theme.override { themeVariants = [ "orange" ]; colorVariants = [ "light" "dark" ]; sizeVariants = [ "compact" ]; tweaks = [ "catppuccin" ]; };
in
{ {
options.chvp.graphical.theme.enable = lib.mkOption { options.chvp.graphical.theme.enable = lib.mkOption {
default = false; default = false;
@ -39,15 +42,16 @@
home.packages = [ home.packages = [
pkgs.catppuccin-cursors.latteLight pkgs.catppuccin-cursors.latteLight
# Also install dark mode to profile for darkman # Also install dark mode to profile for darkman
(pkgs.catppuccin-gtk.override { size = "compact"; variant = "frappe"; }) gtkTheme
]; ];
home.file = { home.pointerCursor = {
".icons/default/index.theme".text = '' enable = true;
[Icon Theme] package = pkgs.catppuccin-cursors.latteLight;
Name=Default dotIcons.enable = true;
Comment=Default Cursor Theme gtk.enable = true;
Inherits=catppuccin-latte-light-cursors x11.enable = true;
''; name = "catppuccin-latte-light-cursors";
size = 24;
}; };
dconf.settings."org/gnome/desktop/wm/preferences".button-layout = ""; dconf.settings."org/gnome/desktop/wm/preferences".button-layout = "";
gtk = { gtk = {
@ -57,65 +61,49 @@
name = "Noto Sans"; name = "Noto Sans";
size = 10; size = 10;
}; };
gtk2.extraConfig = '' gtk3.extraCss = ''
gtk-cursor-theme-name = "catppuccin-latte-light-cursors" /* No (default) titlebar on wayland */
gtk-cursor-theme-size = 24 headerbar.titlebar.default-decoration {
background: transparent;
padding: 0;
margin: 0 0 -17px 0;
border: 0;
min-height: 0;
font-size: 0;
box-shadow: none;
}
/* rm -rf window shadows */
window.csd, /* gtk4? */
window.csd decoration { /* gtk3 */
box-shadow: none;
}
''; '';
gtk3 = { gtk4.extraCss = ''
extraConfig = { /* No (default) titlebar on wayland */
gtk-cursor-theme-name = "catppuccin-latte-light-cursors"; headerbar.titlebar.default-decoration {
gtk-cursor-theme-size = 24; background: transparent;
}; padding: 0;
extraCss = '' margin: 0 0 -17px 0;
/* No (default) titlebar on wayland */ border: 0;
headerbar.titlebar.default-decoration { min-height: 0;
background: transparent; font-size: 0;
padding: 0; box-shadow: none;
margin: 0 0 -17px 0; }
border: 0;
min-height: 0;
font-size: 0;
box-shadow: none;
}
/* rm -rf window shadows */ /* rm -rf window shadows */
window.csd, /* gtk4? */ window.csd, /* gtk4? */
window.csd decoration { /* gtk3 */ window.csd decoration { /* gtk3 */
box-shadow: none; box-shadow: none;
} }
''; '';
};
gtk4 = {
extraConfig = {
gtk-cursor-theme-name = "catppuccin-latte-light-cursors";
gtk-cursor-theme-size = 24;
};
extraCss = ''
/* No (default) titlebar on wayland */
headerbar.titlebar.default-decoration {
background: transparent;
padding: 0;
margin: 0 0 -17px 0;
border: 0;
min-height: 0;
font-size: 0;
box-shadow: none;
}
/* rm -rf window shadows */
window.csd, /* gtk4? */
window.csd decoration { /* gtk3 */
box-shadow: none;
}
'';
};
iconTheme = { iconTheme = {
package = pkgs.libsForQt5.breeze-icons; package = pkgs.libsForQt5.breeze-icons;
name = "breeze"; name = "breeze";
}; };
theme = { theme = {
package = pkgs.catppuccin-gtk.override { size = "compact"; variant = "latte"; }; package = gtkTheme;
name = "Catppuccin-Latte-Compact-Blue-Light"; name = "Colloid-Orange-Light-Compact-Catppuccin";
}; };
}; };
qt = { qt = {
@ -140,7 +128,7 @@
emacsclient --eval "(chvp--dark-mode)" emacsclient --eval "(chvp--dark-mode)"
''; '';
gtk = '' gtk = ''
${pkgs.glib}/bin/gsettings set org.gnome.desktop.interface gtk-theme Catppuccin-Frappe-Compact-Blue-Dark ${pkgs.glib}/bin/gsettings set org.gnome.desktop.interface gtk-theme Colloid-Orange-Dark-Compact-Catppuccin
''; '';
river = '' river = ''
riverctl background-color 0x626880 riverctl background-color 0x626880
@ -165,7 +153,7 @@
emacsclient --eval "(chvp--light-mode)" emacsclient --eval "(chvp--light-mode)"
''; '';
gtk = '' gtk = ''
${pkgs.glib}/bin/gsettings set org.gnome.desktop.interface gtk-theme Catppuccin-Latte-Compact-Blue-Light ${pkgs.glib}/bin/gsettings set org.gnome.desktop.interface gtk-theme Colloid-Orange-Light-Compact-Catppuccin
''; '';
river = '' river = ''
riverctl background-color 0xacb0be riverctl background-color 0xacb0be