Switch back to tokyo-night-gtk theme

Set gtkgreet to inherit theme settings from gtk.nix for automatic
consistency

Include setting cursor size in gtk.nix
This commit is contained in:
Evie Litherland-Smith 2023-11-08 07:35:03 +00:00
parent 5806f9d003
commit cec41c90eb
4 changed files with 13 additions and 16 deletions

View file

@ -32,6 +32,7 @@
./home/emacs/default.nix
./home/hyprland/default.nix
./home/nyxt/default.nix
./home/alacritty.nix
./home/default.nix
./home/foot.nix
./home/kdeconnect.nix
@ -115,9 +116,9 @@
system = { inherit stateVersion; };
networking = { inherit hostName; };
stylix = {
image = ./wallpapers/minimalistic/catppuccin_triangle.png;
image = ./wallpapers/default.jpg;
base16Scheme =
"${pkgs.base16-schemes}/share/themes/primer-dark.yaml";
"${pkgs.base16-schemes}/share/themes/tokyo-night-terminal-dark.yaml";
polarity = "dark";
opacity = {
applications = 0.8;

View file

@ -2,7 +2,7 @@
let
themeName = config.gtk.theme.name;
cursorName = config.gtk.cursorTheme.name;
cursorSize = "24";
cursorSize = toString config.gtk.cursorTheme.size;
in ''
source = ./extra.conf
monitor=,preferred,auto,auto

View file

@ -1,16 +1,22 @@
{ pkgs, ... }:
{
stylix.targets.gtk.enable = false;
gtk = {
enable = true;
cursorTheme = {
package = pkgs.volantes-cursors;
name = "volantes_cursors";
size = 24;
};
iconTheme = {
package = pkgs.papirus-icon-theme;
name = "Papirus-Dark";
};
theme = {
package = pkgs.tokyo-night-gtk;
name = "Tokyonight-Dark-BL";
};
};
xdg.configFile."gtklock/config.ini".text = let
powerbar = "${pkgs.gtklock-powerbar-module}/lib/gtklock/powerbar-module.so";

View file

@ -1,4 +1,4 @@
{ config, lib, pkgs, ... }:
{ config, lib, pkgs, user, ... }:
{
imports = [ ./default.nix ];
@ -46,19 +46,9 @@
displayManager.lightdm = {
enable = true;
greeters.gtk = {
inherit (config.home-manager.users.${user}.gtk)
cursorTheme iconTheme theme;
enable = true;
cursorTheme = {
package = pkgs.volantes-cursors;
name = "volantes_cursors";
};
iconTheme = {
package = pkgs.papirus-icon-theme;
name = "Papirus-Dark";
};
theme = {
package = pkgs.tokyo-night-gtk;
name = "Tokyonight-Dark-BL";
};
};
};
};