diff --git a/home/linux/desktop/default.nix b/home/linux/desktop/default.nix index c718e230..3bb8b9ba 100644 --- a/home/linux/desktop/default.nix +++ b/home/linux/desktop/default.nix @@ -1,6 +1,7 @@ {pkgs, ...}: { imports = [ ./creative.nix + ./gtk.nix ./immutable-file.nix ./media.nix ./ssh.nix diff --git a/home/linux/desktop/gtk.nix b/home/linux/desktop/gtk.nix new file mode 100644 index 00000000..aaaaedf9 --- /dev/null +++ b/home/linux/desktop/gtk.nix @@ -0,0 +1,52 @@ +{ + pkgs, + config, + ... +}: { + home.pointerCursor = { + package = pkgs.bibata-cursors; + name = "Bibata-Modern-Classic"; + size = 24; + gtk.enable = true; + x11.enable = true; + }; + + # set dpi for 4k monitor + xresources.properties = { + # dpi for Xorg's font + "Xft.dpi" = 162; + # or set a generic dpi + "*.dpi" = 162; + }; + + # gtk's theme settings, generate files: + # 1. ~/.gtkrc-2.0 + # 2. ~/.config/gtk-3.0/settings.ini + # 3. ~/.config/gtk-4.0/settings.ini + gtk = { + enable = true; + + font = { + name = "Roboto"; + package = pkgs.roboto; + }; + + gtk2.configLocation = "${config.xdg.configHome}/gtk-2.0/gtkrc"; + + iconTheme = { + name = "Papirus-Dark"; + package = pkgs.papirus-icon-theme; + }; + + theme = { + # https://github.com/catppuccin/gtk + name = "Catppuccin-Macchiato-Compact-Pink-dark"; + package = pkgs.catppuccin-gtk.override { + # https://github.com/NixOS/nixpkgs/blob/nixos-23.05/pkgs/data/themes/catppuccin-gtk/default.nix + accents = [ "pink" ]; + size = "compact"; + variant = "mocha"; + }; + }; + }; +} diff --git a/home/linux/hyprland/default.nix b/home/linux/hyprland/default.nix index 293b56d7..eadfba7d 100644 --- a/home/linux/hyprland/default.nix +++ b/home/linux/hyprland/default.nix @@ -17,23 +17,6 @@ }; home.file.".config/hypr/themes".source = "${catppuccin-hyprland}/themes"; - # gtk's theme settings, generate files: - # 1. ~/.gtkrc-2.0 - # 2. ~/.config/gtk-3.0/settings.ini - # 3. ~/.config/gtk-4.0/settings.ini - gtk = { - enable = true; - theme = { - # https://github.com/catppuccin/gtk - name = "Catppuccin-Macchiato-Compact-Pink-dark"; - package = pkgs.catppuccin-gtk.override { - # https://github.com/NixOS/nixpkgs/blob/nixos-23.05/pkgs/data/themes/catppuccin-gtk/default.nix - accents = [ "pink" ]; - variant = "mocha"; - }; - }; - }; - # music player - mpd home.file.".config/mpd" = { source = ./mpd; @@ -57,16 +40,4 @@ "WLR_EGL_NO_MODIFIRES" = "1"; }; - # this is for xwayland - # set dpi for 4k monitor - xresources.properties = { - "Xft.dpi" = 162; - }; - - # set Xcursor.theme & Xcursor.size in ~/.Xresources automatically - home.pointerCursor = { - name = "Qogir-dark"; - package = pkgs.qogir-theme; - size = 64; - }; } diff --git a/home/linux/i3/default.nix b/home/linux/i3/default.nix index e2b713a1..87bfed30 100644 --- a/home/linux/i3/default.nix +++ b/home/linux/i3/default.nix @@ -44,18 +44,4 @@ "__GLX_VENDOR_LIBRARY_NAME" = "nvidia"; }; - # set dpi for 4k monitor - xresources.properties = { - # dpi for Xorg's font - "Xft.dpi" = 162; - # or set a generic dpi - "*.dpi" = 162; - }; - - # set Xcursor.theme & Xcursor.size in ~/.Xresources automatically - home.pointerCursor = { - name = "Qogir-dark"; - package = pkgs.qogir-theme; - size = 64; - }; }