From dbaeca5340814b1f0a7a95a4a7b6f34eba2b6fd0 Mon Sep 17 00:00:00 2001 From: Nick Date: Tue, 4 Feb 2025 14:05:36 -0600 Subject: [PATCH] feat: moved gtk to higher level and added qt --- home/modules/gui/desktop/theming/default.nix | 10 +++++ .../theming/gtk/config/cursorTheme.nix | 13 +++++++ .../gui/desktop/theming/gtk/config/gtk3.nix | 5 +++ .../desktop/theming/gtk/config/homeCursor.nix | 13 +++++++ .../desktop/theming/gtk/config/iconTheme.nix | 8 ++++ .../gui/desktop/theming/gtk/config/theme.nix | 11 ++++++ .../gui/desktop/theming/gtk/default.nix | 37 +++++++++++++++++++ .../gui/desktop/theming/qt/default.nix | 9 +++++ 8 files changed, 106 insertions(+) create mode 100755 home/modules/gui/desktop/theming/default.nix create mode 100755 home/modules/gui/desktop/theming/gtk/config/cursorTheme.nix create mode 100755 home/modules/gui/desktop/theming/gtk/config/gtk3.nix create mode 100755 home/modules/gui/desktop/theming/gtk/config/homeCursor.nix create mode 100755 home/modules/gui/desktop/theming/gtk/config/iconTheme.nix create mode 100755 home/modules/gui/desktop/theming/gtk/config/theme.nix create mode 100755 home/modules/gui/desktop/theming/gtk/default.nix create mode 100755 home/modules/gui/desktop/theming/qt/default.nix diff --git a/home/modules/gui/desktop/theming/default.nix b/home/modules/gui/desktop/theming/default.nix new file mode 100755 index 0000000..f106bc5 --- /dev/null +++ b/home/modules/gui/desktop/theming/default.nix @@ -0,0 +1,10 @@ +let + content = builtins.readDir ./.; + + dirContent = builtins.filter (n: content.${n} == "directory") (builtins.attrNames content); + + importList = map (name: ./. + "/${name}") dirContent; +in +{ + imports = importList; +} diff --git a/home/modules/gui/desktop/theming/gtk/config/cursorTheme.nix b/home/modules/gui/desktop/theming/gtk/config/cursorTheme.nix new file mode 100755 index 0000000..23a9967 --- /dev/null +++ b/home/modules/gui/desktop/theming/gtk/config/cursorTheme.nix @@ -0,0 +1,13 @@ +{ + pkgs, + flake, + ... +}: +let + inherit (flake.config.aesthetics.themes) cursor; +in +{ + name = "catppuccin-macchiato-dark-cursors"; + package = pkgs.catppuccin-cursors.macchiatoDark; + size = cursor.size; +} diff --git a/home/modules/gui/desktop/theming/gtk/config/gtk3.nix b/home/modules/gui/desktop/theming/gtk/config/gtk3.nix new file mode 100755 index 0000000..ee1ec73 --- /dev/null +++ b/home/modules/gui/desktop/theming/gtk/config/gtk3.nix @@ -0,0 +1,5 @@ +{ + extraConfig = { + gtk-application-prefer-dark-theme = true; + }; +} diff --git a/home/modules/gui/desktop/theming/gtk/config/homeCursor.nix b/home/modules/gui/desktop/theming/gtk/config/homeCursor.nix new file mode 100755 index 0000000..037cc12 --- /dev/null +++ b/home/modules/gui/desktop/theming/gtk/config/homeCursor.nix @@ -0,0 +1,13 @@ +{ pkgs, flake, ... }: +let + inherit (flake.config.aesthetics.themes) + cursor + ; +in +{ + gtk.enable = true; + x11.enable = true; + name = "catppuccin-mocha-dark-cursors"; + package = pkgs.catppuccin-cursors.macchiatoDark; + size = cursor.size; +} diff --git a/home/modules/gui/desktop/theming/gtk/config/iconTheme.nix b/home/modules/gui/desktop/theming/gtk/config/iconTheme.nix new file mode 100755 index 0000000..199e53d --- /dev/null +++ b/home/modules/gui/desktop/theming/gtk/config/iconTheme.nix @@ -0,0 +1,8 @@ +{ pkgs, ... }: +{ + package = pkgs.catppuccin-papirus-folders.override { + flavor = "macchiato"; + accent = "mauve"; + }; + name = "Papirus-Dark"; +} diff --git a/home/modules/gui/desktop/theming/gtk/config/theme.nix b/home/modules/gui/desktop/theming/gtk/config/theme.nix new file mode 100755 index 0000000..ae38e2a --- /dev/null +++ b/home/modules/gui/desktop/theming/gtk/config/theme.nix @@ -0,0 +1,11 @@ +{ pkgs, ... }: +{ + package = pkgs.catppuccin-gtk.override { + size = "compact"; + variant = "macchiato"; + accents = [ + "mauve" + ]; + }; + name = "catppuccin-macchiato-mauve-compact"; +} diff --git a/home/modules/gui/desktop/theming/gtk/default.nix b/home/modules/gui/desktop/theming/gtk/default.nix new file mode 100755 index 0000000..16938af --- /dev/null +++ b/home/modules/gui/desktop/theming/gtk/default.nix @@ -0,0 +1,37 @@ +{ pkgs, flake, ... }: +let + configPath = ./config; + cursorThemePath = import (configPath + /cursorTheme.nix) { + inherit + flake + pkgs + ; + }; + iconThemePath = import (configPath + /iconTheme.nix) { + inherit + pkgs + ; + }; + themePath = import (configPath + /theme.nix) { + inherit + pkgs + ; + }; + homeCursorPath = import (configPath + /homeCursor.nix) { + inherit + flake + pkgs + ; + }; + gtk3Path = import (configPath + /gtk3.nix); +in +{ + gtk = { + enable = true; + gtk3 = gtk3Path; + cursorTheme = cursorThemePath; + iconTheme = iconThemePath; + theme = themePath; + }; + home.pointerCursor = homeCursorPath; +} diff --git a/home/modules/gui/desktop/theming/qt/default.nix b/home/modules/gui/desktop/theming/qt/default.nix new file mode 100755 index 0000000..aecc6a2 --- /dev/null +++ b/home/modules/gui/desktop/theming/qt/default.nix @@ -0,0 +1,9 @@ +{ pkgs, ... }: +{ + qt = { + enable = true; + style = { + package = pkgs.catppuccin-qt5ct; + }; + }; +}