diff --git a/user/home.nix b/user/home.nix index f9fe88c..9b5ac46 100644 --- a/user/home.nix +++ b/user/home.nix @@ -24,6 +24,7 @@ in { ./bmenu.nix ./fzf.nix ./ranger + ./theme.nix inputs.hyprland.homeManagerModules.default ]; # Home Manager needs a bit of information about you and the @@ -76,13 +77,6 @@ in { libsForQt5.qtstyleplugins qt5.qtsvg - ## fonts - liberation_ttf - hack-font - font-awesome_5 - fira-code - nerdfonts_fira_hack - material-wifi-icons ## Network speedtest-cli @@ -124,7 +118,6 @@ in { ]; home.sessionVariables = { - QT_QPA_PLATFORMTHEME = "gtk3"; VOLUME_CHANGE_SOUND = "${pkgs.sound-theme-freedesktop}/share/sounds/freedesktop/stereo/audio-volume-change.oga"; }; @@ -148,29 +141,6 @@ in { filesystem_charset "UTF-8" ''; }; - home.pointerCursor = { - name = "capitaine-cursors"; - size = 32; - package = pkgs.capitaine-cursors; - gtk.enable = true; - }; - gtk = { - enable = true; - theme = { - name = "Orchis-Red-Dark-Compact"; - package = pkgs.orchis_theme_compact; - }; - iconTheme = { - name = "Papirus-Dark"; - package = pkgs.papirus_red; - }; - }; - # qt = { - # enable = true; - # platformTheme = "gtk"; - # # style.package = pkgs.libsForQt5.qtstyleplugins; - # # style.name = "gtk2"; - # }; # This value determines the Home Manager release that your # configuration is compatible with. This helps avoid breakage diff --git a/user/theme.nix b/user/theme.nix new file mode 100644 index 0000000..4a637d7 --- /dev/null +++ b/user/theme.nix @@ -0,0 +1,49 @@ +{ config, pkgs, lib, inputs, ... }: { + home.pointerCursor = { + name = "capitaine-cursors"; + size = 32; + package = pkgs.capitaine-cursors; + gtk.enable = true; + }; + gtk = { + enable = true; + font = { + name = pkgs.uservars.font.interface; + size = pkgs.uservars.font.size.medium; + }; + theme = { + name = "Orchis-Red-Dark-Compact"; + package = pkgs.orchis_theme_compact; + }; + iconTheme = { + name = "Papirus-Dark"; + package = pkgs.papirus_red; + }; + }; + # qt = { + # enable = true; + # platformTheme = "gtk"; + # # style.package = pkgs.libsForQt5.qtstyleplugins; + # # style.name = "gtk2"; + # }; + home.sessionVariables = { + QT_QPA_PLATFORMTHEME = "qt5ct"; + }; + home.packages = with pkgs; [ + libsForQt5.qt5ct + libsForQt5.qtstyleplugin-kvantum + + pkgs.capitaine-cursors + pkgs.orchis_theme_compact + pkgs.papirus_red + + ## fonts + liberation_ttf + hack-font + font-awesome_5 + fira-code + nerdfonts_fira_hack + material-wifi-icons + + ]; +}