Jo/puzzlevision
1
0
Fork 0
mirror of https://github.com/Jokiller230/puzzlevision.git synced 2025-01-18 09:53:06 +01:00
Code Issues Projects Releases Packages Wiki Activity Actions

fix: resolve catppuccin deprecation warnings, use poppins, and replace host with namespace

Browse source
This commit is contained in:
Jo 2024-12-24 16:59:18 +01:00
parent d543faff8c
commit 9e3a71b35e
3 changed files with 19 additions and 18 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

5
modules/home/desktop/gnome/default.nix
View file

@ -1,17 +1,16 @@
{ {
lib, lib,
pkgs, pkgs,
host,
config, config,
osConfig, osConfig,
namespace, namespace,
... ...
}: with lib; with lib.${namespace}; }: with lib; with lib.${namespace};
let let
cfg = config.${host}.desktop.gnome; cfg = config.${namespace}.desktop.gnome;
in in
{ {
options.${host}.desktop.gnome = with types; { options.${namespace}.desktop.gnome = with types; {
enabled-extensions = mkOption { enabled-extensions = mkOption {
type = listOf package; type = listOf package;
default = with pkgs.gnomeExtensions; [ dash-to-dock user-themes blur-my-shell appindicator unite color-picker clipboard-history ]; default = with pkgs.gnomeExtensions; [ dash-to-dock user-themes blur-my-shell appindicator unite color-picker clipboard-history ];

6
modules/home/themes/catppuccin/global/default.nix
View file

@ -6,8 +6,8 @@
accent = "blue"; accent = "blue";
flavor = "macchiato"; flavor = "macchiato";
pointerCursor.enable = true; cursors.enable = true;
pointerCursor.accent = "blue"; cursors.accent = "blue";
pointerCursor.flavor = "macchiato"; cursors.flavor = "macchiato";
}; };
} }

26
modules/home/themes/catppuccin/gnome/default.nix
View file

@ -101,10 +101,10 @@ let
''; '';
}; };
cfg = config.themes.catppuccin.gtk; cfg = config.${namespace}.themes.catppuccin.gtk;
in in
{ {
options.themes.catppuccin.gtk = { enable = mkEnableOption "Enable the Catppuccin theme for GTK"; }; options.${namespace}.themes.catppuccin.gtk = { enable = mkEnableOption "Enable the Catppuccin theme for GTK"; };
config = mkIf cfg.enable { config = mkIf cfg.enable {
home.packages = with pkgs; [ home.packages = with pkgs; [
@ -120,17 +120,9 @@ in
enable = true; enable = true;
font = { font = {
name = "Ubuntu"; name = "Poppins";
size = 12; size = 12;
package = pkgs.ubuntu-sans; package = pkgs.poppins;
};
catppuccin = {
icon = {
enable = true;
accent = "maroon";
flavor = "mocha";
};
}; };
theme = { theme = {
@ -150,6 +142,16 @@ in
}; };
}; };
catppuccin = {
gtk = {
icon = {
enable = true;
accent = "maroon";
flavor = "mocha";
};
};
};
dconf.settings = { dconf.settings = {
"org/gnome/shell/extensions/user-theme" = { "org/gnome/shell/extensions/user-theme" = {
name = "Colloid-Dark-Catppuccin"; name = "Colloid-Dark-Catppuccin";