From 4cb2c6589d6b5d0df0f989d04785017fd2b525de Mon Sep 17 00:00:00 2001 From: clsty Date: Tue, 4 Nov 2025 07:36:45 +0800 Subject: [PATCH 1/9] Update home.nix --- sdata/dist-nix/home-manager/home.nix | 15 +++++++-------- 1 file changed, 7 insertions(+), 8 deletions(-) diff --git a/sdata/dist-nix/home-manager/home.nix b/sdata/dist-nix/home-manager/home.nix index 69eefe775..8673f0f51 100644 --- a/sdata/dist-nix/home-manager/home.nix +++ b/sdata/dist-nix/home-manager/home.nix @@ -10,8 +10,7 @@ xdg-desktop-portal-gnome xdg-desktop-portal-gtk xdg-desktop-portal-wlr - libsForQt5.xdg-desktop-portal-kde - #kdePackages.xdg-desktop-portal-kde + kdePackages.xdg-desktop-portal-kde ]; config.hyprland = { default = [ "hyprland" "gtk" ]; @@ -59,7 +58,7 @@ ### illogical-impulse-basic - #axel (Seems not available, however actually not needed cuz it's only used for install Bibata_Cursor in package-installers.sh) + #axel#axel (TODO: actually not needed cuz it's only used for install Bibata_Cursor in package-installers.sh) bc #bc (Used in quickshell/ii/scripts/colors/switchwall.sh for example) uutils-coreutils-noprefix #coreutils (Too many executables involved, not sure where been used) cliphist #cliphist (Used in Hyprland and Quickshell config) @@ -83,12 +82,12 @@ #breeze #breeze-plus #darkly-bin - #eza (Used in Fish config: `alias ls 'eza --icons'`; TODO: Not available on search.nixos.org) + eza #eza (Used in Fish config: `alias ls 'eza --icons'`) #fish (Probably should not install via Nix) fontconfig #fontconfig (Basic thing) kitty #kitty (Used in fuzzel, Hyprland, kdeglobals and Quickshell config; kitty config is also included as dots) matugen #matugen-bin (Used in Quickshell) - #otf-space-grotesk https://events.ccc.de/congress/2024/infos/styleguide.html (TODO: Not available on search.nixos.org) (Used in Quickshell and matugen config) + #otf-space-grotesk https://events.ccc.de/congress/2024/infos/styleguide.html (TODO: Not available as Nixpkg) (Used in Quickshell and matugen config) starship #starship (Used in Fish config) #ttf-gabarito-git #ttf-jetbrains-mono-nerd @@ -128,7 +127,7 @@ ### illogical-impulse-microtex-git # This package will be installed as /opt/MicroTeX and it #MicroTeX#https://github.com/NanoMichael/MicroTeX - # TODO: It seems not available on search.nixos.org + # TODO: Not available as nixpkg ### illogical-impulse-oneui4-icons-git @@ -145,8 +144,8 @@ ### illogical-impulse-python #clang (Some python package may need this to be built, e.g. #1235) (However it seems not available directly as a package on search.nixos.org) uv #uv (Used for python venv) - #gtk4 (Not explicitly used) (Not directly available as a package on search.nixos.org) - #libadwaita (Not explicitly used) (Not directly available as a package on search.nixos.org) + gtk4 #gtk4 (Not explicitly used) + libadwaita #libadwaita (Not explicitly used) libsoup_3 #libsoup3 (Not explicitly used) libportal-gtk4 #libportal-gtk4 (Not explicitly used) gobject-introspection #gobject-introspection (Not explicitly used) From 534ef6fd7c17bf2cbb4c0719ae05043817185641 Mon Sep 17 00:00:00 2001 From: clsty Date: Tue, 4 Nov 2025 08:59:40 +0800 Subject: [PATCH 2/9] Add ii_check_PKGBUILD_version() in diagnose --- diagnose | 4 ++++ 1 file changed, 4 insertions(+) diff --git a/diagnose b/diagnose index 408b5e896..a686cab5e 100755 --- a/diagnose +++ b/diagnose @@ -58,6 +58,9 @@ ii_check_venv() { ii_check_quickshell_version() { pacman -Q | grep -E 'quickshell|qt6-base' } +ii_check_PKGBUILD_version() { + pacman -Q | grep '^illogical-impulse-' +} e "Checking git repo info" x git remote get-url origin @@ -88,6 +91,7 @@ x ls -l ~/.local/state/quickshell/.venv e "Checking versions" x Hyprland --version x ii_check_quickshell_version +x ii_check_PKGBUILD_version e "Finished. Output saved as \"$output_file\"." if ! command -v curl 2>&1 >>/dev/null ;then echo "\"curl\" not found, pastebin upload unavailable.";exit;fi From b4b15a2808ebbbacf3bb6dc8e0550aaa4395397d Mon Sep 17 00:00:00 2001 From: clsty Date: Tue, 4 Nov 2025 10:22:28 +0800 Subject: [PATCH 3/9] Update home.nix --- sdata/dist-nix/home-manager/home.nix | 143 ++++++++++++++------------- 1 file changed, 72 insertions(+), 71 deletions(-) diff --git a/sdata/dist-nix/home-manager/home.nix b/sdata/dist-nix/home-manager/home.nix index 8673f0f51..77ca01ff7 100644 --- a/sdata/dist-nix/home-manager/home.nix +++ b/sdata/dist-nix/home-manager/home.nix @@ -30,9 +30,7 @@ ## inetutils: provides hostname, ifconfig, ping, etc. ## libnotify: provides notify-send inetutils libnotify - - ##### Fonts/Icons/Cursors/Decoration ##### - fontconfig + foot # Used in Quickshell and Hyprland config; its config is also included ##### Other basic things ##### dbus xorg.xlsclients networkmanager @@ -74,64 +72,65 @@ ### illogical-impulse-bibata-modern-classic-bin - bibata-cursors #https://github.com/ful1e5/Bibata_Cursor + bibata-cursors #https://github.com/ful1e5/Bibata_Cursor # Used in Hyprland config, not necessary ### illogical-impulse-fonts-themes - #adw-gtk-theme-git - #breeze - #breeze-plus - #darkly-bin + adw-gtk3 #adw-gtk-theme-git (https://github.com/lassekongo83/adw-gtk3) (Used in Quickshell config) + kdePackages.breeze kdePackages.breeze-icons #breeze (Used in kdeglobals config) + #breeze-plus (https://github.com/mjkim0727/breeze-plus) (TODO: Not available as nixpkg) (Used in kde-material-you-colors config) + #darkly-bin (TODO: seems not being used) eza #eza (Used in Fish config: `alias ls 'eza --icons'`) #fish (Probably should not install via Nix) fontconfig #fontconfig (Basic thing) kitty #kitty (Used in fuzzel, Hyprland, kdeglobals and Quickshell config; kitty config is also included as dots) matugen #matugen-bin (Used in Quickshell) - #otf-space-grotesk https://events.ccc.de/congress/2024/infos/styleguide.html (TODO: Not available as Nixpkg) (Used in Quickshell and matugen config) + #otf-space-grotesk (https://events.ccc.de/congress/2024/infos/styleguide.html) (TODO: Not available as Nixpkg) (Used in Quickshell and matugen config) starship #starship (Used in Fish config) - #ttf-gabarito-git - #ttf-jetbrains-mono-nerd - #ttf-material-symbols-variable-git - #ttf-readex-pro - #ttf-roboto-flex - #ttf-rubik-vf - #ttf-twemoji + #ttf-gabarito-git (Font name: Gabarito) (Used in fuzzel and Quickshell config) (TODO: Not available as Nixpkg) + nerd-fonts.jetbrains-mono #ttf-jetbrains-mono-nerd (Font name: JetBrains Mono NF, JetBrainsMono Nerd Font) (Used in foot, kdeglobals, kitty, qt5ct, qt6ct and Quickshell config) + material-symbols #ttf-material-symbols-variable-git (Font name: Material Symbols Rounded, Material Symbols Outlined) (Used in Hyprland, matugen, Quickshell and wlogout config) + #ttf-readex-pro (Font name: Readex Pro) (Used in Quickshell config) (TODO: seems not available as nixpkg) + roboto-flex #ttf-roboto-flex (Font name: Roboto Flex) (Used in Hyprland, matugen and Quickshell config) + rubik #ttf-rubik-vf (Font name: Rubik, Rubik Light) (Used in Hyprland, kdeglobals, matugen, qt5ct, qt6ct and Quickshell config) + twemoji-color-font #ttf-twemoji (Not explicitly used, but it may help as fallback for displaying emoji charaters) ### illogical-impulse-hyprland - #hypridle - #hyprcursor + hypridle #hypridle (Used for loginctl to lock session) + #hyprcursor (TODO: Seems not being used) #hyprland (Need NixGL, included elsewhere) - #hyprland-qtutils - #hyprland-qt-support - #hyprlang - #hyprlock - #hyprpicker - #hyprsunset - #hyprutils - #hyprwayland-scanner - #xdg-desktop-portal-hyprland - wl-clipboard #wl-clipboard + #hyprland-qtutils (TODO: Not needed, it's already a dependency of Hyprland itself, and it's not being used anywhere in this repo) + #hyprland-qt-support (TODO: Not needed, it's already a dep of hyprland-qtutils which is a dep of Hyprland, and it's not being used anywhere in this repo) + #hyprlang (TODO: Not needed, it's already a dependency of Hyprland, hypridle, etc.) + #hyprlock (Should not be installed via Nix) + hyprpicker #hyprpicker (Used in Hyprland and Quickshell config) + hyprsunset #hyprsunset (Used in Quickshell config) + #hyprutils #hyprutils (TODO: Not needed, it's already a dep of Hyprland and not being used anywhere in this repo) + #hyprwayland-scanner (TODO: Not needed, it's already a dep of Hyprland and not being used anywhere in this repo) + #xdg-desktop-portal-hyprland (DUPLICATE) + wl-clipboard #wl-clipboard (Surely needed) ### illogical-impulse-kde - #bluedevil - #gnome-keyring - #networkmanager - #plasma-nm - #polkit-kde-agent - #dolphin - #systemsettings + kdePackages.bluedevil #bluedevil (Seems not being used anywhere, maybe a part of KDE settings panel) + gnome-keyring #gnome-keyring (TODO: Maybe should not be installed by Nix) (Provide executable gnome-keyring-daemon, used in Hyprland and Quickshell config) + networkmanager #networkmanager + kdePackages.plasma-nm #plasma-nm (Seems not being used anywhere, maybe a part of KDE settings panel) + #polkit-kde-agent (TODO: Maybe should not install by Nix) + kdePackages.dolphin #dolphin (Used in Hyprland and Quickshell config) + kdePackages.systemsettings #systemsettings (Used in Hyprland keybinds.conf) ### illogical-impulse-microtex-git - # This package will be installed as /opt/MicroTeX and it + # This package will be installed as /opt/MicroTeX #MicroTeX#https://github.com/NanoMichael/MicroTeX # TODO: Not available as nixpkg ### illogical-impulse-oneui4-icons-git #OneUI4-Icons#https://github.com/end-4/OneUI4-Icons + # TODO: Custom repo, need to make a package ### illogical-impulse-portal @@ -142,60 +141,62 @@ ### illogical-impulse-python - #clang (Some python package may need this to be built, e.g. #1235) (However it seems not available directly as a package on search.nixos.org) + clang #clang (Some python package may need this to be built, e.g. #1235) uv #uv (Used for python venv) gtk4 #gtk4 (Not explicitly used) libadwaita #libadwaita (Not explicitly used) libsoup_3 #libsoup3 (Not explicitly used) libportal-gtk4 #libportal-gtk4 (Not explicitly used) gobject-introspection #gobject-introspection (Not explicitly used) - #sassc (TODO: Not used anymore?) + #sassc (TODO: Not used anymore) ### illogical-impulse-quickshell-git + # TODO: maybe Quickshell uses GPU acceleration, which means NixGL is applicable quickshell.packages.x86_64-linux.default ### illogical-impulse-screencapture - #hyprshot - #slurp - #swappy - #tesseract - #tesseract-data-eng - #wf-recorder + hyprshot #hyprshot (Used in Hyprland keybinds.conf as fallback) + slurp #slurp (Used in Hyprland and Quickshell config) + swappy #swappy (Used in Quickshell config) + tesseract #tesseract (Used in Quickshell and Hyprland config) + #tesseract-data-eng (Used as data for tesseract) (TODO: Seems not available as nixpkg) + wf-recorder #wf-recorder (Used in Quickshell config) ### illogical-impulse-toolkit - #kdialog - #qt6-5compat - #qt6-avif-image-plugin - #qt6-base - #qt6-declarative - #qt6-imageformats - #qt6-multimedia - #qt6-positioning - #qt6-quicktimeline - #qt6-sensors - #qt6-svg - #qt6-tools - #qt6-translations - #qt6-virtualkeyboard - #qt6-wayland - #syntax-highlighting - #upower - #wtype - #ydotool + kdePackages.kdialog #kdialog (Used in Quickshell config) + # TODO: Deal with qt6 things, see https://nixos.wiki/wiki/Qt + #qt6-5compat (Maybe for some qt support) + #qt6-avif-image-plugin (Maybe for some qt support) + #qt6-base (Maybe for some qt support) + #qt6-declarative (Maybe for some qt support) + #qt6-imageformats (Maybe for some qt support) + #qt6-multimedia (Maybe for some qt support) + #qt6-positioning (Maybe for some qt support) + #qt6-quicktimeline (Maybe for some qt support) + #qt6-sensors (Maybe for some qt support) + #qt6-svg (Maybe for some qt support) + #qt6-tools (Maybe for some qt support) + #qt6-translations (Maybe for some qt support) + #qt6-virtualkeyboard (Maybe for some qt support) + #qt6-wayland (Maybe for some qt support) + kdePackages.syntax-highlighting #syntax-highlighting (Used in Quickshell config) + upower #upower (Used in Quickshell config) + wtype #wtype (Used in Hyprland scripts/fuzzel-emoji.sh) + ydotool #ydotool (Used in Quickshell config) ### illogical-impulse-widgets - #fuzzel - #glib2 # for `gsettings` it seems? - #imagemagick - #hypridle - #hyprutils - #hyprlock - #hyprpicker - #nm-connection-editor (TODO: Not needed?) + fuzzel #fuzzel (Used in Hyprland and Quickshell config; its config is also included) + glib #glib2 (Provide executable gsettings) (Used in install script, also in matugen and quickshell config) + imagemagick #imagemagick (Provide executable: magick) (Used in Quickshell config) + #hypridle (DUPLICATE) + #hyprutils (DUPLICATE) + #hyprlock (DUPLICATE) + #hyprpicker (DUPLICATE) + #nm-connection-editor (TODO: Not needed) songrec #songrec (Used in Quickshell config) translate-shell #translate-shell (Used in Quickshell config) wlogout #wlogout (Used in Hyprland config) From 76db90af1b07d14dd713d12f5a5f34ded5dfdb9b Mon Sep 17 00:00:00 2001 From: clsty Date: Tue, 4 Nov 2025 11:15:53 +0800 Subject: [PATCH 4/9] Update flake.nix --- sdata/dist-nix/home-manager/flake.nix | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) diff --git a/sdata/dist-nix/home-manager/flake.nix b/sdata/dist-nix/home-manager/flake.nix index 792d3bb5c..7fcbf9ff5 100644 --- a/sdata/dist-nix/home-manager/flake.nix +++ b/sdata/dist-nix/home-manager/flake.nix @@ -9,9 +9,9 @@ url = "github:nix-community/home-manager/release-25.05"; inputs.nixpkgs.follows = "nixpkgs"; }; - hyprland = { - url = "github:hyprwm/Hyprland"; - }; + #hyprland = { + # url = "github:hyprwm/Hyprland"; + #}; nixgl.url = "github:nix-community/nixGL"; quickshell = { url = "git+https://git.outfoxxed.me/outfoxxed/quickshell?ref=db1777c20b936a86528c1095cbcb1ebd92801402"; From 7534509caacde59cf1261d772d7111393e999d66 Mon Sep 17 00:00:00 2001 From: clsty Date: Tue, 4 Nov 2025 11:33:54 +0800 Subject: [PATCH 5/9] Support custom os-release --- .gitignore | 1 + sdata/subcmd-install/1.deps-selector.sh | 12 +++++++++--- 2 files changed, 10 insertions(+), 3 deletions(-) diff --git a/.gitignore b/.gitignore index bc6ebed73..cef4d7aab 100644 --- a/.gitignore +++ b/.gitignore @@ -5,3 +5,4 @@ __pycache__/ *.py[cod] dots/.config/quickshell/ii/.qmlls.ini .update-lock +/os-release diff --git a/sdata/subcmd-install/1.deps-selector.sh b/sdata/subcmd-install/1.deps-selector.sh index 27661925e..dec23c463 100644 --- a/sdata/subcmd-install/1.deps-selector.sh +++ b/sdata/subcmd-install/1.deps-selector.sh @@ -65,9 +65,15 @@ esac # Helpful link(s): # http://stackoverflow.com/questions/29581754 # https://github.com/which-distro/os-release -export OS_RELEASE_FILE=${OS_RELEASE_FILE:-/etc/os-release} -test -f ${OS_RELEASE_FILE} || \ - ( echo "${OS_RELEASE_FILE} does not exist. Aborting..." ; exit 1 ; ) +OS_RELEASE_FILE_CUSTOM="${REPO_ROOT}/os-release" +if test -f "${OS_RELEASE_FILE_CUSTOM}"; then + printf "${STY_YELLOW}Warning: using custom os-release file \"${OS_RELEASE_FILE_CUSTOM}\".${STY_RST}\n" + OS_RELEASE_FILE="${OS_RELEASE_FILE_CUSTOM}" +elif test -f /etc/os-release; then + OS_RELEASE_FILE=/etc/os-release +else + printf "${STY_RED}/etc/os-release does not exist, aborting...${STY_RST}\n" ; exit 1 +fi export OS_DISTRO_ID=$(awk -F'=' '/^ID=/ { gsub("\"","",$2); print tolower($2) }' ${OS_RELEASE_FILE} 2> /dev/null) export OS_DISTRO_ID_LIKE=$(awk -F'=' '/^ID_LIKE=/ { gsub("\"","",$2); print tolower($2) }' ${OS_RELEASE_FILE} 2> /dev/null) From 17d2d32bf13998e249994225c290aa1964ea318f Mon Sep 17 00:00:00 2001 From: clsty Date: Tue, 4 Nov 2025 11:45:34 +0800 Subject: [PATCH 6/9] Update dist-nix --- sdata/dist-nix/home-manager/home.nix | 24 ++++++++++++------------ sdata/lib/package-installers.sh | 4 ++-- 2 files changed, 14 insertions(+), 14 deletions(-) diff --git a/sdata/dist-nix/home-manager/home.nix b/sdata/dist-nix/home-manager/home.nix index 77ca01ff7..7eefd3601 100644 --- a/sdata/dist-nix/home-manager/home.nix +++ b/sdata/dist-nix/home-manager/home.nix @@ -56,7 +56,7 @@ ### illogical-impulse-basic - #axel#axel (TODO: actually not needed cuz it's only used for install Bibata_Cursor in package-installers.sh) + #axel#axel (TODOrm: actually not needed cuz it's only used for install Bibata_Cursor in package-installers.sh) bc #bc (Used in quickshell/ii/scripts/colors/switchwall.sh for example) uutils-coreutils-noprefix #coreutils (Too many executables involved, not sure where been used) cliphist #cliphist (Used in Hyprland and Quickshell config) @@ -65,7 +65,7 @@ wget #wget (Used in Quickshell config) ripgrep #ripgrep (Not sure where been used) jq #jq (Widely used) - #meson (TODO: Actually not needed. It was used in building AGS.) + #meson (TODOrm: Actually not needed. It was used in building AGS.) xdg-user-dirs #xdg-user-dirs (Used in Hyprland and Quickshell config) rsync #rsync (Used in install script) yq-go #go-yq (Used in install script) @@ -79,7 +79,7 @@ adw-gtk3 #adw-gtk-theme-git (https://github.com/lassekongo83/adw-gtk3) (Used in Quickshell config) kdePackages.breeze kdePackages.breeze-icons #breeze (Used in kdeglobals config) #breeze-plus (https://github.com/mjkim0727/breeze-plus) (TODO: Not available as nixpkg) (Used in kde-material-you-colors config) - #darkly-bin (TODO: seems not being used) + #darkly-bin (TODOrm: seems not being used?) eza #eza (Used in Fish config: `alias ls 'eza --icons'`) #fish (Probably should not install via Nix) fontconfig #fontconfig (Basic thing) @@ -98,23 +98,23 @@ ### illogical-impulse-hyprland hypridle #hypridle (Used for loginctl to lock session) - #hyprcursor (TODO: Seems not being used) + #hyprcursor (TODOrm: Seems not being used?) #hyprland (Need NixGL, included elsewhere) - #hyprland-qtutils (TODO: Not needed, it's already a dependency of Hyprland itself, and it's not being used anywhere in this repo) - #hyprland-qt-support (TODO: Not needed, it's already a dep of hyprland-qtutils which is a dep of Hyprland, and it's not being used anywhere in this repo) - #hyprlang (TODO: Not needed, it's already a dependency of Hyprland, hypridle, etc.) + #hyprland-qtutils (TODOrm: Not needed, it's already a dependency of Hyprland itself, and it's not being used anywhere in this repo) + #hyprland-qt-support (TODOrm: Not needed, it's already a dep of hyprland-qtutils which is a dep of Hyprland, and it's not being used anywhere in this repo) + #hyprlang (TODOrm: Not needed, it's already a dependency of Hyprland, hypridle, etc.) #hyprlock (Should not be installed via Nix) hyprpicker #hyprpicker (Used in Hyprland and Quickshell config) hyprsunset #hyprsunset (Used in Quickshell config) - #hyprutils #hyprutils (TODO: Not needed, it's already a dep of Hyprland and not being used anywhere in this repo) - #hyprwayland-scanner (TODO: Not needed, it's already a dep of Hyprland and not being used anywhere in this repo) + #hyprutils #hyprutils (TODOrm: Not needed, it's already a dep of Hyprland and not being used anywhere in this repo) + #hyprwayland-scanner (TODOrm: Not needed, it's already a dep of Hyprland and not being used anywhere in this repo) #xdg-desktop-portal-hyprland (DUPLICATE) wl-clipboard #wl-clipboard (Surely needed) ### illogical-impulse-kde kdePackages.bluedevil #bluedevil (Seems not being used anywhere, maybe a part of KDE settings panel) - gnome-keyring #gnome-keyring (TODO: Maybe should not be installed by Nix) (Provide executable gnome-keyring-daemon, used in Hyprland and Quickshell config) + #gnome-keyring #gnome-keyring (TODO: Maybe should not be installed by Nix) (Provide executable gnome-keyring-daemon, used in Hyprland and Quickshell config) networkmanager #networkmanager kdePackages.plasma-nm #plasma-nm (Seems not being used anywhere, maybe a part of KDE settings panel) #polkit-kde-agent (TODO: Maybe should not install by Nix) @@ -148,7 +148,7 @@ libsoup_3 #libsoup3 (Not explicitly used) libportal-gtk4 #libportal-gtk4 (Not explicitly used) gobject-introspection #gobject-introspection (Not explicitly used) - #sassc (TODO: Not used anymore) + #sassc (TODOrm: Not used anymore) ### illogical-impulse-quickshell-git @@ -196,7 +196,7 @@ #hyprutils (DUPLICATE) #hyprlock (DUPLICATE) #hyprpicker (DUPLICATE) - #nm-connection-editor (TODO: Not needed) + #nm-connection-editor (TODOrm: Not needed) songrec #songrec (Used in Quickshell config) translate-shell #translate-shell (Used in Quickshell config) wlogout #wlogout (Used in Hyprland config) diff --git a/sdata/lib/package-installers.sh b/sdata/lib/package-installers.sh index 8ab15b086..24f3bf3ce 100644 --- a/sdata/lib/package-installers.sh +++ b/sdata/lib/package-installers.sh @@ -53,8 +53,8 @@ install-bibata(){ x cd $REPO_ROOT/cache/bibata-cursor name="Bibata-Modern-Classic" file="$name.tar.xz" - # Use axel because `curl -O` always downloads a file with 0 byte size, idk why - x axel https://github.com/ful1e5/Bibata_Cursor/releases/latest/download/$file + try rm $file + x curl -JLO https://github.com/ful1e5/Bibata_Cursor/releases/latest/download/$file tar -xf $file x sudo mkdir -p /usr/local/share/icons x sudo cp -r $name /usr/local/share/icons From 5af742012933df0ce65434208220dd712340b053 Mon Sep 17 00:00:00 2001 From: clsty Date: Tue, 4 Nov 2025 12:33:48 +0800 Subject: [PATCH 7/9] Update dist-nix --- sdata/dist-nix/home-manager/flake.nix | 2 +- sdata/dist-nix/home-manager/home.nix | 6 +++--- 2 files changed, 4 insertions(+), 4 deletions(-) diff --git a/sdata/dist-nix/home-manager/flake.nix b/sdata/dist-nix/home-manager/flake.nix index 7fcbf9ff5..79164ad6a 100644 --- a/sdata/dist-nix/home-manager/flake.nix +++ b/sdata/dist-nix/home-manager/flake.nix @@ -14,7 +14,7 @@ #}; nixgl.url = "github:nix-community/nixGL"; quickshell = { - url = "git+https://git.outfoxxed.me/outfoxxed/quickshell?ref=db1777c20b936a86528c1095cbcb1ebd92801402"; + url = "github:quickshell-mirror/quickshell/db1777c20b936a86528c1095cbcb1ebd92801402"; inputs.nixpkgs.follows = "nixpkgs"; }; }; diff --git a/sdata/dist-nix/home-manager/home.nix b/sdata/dist-nix/home-manager/home.nix index 7eefd3601..384c9073e 100644 --- a/sdata/dist-nix/home-manager/home.nix +++ b/sdata/dist-nix/home-manager/home.nix @@ -45,8 +45,8 @@ lxqt.pavucontrol-qt #pavucontrol-qt (Used in Hyprland and Quickshell config) wireplumber #wireplumber (not explicitly used) pipewire #pipewire-pulse (not explicitly used) - libdbusmenu-gtk3 #libdbusmenu-gtk3 (not explicitly used) - playerctl #playerctl (Used in Hyprland and Quickshell config) + libdbusmenu-gtk3 #libdbusmenu-gtk3 (not explicitly used) + playerctl #playerctl (Used in Hyprland and Quickshell config) ### illogical-impulse-backlight @@ -72,7 +72,7 @@ ### illogical-impulse-bibata-modern-classic-bin - bibata-cursors #https://github.com/ful1e5/Bibata_Cursor # Used in Hyprland config, not necessary + bibata-cursors #https://github.com/ful1e5/Bibata_Cursor (Used in Hyprland config, not necessary) ### illogical-impulse-fonts-themes From 0f93784b8aadad1cf1db529b50642eaab323ada3 Mon Sep 17 00:00:00 2001 From: clsty Date: Tue, 4 Nov 2025 12:40:38 +0800 Subject: [PATCH 8/9] Fix quickshell in dist-nix --- sdata/dist-nix/home-manager/flake.nix | 4 ++-- sdata/dist-nix/home-manager/home.nix | 2 +- 2 files changed, 3 insertions(+), 3 deletions(-) diff --git a/sdata/dist-nix/home-manager/flake.nix b/sdata/dist-nix/home-manager/flake.nix index 79164ad6a..d9b9a30b6 100644 --- a/sdata/dist-nix/home-manager/flake.nix +++ b/sdata/dist-nix/home-manager/flake.nix @@ -19,7 +19,7 @@ }; }; - outputs = { nixpkgs, home-manager, nixgl, ... }: + outputs = { nixpkgs, home-manager, nixgl, quickshell, ... }: let home_attrs = rec { username = import ./username.nix; @@ -35,7 +35,7 @@ homeConfigurations = { illogical_impulse = home-manager.lib.homeManagerConfiguration { inherit pkgs; - extraSpecialArgs = { inherit nixgl home_attrs; }; + extraSpecialArgs = { inherit home_attrs nixgl quickshell; }; modules = [ ./home.nix ]; diff --git a/sdata/dist-nix/home-manager/home.nix b/sdata/dist-nix/home-manager/home.nix index 384c9073e..41480b0e3 100644 --- a/sdata/dist-nix/home-manager/home.nix +++ b/sdata/dist-nix/home-manager/home.nix @@ -1,4 +1,4 @@ -{ config, lib, pkgs, nixgl, home_attrs, ... }: +{ config, lib, pkgs, nixgl, quickshell, home_attrs, ... }: { programs.home-manager.enable = true; nixGL.packages = nixgl.packages; From a60f917f59d8561b2bd24cd0e96f322cfbf3e5aa Mon Sep 17 00:00:00 2001 From: clsty Date: Tue, 4 Nov 2025 13:48:09 +0800 Subject: [PATCH 9/9] Apply NixGL to quickshell --- sdata/dist-nix/home-manager/home.nix | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/sdata/dist-nix/home-manager/home.nix b/sdata/dist-nix/home-manager/home.nix index 41480b0e3..7c52b8c42 100644 --- a/sdata/dist-nix/home-manager/home.nix +++ b/sdata/dist-nix/home-manager/home.nix @@ -152,8 +152,7 @@ ### illogical-impulse-quickshell-git - # TODO: maybe Quickshell uses GPU acceleration, which means NixGL is applicable - quickshell.packages.x86_64-linux.default + #quickshell.packages.x86_64-linux.default (NixGL applicable, included elsewhere) ### illogical-impulse-screencapture @@ -204,6 +203,7 @@ ] ++ [ (config.lib.nixGL.wrap pkgs.hyprland) + (config.lib.nixGL.wrap quickshell.packages.x86_64-linux.default) ]; }//home_attrs; }