Skip to content

Commit

Permalink
chore: migrate to catppuccin.nix
Browse files Browse the repository at this point in the history
  • Loading branch information
selfuryon committed Apr 29, 2024
1 parent 9fb1ef7 commit c5ce4e3
Show file tree
Hide file tree
Showing 18 changed files with 341 additions and 294 deletions.
62 changes: 22 additions & 40 deletions flake.lock

Some generated files are not rendered by default. Learn more about how customized files appear on GitHub.

10 changes: 1 addition & 9 deletions flake.nix
Original file line number Diff line number Diff line change
Expand Up @@ -7,6 +7,7 @@
url = "github:nix-community/home-manager";
inputs.nixpkgs.follows = "nixpkgs";
};
catppuccin.url = "github:catppuccin/nix";
impermanence.url = "github:nix-community/impermanence";
disko = {
url = "github:nix-community/disko";
Expand Down Expand Up @@ -70,15 +71,6 @@
url = "github:tinted-theming/schemes";
flake = false;
};
catppuccin-alacritty = {
url = "github:catppuccin/alacritty";
flake = false;
};
catppuccin-k9s = {
url = "github:catppuccin/k9s";
flake = false;
};

# Neovim plugins
"syntax-tree-surfer" = {
url = "github:ziontee113/syntax-tree-surfer";
Expand Down
1 change: 1 addition & 0 deletions nixos/default.nix
Original file line number Diff line number Diff line change
Expand Up @@ -19,6 +19,7 @@
defaultModules = [
{
imports = [
inputs.catppuccin.nixosModules.catppuccin
inputs.home-manager.nixosModules.home-manager
inputs.ragenix.nixosModules.age
];
Expand Down
1 change: 1 addition & 0 deletions nixos/roles/system/global/fonts.nix
Original file line number Diff line number Diff line change
Expand Up @@ -28,6 +28,7 @@
};
};
console = {
catppuccin.enable = true;
font = "Lat2-Terminus16";
keyMap = "us";
};
Expand Down
9 changes: 3 additions & 6 deletions nixos/roles/user/desktop/common/alacritty.nix
Original file line number Diff line number Diff line change
@@ -1,12 +1,9 @@
{
inputs,
config,
...
}: {
{config, ...}: {
programs.alacritty = {
enable = true;
catppuccin.enable = true;
settings = {
import = ["${inputs.catppuccin-alacritty}/catppuccin-latte.yml"];
# import = ["${inputs.catppuccin-alacritty}/catppuccin-latte.yml"];
env.TERM = "xterm-256color";
window = {
padding = {
Expand Down
48 changes: 25 additions & 23 deletions nixos/roles/user/desktop/common/dunst.nix
Original file line number Diff line number Diff line change
Expand Up @@ -5,42 +5,44 @@
}: {
services.dunst = {
enable = true;
catppuccin.enable = true;
iconTheme = {
name = "hicolor";
package = pkgs.tela-icon-theme;
size = "32x32";
};
settings = with config.scheme.withHashtag; {
# settings = with config.scheme.withHashtag; {
settings = {
global = {
font = "${config.themes.fontProfile.regular.family}";
width = 600;
height = 200;
offset = "30x50";
origin = "top-right";
transparency = 10;
frame_color = base05;
separator_color = base05;
font = "${config.themes.fontProfile.regular.family}";
# frame_color = base05;
# separator_color = base05;
};

# https://github.com/tinted-theming/base16-dunst
urgency_low = {
msg_urgency = "low";
background = base01;
foreground = base03;
timeout = 10;
};
urgency_normal = {
msg_urgency = "normal";
background = base02;
foreground = base05;
timeout = 10;
};
urgency_critical = {
msg_urgency = "critical";
background = base08;
foreground = base06;
timeout = 10;
};
# # https://github.com/tinted-theming/base16-dunst
# urgency_low = {
# msg_urgency = "low";
# background = base01;
# foreground = base03;
# timeout = 10;
# };
# urgency_normal = {
# msg_urgency = "normal";
# background = base02;
# foreground = base05;
# timeout = 10;
# };
# urgency_critical = {
# msg_urgency = "critical";
# background = base08;
# foreground = base06;
# timeout = 10;
# };
};
};
}
43 changes: 30 additions & 13 deletions nixos/roles/user/desktop/common/gtk.nix
Original file line number Diff line number Diff line change
@@ -1,13 +1,23 @@
{pkgs, ...}: {
home.pointerCursor = {
name = "Catppuccin-Latte-Lavender-Cursors";
package = pkgs.catppuccin-cursors.latteLavender;
gtk.enable = true;
size = 16;
};

gtk = {
enable = true;
catppuccin.enable = true;
gtk3.extraConfig.gtk-application-prefer-dark-theme = false;
gtk3.bookmarks = [
"file:///home/syakovlev/Documents"
"file:///home/syakovlev/mega"
"file:///home/syakovlev/Downloads"
];
font = {
package = pkgs.noto-fonts;
#name = config.themes.fontProfile.regular.family;
name = "Inter";
size = 12;
};
Expand All @@ -16,20 +26,27 @@
name = "Tela";
};
# theme = {
# package = pkgs.orchis-theme;
# name = "Orchis-Light";
# name = "Catppuccin-Latte";
# package = pkgs.catppuccin-gtk.override {
# accents = ["green"];
# variant = "latte";
# };
# };
theme = {
name = "Catppuccin-Latte";
package = pkgs.catppuccin-gtk.override {
accents = ["green"];
variant = "latte";
};
};
cursorTheme = {
package = pkgs.capitaine-cursors;
name = "capitaine-cursors";
size = 16;
# cursorTheme = {
# package = pkgs.capitaine-cursors;
# name = "capitaine-cursors";
# size = 16;
# };
};

dconf.settings."org/gnome/desktop/interface" = {
color-scheme = "prefer-light";
};

dconf.settings = {
# For Gnome shell
"org/gnome/shell/extensions/user-theme" = {
name = "Catppuccin-Latte-Standard-Lavender-Light";
};
};
}
3 changes: 2 additions & 1 deletion nixos/roles/user/desktop/common/kitty.nix
Original file line number Diff line number Diff line change
@@ -1,12 +1,13 @@
{config, ...}: {
programs.kitty = {
enable = true;
catppuccin.enable = true;
font = {
inherit (config.themes.fontProfile.monospace) package;
name = config.themes.fontProfile.monospace.family;
size = 15;
};
theme = "Catppuccin-Latte";
#theme = "Catppuccin-Latte";
settings = {
enable_audio_bell = false;
term = "xterm-256color";
Expand Down
56 changes: 50 additions & 6 deletions nixos/roles/user/desktop/common/qt.nix
Original file line number Diff line number Diff line change
@@ -1,11 +1,55 @@
{pkgs, ...}: {
{
pkgs,
lib,
...
}: let
variant = "Latte";
accent = "Blue";
kvantumThemePackage = pkgs.catppuccin-kvantum.override {
inherit variant accent;
};
in {
home.packages = with pkgs; [
kvantumThemePackage
libsForQt5.qtstyleplugin-kvantum
libsForQt5.qt5ct
lxqt.lxqt-menu-data
shared-mime-info
pcmanfm-qt
];

qt = {
enable = true;
platformTheme.name = "adwaita";
style = {
name = "lightly";
#package = pkgs.adwaita-qt;
package = pkgs.libsForQt5.lightly;
platformTheme.name = "qtct";
style.name = "kvantum";
};

xdg.configFile = {
"Kvantum/kvantum.kvconfig".text = ''
[General]
theme=Catppuccin-${variant}-${accent}
'';

# The important bit is here, links the theme directory from the package to a directory under `~/.config`
# where Kvantum should find it.
"Kvantum/Catppuccin-${variant}-${accent}".source = "${kvantumThemePackage}/share/Kvantum/Catppuccin-${variant}-${accent}";

qt5ct = {
target = "qt5ct/qt5ct.conf";
text = lib.generators.toINI {} {
Appearance = {
icon_theme = "Papirus-Light";
};
};
};

qt6ct = {
target = "qt6ct/qt6ct.conf";
text = lib.generators.toINI {} {
Appearance = {
icon_theme = "Papirus-Light";
};
};
};
};
}
Loading

0 comments on commit c5ce4e3

Please sign in to comment.