Do some minor refactoring

This commit is contained in:
SebastianStork 2025-07-27 20:23:43 +02:00
parent ea509959ff
commit 472d0eea96
9 changed files with 29 additions and 21 deletions

View file

@ -13,7 +13,7 @@
settings =
let
theme-name =
themeName =
{
dark = "default";
light = "GitHub_Light";
@ -21,7 +21,7 @@
.${config.custom.theme};
in
{
include = "${pkgs.kitty-themes}/share/kitty-themes/themes/${theme-name}.conf";
include = "${pkgs.kitty-themes}/share/kitty-themes/themes/${themeName}.conf";
font_family = "JetBrainsMono Nerd Font";
background_opacity = "0.85";
cursor_shape = "beam";

View file

@ -5,7 +5,7 @@
...
}:
let
cfgTheme = config.custom.theme;
inherit (config.custom) theme;
in
{
options.custom.theme = lib.mkOption {
@ -22,8 +22,10 @@ in
gtk2.configLocation = "${config.xdg.configHome}/gtk-2.0/gtkrc";
theme.package = pkgs.gnome-themes-extra;
iconTheme.package = pkgs.papirus-icon-theme;
font.name = "Open Sans";
font.package = pkgs.open-sans;
font = {
name = "Open Sans";
package = pkgs.open-sans;
};
};
qt = {
enable = true;
@ -37,18 +39,22 @@ in
};
}
(lib.mkIf (cfgTheme == "dark") {
(lib.mkIf (theme == "dark") {
dconf.settings."org/gnome/desktop/interface".color-scheme = "prefer-dark";
gtk.theme.name = "Adwaita-dark";
gtk.iconTheme.name = "Papirus-Dark";
gtk = {
theme.name = "Adwaita-dark";
iconTheme.name = "Papirus-Dark";
};
qt.style.name = "adwaita-dark";
home.pointerCursor.name = "Bibata-Original-Classic";
})
(lib.mkIf (cfgTheme == "light") {
(lib.mkIf (theme == "light") {
dconf.settings."org/gnome/desktop/interface".color-scheme = "prefer-light";
gtk.theme.name = "Adwaita";
gtk.iconTheme.name = "Papirus";
gtk = {
theme.name = "Adwaita";
iconTheme.name = "Papirus";
};
qt.style.name = "adwaita";
home.pointerCursor.name = "Bibata-Original-Ice";
})