alteur/nix-dotfiles
1
0
Fork 0
Code Issues Pull requests Projects Releases Packages Wiki Activity

bump

Browse source
This commit is contained in:
alsaiduq-lab 2025-03-28 13:48:04 -06:00
parent a068b3c11a
commit 835e79ffcf
2 changed files with 61 additions and 40 deletions
Download patch file Download diff file Expand all files Collapse all files

18
modules/i3-xfce.nix
View file

@ -33,7 +33,7 @@ in {
export XDG_DATA_DIRS="${pkgs.gsettings-desktop-schemas}/share:${pkgs.gtk3}/share/gsettings-schemas/${pkgs.gtk3.name}:${pkgs.tokyonight-gtk-theme}/share:${customPkgs.vivid-icons}/share:$XDG_DATA_DIRS" export XDG_DATA_DIRS="${pkgs.gsettings-desktop-schemas}/share:${pkgs.gtk3}/share/gsettings-schemas/${pkgs.gtk3.name}:${pkgs.tokyonight-gtk-theme}/share:${customPkgs.vivid-icons}/share:$XDG_DATA_DIRS"
${pkgs.glib}/bin/gsettings set org.gnome.desktop.interface gtk-theme "Tokyonight-Dark" || echo "Failed to set GTK theme" > /tmp/theme-debug.log ${pkgs.glib}/bin/gsettings set org.gnome.desktop.interface gtk-theme "Tokyonight-Dark" || echo "Failed to set GTK theme" > /tmp/theme-debug.log
${pkgs.glib}/bin/gsettings set org.gnome.desktop.interface icon-theme "Vivid-Icons-Dark" || ${pkgs.glib}/bin/gsettings set org.gnome.desktop.interface icon-theme "Papirus-Dark" || echo "Failed to set icon theme" > /tmp/theme-debug.log ${pkgs.glib}/bin/gsettings set org.gnome.desktop.interface icon-theme "Vivid-Magna-Glassy-Dark-Icons" || ${pkgs.glib}/bin/gsettings set org.gnome.desktop.interface icon-theme "Papirus-Dark" || echo "Failed to set icon theme" > /tmp/theme-debug.log
${pkgs.glib}/bin/gsettings set org.gnome.desktop.interface cursor-theme "capitaine-cursors" || echo "Failed to set cursor theme" > /tmp/theme-debug.log ${pkgs.glib}/bin/gsettings set org.gnome.desktop.interface cursor-theme "capitaine-cursors" || echo "Failed to set cursor theme" > /tmp/theme-debug.log
''; '';
}; };
@ -55,7 +55,7 @@ in {
}; };
iconTheme = { iconTheme = {
package = customPkgs.vivid-icons; package = customPkgs.vivid-icons;
name = "Vivid-Icons-Dark"; name = "Vivid-Magna-Glassy-Dark-Icons";
}; };
cursorTheme = { cursorTheme = {
package = pkgs.capitaine-cursors; package = pkgs.capitaine-cursors;
@ -83,7 +83,7 @@ in {
environment.etc = { environment.etc = {
"gtk-2.0/gtkrc".text = '' "gtk-2.0/gtkrc".text = ''
gtk-theme-name="Tokyonight-Dark" gtk-theme-name="Tokyonight-Dark"
gtk-icon-theme-name="Vivid-Icons-Dark" gtk-icon-theme-name="Vivid-Magna-Glassy-Dark-Icons"
gtk-font-name="Clear Sans 10" gtk-font-name="Clear Sans 10"
gtk-cursor-theme-name="capitaine-cursors" gtk-cursor-theme-name="capitaine-cursors"
gtk-cursor-theme-size=24 gtk-cursor-theme-size=24
@ -92,25 +92,25 @@ in {
[Settings] [Settings]
gtk-application-prefer-dark-theme=1 gtk-application-prefer-dark-theme=1
gtk-theme-name=Tokyonight-Dark gtk-theme-name=Tokyonight-Dark
gtk-icon-theme-name=Vivid-Icons-Dark gtk-icon-theme-name="Vivid-Magna-Glassy-Dark-Icons"
gtk-font-name=Clear Sans 10 gtk-font-name=Clear Sans 10
gtk-cursor-theme-name=capitaine-cursors gtk-cursor-theme-name="capitaine-cursors"
gtk-cursor-theme-size=24 gtk-cursor-theme-size=24
''; '';
"gtk-4.0/settings.ini".text = '' "gtk-4.0/settings.ini".text = ''
[Settings] [Settings]
gtk-application-prefer-dark-theme=1 gtk-application-prefer-dark-theme=1
gtk-theme-name=Tokyonight-Dark gtk-theme-name=Tokyonight-Dark
gtk-icon-theme-name=Vivid-Icons-Dark gtk-icon-theme-name="Vivid-Magna-Glassy-Dark-Icons"
gtk-font-name=Clear Sans 10 gtk-font-name=Clear Sans 10
gtk-cursor-theme-name=capitaine-cursors gtk-cursor-theme-name="capitaine-cursors"
gtk-cursor-theme-size=24 gtk-cursor-theme-size=24
''; '';
}; };
environment.variables = { environment.variables = {
GTK_THEME = "Tokyonight-Dark"; GTK_THEME = "Tokyonight-Dark";
ICON_THEME = "Vivid-Icons-Dark"; ICON_THEME = "Vivid-Magna-Glassy-Dark-Icons";
XCURSOR_THEME = "capitaine-cursors"; XCURSOR_THEME = "capitaine-cursors";
XCURSOR_SIZE = "24"; XCURSOR_SIZE = "24";
}; };
@ -148,7 +148,7 @@ in {
programs.dconf.profiles.user.databases = [{ programs.dconf.profiles.user.databases = [{
settings = { settings = {
"org/gnome/desktop/interface" = { "org/gnome/desktop/interface" = {
icon-theme = "Vivid-Icons-Dark"; icon-theme = "Vivid-Magna-Glassy-Dark-Icons";
gtk-theme = "Tokyonight-Dark"; gtk-theme = "Tokyonight-Dark";
cursor-theme = "capitaine-cursors"; cursor-theme = "capitaine-cursors";
}; };

83
pkgs/vivid-icons/default.nix
View file

@ -2,9 +2,8 @@
lib, lib,
stdenv, stdenv,
fetchFromGitHub, fetchFromGitHub,
hicolor-icon-theme,
}: }:
stdenv.mkDerivation rec { stdenv.mkDerivation {
pname = "vivid-icons"; pname = "vivid-icons";
version = "unstable-${builtins.substring 0 7 "fe8b8f1bdd3784dc838c125bb9e1b2d713f40e67"}"; version = "unstable-${builtins.substring 0 7 "fe8b8f1bdd3784dc838c125bb9e1b2d713f40e67"}";
src = fetchFromGitHub { src = fetchFromGitHub {
@ -13,42 +12,64 @@ stdenv.mkDerivation rec {
rev = "fe8b8f1bdd3784dc838c125bb9e1b2d713f40e67"; rev = "fe8b8f1bdd3784dc838c125bb9e1b2d713f40e67";
sha256 = "UlZkxeWb2n5TexaQymeyEqAjKwDfonTXO2OYjICHl+U="; sha256 = "UlZkxeWb2n5TexaQymeyEqAjKwDfonTXO2OYjICHl+U=";
}; };
buildInputs = [hicolor-icon-theme]; buildInputs = [ ];
installPhase = '' installPhase = ''
mkdir -p $out/share/icons echo "Source contents at root:"
for dir in Vivid-Icons-*; do ls -la .
if [ -d "$dir" ]; then mkdir -p $out/share/icons
theme_name=$(basename "$dir") cd "Vivid Icons Themes"
dest_dir="$out/share/icons/$theme_name" echo "Contents of Vivid Icons Themes:"
cp -r "$dir" "$dest_dir" ls -la .
echo "[Icon Theme]" > "$dest_dir/index.theme" for dir in Vivid-Dark-Icons Vivid-Glassy-Dark-Icons Vivid-Magna-Glassy-Dark-Icons; do
echo "Name=$theme_name" >> "$dest_dir/index.theme" if [ -d "$dir" ]; then
echo "Comment=$theme_name icons" >> "$dest_dir/index.theme" echo "Processing: $dir"
echo "Inherits=hicolor" >> "$dest_dir/index.theme" theme_name="$dir"
directories="" dest_dir="$out/share/icons/$theme_name"
for size_dir in "$dest_dir"/*; do mkdir -p "$dest_dir"
if [ -d "$size_dir" ]; then find "$dir" -type d -regex ".*/[0-9]+" | while read -r size_dir; do
size=$(basename "$size_dir") size=$(basename "$size_dir")
if [[ "$size" =~ ^[0-9]+x[0-9]+$ ]]; then category=$(basename "$(dirname "$size_dir")")
directories="$directories''${directories:+,}$size" target_dir="$dest_dir/''${size}x''${size}/$category"
echo "[$size]" >> "$dest_dir/index.theme" mkdir -p "$target_dir"
echo "Size=''${size%%x*}" >> "$dest_dir/index.theme" cp -rv "$size_dir"/* "$target_dir/"
echo "Context=Actions" >> "$dest_dir/index.theme" done
echo "Type=Fixed" >> "$dest_dir/index.theme" echo "[Icon Theme]" > "$dest_dir/index.theme"
fi echo "Name=$theme_name" >> "$dest_dir/index.theme"
echo "Comment=$theme_name icons" >> "$dest_dir/index.theme"
directories=""
for size_dir in "$dest_dir"/*; do
if [ -d "$size_dir" ]; then
size=$(basename "$size_dir") # e.g., "22x22"
if [[ "$size" =~ ^[0-9]+x[0-9]+$ ]]; then
directories="$directories''${directories:+,}$size"
echo "[$size]" >> "$dest_dir/index.theme"
echo "Size=''${size%%x*}" >> "$dest_dir/index.theme"
echo "Context=Actions" >> "$dest_dir/index.theme"
echo "Type=Fixed" >> "$dest_dir/index.theme"
fi fi
done fi
echo "Directories=$directories" >> "$dest_dir/index.theme" done
if [ -z "$directories" ]; then
echo "No size dirs found for $theme_name, adding fallback"
directories="scalable"
echo "[scalable]" >> "$dest_dir/index.theme"
echo "Size=48" >> "$dest_dir/index.theme"
echo "Context=Actions" >> "$dest_dir/index.theme"
echo "Type=Scalable" >> "$dest_dir/index.theme"
fi fi
done echo "Directories=$directories" >> "$dest_dir/index.theme"
echo "Installed themes:" else
ls -la $out/share/icons/ echo "Warning: $dir not found in Vivid Icons Themes"
''; fi
done
echo "Installed themes:"
ls -la $out/share/icons/
'';
meta = with lib; { meta = with lib; {
description = "Vivid Icons Theme"; description = "Vivid Icons Theme";
homepage = "https://github.com/L4ki/Vivid-Plasma-Themes"; homepage = "https://github.com/L4ki/Vivid-Plasma-Themes";
license = licenses.gpl3; license = licenses.gpl3;
platforms = platforms.all; platforms = platforms.all;
maintainers = with maintainers; ["Cobray"]; maintainers = with maintainers; [ "Cobray" ];
}; };
} }