Skip to content

Commit a6e67be

Browse files
committed
feat: use catppuccin to theme applications
Use and configure catppuccin to theme applications. Signed-off-by: Jalil David Salamé Messina <jalil.salame@gmail.com>
1 parent 2e83522 commit a6e67be

File tree

8 files changed

+67
-17
lines changed

8 files changed

+67
-17
lines changed

flake-modules/home-modules.nix

Lines changed: 1 addition & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -9,6 +9,7 @@
99
let
1010
defaultModules = [
1111
inputs.nixvim.homeModules.nixvim
12+
inputs.catppuccin.homeModules.catppuccin
1213
self.nixvimModules.homeManager
1314
../modules/hm
1415
];

flake-modules/nixos-modules.nix

Lines changed: 1 addition & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -10,6 +10,7 @@
1010
nixosModule = {
1111
imports = [
1212
inputs.home-manager.nixosModules.home-manager
13+
inputs.catppuccin.nixosModules.catppuccin
1314
../modules/nixos
1415
];
1516
home-manager = {

flake.lock

Lines changed: 22 additions & 0 deletions
Some generated files are not rendered by default. Learn more about customizing how changed files appear on GitHub.

flake.nix

Lines changed: 4 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -15,6 +15,10 @@
1515
url = "github:nix-community/home-manager/release-25.11";
1616
inputs.nixpkgs.follows = "nixpkgs";
1717
};
18+
catppuccin = {
19+
url = "github:catppuccin/nix/release-25.11";
20+
inputs.nixpkgs.follows = "nixpkgs";
21+
};
1822
nixvim = {
1923
url = "github:nix-community/nixvim/nixos-25.11";
2024
inputs = {

modules/hm/default.nix

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -12,6 +12,7 @@ in
1212
{
1313
imports = [
1414
./options.nix
15+
./styling.nix
1516
./gui
1617
./dev.nix
1718
./users.nix
@@ -55,7 +56,6 @@ in
5556
config = {
5657
# Disable headers and numbers
5758
style = "plain";
58-
theme = lib.mkForce "gruvbox-dark";
5959
};
6060
};
6161
# Direnv

modules/hm/gui/default.nix

Lines changed: 0 additions & 15 deletions
Original file line numberDiff line numberDiff line change
@@ -9,11 +9,6 @@ let
99
inherit (config) jhome;
1010
flatpakEnabled = fromOs [ "services" "flatpak" "enable" ] false;
1111
cfg = jhome.gui;
12-
cursor = {
13-
package = pkgs.nordzy-cursor-theme;
14-
size = 48;
15-
name = "Nordzy-cursors";
16-
};
1712
in
1813
{
1914
imports = [
@@ -196,19 +191,9 @@ in
196191
};
197192
};
198193

199-
home.pointerCursor = lib.mkIf config.jhome.styling.enable (
200-
lib.mkDefault {
201-
gtk.enable = true;
202-
inherit (cursor) name package;
203-
}
204-
);
205194
# Set Gtk theme
206195
gtk = lib.mkIf config.jhome.styling.enable {
207196
enable = true;
208-
iconTheme = {
209-
name = "Papirus-Dark";
210-
package = pkgs.papirus-icon-theme;
211-
};
212197
colorScheme = "dark";
213198
};
214199
# Set Qt theme

modules/hm/styling.nix

Lines changed: 28 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,28 @@
1+
{ lib, config, ... }:
2+
let
3+
cfg = config.jhome;
4+
in
5+
{
6+
config = lib.mkIf (cfg.enable && cfg.styling.enable) {
7+
catppuccin = lib.mkMerge [
8+
{
9+
bat.enable = true;
10+
btop.enable = true;
11+
delta.enable = true;
12+
eza.enable = true;
13+
fish.enable = true;
14+
fzf.enable = true;
15+
zellij.enable = true;
16+
}
17+
(lib.mkIf cfg.gui.enable {
18+
alacritty.enable = true;
19+
cursors.enable = true;
20+
fuzzel.enable = true;
21+
mako.enable = true;
22+
mpv.enable = true;
23+
waybar.enable = true;
24+
zathura.enable = true;
25+
})
26+
];
27+
};
28+
}

modules/nixos/styling/default.nix

Lines changed: 10 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -2,19 +2,28 @@
22
let
33
cfg = args.config.jconfig.styling;
44
enable = args.config.jconfig.enable && cfg.enable;
5+
gui = args.config.jconfig.gui.enable;
56
in
67
{
78
imports = [
89
(import ../../shared/starship.nix { cfg = args.config.jconfig; })
910
];
1011

1112
config = lib.mkIf enable {
13+
catppuccin = lib.mkMerge [
14+
{ tty.enable = true; }
15+
(lib.mkIf gui {
16+
cursors.enable = true;
17+
gtk.icon.enable = true;
18+
})
19+
];
20+
1221
boot.plymouth = {
1322
inherit (cfg) enable;
1423
logo = cfg.bootLogo;
1524
};
1625

17-
fonts = lib.mkIf args.config.jconfig.gui.enable {
26+
fonts = lib.mkIf gui {
1827
packages = [
1928
pkgs.jetbrains-mono
2029
pkgs.nerd-fonts.symbols-only

0 commit comments

Comments
 (0)