From b77cd182ce93c33881446884c1d3dcb7a8c38a87 Mon Sep 17 00:00:00 2001 From: Minijackson Date: Tue, 5 Jul 2022 22:32:35 +0200 Subject: usecases/graphical: switch to graphite gtk theme and tela icon theme --- usecases/desktop/graphical.nix | 55 +++++++++++++++++++++++++++++------------- 1 file changed, 38 insertions(+), 17 deletions(-) diff --git a/usecases/desktop/graphical.nix b/usecases/desktop/graphical.nix index 372af62..208c827 100644 --- a/usecases/desktop/graphical.nix +++ b/usecases/desktop/graphical.nix @@ -1,8 +1,9 @@ -inputs: - -{ config, lib, pkgs, ... }: - -{ +inputs: { + config, + lib, + pkgs, + ... +}: { imports = [ (import ./graphical/alacritty.nix inputs) (import ./graphical/firefox.nix inputs) @@ -26,7 +27,7 @@ inputs: qutebrowser xdg-utils xsel - (wrapMpv mpv-unwrapped { scripts = with pkgs.mpvScripts; [ mpris sponsorblock ]; }) + (wrapMpv mpv-unwrapped {scripts = with pkgs.mpvScripts; [mpris sponsorblock];}) ]; programs.evolution.enable = true; @@ -58,9 +59,9 @@ inputs: #ultimate.enable = true; defaultFonts = { - serif = [ "DejaVu Serif" ]; - sansSerif = [ "DejaVu Sans" ]; - monospace = [ "FiraMono Nerd Font" ]; + serif = ["DejaVu Serif"]; + sansSerif = ["DejaVu Sans"]; + monospace = ["FiraMono Nerd Font"]; #emoji = [ "JoyPixels" ]; }; }; @@ -90,21 +91,41 @@ inputs: programs.gnupg.agent.pinentryFlavor = "gtk2"; # For KDEConnect - networking.firewall.allowedTCPPortRanges = [{ from = 1714; to = 1764; }]; - networking.firewall.allowedUDPPortRanges = [{ from = 1714; to = 1764; }]; + networking.firewall.allowedTCPPortRanges = [ + { + from = 1714; + to = 1764; + } + ]; + networking.firewall.allowedUDPPortRanges = [ + { + from = 1714; + to = 1764; + } + ]; home-manager.users.minijackson = { gtk = { enable = true; iconTheme = { # TODO: properly modify the colors - package = pkgs.gruvbox-dark-icons-gtk; - name = "oomox-gruvbox-dark"; + package = pkgs.unstable.tela-circle-icon-theme.override { + colorVariants = ["brown"]; + }; + name = "Tela-circle-brown-dark"; }; - theme = { - # package = override-arc-theme pkgs.arc-theme; - package = pkgs.gruvbox-dark-gtk; - name = "gruvbox-dark"; + theme = let + color = + if config.theme.colors.dominantName == "cyan" + then "teal" + else config.theme.colors.dominantName; + in { + package = pkgs.unstable.graphite-gtk-theme.override { + themeVariants = [color]; + sizeVariants = ["compact"]; + tweaks = ["normal"]; + }; + name = "Graphite-${color}-dark-compact"; }; gtk4.extraConfig = { -- cgit v1.2.3