From 3e208d20934bedd8cd7769f23f35cfae9d8e7d0d Mon Sep 17 00:00:00 2001 From: Seth Flynn Date: Fri, 14 Feb 2025 01:18:47 -0500 Subject: seth: simplify module structure Moving to mixins generally reduces the boilerplate in all configurations, and less custom "stuff" These are then enabled by the regular options in programs.nix for example Many of the other options (like desktops) also had little use in being abstracted as there's no situation where I'd *not* want them to be applied when said desktop is in use --- users/seth/tweaks/adwaita-ize.nix | 36 ------------------------------------ users/seth/tweaks/catppuccin.nix | 29 ----------------------------- users/seth/tweaks/default.nix | 7 ------- users/seth/tweaks/nix-override.nix | 23 ----------------------- 4 files changed, 95 deletions(-) delete mode 100644 users/seth/tweaks/adwaita-ize.nix delete mode 100644 users/seth/tweaks/catppuccin.nix delete mode 100644 users/seth/tweaks/default.nix delete mode 100644 users/seth/tweaks/nix-override.nix (limited to 'users/seth/tweaks') diff --git a/users/seth/tweaks/adwaita-ize.nix b/users/seth/tweaks/adwaita-ize.nix deleted file mode 100644 index 7a41959..0000000 --- a/users/seth/tweaks/adwaita-ize.nix +++ /dev/null @@ -1,36 +0,0 @@ -{ - config, - lib, - pkgs, - ... -}: -let - cfg = config.seth.tweaks.adwaita-ize; -in -{ - options.seth.tweaks.adwaita-ize = { - enable = lib.mkEnableOption "libadwaita themeing for non-libadwaita apps"; - - adw-gtk3 = lib.mkEnableOption "adw-gtk3 theme for GTK3 apps" // { - default = true; - }; - }; - - config = lib.mkIf cfg.enable ( - lib.mkMerge [ - (lib.mkIf cfg.adw-gtk3 { - assertions = [ - { - assertion = config.gtk.enable; - message = "`gtk.enable` must be `true` to apply the adw-gtk3 theme"; - } - ]; - - gtk.theme = { - name = "adw-gtk3-dark"; - package = pkgs.adw-gtk3; - }; - }) - ] - ); -} diff --git a/users/seth/tweaks/catppuccin.nix b/users/seth/tweaks/catppuccin.nix deleted file mode 100644 index c0a1d5e..0000000 --- a/users/seth/tweaks/catppuccin.nix +++ /dev/null @@ -1,29 +0,0 @@ -{ - config, - lib, - inputs, - ... -}: -let - cfg = config.seth.tweaks.catppuccin; -in -{ - options.seth.tweaks.catppuccin = { - enable = lib.mkEnableOption "catppuccin themeing" // { - default = config.seth.enable; - defaultText = "config.seth.enable"; - }; - }; - - imports = [ - inputs.catppuccin.homeManagerModules.catppuccin - ]; - - config = lib.mkIf cfg.enable { - catppuccin = { - enable = true; - accent = "mauve"; - flavor = "mocha"; - }; - }; -} diff --git a/users/seth/tweaks/default.nix b/users/seth/tweaks/default.nix deleted file mode 100644 index 5fe72e7..0000000 --- a/users/seth/tweaks/default.nix +++ /dev/null @@ -1,7 +0,0 @@ -{ - imports = [ - ./adwaita-ize.nix - ./catppuccin.nix - ./nix-override.nix - ]; -} diff --git a/users/seth/tweaks/nix-override.nix b/users/seth/tweaks/nix-override.nix deleted file mode 100644 index 47f5c69..0000000 --- a/users/seth/tweaks/nix-override.nix +++ /dev/null @@ -1,23 +0,0 @@ -{ - config, - lib, - pkgs, - ... -}: -let - cfg = config.seth.tweaks.nix-override; -in -{ - options.seth.tweaks.nix-override = { - enable = lib.mkEnableOption "the use of a non-default implementation of Nix"; - package = lib.mkPackageOption pkgs "lix" { }; - }; - - config = lib.mkIf cfg.enable { - nix.package = cfg.package; - - programs = { - direnv.nix-direnv.package = pkgs.nix-direnv.override { nix = cfg.package; }; - }; - }; -} -- cgit v1.2.3