nixos/catppuccin: make it a mixin

4 files changed, 17 insertions, 34 deletions

diff --git a/modules/nixos/mixins/catppuccin.nix b/modules/nixos/mixins/catppuccin.nix
new file mode 100644
index 0000000..f513561
--- /dev/null
+++ b/modules/nixos/mixins/catppuccin.nix
@@ -0,0 +1,15 @@
+{ inputs, ... }:
+
+{
+  imports = [
+    inputs.catppuccin.nixosModules.catppuccin
+  ];
+
+  catppuccin = {
+    accent = "mauve";
+    flavor = "mocha";
+
+    # Don't use modules with IFD by default
+    tty.enable = false;
+  };
+}
diff --git a/modules/nixos/mixins/default.nix b/modules/nixos/mixins/default.nix
index 2d8def1..946f790 100644
--- a/modules/nixos/mixins/default.nix
+++ b/modules/nixos/mixins/default.nix
@@ -2,9 +2,11 @@
   imports = [
     ./acme.nix
     ./budgie.nix
+    ./catppuccin.nix
     ./comin.nix
     ./forgejo.nix
     ./gnome.nix
+    ./home-manager.nix
     ./kanidm.nix
     ./lanzaboote.nix
     ./nginx.nix
diff --git a/modules/nixos/tweaks/catppuccin.nix b/modules/nixos/tweaks/catppuccin.nix
deleted file mode 100644
index 439dfb4..0000000
--- a/modules/nixos/tweaks/catppuccin.nix
+++ /dev/null
@@ -1,29 +0,0 @@
-{
-  config,
-  lib,
-  inputs,
-  ...
-}:
-let
-  cfg = config.tweaks.catppuccin;
-in
-{
-  options.tweaks.catppuccin = {
-    enable = lib.mkEnableOption "Catppuccin themeing";
-  };
-
-  imports = [
-    inputs.catppuccin.nixosModules.catppuccin
-  ];
-
-  config = lib.mkIf cfg.enable {
-    catppuccin = {
-      enable = true;
-      accent = "mauve";
-      flavor = "mocha";
-
-      # Don't use modules with IFD by default
-      tty.enable = false;
-    };
-  };
-}
diff --git a/modules/nixos/tweaks/default.nix b/modules/nixos/tweaks/default.nix
deleted file mode 100644
index fc1193a..0000000
--- a/modules/nixos/tweaks/default.nix
+++ /dev/null
@@ -1,5 +0,0 @@
-{
-  imports = [
-    ./catppuccin.nix
-  ];
-}