From d7d7356c1cc85261fbcaa2a5ec785effe5a0ca67 Mon Sep 17 00:00:00 2001 From: Guanran Wang Date: Sun, 5 Nov 2023 19:26:09 +0800 Subject: [PATCH] home,nixos: split theme config --- .../guanranwang/home-manager/nixos/fonts.nix | 1 + users/guanranwang/home-manager/nixos/home.nix | 95 +--------------- .../home-manager/nixos/presets/desktop.nix | 1 + .../guanranwang/home-manager/nixos/theme.nix | 103 ++++++++++++++++++ 4 files changed, 106 insertions(+), 94 deletions(-) create mode 100644 users/guanranwang/home-manager/nixos/theme.nix diff --git a/users/guanranwang/home-manager/nixos/fonts.nix b/users/guanranwang/home-manager/nixos/fonts.nix index 912e48c..4bda9c4 100644 --- a/users/guanranwang/home-manager/nixos/fonts.nix +++ b/users/guanranwang/home-manager/nixos/fonts.nix @@ -1,4 +1,5 @@ {pkgs, ...}: { + fonts.fontconfig.enable = true; home.packages = with pkgs; [ ### Noto Fonts noto-fonts diff --git a/users/guanranwang/home-manager/nixos/home.nix b/users/guanranwang/home-manager/nixos/home.nix index cccec66..2b5c603 100644 --- a/users/guanranwang/home-manager/nixos/home.nix +++ b/users/guanranwang/home-manager/nixos/home.nix @@ -1,8 +1,4 @@ -{ - config, - pkgs, - ... -}: { +{pkgs, ...}: { home = { username = "guanranwang"; homeDirectory = "/home/guanranwang"; @@ -101,12 +97,6 @@ nil gopls libclang - - # themes - tela-icon-theme - tela-circle-icon-theme - papirus-icon-theme - adw-gtk3 ]) ++ (with pkgs.gnome; [ # GNOME @@ -130,89 +120,6 @@ just-perfection kimpanel ]); - - pointerCursor = { - gtk.enable = true; - x11.enable = true; - name = "Adwaita"; - package = pkgs.gnome.adwaita-icon-theme; - size = 24; - }; - }; - - gtk = { - enable = true; - font.name = "Sans"; - cursorTheme = { - name = "Adwaita"; - package = pkgs.gnome.adwaita-icon-theme; - size = 24; - }; - theme = { - name = "adw-gtk3-dark"; - package = pkgs.adw-gtk3; - }; - iconTheme = { - #name = "Tela-dracula-dark"; - #package = pkgs.tela-icon-theme; - name = "Papirus-Dark"; - package = pkgs.papirus-icon-theme; - }; - gtk2.configLocation = "${config.xdg.configHome}/gtk-2.0/gtkrc"; - }; - - dconf.settings = { - "org/gnome/desktop/wm/preferences" = { - "titlebar-font" = "Sans Bold"; - "button-layout" = "icon,appmenu:"; - }; - "org/gnome/desktop/interface" = { - "clock-format" = "12h"; - "color-scheme" = "prefer-dark"; - "document-font-name" = "Sans"; - "font-name" = "Sans"; - "monospace-font-name" = "Monospace"; - }; - }; - - fonts.fontconfig.enable = true; - - # X resources file - # ~/.Xresources - xresources.properties = { - # Cursor - "Xcursor.theme" = "Adwaita"; - - # Fonts - "Xft.autohint" = "0"; - "Xft.lcdfilter" = "lcddefault"; - "Xft.hintstyle" = "hintslight"; - "Xft.hinting" = "1"; - "Xft.antialias" = "1"; - "Xft.rgba" = "rgb"; - - # Tokyonight color scheme - # i have no idea what does it apply to - "*background" = "#1a1b26"; - "*foreground" = "#c0caf5"; - - "*color0" = "#15161e"; - "*color1" = "#f7768e"; - "*color2" = "#9ece6a"; - "*color3" = "#e0af68"; - "*color4" = "#7aa2f7"; - "*color5" = "#bb9af7"; - "*color6" = "#7dcfff"; - "*color7" = "#a9b1d6"; - - "*color8" = "#414868"; - "*color9" = "#f7768e"; - "*color10" = "#9ece6a"; - "*color11" = "#e0af68"; - "*color12" = "#7aa2f7"; - "*color13" = "#bb9af7"; - "*color14" = "#7dcfff"; - "*color15" = "#c0caf5"; }; wayland.windowManager = { diff --git a/users/guanranwang/home-manager/nixos/presets/desktop.nix b/users/guanranwang/home-manager/nixos/presets/desktop.nix index 27c1d2b..832b82f 100644 --- a/users/guanranwang/home-manager/nixos/presets/desktop.nix +++ b/users/guanranwang/home-manager/nixos/presets/desktop.nix @@ -13,6 +13,7 @@ ../dotfiles.nix ../fonts.nix ../i18n.nix + ../theme.nix ../wm ../xdg diff --git a/users/guanranwang/home-manager/nixos/theme.nix b/users/guanranwang/home-manager/nixos/theme.nix new file mode 100644 index 0000000..4a7dafb --- /dev/null +++ b/users/guanranwang/home-manager/nixos/theme.nix @@ -0,0 +1,103 @@ +{ + pkgs, + config, + ... +}: { + gtk.enable = true; + gtk.gtk2.configLocation = "${config.xdg.configHome}/gtk-2.0/gtkrc"; + + ### Cursor + home.pointerCursor = { + gtk.enable = true; + x11.enable = true; + name = "Adwaita"; + package = pkgs.gnome.adwaita-icon-theme; + size = 24; + }; + # gtk.cursorTheme is unneeded + # https://github.com/nix-community/home-manager/blob/8765d4e38aa0be53cdeee26f7386173e6c65618d/modules/config/home-cursor.nix#L179C33-L179C33 + + ### Icon + gtk = { + iconTheme = { + #name = "Tela-dracula-dark"; + #package = pkgs.tela-icon-theme; + name = "Papirus-Dark"; + package = pkgs.papirus-icon-theme; + }; + }; + + ### Font + gtk.font.name = "Sans"; + + ### GTK theme + gtk.theme = { + name = "adw-gtk3-dark"; + package = pkgs.adw-gtk3; + }; + + ### Dconf + dconf.settings = { + "org/gnome/desktop/wm/preferences" = { + "titlebar-font" = "Sans Bold"; + }; + "org/gnome/desktop/interface" = { + "document-font-name" = "Sans"; + "monospace-font-name" = "Monospace"; + # "font-name" is unneeded + # https://github.com/nix-community/home-manager/blob/8765d4e38aa0be53cdeee26f7386173e6c65618d/modules/misc/gtk.nix#L237C19-L237C19 + + "clock-format" = "12h"; + "color-scheme" = "prefer-dark"; + "button-layout" = "icon,appmenu:"; # remove csd window buttons + + # i want to split dconf but + # + # error: attribute '"org/gnome/desktop/interface"' already defined at /nix/store/cjr3qn1kg0z268dnbmc2vry4sbgqvnvm-source/users/guanranwang/home-manager/nixos/theming.nix:52:5 + # + # at /nix/store/cjr3qn1kg0z268dnbmc2vry4sbgqvnvm-source/users/guanranwang/home-manager/nixos/theming.nix:36:5: + # + # 35| }; + # 36| "org/gnome/desktop/interface" = { + # | ^ + # 37| "document-font-name" = "Sans"; + }; + }; + + # Misc + xresources.properties = { + # Cursor + "Xcursor.theme" = "Adwaita"; + + # Fonts + "Xft.autohint" = "0"; + "Xft.lcdfilter" = "lcddefault"; + "Xft.hintstyle" = "hintslight"; + "Xft.hinting" = "1"; + "Xft.antialias" = "1"; + "Xft.rgba" = "rgb"; + + # Tokyonight color scheme + # i have no idea what does it apply to + "*background" = "#1a1b26"; + "*foreground" = "#c0caf5"; + + "*color0" = "#15161e"; + "*color1" = "#f7768e"; + "*color2" = "#9ece6a"; + "*color3" = "#e0af68"; + "*color4" = "#7aa2f7"; + "*color5" = "#bb9af7"; + "*color6" = "#7dcfff"; + "*color7" = "#a9b1d6"; + + "*color8" = "#414868"; + "*color9" = "#f7768e"; + "*color10" = "#9ece6a"; + "*color11" = "#e0af68"; + "*color12" = "#7aa2f7"; + "*color13" = "#bb9af7"; + "*color14" = "#7dcfff"; + "*color15" = "#c0caf5"; + }; +}