diff --git a/flake.lock b/flake.lock index 015f48b..bb30637 100644 --- a/flake.lock +++ b/flake.lock @@ -16,6 +16,21 @@ "type": "gitlab" } }, + "catppuccin": { + "locked": { + "lastModified": 1720472194, + "narHash": "sha256-CYscFEts6tyvosc1T29nxhzIYJAj/1CCEkV3ZMzSN/c=", + "owner": "catppuccin", + "repo": "nix", + "rev": "d75d5803852fb0833767dc969a4581ac13204e22", + "type": "github" + }, + "original": { + "owner": "catppuccin", + "repo": "nix", + "type": "github" + } + }, "clan-core": { "inputs": { "disko": [ @@ -549,6 +564,7 @@ }, "root": { "inputs": { + "catppuccin": "catppuccin", "disko": "disko", "firefox-addons": "firefox-addons", "home-manager": "home-manager", diff --git a/flake.nix b/flake.nix index 9c3b412..e6291f8 100644 --- a/flake.nix +++ b/flake.nix @@ -42,6 +42,7 @@ url = "gitlab:simple-nixos-mailserver/nixos-mailserver"; inputs.nixpkgs.follows = "nixpkgs"; }; + catppuccin.url = "github:catppuccin/nix"; # Packages tela-icon-theme = { diff --git a/home-modules/common/default.nix b/home-modules/common/default.nix index 4aded03..45f3aaa 100644 --- a/home-modules/common/default.nix +++ b/home-modules/common/default.nix @@ -63,5 +63,11 @@ in videos = "${config.home.homeDirectory}/Videos"; }; }; + qt = { + enable = true; + style.name = "kvantum"; + platformTheme.name = "kvantum"; + }; + gtk.enable = true; }; } diff --git a/modules/default.nix b/modules/default.nix index 21a718f..ef9b7c6 100644 --- a/modules/default.nix +++ b/modules/default.nix @@ -28,5 +28,6 @@ self.inputs.home-manager.nixosModules.home-manager self.inputs.nixos-generators.nixosModules.all-formats self.inputs.sops-nix.nixosModules.sops + self.inputs.catppuccin.nixosModules.catppuccin ]; } diff --git a/modules/nix/default.nix b/modules/nix/default.nix index 3477713..1105d91 100644 --- a/modules/nix/default.nix +++ b/modules/nix/default.nix @@ -85,7 +85,10 @@ in useGlobalPkgs = true; useUserPackages = true; backupFileExtension = "backup"; - sharedModules = [ self.outputs.homeManagerModules.default ]; + sharedModules = [ + self.outputs.homeManagerModules.default + self.inputs.catppuccin.homeManagerModules.catppuccin + ]; }; systemd.services.nix-daemon.serviceConfig.LimitNOFILE = lib.mkForce 1048576000; diff --git a/modules/users/jopejoe1/default.nix b/modules/users/jopejoe1/default.nix index 2c1a96d..234314c 100644 --- a/modules/users/jopejoe1/default.nix +++ b/modules/users/jopejoe1/default.nix @@ -78,6 +78,11 @@ in sway.enable = true; firefox.enable = config.jopejoe1.gui.enable; }; + catppuccin = { + enable = true; + flavor = "frappe"; + accent = "mauve"; + }; }; }; } diff --git a/systems/kuraokami/default.nix b/systems/kuraokami/default.nix index b832c8e..527ef33 100644 --- a/systems/kuraokami/default.nix +++ b/systems/kuraokami/default.nix @@ -12,7 +12,7 @@ ./hardware.nix nixos-hardware.nixosModules.common-cpu-intel #nixos-hardware.nixosModules.common-gpu-intel - #nixos-hardware.nixosModules.common-gpu-nvidia + nixos-hardware.nixosModules.common-gpu-nvidia nixos-hardware.nixosModules.common-pc nixos-hardware.nixosModules.common-hidpi nixos-hardware.nixosModules.common-pc-ssd @@ -165,15 +165,9 @@ "aarch64-linux" ]; - programs.nix-ld = { + catppuccin = { enable = true; - libraries = with pkgs; [ - libz - xz - xorg.libX11 - freetype - zstd - dbus - ]; + flavor = "frappe"; + accent = "mauve"; }; }