fix: catppuccin gtk theme

This commit is contained in:
DACHXY 2024-12-26 15:53:51 +08:00
parent 9c2da1547b
commit 87c07bfecf
7 changed files with 32 additions and 15 deletions

View file

@ -1,5 +1,7 @@
{ pkgs, ... }:
let configDir = ../config; let configDir = ../config;
in { in
{
home.file = { home.file = {
".config/nvim" = { ".config/nvim" = {
source = "${configDir}/nvim"; source = "${configDir}/nvim";

View file

@ -17,7 +17,6 @@
CLUTTER_BACKEND = "wayland"; CLUTTER_BACKEND = "wayland";
WLR_RENDERER = "vulkan"; WLR_RENDERER = "vulkan";
XCURSOR_SIZE = "32"; XCURSOR_SIZE = "32";
GTK_THEME = "Catppuccin-Macchiato-Compact-Lavender-Dark";
XDG_CURRENT_DESKTOP = "Hyprland"; XDG_CURRENT_DESKTOP = "Hyprland";
XDG_SESSION_DESKTOP = "Hyprland"; XDG_SESSION_DESKTOP = "Hyprland";
XDG_SESSION_TYPE = "wayland"; XDG_SESSION_TYPE = "wayland";

View file

@ -1,4 +1,5 @@
{ pkgs, ... }: { { pkgs, ... }:
{
gtk = { gtk = {
enable = true; enable = true;
@ -8,10 +9,10 @@
}; };
theme = { theme = {
name = "Catppuccin-Macchiato-Compact-Lavender-dark"; name = "catppuccin-macchiato-lavender-compact";
package = pkgs.catppuccin-gtk.override { package = pkgs.catppuccin-gtk.override {
size = "compact";
accents = [ "lavender" ]; accents = [ "lavender" ];
size = "compact";
variant = "macchiato"; variant = "macchiato";
}; };
}; };
@ -21,13 +22,24 @@
package = pkgs.papirus-folders; package = pkgs.papirus-folders;
}; };
gtk3.extraConfig = { gtk3 = {
# extraCss = gtk-css;
extraConfig = {
gtk-application-prefer-dark-theme = 1; gtk-application-prefer-dark-theme = 1;
}; };
gtk4.extraConfig = {
gtk-application-prefer-dark-theme = 1;
}; };
gtk4 = {
# extraCss = gtk-css;
extraConfig = {
gtk-application-prefer-dark-theme = 1;
};
};
};
qt = {
enable = true;
style.name = "adwaita-dark";
style.package = pkgs.adwaita-qt;
}; };
} }

View file

@ -27,6 +27,7 @@
"font.name.monospace.zh-TW" = "Noto Sans Mono CJK TC"; "font.name.monospace.zh-TW" = "Noto Sans Mono CJK TC";
}; };
# firefox = { # firefox = {
# enable = true; # enable = true;
# languagePacks = [ # languagePacks = [

View file

@ -55,6 +55,7 @@
# Misc # Misc
xfce.thunar # File manager xfce.thunar # File manager
nwg-look
# Portal # Portal
xdg-desktop-portal-gtk xdg-desktop-portal-gtk

View file

@ -86,12 +86,11 @@
mtr.enable = true; mtr.enable = true;
fish.enable = true; fish.enable = true;
# nix-index = { thunar.plugins = with pkgs.xfce; [
# enable = true; thunar-archive-plugin
# enableFishIntegration = true; thunar-volman
# enableBashIntegration = false; thunar-media-tags-plugin
# enableZshIntegration = false; ];
# };
# Set fish as default shell but not login shell # Set fish as default shell but not login shell
bash = { bash = {

View file

@ -42,5 +42,8 @@
devmon.enable = true; devmon.enable = true;
flatpak.enable = true; flatpak.enable = true;
# Thuner plugin
tumbler.enable = true; # Thumbnail
}; };
} }