chore(modules): use catppuccin.enable in test.nix

catppuccin · Apr 22, 2024 · 352e52d · 352e52d
1 parent de389d1
commit 352e52d
Show file tree

Hide file tree

Showing 3 changed files with 57 additions and 79 deletions.
diff --git a/dev/flake.lock b/dev/flake.lock
diff --git a/dev/flake.nix b/dev/flake.nix
@@ -8,11 +8,9 @@
       url = "github:nix-community/home-manager";
       inputs.nixpkgs.follows = "nixpkgs";
     };
-
-    get-flake.url = "github:ursi/get-flake";
   };
 
-  outputs = { self, nixpkgs, get-flake, ... }@inputs:
+  outputs = { self, nixpkgs, ... }@inputs:
     let
       systems = [
         "x86_64-linux"
@@ -24,11 +22,10 @@
       inherit (nixpkgs) lib;
 
       forAllSystems = fn: lib.genAttrs systems (s: fn nixpkgs.legacyPackages.${s});
-      ctp = get-flake ../.;
     in
     {
       checks = forAllSystems (pkgs: lib.optionalAttrs pkgs.stdenv.isLinux {
-        module-vm-test = pkgs.nixosTest (import ../test.nix { inherit ctp inputs; });
+        module-vm-test = pkgs.nixosTest (import ../test.nix inputs);
       });
 
       formatter = forAllSystems (pkgs: pkgs.nixpkgs-fmt);
@@ -57,8 +54,8 @@
             '';
         in
         {
-          nixos-doc = mkDoc "nixos" ctp.nixosModules.catppuccin;
-          home-manager-doc = mkDoc "home-manager" ctp.homeManagerModules.catppuccin;
+          nixos-doc = mkDoc "nixos" ../modules/nixos;
+          home-manager-doc = mkDoc "home-manager" ../modules/home-manager;
 
           default = self.packages.${pkgs.system}.home-manager-doc;
         });

diff --git a/test.nix b/test.nix
@@ -1,36 +1,35 @@
-{ ctp
-, inputs
-, ...
-}:
+inputs:
 let
   common = {
-    catppuccin.flavour = "mocha";
-    users.users.test = {
-      isNormalUser = true;
-      home = "/home/test";
+    catppuccin = {
+      enable = true;
+      flavour = "mocha";
     };
   };
 
-  ctpEnable = {
-    enable = true;
-    catppuccin.enable = true;
-  };
+  # shorthand enable
+  enable = { enable = true; };
 in
 {
   name = "module-test";
 
   nodes.machine = { lib, ... }: {
     imports = [
-      ctp.nixosModules.catppuccin
       inputs.home-manager.nixosModules.default
+      ./modules/nixos
       common
     ];
 
-    boot.loader.grub = ctpEnable;
+    boot.loader.grub = enable;
 
-    console = ctpEnable;
+    console = enable;
 
-    programs.dconf.enable = true; # required for gtk
+    programs.dconf = enable; # required for gtk
+
+    users.users.test = {
+      isNormalUser = true;
+      home = "/home/test";
+    };
 
     virtualisation = {
       memorySize = 4096;
@@ -39,11 +38,10 @@ in
 
     home-manager.users.test = {
       imports = [
-        ctp.homeManagerModules.catppuccin
+        ./modules/home-manager
+        common
       ];
 
-      inherit (common) catppuccin;
-
       xdg.enable = true;
 
       home = {
@@ -53,58 +51,57 @@ in
 
       manual.manpages.enable = lib.mkDefault false;
 
-      i18n.inputMethod = {
-        enabled = "fcitx5";
-        fcitx5.catppuccin.enable = true;
-      };
+      i18n.inputMethod.enabled = "fcitx5";
 
       programs = {
-        alacritty = ctpEnable;
-        bat = ctpEnable;
-        bottom = ctpEnable;
-        btop = ctpEnable;
-        cava = ctpEnable;
-        fish = ctpEnable;
-        foot = ctpEnable;
-        fzf = ctpEnable;
-        git.enable = true; # Required for delta
-        git.delta = ctpEnable;
-        gitui = ctpEnable;
+        alacritty = enable;
+        bat = enable;
+        bottom = enable;
+        btop = enable;
+        cava = enable;
+        fish = enable;
+        foot = enable;
+        fzf = enable;
+        git = enable // {
+          delta = enable;
+        };
+        gitui = enable;
+        # this is enabled by default already, but still
+        # listing explicitly so we know it's tested
         glamour.catppuccin.enable = true;
-        helix = ctpEnable;
-        home-manager.enable = false;
-        imv = ctpEnable;
-        k9s = ctpEnable;
-        kitty = ctpEnable;
-        lazygit = ctpEnable;
-        micro = ctpEnable;
-        mpv = ctpEnable;
-        neovim = ctpEnable;
-        rio = ctpEnable;
-        rofi = ctpEnable;
-        starship = ctpEnable;
-        swaylock = ctpEnable;
-        tmux = ctpEnable;
-        yazi = ctpEnable;
-        zathura = ctpEnable;
+        helix = enable;
+        imv = enable;
+        k9s = enable;
+        kitty = enable;
+        lazygit = enable;
+        micro = enable;
+        mpv = enable;
+        neovim = enable;
+        rio = enable;
+        rofi = enable;
+        starship = enable;
+        swaylock = enable;
+        tmux = enable;
+        yazi = enable;
+        zathura = enable;
       };
 
-      gtk = lib.recursiveUpdate ctpEnable { catppuccin.cursor.enable = true; };
+      gtk = lib.recursiveUpdate enable { catppuccin.cursor.enable = true; };
 
       services = {
-        dunst = ctpEnable;
-        mako = ctpEnable;
+        dunst = enable;
+        mako = enable;
         polybar =
-          ctpEnable
+          enable
           // {
             script = ''
               polybar top &
             '';
           };
       };
 
-      wayland.windowManager.sway = ctpEnable;
-      wayland.windowManager.hyprland = ctpEnable;
+      wayland.windowManager.sway = enable;
+      wayland.windowManager.hyprland = enable;
     };
   };