Adding catppuccin

flake.nix

@@ -20,23 +20,24 @@
     catppuccin.url = "github:catppuccin/nix";
   };
 
-  outputs = { self, nixpkgs, home-manager, ... }@inputs:
+  outputs = { self, nixpkgs, home-manager, catppuccin, ... }@inputs:
     let
       inherit (self) outputs;
       pkgs = import nixpkgs { };
       x86 = nixpkgs.legacyPackages.x86_64-linux;
       forEachSystem = nixpkgs.lib.genAttrs [ "x86_64-linux" ];
       forEachPkg = f: forEachSystem (sys: f nixpkgs.legacyPackages.${sys});
-      mkNixOS = modules:
+      mkNixOS = extraModules:
         nixpkgs.lib.nixosSystem {
-          inherit modules;
+          inherit extraModules;
           specialArgs = { inherit inputs outputs; };
+          modules = extraModules ++ [ catppuccin.nixosModules.catppuccin ];
         };
 
       mkHome = modules: pkgs:
         home-manager.lib.homeManagerConfiguration {
           inherit modules pkgs;
-          extraSpecialArgs = { inherit inputs outputs; };
+          extraSpecialArgs = { inherit inputs outputs catppuccin; };
         };
     in {
       nixosConfigurations = {

home-manager/arrakis/default.nix

@@ -1,11 +1,13 @@
-{ inputs, lib, pkgs, config, outputs, ... }: {
+{ inputs, lib, pkgs, config, outputs, catppuccin, ... }: {
   imports = [
     inputs.nix-colors.homeManagerModule
     inputs.nixvim.homeManagerModules.nixvim
+    catppuccin.homeManagerModules.catppuccin
     ../common/programs/default.nix
     ../common/programs/hyprland.nix
     ../common/programs/eww
     ../common/programs/kitty.nix
+    ../common/features/colorscheme.nix
   ];
 
   home.sessionVariables = {
@@ -26,8 +28,6 @@
 
   programs.kitty.settings.font_size = 8;
 
-  colorscheme = inputs.nix-colors.colorSchemes.catppuccin-frappe;
-
   programs = {
     home-manager.enable = true;
     git.enable = true;

home-manager/common/features/colorscheme.nix

@@ -0,0 +1 @@
+{ catppuccin, ... }: { catppuccin.enable = true; }

home-manager/common/programs/hyprland.nix

@@ -59,6 +59,7 @@
 
       "exec-once" = [
         "dbus-update-activation-environment --systemd WAYLAND_DISPLAY XDG_CURRENT_DESKTOP"
+        "eww daemon & eww -c $HOME/.config/eww open bar"
       ];
 
       "$mod" = "SUPER";

hosts/common/features/desktop-apps.nix

@@ -31,14 +31,14 @@
       libertine
       fira-code
       fira-code-symbols
-      (nerdfonts.override { fonts = [ "FiraCode" ]; })
+      (nerdfonts.override { fonts = [ "FiraCode" "VictorMono" ]; })
     ];
 
     fontconfig = {
       defaultFonts = {
         serif = [ "Libertine" ];
         sansSerif = [ "Ubuntu" ];
-        monospace = [ "FiraCode" "VictorMono" ];
+        monospace = [ "FiraCode" ];
       };
     };
   };