From 5269981d5d81dbb5b60550bf7f50fe19c2813eea Mon Sep 17 00:00:00 2001 From: Nick Date: Tue, 4 Feb 2025 14:04:40 -0600 Subject: [PATCH] feat: moved gtk to higher level --- .../gui/apps/tools/gtk/config/cursorTheme.nix | 13 ------- .../gui/apps/tools/gtk/config/gtk3.nix | 5 --- .../gui/apps/tools/gtk/config/homeCursor.nix | 13 ------- .../gui/apps/tools/gtk/config/iconTheme.nix | 8 ---- .../gui/apps/tools/gtk/config/theme.nix | 11 ------ home/modules/gui/apps/tools/gtk/default.nix | 37 ------------------- 6 files changed, 87 deletions(-) delete mode 100755 home/modules/gui/apps/tools/gtk/config/cursorTheme.nix delete mode 100755 home/modules/gui/apps/tools/gtk/config/gtk3.nix delete mode 100755 home/modules/gui/apps/tools/gtk/config/homeCursor.nix delete mode 100755 home/modules/gui/apps/tools/gtk/config/iconTheme.nix delete mode 100755 home/modules/gui/apps/tools/gtk/config/theme.nix delete mode 100755 home/modules/gui/apps/tools/gtk/default.nix diff --git a/home/modules/gui/apps/tools/gtk/config/cursorTheme.nix b/home/modules/gui/apps/tools/gtk/config/cursorTheme.nix deleted file mode 100755 index 23a9967..0000000 --- a/home/modules/gui/apps/tools/gtk/config/cursorTheme.nix +++ /dev/null @@ -1,13 +0,0 @@ -{ - 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/apps/tools/gtk/config/gtk3.nix b/home/modules/gui/apps/tools/gtk/config/gtk3.nix deleted file mode 100755 index ee1ec73..0000000 --- a/home/modules/gui/apps/tools/gtk/config/gtk3.nix +++ /dev/null @@ -1,5 +0,0 @@ -{ - extraConfig = { - gtk-application-prefer-dark-theme = true; - }; -} diff --git a/home/modules/gui/apps/tools/gtk/config/homeCursor.nix b/home/modules/gui/apps/tools/gtk/config/homeCursor.nix deleted file mode 100755 index 037cc12..0000000 --- a/home/modules/gui/apps/tools/gtk/config/homeCursor.nix +++ /dev/null @@ -1,13 +0,0 @@ -{ 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/apps/tools/gtk/config/iconTheme.nix b/home/modules/gui/apps/tools/gtk/config/iconTheme.nix deleted file mode 100755 index 199e53d..0000000 --- a/home/modules/gui/apps/tools/gtk/config/iconTheme.nix +++ /dev/null @@ -1,8 +0,0 @@ -{ pkgs, ... }: -{ - package = pkgs.catppuccin-papirus-folders.override { - flavor = "macchiato"; - accent = "mauve"; - }; - name = "Papirus-Dark"; -} diff --git a/home/modules/gui/apps/tools/gtk/config/theme.nix b/home/modules/gui/apps/tools/gtk/config/theme.nix deleted file mode 100755 index ae38e2a..0000000 --- a/home/modules/gui/apps/tools/gtk/config/theme.nix +++ /dev/null @@ -1,11 +0,0 @@ -{ pkgs, ... }: -{ - package = pkgs.catppuccin-gtk.override { - size = "compact"; - variant = "macchiato"; - accents = [ - "mauve" - ]; - }; - name = "catppuccin-macchiato-mauve-compact"; -} diff --git a/home/modules/gui/apps/tools/gtk/default.nix b/home/modules/gui/apps/tools/gtk/default.nix deleted file mode 100755 index 16938af..0000000 --- a/home/modules/gui/apps/tools/gtk/default.nix +++ /dev/null @@ -1,37 +0,0 @@ -{ 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; -}