diff --git a/home/home.nix b/home/home.nix index 4704747..f410f06 100644 --- a/home/home.nix +++ b/home/home.nix @@ -99,24 +99,24 @@ in { enable = true; colors = with palette-hex; (builtins.replaceStrings - ["BLACK" - "BLCKA" - "RED" - "RDA" - "GREEN" - "GRNA" - "YELLOW" - "YLWA" - "BLUE" - "BLUA" - "MAGENTA" - "MGNA" - "CYAN" - "CYNA" - "WHITE" - "WHTA" - "FG" - "BG" ] + ["#BLACK" + "#BLCKA" + "#RED" + "#RDA" + "#GREEN" + "#GRNA" + "#YELLOW" + "#YLWA" + "#BLUE" + "#BLUA" + "#MAGENTA" + "#MGNA" + "#CYAN" + "#CYNA" + "#WHITE" + "#WHTA" + "#FG" + "#BG" ] [normal.black bright.black normal.red @@ -160,28 +160,37 @@ in { { "swaync/config.json" = dots/swaync/config.json; "swaync/configSchema.json" = dots/swaync/configSchema.json; - } // {"swaync/style.css" = { - enable = true; - text = with palette-hex; (builtins.replaceStrings - ["PANELBG" - "BORDER" - "NOTIBGNORM" - "NOTIBGHOVER" - "NOTIBGFOCUS" - "NOTIBGCLOSE" - "NOTIBGHOVERCLOSE" - "BGSELECTED"] - [util.bg - normal.black - util.bg - bright.black - bright.black - normal.black - bright.black - bright.black] - (builtins.readFile dots/swaync/style.css)); + } // + { + "swaync/style.css" = { + enable = true; + text = with palette-hex; (builtins.replaceStrings + ["#PANELBG" + "#BORDER" + "#NOTIBGNORM" + "#NOTIBGHOVER" + "#NOTIBGFOCUS" + "#NOTIBGCLOSE" + "#NOTIBGHOVERCLOSE" + "#BGSELECTED"] + [util.bg + normal.black + util.bg + bright.black + bright.black + normal.black + bright.black + bright.black] + (builtins.readFile dots/swaync/style.css)); + }; + } // + { + "Kvantum/gruvbox-kvantum" = { + enable = true; + recursive = true; + source = pkgs.rice.kvantum.package; + }; }; - }; xdg.systemDirs.data = [ "${pkgs.gtk3}/share/gsettings-schemas/${pkgs.gtk3.name}" @@ -197,10 +206,10 @@ in { style = with palette-hex; (builtins.replaceStrings ["/usr/share/wlogout" "/etc/wlogout" - "WINBG" - "BTNCOL" - "BTNBG" - "BTNFOCUSBG"] + "#WINBG" + "#BTNCOL" + "#BTNBG" + "#BTNFOCUSBG"] ["${pkgs.wlogout}/share/wlogout" "${pkgs.wlogout}/etc/wlogout" util.bg diff --git a/pkgs/default.nix b/pkgs/default.nix index 7bef236..03ced2e 100644 --- a/pkgs/default.nix +++ b/pkgs/default.nix @@ -1,6 +1,8 @@ {pkgs, ...}: { hyprland-system76-scheduler-integration = pkgs.callPackage ./hyprland-system76-scheduler-integration.nix {}; culr = pkgs.callPackage ./culr.nix {}; + gruvbox-kvantum = pkgs.callPackage ./gruvbox-kvantum.nix {}; + gruvbox-gtk-theme = pkgs.callPackage ./gruvbox-gtk-theme.nix {}; # system76-scheduler = pkgs.callPackage ./system76-scheduler.nix {}; # swayosd = pkgs.callPackage ./swayosd.nix {}; # fuzzel = pkgs.callPackage ./fuzzel.nix {}; diff --git a/pkgs/gruvbox-gtk-theme.nix b/pkgs/gruvbox-gtk-theme.nix index 759d755..06da31f 100644 --- a/pkgs/gruvbox-gtk-theme.nix +++ b/pkgs/gruvbox-gtk-theme.nix @@ -14,7 +14,7 @@ stdenv.mkDerivation rec { owner = "Fausto-Korpsvart"; repo = "Gruvbox-GTK-Theme"; rev = "5927e8693a70619b45fbe3317c59f04f6e101943"; - sha256 = lib.fakeSha256; + sha256 = "sha256-zvByW7wqVl4A5bKlVsJOSmyqkJiaHvciwSit3K/FqRM="; }; buildInputs = [ diff --git a/pkgs/gruvbox-kvantum.nix b/pkgs/gruvbox-kvantum.nix index 3f73ec0..678a105 100644 --- a/pkgs/gruvbox-kvantum.nix +++ b/pkgs/gruvbox-kvantum.nix @@ -11,12 +11,13 @@ stdenv.mkDerivation rec { owner = "thefallnn"; repo = "Gruvbox-Kvantum"; rev = "b04c6b67a4228c2b980821a0f0531bfe122c4aac"; - sha256 = lib.fakeSha256; + sha256 = "sha256-hFqqd39lGEnikM8+4MXwnNmZvQzhKOjFThrqx3q2lbo="; }; installPhase = '' runHook preInstall cp -a gruvbox-kvantum/ $out/ + sed -i 's/translucent_windows=true/translucent_windows=false/' $out/gruvbox-kvantum.kvconfig runHook postInstall ''; } diff --git a/rice.nix b/rice.nix index 8bca559..9b94d0e 100644 --- a/rice.nix +++ b/rice.nix @@ -37,12 +37,12 @@ in rec { fonts = { sans = { name = "Inria Sans"; - size = 12; + size = 14; package = self.inriafonts; }; serif = { name = "Inria Serif"; - size = 12; + size = 14; package = self.inriafonts; }; monospace = { @@ -52,7 +52,7 @@ in rec { }; emoji = { name = "Twitter Color Emoji"; - size = 12; + size = 14; package = self.twemoji-color-font; }; };