theme: fix gtk light theme not being set
This commit is contained in:
parent
dd7785c85c
commit
a023a9f103
|
@ -1,4 +1,8 @@
|
||||||
{ pkgs, ... }: {
|
{ pkgs, ... }:
|
||||||
|
let
|
||||||
|
inherit (pkgs.uservars) key accent font theme;
|
||||||
|
in
|
||||||
|
{
|
||||||
|
|
||||||
# Enable the X11 windowing system.
|
# Enable the X11 windowing system.
|
||||||
services.xserver.enable = false;
|
services.xserver.enable = false;
|
||||||
|
@ -20,7 +24,7 @@
|
||||||
let
|
let
|
||||||
greetd_main_script = pkgs.writeShellScriptBin "main" ''
|
greetd_main_script = pkgs.writeShellScriptBin "main" ''
|
||||||
${pkgs.dbus-sway-environment}/bin/dbus-sway-environment
|
${pkgs.dbus-sway-environment}/bin/dbus-sway-environment
|
||||||
export XDG_CURRENT_DESKTOP=sway GTK_THEME="${pkgs.uservars.gtk_theme}" XCURSOR_THEME="${pkgs.uservars.cursor_theme}"
|
export XDG_CURRENT_DESKTOP=sway GTK_THEME="${theme.gtk_theme}" XCURSOR_THEME="${theme.cursor_theme}"
|
||||||
${pkgs.greetd.gtkgreet}/bin/gtkgreet -l -c sway
|
${pkgs.greetd.gtkgreet}/bin/gtkgreet -l -c sway
|
||||||
swaymsg exit
|
swaymsg exit
|
||||||
'';
|
'';
|
||||||
|
|
|
@ -1,6 +1,9 @@
|
||||||
{ config, pkgs, lib, ... }:
|
{ config, pkgs, lib, ... }:
|
||||||
let inherit (pkgs.uservars) key theme color accent font;
|
let
|
||||||
in {
|
inherit (pkgs.uservars) key theme accent font;
|
||||||
|
inherit (theme) color;
|
||||||
|
in
|
||||||
|
{
|
||||||
config = {
|
config = {
|
||||||
programs.alacritty = {
|
programs.alacritty = {
|
||||||
enable = true;
|
enable = true;
|
||||||
|
|
|
@ -1,6 +1,9 @@
|
||||||
{ config, pkgs, lib, inputs, ... }:
|
{ config, pkgs, lib, inputs, ... }:
|
||||||
let inherit (pkgs.uservars) key theme color accent font;
|
let
|
||||||
in {
|
inherit (pkgs.uservars) key theme accent font;
|
||||||
|
inherit (theme) color;
|
||||||
|
in
|
||||||
|
{
|
||||||
# My bemenu wrapper
|
# My bemenu wrapper
|
||||||
xdg.configFile = {
|
xdg.configFile = {
|
||||||
"bmenu.conf".text = ''
|
"bmenu.conf".text = ''
|
||||||
|
|
|
@ -1,6 +1,7 @@
|
||||||
{ config, pkgs, lib, inputs, ... }:
|
{ config, pkgs, lib, inputs, ... }:
|
||||||
let
|
let
|
||||||
inherit (pkgs.uservars) key theme color accent font;
|
inherit (pkgs.uservars) key theme accent font;
|
||||||
|
inherit (theme) color;
|
||||||
|
|
||||||
colors = {
|
colors = {
|
||||||
"bg+" = color.bg_light;
|
"bg+" = color.bg_light;
|
||||||
|
|
|
@ -1,6 +1,9 @@
|
||||||
{ config, pkgs, lib, font, ... }:
|
{ config, pkgs, lib, font, ... }:
|
||||||
let inherit (pkgs.uservars) key theme color accent font editor;
|
let
|
||||||
in {
|
inherit (pkgs.uservars) key theme accent font editor;
|
||||||
|
inherit (theme) color;
|
||||||
|
in
|
||||||
|
{
|
||||||
config = {
|
config = {
|
||||||
programs.helix = {
|
programs.helix = {
|
||||||
enable = true;
|
enable = true;
|
||||||
|
|
|
@ -1,6 +1,9 @@
|
||||||
{ config, pkgs, lib, font, ... }:
|
{ config, pkgs, lib, font, ... }:
|
||||||
let inherit (pkgs.uservars) key theme color accent font dmenu editor;
|
let
|
||||||
in {
|
inherit (pkgs.uservars) key theme accent font dmenu editor;
|
||||||
|
inherit (theme) color;
|
||||||
|
in
|
||||||
|
{
|
||||||
config = {
|
config = {
|
||||||
programs.kakoune = {
|
programs.kakoune = {
|
||||||
enable = true;
|
enable = true;
|
||||||
|
|
|
@ -1,6 +1,9 @@
|
||||||
{ config, pkgs, lib, font, ... }:
|
{ config, pkgs, lib, font, ... }:
|
||||||
let inherit (pkgs.uservars) key theme color accent font browser;
|
let
|
||||||
in {
|
inherit (pkgs.uservars) key theme accent font browser;
|
||||||
|
inherit (theme) color;
|
||||||
|
in
|
||||||
|
{
|
||||||
config = {
|
config = {
|
||||||
programs.qutebrowser = {
|
programs.qutebrowser = {
|
||||||
enable = true;
|
enable = true;
|
||||||
|
|
|
@ -1,6 +1,9 @@
|
||||||
{ config, pkgs, lib, font, ... }:
|
{ config, pkgs, lib, font, ... }:
|
||||||
let inherit (pkgs.uservars) key theme color accent font;
|
let
|
||||||
in {
|
inherit (pkgs.uservars) key theme accent font;
|
||||||
|
inherit (theme) color;
|
||||||
|
in
|
||||||
|
{
|
||||||
config = {
|
config = {
|
||||||
programs.rofi = {
|
programs.rofi = {
|
||||||
enable = true;
|
enable = true;
|
||||||
|
|
|
@ -1,6 +1,7 @@
|
||||||
{ config, pkgs, lib, ... }:
|
{ config, pkgs, lib, ... }:
|
||||||
let
|
let
|
||||||
inherit (pkgs.uservars) key theme color accent font;
|
inherit (pkgs.uservars) key accent font theme;
|
||||||
|
inherit (theme) color;
|
||||||
color_picker = pkgs.writeShellScript "color_picker" ''
|
color_picker = pkgs.writeShellScript "color_picker" ''
|
||||||
grim -g "$(slurp -b aabbcc00 -p)" - |
|
grim -g "$(slurp -b aabbcc00 -p)" - |
|
||||||
convert - txt:- |
|
convert - txt:- |
|
||||||
|
|
|
@ -1,5 +1,9 @@
|
||||||
{ config, pkgs, lib, inputs, ... }:
|
{ config, pkgs, lib, inputs, ... }:
|
||||||
with pkgs.uservars; {
|
let
|
||||||
|
inherit (pkgs.uservars) theme font;
|
||||||
|
inherit (theme) color gtk_theme icon_theme cursor_theme;
|
||||||
|
in
|
||||||
|
{
|
||||||
home.pointerCursor = {
|
home.pointerCursor = {
|
||||||
name = cursor_theme;
|
name = cursor_theme;
|
||||||
size = 24;
|
size = 24;
|
||||||
|
@ -30,10 +34,10 @@ with pkgs.uservars; {
|
||||||
|
|
||||||
dconf.settings = {
|
dconf.settings = {
|
||||||
"org/gnome/desktop/interface" = {
|
"org/gnome/desktop/interface" = {
|
||||||
gtk-theme = pkgs.uservars.gtk_theme;
|
gtk-theme = gtk_theme;
|
||||||
icon-theme = pkgs.uservars.icon_theme;
|
icon-theme = icon_theme;
|
||||||
cursor-theme = pkgs.uservars.cursor_theme;
|
cursor-theme = cursor_theme;
|
||||||
color-scheme = "prefer-${pkgs.uservars.color.type}";
|
color-scheme = "prefer-${color.type}";
|
||||||
};
|
};
|
||||||
};
|
};
|
||||||
|
|
||||||
|
|
|
@ -23,6 +23,10 @@ let
|
||||||
};
|
};
|
||||||
themes = {
|
themes = {
|
||||||
dark = {
|
dark = {
|
||||||
|
gtk_theme = "Orchis-Red-Dark-Compact";
|
||||||
|
icon_theme = "Papirus-Dark";
|
||||||
|
cursor_theme = "Bibata-Modern-Classic";
|
||||||
|
|
||||||
background = "~/.local/share/backgrounds/nixos-dark-pattern.png";
|
background = "~/.local/share/backgrounds/nixos-dark-pattern.png";
|
||||||
opacity = 95;
|
opacity = 95;
|
||||||
opacityHex = "ee";
|
opacityHex = "ee";
|
||||||
|
@ -50,6 +54,10 @@ let
|
||||||
};
|
};
|
||||||
};
|
};
|
||||||
light = {
|
light = {
|
||||||
|
gtk_theme = "Orchis-Red-Compact";
|
||||||
|
icon_theme = "Papirus";
|
||||||
|
cursor_theme = "Bibata-Modern-Classic";
|
||||||
|
|
||||||
background = "~/.local/share/backgrounds/nixos-light-pattern.png";
|
background = "~/.local/share/backgrounds/nixos-light-pattern.png";
|
||||||
opacity = 95;
|
opacity = 95;
|
||||||
opacityHex = "ee";
|
opacityHex = "ee";
|
||||||
|
@ -84,13 +92,8 @@ rec {
|
||||||
key = keys.colemak;
|
key = keys.colemak;
|
||||||
|
|
||||||
theme = themes.dark;
|
theme = themes.dark;
|
||||||
color = theme.color;
|
|
||||||
accent = accents.red;
|
accent = accents.red;
|
||||||
|
|
||||||
gtk_theme = "Orchis-Red-Dark-Compact";
|
|
||||||
icon_theme = "Papirus-Dark";
|
|
||||||
cursor_theme = "Bibata-Modern-Classic";
|
|
||||||
|
|
||||||
font = {
|
font = {
|
||||||
mono = "Hack Nerd Font";
|
mono = "Hack Nerd Font";
|
||||||
interface = "Liberation Sans";
|
interface = "Liberation Sans";
|
||||||
|
|
|
@ -1,6 +1,9 @@
|
||||||
{ config, pkgs, lib, font, ... }:
|
{ config, pkgs, lib, font, ... }:
|
||||||
let inherit (pkgs.uservars) key theme color accent font;
|
let
|
||||||
in {
|
inherit (pkgs.uservars) key theme accent font;
|
||||||
|
inherit (theme) color;
|
||||||
|
in
|
||||||
|
{
|
||||||
config = {
|
config = {
|
||||||
programs.waybar = {
|
programs.waybar = {
|
||||||
enable = true;
|
enable = true;
|
||||||
|
|
|
@ -1,6 +1,9 @@
|
||||||
{ config, pkgs, lib, font, ... }:
|
{ config, pkgs, lib, font, ... }:
|
||||||
let inherit (pkgs.uservars) key color accent font;
|
let
|
||||||
in {
|
inherit (pkgs.uservars) key accent font theme;
|
||||||
|
inherit (theme) color;
|
||||||
|
in
|
||||||
|
{
|
||||||
config = {
|
config = {
|
||||||
programs.zathura.enable = true;
|
programs.zathura.enable = true;
|
||||||
programs.zathura.options = {
|
programs.zathura.options = {
|
||||||
|
|
Loading…
Reference in a new issue