From b3a03e5e9b144bc8e4645fd1b555c1932c4019e8 Mon Sep 17 00:00:00 2001 From: Anthony Rodriguez Date: Fri, 17 Jan 2025 10:47:43 +0100 Subject: [PATCH] treewide: move discord styling out of module --- modules/hm/programs/default.nix | 1 + .../style/modules => hm/programs}/discord.nix | 17 +++++++++-------- modules/hm/programs/misc.nix | 1 - 3 files changed, 10 insertions(+), 9 deletions(-) rename modules/{nix/style/modules => hm/programs}/discord.nix (93%) diff --git a/modules/hm/programs/default.nix b/modules/hm/programs/default.nix index 49f08d0..5319976 100644 --- a/modules/hm/programs/default.nix +++ b/modules/hm/programs/default.nix @@ -6,6 +6,7 @@ ./media ./terminal + ./discord.nix ./games.nix ./gnome.nix ./misc.nix diff --git a/modules/nix/style/modules/discord.nix b/modules/hm/programs/discord.nix similarity index 93% rename from modules/nix/style/modules/discord.nix rename to modules/hm/programs/discord.nix index b24f009..b7523d8 100644 --- a/modules/nix/style/modules/discord.nix +++ b/modules/hm/programs/discord.nix @@ -1,13 +1,15 @@ { lib, - config, + pkgs, + osConfig, ... }: let - cfg = config.local.style; + styleCfg = osConfig.local.style; in { - config.home-manager.sharedModules = lib.mkIf cfg.enable [ - { - xdg.configFile."vesktop/themes/midnight-base16.css".text = with cfg.scheme.palette; '' + config = lib.mkIf osConfig.local.profiles.desktop.enable { + home.packages = [pkgs.vesktop]; + xdg.configFile."vesktop/themes/midnight-base16.css".text = with styleCfg.scheme.palette; + lib.mkIf styleCfg.enable '' /** * @name Midnight-base16 * @description A dark, rounded discord theme. Updated to use base16 colors. @@ -30,7 +32,7 @@ in { --font: 'gg sans'; /* top left corner text */ - --corner-text: '${cfg.scheme.name}'; + --corner-text: '${styleCfg.scheme.name}'; /* color of status indicators and window controls */ --online-indicator: ${base0B}; /* change to #23a55a for default green */ @@ -108,6 +110,5 @@ in { fill: var(--text-0) !important; } ''; - } - ]; + }; } diff --git a/modules/hm/programs/misc.nix b/modules/hm/programs/misc.nix index d6dbbca..bc7773c 100644 --- a/modules/hm/programs/misc.nix +++ b/modules/hm/programs/misc.nix @@ -19,7 +19,6 @@ playerctl proton-pass simple-scan - vesktop wl-clipboard ];