From 9519f952449eabbf2ac8bee7394009007ee78988 Mon Sep 17 00:00:00 2001 From: alsaiduq-lab Date: Sun, 16 Mar 2025 17:46:17 -0600 Subject: [PATCH] whoops --- modules/i3-xfce.nix | 10 +++----- pkgs/tokyo-night/default.nix | 44 ++++++++++++++++++++++++++---------- 2 files changed, 35 insertions(+), 19 deletions(-) diff --git a/modules/i3-xfce.nix b/modules/i3-xfce.nix index e326991..a6562dd 100644 --- a/modules/i3-xfce.nix +++ b/modules/i3-xfce.nix @@ -39,7 +39,7 @@ in background = "#000000"; greeters.gtk = { enable = true; - theme.name = "Tokyonight-Storm-B"; + theme.name = "Tokyonight-Dark"; iconTheme.name = "Vivid-Dark-Icons"; }; }; @@ -59,27 +59,23 @@ in ''; mode = "0644"; }; - qt.enable = true; qt.platformTheme = "qt5ct"; qt.style = "adwaita-dark"; - environment.etc."gtk-3.0/settings.ini".text = '' [Settings] gtk-application-prefer-dark-theme=1 - gtk-theme-name=Tokyonight-Storm-B + gtk-theme-name=Tokyonight-Dark gtk-icon-theme-name=Vivid-Dark-Icons gtk-font-name=Sans 10 ''; - environment.etc."gtk-4.0/settings.ini".text = '' [Settings] gtk-application-prefer-dark-theme=1 - gtk-theme-name=Tokyonight-Storm-B + gtk-theme-name=Tokyonight-Dark gtk-icon-theme-name=Vivid-Dark-Icons gtk-font-name=Sans 10 ''; - environment.systemPackages = with pkgs; [ arandr nitrogen diff --git a/pkgs/tokyo-night/default.nix b/pkgs/tokyo-night/default.nix index 0c25ab3..79e880e 100644 --- a/pkgs/tokyo-night/default.nix +++ b/pkgs/tokyo-night/default.nix @@ -1,4 +1,4 @@ -{ lib, stdenv, fetchFromGitHub, gtk-engine-murrine, gtk_engines }: +{ lib, stdenv, fetchFromGitHub, gtk-engine-murrine, gtk_engines, bash, sassc }: stdenv.mkDerivation { pname = "tokyo-night-gtk"; @@ -11,20 +11,40 @@ stdenv.mkDerivation { sha256 = "0c7sp9n2pc70yy9msmbmcyhqbr63v1ssnsxk6vg10zwwc3wl19h0"; }; - nativeBuildInputs = [ ]; - - buildInputs = [ - gtk-engine-murrine - gtk_engines - ]; - - propagatedUserEnvPkgs = [ - gtk-engine-murrine - ]; + nativeBuildInputs = [ bash sassc ]; + buildInputs = [ gtk-engine-murrine gtk_engines ]; + propagatedUserEnvPkgs = [ gtk-engine-murrine ]; + patchPhase = '' + cd themes + substituteInPlace install.sh \ + --replace-fail 'name="${2}${3}${4}${5}${6}"' 'name="Tokyonight${3}${4}${5}"' + substituteInPlace install.sh \ + --replace-fail 'if [ "$UID" -eq "$ROOT_UID" ]; then' 'if false; then' \ + --replace-fail 'DEST_DIR="/usr/share/themes"' 'DEST_DIR="$TMPDIR/.themes"' \ + --replace-fail 'DEST_DIR="$HOME/.themes"' 'DEST_DIR="$TMPDIR/.themes"' + substituteInPlace install.sh \ + --replace-fail 'if [[ "$(command -v gnome-shell)" ]]; then' 'if false; then' \ + --replace-fail 'if has_command xfce4-popup-whiskermen; then' 'if false; then' \ + --replace-fail 'if (pgrep xfce4-session &>/dev/null); then' 'if false; then' + ''; + buildPhase = '' + export HOME=$TMPDIR + mkdir -p $TMPDIR/.themes + bash ./install.sh + bash ./install.sh --tweaks storm + bash ./install.sh --tweaks storm black + bash ./install.sh --tweaks storm black outline + echo "Created themes:" + ls -la $TMPDIR/.themes/ + ''; installPhase = '' mkdir -p $out/share/themes - cp -r themes/src/Tokyonight-* $out/share/themes/ + for theme in $TMPDIR/.themes/*; do + if [ -d "$theme" ]; then + cp -r "$theme" "$out/share/themes/" + fi + done ''; meta = with lib; {