From d266dd3ecea39cb13c91e5d7169c5629818c2e31 Mon Sep 17 00:00:00 2001 From: Richard Henninger <56615615+richen604@users.noreply.github.com> Date: Mon, 6 Oct 2025 23:35:05 -0700 Subject: [PATCH 01/24] Revert "refactor: removed namespacing in hydenix packages" This reverts commit c530c49216818695ea0a651d71f634ed7a17a116. --- TODO.md | 150 -------------------- hydenix/modules/hm/dolphin.nix | 8 +- hydenix/modules/hm/editors.nix | 18 +-- hydenix/modules/hm/fastfetch.nix | 4 +- hydenix/modules/hm/gtk.nix | 8 +- hydenix/modules/hm/hyde.nix | 52 +++---- hydenix/modules/hm/hyprland/animations.nix | 4 +- hydenix/modules/hm/hyprland/default.nix | 4 +- hydenix/modules/hm/hyprland/hypridle.nix | 2 +- hydenix/modules/hm/hyprland/keybindings.nix | 2 +- hydenix/modules/hm/hyprland/monitors.nix | 2 +- hydenix/modules/hm/hyprland/nvidia.nix | 2 +- hydenix/modules/hm/hyprland/pyprland.nix | 2 +- hydenix/modules/hm/hyprland/shaders.nix | 6 +- hydenix/modules/hm/hyprland/windowrules.nix | 2 +- hydenix/modules/hm/hyprland/workflows.nix | 4 +- hydenix/modules/hm/lockscreen.nix | 22 +-- hydenix/modules/hm/notifications.nix | 4 +- hydenix/modules/hm/qt.nix | 18 +-- hydenix/modules/hm/rofi.nix | 6 +- hydenix/modules/hm/screenshots.nix | 2 +- hydenix/modules/hm/shell.nix | 76 +++++----- hydenix/modules/hm/social.nix | 2 +- hydenix/modules/hm/spotify.nix | 4 +- hydenix/modules/hm/terminals.nix | 6 +- hydenix/modules/hm/theme.nix | 2 +- hydenix/modules/hm/uwsm.nix | 10 +- hydenix/modules/hm/waybar.nix | 14 +- hydenix/modules/hm/wlogout.nix | 10 +- hydenix/modules/system/boot.nix | 4 +- hydenix/modules/system/sddm.nix | 2 +- hydenix/sources/overlay.nix | 15 +- template/docs/faq.md | 40 ++++++ 33 files changed, 200 insertions(+), 307 deletions(-) diff --git a/TODO.md b/TODO.md index 9f8052a1..bea6d21e 100644 --- a/TODO.md +++ b/TODO.md @@ -13,156 +13,6 @@ ## 5.0.0 -feat!: 5.0 release - -existing template has gone through a major overhaul, please read through all the breaking changes below. at worst generate a new template and copy your config over. - -a restart or `nixos-rebuild boot` is required for this update - -BREAKING CHANGES: - -- updated hyde to f246f2a -- hyde now uses uwsm (`hydenix.hm.uwsm.enable` is true by default) -- hydenix no longer uses hyde's sddm themes as they rely on deprecated qt5 libraries, `sddm-astronaut` is now used instead by default --
hydenix template changes: (click to expand) - - (`template/flake.nix`) - - ```diff - diff --git a/template/flake.nix b/template/flake.nix - index 125f1e9..0ba0e9a 100644 - --- a/template/flake.nix - +++ b/template/flake.nix - @@ -2,31 +2,35 @@ - description = "template for hydenix"; - - inputs = { - - # User's nixpkgs - for user packages - + # Your nixpkgs - nixpkgs.url = "github:nixos/nixpkgs/nixos-unstable"; - - - # Hydenix and its nixpkgs - kept separate to avoid conflicts - + # Hydenix - hydenix = { - # Available inputs: - # Main: github:richen604/hydenix - - # Dev: github:richen604/hydenix/dev - # Commit: github:richen604/hydenix/ - - # Version: github:richen604/hydenix/v1.0.0 - + # Version: github:richen604/hydenix/v1.0.0 - note the version may not be compatible with this template - url = "github:richen604/hydenix"; - + # uncomment the below if you know what you're doing, hydenix updates nixos-unstable every week or so - + # inputs.nixpkgs.follows = "nixpkgs"; - }; - - - # Nix-index-database - for comma and command-not-found - - nix-index-database = { - - url = "github:nix-community/nix-index-database"; - + # Home Manager - + home-manager = { - + url = "github:nix-community/home-manager"; - inputs.nixpkgs.follows = "nixpkgs"; - }; - + - + # Hardware Configuration's, used in ./configuration.nix. Feel free to remove if unused - + nixos-hardware.url = "github:nixos/nixos-hardware/master"; - }; - - outputs = - { ... }@inputs: - let - - hydenixConfig = inputs.hydenix.inputs.hydenix-nixpkgs.lib.nixosSystem { - - inherit (inputs.hydenix.lib) system; - + system = "x86_64-linux"; - + hydenixConfig = inputs.nixpkgs.lib.nixosSystem { - + inherit system; - specialArgs = { - inherit inputs; - }; - @@ -38,5 +42,6 @@ - in - { - nixosConfigurations.hydenix = hydenixConfig; - + nixosConfigurations.default = hydenixConfig; - }; - } - ``` - - (`template/configuration.nix`) - - ```diff - --- a/template/configuration.nix - +++ b/template/configuration.nix - @@ -5,17 +5,12 @@ - let - # Package configuration - sets up package system with proper overlays - # Most users won't need to modify this section - - pkgs = import inputs.hydenix.inputs.hydenix-nixpkgs { - - inherit (inputs.hydenix.lib) system; - + system = "x86_64-linux"; - + pkgs = import inputs.nixpkgs { - + inherit system; - config.allowUnfree = true; - overlays = [ - - inputs.hydenix.lib.overlays - - (final: prev: { - - userPkgs = import inputs.nixpkgs { - - inherit (pkgs) system; - - config.allowUnfree = true; - - }; - - }) - + inputs.hydenix.overlays.default - ]; - }; - in - @@ -24,8 +19,8 @@ in - - imports = [ - # hydenix inputs - Required modules, don't modify unless you know what you're doing - - inputs.hydenix.inputs.home-manager.nixosModules.home-manager - - inputs.hydenix.lib.nixOsModules - + inputs.home-manager.nixosModules.home-manager - + inputs.hydenix.nixosModules.default - ./modules/system # Your custom system modules - ./hardware-configuration.nix # Auto-generated hardware config - - @@ -33,17 +28,17 @@ in - # Run `lshw -short` or `lspci` to identify your hardware - - # GPU Configuration (choose one): - - # inputs.hydenix.inputs.nixos-hardware.nixosModules.common-gpu-nvidia # NVIDIA - - # inputs.hydenix.inputs.nixos-hardware.nixosModules.common-gpu-amd # AMD - + # inputs.nixos-hardware.nixosModules.common-gpu-nvidia # NVIDIA - + # inputs.nixos-hardware.nixosModules.common-gpu-amd # AMD - - # CPU Configuration (choose one): - - # inputs.hydenix.inputs.nixos-hardware.nixosModules.common-cpu-amd # AMD CPUs - - # inputs.hydenix.inputs.nixos-hardware.nixosModules.common-cpu-intel # Intel CPUs - + # inputs.nixos-hardware.nixosModules.common-cpu-amd # AMD CPUs - + # inputs.nixos-hardware.nixosModules.common-cpu-intel # Intel CPUs - - # Additional Hardware Modules - Uncomment based on your system type: - - # inputs.hydenix.inputs.nixos-hardware.nixosModules.common-hidpi # High-DPI displays - + # inputs.nixos-hardware.nixosModules.common-hidpi # High-DPI displays - + # inputs.nixos-hardware.nixosModules.common-pc-laptop # Laptops - + # inputs.nixos-hardware.nixosModules.common-pc-ssd # SSD storage - ]; - - # If enabling NVIDIA, you will be prompted to configure hardware.nvidia - @@ -68,8 +63,7 @@ in - { ... }: - { - imports = [ - - inputs.hydenix.lib.homeModules - - inputs.nix-index-database.hmModules.nix-index # Command-not-found and comma tool support - + inputs.hydenix.homeModules.default - ./modules/hm # Your custom home-manager modules (configure hydenix.hm here!) - ]; - }; - ``` - -
- ## backlog - feat: move hyprlock to hyprland module, swaylock should just be swaylock module diff --git a/hydenix/modules/hm/dolphin.nix b/hydenix/modules/hm/dolphin.nix index b4b655e8..9ec10893 100644 --- a/hydenix/modules/hm/dolphin.nix +++ b/hydenix/modules/hm/dolphin.nix @@ -42,18 +42,18 @@ in home.file = { ".config/dolphinrc" = { - source = "${pkgs.hyde}/Configs/.config/dolphinrc"; + source = "${pkgs.hydenix.hyde}/Configs/.config/dolphinrc"; }; ".config/baloofilerc" = { - source = "${pkgs.hyde}/Configs/.config/baloofilerc"; + source = "${pkgs.hydenix.hyde}/Configs/.config/baloofilerc"; }; ".config/menus/applications.menu" = { - source = "${pkgs.hyde}/Configs/.config/menus/applications.menu"; + source = "${pkgs.hydenix.hyde}/Configs/.config/menus/applications.menu"; }; # stateful file for themes ".config/kdeglobals" = { - source = "${pkgs.hyde}/Configs/.config/kdeglobals"; + source = "${pkgs.hydenix.hyde}/Configs/.config/kdeglobals"; force = true; mutable = true; }; diff --git a/hydenix/modules/hm/editors.nix b/hydenix/modules/hm/editors.nix index 208a98cf..c2928a7b 100644 --- a/hydenix/modules/hm/editors.nix +++ b/hydenix/modules/hm/editors.nix @@ -82,22 +82,22 @@ in home.file = lib.mkMerge [ (lib.mkIf cfg.vscode.enable { # Editor flags - ".config/code-flags.conf".source = "${pkgs.hyde}/Configs/.config/code-flags.conf"; - ".config/codium-flags.conf".source = "${pkgs.hyde}/Configs/.config/codium-flags.conf"; + ".config/code-flags.conf".source = "${pkgs.hydenix.hyde}/Configs/.config/code-flags.conf"; + ".config/codium-flags.conf".source = "${pkgs.hydenix.hyde}/Configs/.config/codium-flags.conf"; # VS Code settings ".config/Code - OSS/User/settings.json" = { - source = "${pkgs.hyde}/Configs/.config/Code - OSS/User/settings.json"; + source = "${pkgs.hydenix.hyde}/Configs/.config/Code - OSS/User/settings.json"; force = true; mutable = true; }; ".config/Code/User/settings.json" = { - source = "${pkgs.hyde}/Configs/.config/Code/User/settings.json"; + source = "${pkgs.hydenix.hyde}/Configs/.config/Code/User/settings.json"; force = true; mutable = true; }; ".config/VSCodium/User/settings.json" = { - source = "${pkgs.hyde}/Configs/.config/VSCodium/User/settings.json"; + source = "${pkgs.hydenix.hyde}/Configs/.config/VSCodium/User/settings.json"; force = true; mutable = true; }; @@ -105,7 +105,7 @@ in (lib.mkIf cfg.vscode.wallbash { # Link the wallbash extension from hyde package ".vscode/extensions/prasanthrangan.wallbash" = { - source = "${pkgs.hyde}/share/vscode/extensions/prasanthrangan.wallbash"; + source = "${pkgs.hydenix.hyde}/share/vscode/extensions/prasanthrangan.wallbash"; recursive = true; mutable = true; force = true; @@ -114,12 +114,12 @@ in (lib.mkIf (cfg.vim or cfg.neovim) { ".config/vim/colors/wallbash.vim" = { - source = "${pkgs.hyde}/Configs/.config/vim/colors/wallbash.vim"; + source = "${pkgs.hydenix.hyde}/Configs/.config/vim/colors/wallbash.vim"; force = true; mutable = true; }; - ".config/vim/hyde.vim".source = "${pkgs.hyde}/Configs/.config/vim/hyde.vim"; - ".config/vim/vimrc".source = "${pkgs.hyde}/Configs/.config/vim/vimrc"; + ".config/vim/hyde.vim".source = "${pkgs.hydenix.hyde}/Configs/.config/vim/hyde.vim"; + ".config/vim/vimrc".source = "${pkgs.hydenix.hyde}/Configs/.config/vim/vimrc"; }) ]; diff --git a/hydenix/modules/hm/fastfetch.nix b/hydenix/modules/hm/fastfetch.nix index 1479aaa5..7630dd87 100644 --- a/hydenix/modules/hm/fastfetch.nix +++ b/hydenix/modules/hm/fastfetch.nix @@ -20,12 +20,12 @@ in config = lib.mkIf cfg.enable { home.file = { ".config/fastfetch/config.jsonc" = { - source = "${pkgs.hyde}/Configs/.config/fastfetch/config.jsonc"; + source = "${pkgs.hydenix.hyde}/Configs/.config/fastfetch/config.jsonc"; }; # TODO: add hydenix logo # TODO: custom logos and pick defaults ".config/fastfetch/logos" = { - source = "${pkgs.hyde}/Configs/.config/fastfetch/logos"; + source = "${pkgs.hydenix.hyde}/Configs/.config/fastfetch/logos"; recursive = true; }; }; diff --git a/hydenix/modules/hm/gtk.nix b/hydenix/modules/hm/gtk.nix index bffedb0b..81be3f16 100644 --- a/hydenix/modules/hm/gtk.nix +++ b/hydenix/modules/hm/gtk.nix @@ -32,23 +32,23 @@ in ]; home.file = { ".config/nwg-look/config" = { - source = "${pkgs.hyde}/Configs/.config/nwg-look/config"; + source = "${pkgs.hydenix.hyde}/Configs/.config/nwg-look/config"; }; # stateful files # TODO: might flash on initial theme change, unnecessary? ".config/gtk-3.0/settings.ini" = { - source = "${pkgs.hyde}/Configs/.config/gtk-3.0/settings.ini"; + source = "${pkgs.hydenix.hyde}/Configs/.config/gtk-3.0/settings.ini"; force = true; mutable = true; }; ".gtkrc-2.0" = { - source = "${pkgs.hyde}/Configs/.gtkrc-2.0"; + source = "${pkgs.hydenix.hyde}/Configs/.gtkrc-2.0"; force = true; mutable = true; }; ".config/xsettingsd/xsettingsd.conf" = { - source = "${pkgs.hyde}/Configs/.config/xsettingsd/xsettingsd.conf"; + source = "${pkgs.hydenix.hyde}/Configs/.config/xsettingsd/xsettingsd.conf"; force = true; mutable = true; }; diff --git a/hydenix/modules/hm/hyde.nix b/hydenix/modules/hm/hyde.nix index aff83b54..8c55273c 100644 --- a/hydenix/modules/hm/hyde.nix +++ b/hydenix/modules/hm/hyde.nix @@ -21,16 +21,16 @@ in # TODO: review stateful files in hyde module config = lib.mkIf cfg.enable { home.packages = with pkgs; [ - hyde + hydenix.hyde Bibata-Modern-Ice Tela-circle-dracula kdePackages.kconfig # TODO: not sure if this is still needed wf-recorder # screen recorder for wlroots-based compositors such as sway python-pyamdgpuinfo - hyq - hydectl - hyde-ipc - hyde-config + hydenix.hyq + hydenix.hydectl + hydenix.hyde-ipc + hydenix.hyde-config ]; # ensures hyprland config is available in session as per hyde uwsm update @@ -50,7 +50,7 @@ in home.file = { # Regular files (processed first) ".config/hyde/wallbash" = { - source = "${pkgs.hyde}/Configs/.config/hyde/wallbash"; + source = "${pkgs.hydenix.hyde}/Configs/.config/hyde/wallbash"; recursive = true; force = true; mutable = true; @@ -80,19 +80,19 @@ in ''; }; ".config/systemd/user/hyde-ipc.service" = { - source = "${pkgs.hyde}/Configs/.config/systemd/user/hyde-ipc.service"; + source = "${pkgs.hydenix.hyde}/Configs/.config/systemd/user/hyde-ipc.service"; }; ".local/bin/hyde-shell" = { source = pkgs.writeShellScript "hyde-shell" '' export PYTHONPATH="${pkgs.python-pyamdgpuinfo}/${pkgs.python3.sitePackages}:$PYTHONPATH" - exec "${pkgs.hyde}/Configs/.local/bin/hyde-shell" "$@" + exec "${pkgs.hydenix.hyde}/Configs/.local/bin/hyde-shell" "$@" ''; executable = true; }; ".local/lib/hyde" = { - source = "${pkgs.hyde}/Configs/.local/lib/hyde"; + source = "${pkgs.hydenix.hyde}/Configs/.local/lib/hyde"; recursive = true; executable = true; force = true; @@ -109,60 +109,60 @@ in }; ".local/share/fastfetch/presets/hyde" = { - source = "${pkgs.hyde}/Configs/.local/share/fastfetch/presets/hyde"; + source = "${pkgs.hydenix.hyde}/Configs/.local/share/fastfetch/presets/hyde"; recursive = true; }; ".local/share/hyde" = { - source = "${pkgs.hyde}/Configs/.local/share/hyde"; + source = "${pkgs.hydenix.hyde}/Configs/.local/share/hyde"; recursive = true; executable = true; force = true; mutable = true; }; ".local/share/wallbash/" = { - source = "${pkgs.hyde}/Configs/.local/share/wallbash/"; + source = "${pkgs.hydenix.hyde}/Configs/.local/share/wallbash/"; recursive = true; force = true; mutable = true; }; ".local/share/waybar/includes" = { - source = "${pkgs.hyde}/Configs/.local/share/waybar/includes"; + source = "${pkgs.hydenix.hyde}/Configs/.local/share/waybar/includes"; recursive = true; }; ".local/share/waybar/layouts" = { - source = "${pkgs.hyde}/Configs/.local/share/waybar/layouts"; + source = "${pkgs.hydenix.hyde}/Configs/.local/share/waybar/layouts"; recursive = true; }; ".local/share/waybar/menus" = { - source = "${pkgs.hyde}/Configs/.local/share/waybar/menus"; + source = "${pkgs.hydenix.hyde}/Configs/.local/share/waybar/menus"; recursive = true; }; ".local/share/waybar/modules" = { - source = "${pkgs.hyde}/Configs/.local/share/waybar/modules"; + source = "${pkgs.hydenix.hyde}/Configs/.local/share/waybar/modules"; recursive = true; }; ".local/share/waybar/styles" = { - source = "${pkgs.hyde}/Configs/.local/share/waybar/styles"; + source = "${pkgs.hydenix.hyde}/Configs/.local/share/waybar/styles"; force = true; mutable = true; recursive = true; }; ".config/MangoHud/MangoHud.conf" = { - source = "${pkgs.hyde}/Configs/.config/MangoHud/MangoHud.conf"; + source = "${pkgs.hydenix.hyde}/Configs/.config/MangoHud/MangoHud.conf"; }; ".local/share/kio/servicemenus/hydewallpaper.desktop" = { - source = "${pkgs.hyde}/Configs/.local/share/kio/servicemenus/hydewallpaper.desktop"; + source = "${pkgs.hydenix.hyde}/Configs/.local/share/kio/servicemenus/hydewallpaper.desktop"; }; ".local/share/kxmlgui5/dolphin/dolphinui.rc" = { - source = "${pkgs.hyde}/Configs/.local/share/kxmlgui5/dolphin/dolphinui.rc"; + source = "${pkgs.hydenix.hyde}/Configs/.local/share/kxmlgui5/dolphin/dolphinui.rc"; }; ".config/electron-flags.conf" = { - source = "${pkgs.hyde}/Configs/.config/electron-flags.conf"; + source = "${pkgs.hydenix.hyde}/Configs/.config/electron-flags.conf"; }; ".local/share/icons/Wallbash-Icon" = { - source = "${pkgs.hyde}/share/icons/Wallbash-Icon"; + source = "${pkgs.hydenix.hyde}/share/icons/Wallbash-Icon"; force = true; recursive = true; mutable = true; @@ -170,22 +170,22 @@ in # stateful files ".config/hyde/config.toml" = { - source = "${pkgs.hyde}/Configs/.config/hyde/config.toml"; + source = "${pkgs.hydenix.hyde}/Configs/.config/hyde/config.toml"; force = true; mutable = true; }; ".local/share/dolphin/view_properties/global/.directory" = { - source = "${pkgs.hyde}/Configs/.local/share/dolphin/view_properties/global/.directory"; + source = "${pkgs.hydenix.hyde}/Configs/.local/share/dolphin/view_properties/global/.directory"; force = true; mutable = true; }; ".local/share/icons/default/index.theme" = { - source = "${pkgs.hyde}/Configs/.local/share/icons/default/index.theme"; + source = "${pkgs.hydenix.hyde}/Configs/.local/share/icons/default/index.theme"; force = true; mutable = true; }; ".local/share/themes/Wallbash-Gtk" = { - source = "${pkgs.hyde}/share/themes/Wallbash-Gtk"; + source = "${pkgs.hydenix.hyde}/share/themes/Wallbash-Gtk"; recursive = true; force = true; mutable = true; diff --git a/hydenix/modules/hm/hyprland/animations.nix b/hydenix/modules/hm/hyprland/animations.nix index 107945ef..1b008750 100644 --- a/hydenix/modules/hm/hyprland/animations.nix +++ b/hydenix/modules/hm/hyprland/animations.nix @@ -46,7 +46,7 @@ in } else { - source = "${pkgs.hyde}/Configs/.config/hypr/animations/${cfg.animations.preset}.conf"; + source = "${pkgs.hydenix.hyde}/Configs/.config/hypr/animations/${cfg.animations.preset}.conf"; force = true; mutable = true; }; @@ -64,7 +64,7 @@ in } else { - source = "${pkgs.hyde}/Configs/.config/hypr/animations/${preset}.conf"; + source = "${pkgs.hydenix.hyde}/Configs/.config/hypr/animations/${preset}.conf"; }; }) animationPresets )) diff --git a/hydenix/modules/hm/hyprland/default.nix b/hydenix/modules/hm/hyprland/default.nix index bf326479..279e0e34 100644 --- a/hydenix/modules/hm/hyprland/default.nix +++ b/hydenix/modules/hm/hyprland/default.nix @@ -50,7 +50,7 @@ in home.file = { ".local/share/hypr/" = { - source = "${pkgs.hyde}/Configs/.local/share/hypr/"; + source = "${pkgs.hydenix.hyde}/Configs/.local/share/hypr/"; recursive = true; }; ".config/hypr/hyprland.conf" = @@ -61,7 +61,7 @@ in } else { - source = "${pkgs.hyde}/Configs/.config/hypr/hyprland.conf"; + source = "${pkgs.hydenix.hyde}/Configs/.config/hypr/hyprland.conf"; force = true; }; diff --git a/hydenix/modules/hm/hyprland/hypridle.nix b/hydenix/modules/hm/hyprland/hypridle.nix index 58e8c7ff..b80b4054 100644 --- a/hydenix/modules/hm/hyprland/hypridle.nix +++ b/hydenix/modules/hm/hyprland/hypridle.nix @@ -20,7 +20,7 @@ in else { text = '' - ${lib.readFile "${pkgs.hyde}/Configs/.config/hypr/hypridle.conf"} + ${lib.readFile "${pkgs.hydenix.hyde}/Configs/.config/hypr/hypridle.conf"} ${cfg.hypridle.extraConfig} ''; force = true; diff --git a/hydenix/modules/hm/hyprland/keybindings.nix b/hydenix/modules/hm/hyprland/keybindings.nix index 7089bf74..dfe5f7de 100644 --- a/hydenix/modules/hm/hyprland/keybindings.nix +++ b/hydenix/modules/hm/hyprland/keybindings.nix @@ -20,7 +20,7 @@ in else { text = '' - ${lib.readFile "${pkgs.hyde}/Configs/.config/hypr/keybindings.conf"} + ${lib.readFile "${pkgs.hydenix.hyde}/Configs/.config/hypr/keybindings.conf"} ${cfg.keybindings.extraConfig} ''; force = true; diff --git a/hydenix/modules/hm/hyprland/monitors.nix b/hydenix/modules/hm/hyprland/monitors.nix index 2024ab42..7bd962f3 100644 --- a/hydenix/modules/hm/hyprland/monitors.nix +++ b/hydenix/modules/hm/hyprland/monitors.nix @@ -20,7 +20,7 @@ in } else { - source = "${pkgs.hyde}/Configs/.config/hypr/monitors.conf"; + source = "${pkgs.hydenix.hyde}/Configs/.config/hypr/monitors.conf"; force = true; mutable = true; }; diff --git a/hydenix/modules/hm/hyprland/nvidia.nix b/hydenix/modules/hm/hyprland/nvidia.nix index cf71dd99..11842ac6 100644 --- a/hydenix/modules/hm/hyprland/nvidia.nix +++ b/hydenix/modules/hm/hyprland/nvidia.nix @@ -20,7 +20,7 @@ in else { text = '' - ${lib.readFile "${pkgs.hyde}/Configs/.config/hypr/nvidia.conf"} + ${lib.readFile "${pkgs.hydenix.hyde}/Configs/.config/hypr/nvidia.conf"} ${cfg.nvidia.extraConfig} ''; force = true; diff --git a/hydenix/modules/hm/hyprland/pyprland.nix b/hydenix/modules/hm/hyprland/pyprland.nix index 6e9e1088..df1b6757 100644 --- a/hydenix/modules/hm/hyprland/pyprland.nix +++ b/hydenix/modules/hm/hyprland/pyprland.nix @@ -20,7 +20,7 @@ in else { text = '' - ${lib.readFile "${pkgs.hyde}/Configs/.config/hypr/pyprland.toml"} + ${lib.readFile "${pkgs.hydenix.hyde}/Configs/.config/hypr/pyprland.toml"} ${cfg.pyprland.extraConfig} ''; force = true; diff --git a/hydenix/modules/hm/hyprland/shaders.nix b/hydenix/modules/hm/hyprland/shaders.nix index 16d118be..2dd877c5 100644 --- a/hydenix/modules/hm/hyprland/shaders.nix +++ b/hydenix/modules/hm/hyprland/shaders.nix @@ -32,7 +32,7 @@ in map (shader: { name = ".config/hypr/shaders/${shader}.frag"; value = { - source = "${pkgs.hyde}/Configs/.config/hypr/shaders/${shader}.frag"; + source = "${pkgs.hydenix.hyde}/Configs/.config/hypr/shaders/${shader}.frag"; }; }) standardShaders )) @@ -40,7 +40,7 @@ in # Additional shader files { ".config/hypr/shaders/.compiled.cache.glsl" = { - source = "${pkgs.hyde}/Configs/.config/hypr/shaders/.compiled.cache.glsl"; + source = "${pkgs.hydenix.hyde}/Configs/.config/hypr/shaders/.compiled.cache.glsl"; force = true; mutable = true; }; @@ -57,7 +57,7 @@ in mutable = true; }; ".config/hypr/shaders/wallbash.inc".source = - "${pkgs.hyde}/Configs/.config/hypr/shaders/wallbash.inc"; + "${pkgs.hydenix.hyde}/Configs/.config/hypr/shaders/wallbash.inc"; } ]) diff --git a/hydenix/modules/hm/hyprland/windowrules.nix b/hydenix/modules/hm/hyprland/windowrules.nix index ad2c394f..889ba059 100644 --- a/hydenix/modules/hm/hyprland/windowrules.nix +++ b/hydenix/modules/hm/hyprland/windowrules.nix @@ -20,7 +20,7 @@ in else { text = '' - ${lib.readFile "${pkgs.hyde}/Configs/.config/hypr/windowrules.conf"} + ${lib.readFile "${pkgs.hydenix.hyde}/Configs/.config/hypr/windowrules.conf"} ${cfg.windowrules.extraConfig} ''; force = true; diff --git a/hydenix/modules/hm/hyprland/workflows.nix b/hydenix/modules/hm/hyprland/workflows.nix index b779cded..241bb93c 100644 --- a/hydenix/modules/hm/hyprland/workflows.nix +++ b/hydenix/modules/hm/hyprland/workflows.nix @@ -30,7 +30,7 @@ in } else { - source = "${pkgs.hyde}/Configs/.config/hypr/workflows/${cfg.workflows.active}.conf"; + source = "${pkgs.hydenix.hyde}/Configs/.config/hypr/workflows/${cfg.workflows.active}.conf"; force = true; mutable = true; }; @@ -48,7 +48,7 @@ in } else { - source = "${pkgs.hyde}/Configs/.config/hypr/workflows/${workflow}.conf"; + source = "${pkgs.hydenix.hyde}/Configs/.config/hypr/workflows/${workflow}.conf"; }; }) workflowPresets )) diff --git a/hydenix/modules/hm/lockscreen.nix b/hydenix/modules/hm/lockscreen.nix index 83454ca6..c9e823ce 100644 --- a/hydenix/modules/hm/lockscreen.nix +++ b/hydenix/modules/hm/lockscreen.nix @@ -39,45 +39,45 @@ in # Hyprlock configs (lib.mkIf cfg.hyprlock { ".config/hypr/hyprlock.conf" = { - source = "${pkgs.hyde}/Configs/.config/hypr/hyprlock.conf"; + source = "${pkgs.hydenix.hyde}/Configs/.config/hypr/hyprlock.conf"; }; ".config/hypr/hyprlock/theme.conf" = { - source = "${pkgs.hyde}/Configs/.config/hypr/hyprlock/theme.conf"; + source = "${pkgs.hydenix.hyde}/Configs/.config/hypr/hyprlock/theme.conf"; mutable = true; force = true; }; ".config/hypr/hyprlock/greetd-wallbash.conf" = { - source = "${pkgs.hyde}/Configs/.config/hypr/hyprlock/greetd-wallbash.conf"; + source = "${pkgs.hydenix.hyde}/Configs/.config/hypr/hyprlock/greetd-wallbash.conf"; mutable = true; force = true; }; ".config/hypr/hyprlock/Anurati.conf" = { - source = "${pkgs.hyde}/Configs/.config/hypr/hyprlock/Anurati.conf"; + source = "${pkgs.hydenix.hyde}/Configs/.config/hypr/hyprlock/Anurati.conf"; }; ".config/hypr/hyprlock/Arfan on Clouds.conf" = { - source = "${pkgs.hyde}/Configs/.config/hypr/hyprlock/Arfan on Clouds.conf"; + source = "${pkgs.hydenix.hyde}/Configs/.config/hypr/hyprlock/Arfan on Clouds.conf"; }; ".config/hypr/hyprlock/IBM Plex.conf" = { - source = "${pkgs.hyde}/Configs/.config/hypr/hyprlock/IBM Plex.conf"; + source = "${pkgs.hydenix.hyde}/Configs/.config/hypr/hyprlock/IBM Plex.conf"; }; ".config/hypr/hyprlock/SF Pro.conf" = { - source = "${pkgs.hyde}/Configs/.config/hypr/hyprlock/SF Pro.conf"; + source = "${pkgs.hydenix.hyde}/Configs/.config/hypr/hyprlock/SF Pro.conf"; }; ".config/hypr/hyprlock/IBM Xtented.conf" = { - source = "${pkgs.hyde}/Configs/.config/hypr/hyprlock/IBM Xtented.conf"; + source = "${pkgs.hydenix.hyde}/Configs/.config/hypr/hyprlock/IBM Xtented.conf"; }; ".config/hypr/hyprlock/greetd.conf" = { - source = "${pkgs.hyde}/Configs/.config/hypr/hyprlock/greetd.conf"; + source = "${pkgs.hydenix.hyde}/Configs/.config/hypr/hyprlock/greetd.conf"; }; ".config/hypr/hyprlock/HyDE.conf" = { - source = "${pkgs.hyde}/Configs/.config/hypr/hyprlock/HyDE.conf"; + source = "${pkgs.hydenix.hyde}/Configs/.config/hypr/hyprlock/HyDE.conf"; }; }) # Swaylock config (lib.mkIf cfg.swaylock { ".config/swaylock/config" = { - source = "${pkgs.hyde}/Configs/.config/swaylock/config"; + source = "${pkgs.hydenix.hyde}/Configs/.config/swaylock/config"; }; }) ]; diff --git a/hydenix/modules/hm/notifications.nix b/hydenix/modules/hm/notifications.nix index 87b3ba9b..6083cc74 100644 --- a/hydenix/modules/hm/notifications.nix +++ b/hydenix/modules/hm/notifications.nix @@ -25,12 +25,12 @@ in home.file = { # # stateful file for themes ".config/dunst/dunstrc" = { - source = "${pkgs.hyde}/Configs/.config/dunst/dunstrc"; + source = "${pkgs.hydenix.hyde}/Configs/.config/dunst/dunstrc"; force = true; mutable = true; }; ".config/dunst/dunst.conf" = { - source = "${pkgs.hyde}/Configs/.config/dunst/dunst.conf"; + source = "${pkgs.hydenix.hyde}/Configs/.config/dunst/dunst.conf"; force = true; mutable = true; }; diff --git a/hydenix/modules/hm/qt.nix b/hydenix/modules/hm/qt.nix index a7eb6f6b..6200f1c5 100644 --- a/hydenix/modules/hm/qt.nix +++ b/hydenix/modules/hm/qt.nix @@ -31,43 +31,43 @@ in home.file = { ".config/qt5ct/qt5ct.conf" = { - source = "${pkgs.hyde}/Configs/.config/qt5ct/qt5ct.conf"; + source = "${pkgs.hydenix.hyde}/Configs/.config/qt5ct/qt5ct.conf"; }; ".config/qt6ct/qt6ct.conf" = { - source = "${pkgs.hyde}/Configs/.config/qt6ct/qt6ct.conf"; + source = "${pkgs.hydenix.hyde}/Configs/.config/qt6ct/qt6ct.conf"; }; ".config/menus/applications.menu" = { - source = "${pkgs.hyde}/Configs/.config/menus/applications.menu"; + source = "${pkgs.hydenix.hyde}/Configs/.config/menus/applications.menu"; }; ".config/Kvantum/wallbash/wallbash.kvconfig" = { - source = "${pkgs.hyde}/Configs/.config/Kvantum/wallbash/wallbash.kvconfig"; + source = "${pkgs.hydenix.hyde}/Configs/.config/Kvantum/wallbash/wallbash.kvconfig"; force = true; mutable = true; }; ".config/Kvantum/wallbash/wallbash.svg" = { - source = "${pkgs.hyde}/Configs/.config/Kvantum/wallbash/wallbash.svg"; + source = "${pkgs.hydenix.hyde}/Configs/.config/Kvantum/wallbash/wallbash.svg"; force = true; mutable = true; }; ".config/Kvantum/kvantum.kvconfig" = { - source = "${pkgs.hyde}/Configs/.config/Kvantum/kvantum.kvconfig"; + source = "${pkgs.hydenix.hyde}/Configs/.config/Kvantum/kvantum.kvconfig"; force = true; mutable = true; }; # stateful files ".config/kdeglobals" = { - source = "${pkgs.hyde}/Configs/.config/kdeglobals"; + source = "${pkgs.hydenix.hyde}/Configs/.config/kdeglobals"; force = true; mutable = true; }; ".config/qt5ct/colors.conf" = { - source = "${pkgs.hyde}/Configs/.config/qt5ct/colors.conf"; + source = "${pkgs.hydenix.hyde}/Configs/.config/qt5ct/colors.conf"; force = true; mutable = true; }; ".config/qt6ct/colors.conf" = { - source = "${pkgs.hyde}/Configs/.config/qt6ct/colors.conf"; + source = "${pkgs.hydenix.hyde}/Configs/.config/qt6ct/colors.conf"; force = true; mutable = true; }; diff --git a/hydenix/modules/hm/rofi.nix b/hydenix/modules/hm/rofi.nix index 7b911a44..9092fc13 100644 --- a/hydenix/modules/hm/rofi.nix +++ b/hydenix/modules/hm/rofi.nix @@ -26,7 +26,7 @@ in # stateful file, written by wallbash # .local/share/hyde/wallbash/theme/rofi.dcol ".config/rofi/theme.rasi" = { - source = "${pkgs.hyde}/Configs/.config/rofi/theme.rasi"; + source = "${pkgs.hydenix.hyde}/Configs/.config/rofi/theme.rasi"; force = true; mutable = true; }; @@ -40,14 +40,14 @@ in home.file = { ".local/share/hyde/rofi/assets/" = { - source = "${pkgs.hyde}/Configs/.local/share/hyde/rofi/assets/"; + source = "${pkgs.hydenix.hyde}/Configs/.local/share/hyde/rofi/assets/"; recursive = true; force = true; mutable = true; }; ".local/share/hyde/rofi/themes/" = { - source = "${pkgs.hyde}/Configs/.local/share/hyde/rofi/themes/"; + source = "${pkgs.hydenix.hyde}/Configs/.local/share/hyde/rofi/themes/"; recursive = true; force = true; mutable = true; diff --git a/hydenix/modules/hm/screenshots.nix b/hydenix/modules/hm/screenshots.nix index 5dcc321c..cf406355 100644 --- a/hydenix/modules/hm/screenshots.nix +++ b/hydenix/modules/hm/screenshots.nix @@ -59,7 +59,7 @@ in home.file = lib.mkIf cfg.satty.enable { ".config/satty/config.toml" = { - source = "${pkgs.hyde}/Configs/.config/satty/config.toml"; + source = "${pkgs.hydenix.hyde}/Configs/.config/satty/config.toml"; force = true; }; }; diff --git a/hydenix/modules/hm/shell.nix b/hydenix/modules/hm/shell.nix index 4f166cf5..1bca1e65 100644 --- a/hydenix/modules/hm/shell.nix +++ b/hydenix/modules/hm/shell.nix @@ -261,8 +261,8 @@ in set -g fish_greeting # Source Hyde configuration - source ${pkgs.hyde}/Configs/.config/fish/conf.d/hyde.fish - source ${pkgs.hyde}/Configs/.config/fish/user.fish + source ${pkgs.hydenix.hyde}/Configs/.config/fish/conf.d/hyde.fish + source ${pkgs.hydenix.hyde}/Configs/.config/fish/user.fish ${lib.optionalString cfg.starship.enable '' if type -q starship @@ -349,64 +349,62 @@ in home.file = lib.mkMerge [ (lib.mkIf cfg.zsh.enable { # Zsh configs - ".zshenv".source = "${pkgs.hyde}/Configs/.zshenv"; - ".config/zsh/completions/hyde-shell.zsh".source = - "${pkgs.hyde}/Configs/.config/zsh/completions/hyde-shell.zsh"; + ".zshenv".source = "${pkgs.hydenix.hyde}/Configs/.zshenv"; + ".config/zsh/completions/hyde-shell.zsh".source = "${pkgs.hydenix.hyde}/Configs/.config/zsh/completions/hyde-shell.zsh"; ".config/zsh/.p10k.zsh" = { - source = "${pkgs.hyde}/Configs/.config/zsh/.p10k.zsh"; + source = "${pkgs.hydenix.hyde}/Configs/.config/zsh/.p10k.zsh"; enable = cfg.p10k.enable; }; - ".config/zsh/completions/fzf.zsh".source = "${pkgs.hyde}/Configs/.config/zsh/completions/fzf.zsh"; - ".config/zsh/completions/hydectl.zsh".source = - "${pkgs.hyde}/Configs/.config/zsh/completions/hydectl.zsh"; - ".config/zsh/functions/bat.zsh".source = "${pkgs.hyde}/Configs/.config/zsh/functions/bat.zsh"; - ".config/zsh/functions/bind_M_n_history.zsh".source = - "${pkgs.hyde}/Configs/.config/zsh/functions/bind_M_n_history.zsh"; - ".config/zsh/functions/duf.zsh".source = "${pkgs.hyde}/Configs/.config/zsh/functions/duf.zsh"; - ".config/zsh/functions/error-handlers.zsh".source = - "${pkgs.hyde}/Configs/.config/zsh/functions/error-handlers.zsh"; - ".config/zsh/functions/eza.zsh".source = "${pkgs.hyde}/Configs/.config/zsh/functions/eza.zsh"; - ".config/zsh/functions/fzf.zsh".source = "${pkgs.hyde}/Configs/.config/zsh/functions/fzf.zsh"; - ".config/zsh/functions/kb_help.zsh".source = - "${pkgs.hyde}/Configs/.config/zsh/functions/kb_help.zsh"; + ".config/zsh/completions/fzf.zsh".source = "${pkgs.hydenix.hyde}/Configs/.config/zsh/completions/fzf.zsh"; + ".config/zsh/completions/hydectl.zsh".source = "${pkgs.hydenix.hyde}/Configs/.config/zsh/completions/hydectl.zsh"; + ".config/zsh/functions/bat.zsh".source = "${pkgs.hydenix.hyde}/Configs/.config/zsh/functions/bat.zsh"; + ".config/zsh/functions/bind_M_n_history.zsh".source = "${pkgs.hydenix.hyde}/Configs/.config/zsh/functions/bind_M_n_history.zsh"; + ".config/zsh/functions/duf.zsh".source = "${pkgs.hydenix.hyde}/Configs/.config/zsh/functions/duf.zsh"; + ".config/zsh/functions/error-handlers.zsh".source = "${pkgs.hydenix.hyde}/Configs/.config/zsh/functions/error-handlers.zsh"; + ".config/zsh/functions/eza.zsh".source = "${pkgs.hydenix.hyde}/Configs/.config/zsh/functions/eza.zsh"; + ".config/zsh/functions/fzf.zsh".source = "${pkgs.hydenix.hyde}/Configs/.config/zsh/functions/fzf.zsh"; + ".config/zsh/functions/kb_help.zsh".source = "${pkgs.hydenix.hyde}/Configs/.config/zsh/functions/kb_help.zsh"; # We are not including any of these configurations as they are part of the existing zsh options - # ".config/zsh/.zshenv".source = "${pkgs.hyde}/Configs/.config/zsh/.zshenv"; - # ".config/zsh/user.zsh".source = "${pkgs.hyde}/Configs/.config/zsh/user.zsh"; - # ".config/zsh/prompt.zsh".source = "${pkgs.hyde}/Configs/.config/zsh/prompt.zsh"; - # ".config/zsh/conf.d/hyde/terminal.zsh".source = "${pkgs.hyde}/Configs/.config/zsh/conf.d/hyde/terminal.zsh"; - # ".config/zsh/conf.d/00-hyde.zsh".source = "${pkgs.hyde}/Configs/.config/zsh/conf.d/00-hyde.zsh"; - # ".config/zsh/conf.d/hyde/env.zsh".source = "${pkgs.hyde}/Configs/.config/zsh/conf.d/hyde/env.zsh"; - # ".config/zsh/conf.d/hyde/prompt.zsh".source = "${pkgs.hyde}/Configs/.config/zsh/conf.d/hyde/prompt.zsh"; + # ".config/zsh/.zshenv".source = "${pkgs.hydenix.hyde}/Configs/.config/zsh/.zshenv"; + # ".config/zsh/user.zsh".source = "${pkgs.hydenix.hyde}/Configs/.config/zsh/user.zsh"; + # ".config/zsh/prompt.zsh".source = "${pkgs.hydenix.hyde}/Configs/.config/zsh/prompt.zsh"; + # ".config/zsh/conf.d/hyde/terminal.zsh".source = "${pkgs.hydenix.hyde}/Configs/.config/zsh/conf.d/hyde/terminal.zsh"; + # ".config/zsh/conf.d/00-hyde.zsh".source = "${pkgs.hydenix.hyde}/Configs/.config/zsh/conf.d/00-hyde.zsh"; + # ".config/zsh/conf.d/hyde/env.zsh".source = "${pkgs.hydenix.hyde}/Configs/.config/zsh/conf.d/hyde/env.zsh"; + # ".config/zsh/conf.d/hyde/prompt.zsh".source = "${pkgs.hydenix.hyde}/Configs/.config/zsh/conf.d/hyde/prompt.zsh"; }) (lib.mkIf cfg.fish.enable { # Fish configs ".config/fish/completions/hyde-shell.fish".source = - "${pkgs.hyde}/Configs/.config/fish/completions/hyde-shell.fish"; - ".config/fish/conf.d/hyde.fish".source = "${pkgs.hyde}/Configs/.config/fish/conf.d/hyde.fish"; + "${pkgs.hydenix.hyde}/Configs/.config/fish/completions/hyde-shell.fish"; + ".config/fish/conf.d/hyde.fish".source = + "${pkgs.hydenix.hyde}/Configs/.config/fish/conf.d/hyde.fish"; ".config/fish/functions/bind_M_n_history.fish".source = - "${pkgs.hyde}/Configs/.config/fish/functions/bind_M_n_history.fish"; + "${pkgs.hydenix.hyde}/Configs/.config/fish/functions/bind_M_n_history.fish"; ".config/fish/functions/fzf/ffcd.fish".source = - "${pkgs.hyde}/Configs/.config/fish/functions/fzf/ffcd.fish"; + "${pkgs.hydenix.hyde}/Configs/.config/fish/functions/fzf/ffcd.fish"; ".config/fish/functions/fzf/ffch.fish".source = - "${pkgs.hyde}/Configs/.config/fish/functions/fzf/ffch.fish"; + "${pkgs.hydenix.hyde}/Configs/.config/fish/functions/fzf/ffch.fish"; ".config/fish/functions/fzf/ffec.fish".source = - "${pkgs.hyde}/Configs/.config/fish/functions/fzf/ffec.fish"; + "${pkgs.hydenix.hyde}/Configs/.config/fish/functions/fzf/ffec.fish"; ".config/fish/functions/fzf/ffe.fish".source = - "${pkgs.hyde}/Configs/.config/fish/functions/fzf/ffe.fish"; - ".config/fish/user.fish".source = "${pkgs.hyde}/Configs/.config/fish/user.fish"; + "${pkgs.hydenix.hyde}/Configs/.config/fish/functions/fzf/ffe.fish"; + ".config/fish/user.fish".source = "${pkgs.hydenix.hyde}/Configs/.config/fish/user.fish"; }) # LSD configs - these are always included { - ".config/lsd/config.yaml".source = "${pkgs.hyde}/Configs/.config/lsd/config.yaml"; - ".config/lsd/icons.yaml".source = "${pkgs.hyde}/Configs/.config/lsd/icons.yaml"; - ".config/lsd/colors.yaml".source = "${pkgs.hyde}/Configs/.config/lsd/colors.yaml"; + ".config/lsd/config.yaml".source = "${pkgs.hydenix.hyde}/Configs/.config/lsd/config.yaml"; + ".config/lsd/icons.yaml".source = "${pkgs.hydenix.hyde}/Configs/.config/lsd/icons.yaml"; + ".config/lsd/colors.yaml".source = "${pkgs.hydenix.hyde}/Configs/.config/lsd/colors.yaml"; } (lib.mkIf cfg.starship.enable { - ".config/starship/powerline.toml".source = "${pkgs.hyde}/Configs/.config/starship/powerline.toml"; - ".config/starship/starship.toml".source = "${pkgs.hyde}/Configs/.config/starship/starship.toml"; + ".config/starship/powerline.toml".source = + "${pkgs.hydenix.hyde}/Configs/.config/starship/powerline.toml"; + ".config/starship/starship.toml".source = + "${pkgs.hydenix.hyde}/Configs/.config/starship/starship.toml"; }) ]; }; diff --git a/hydenix/modules/hm/social.nix b/hydenix/modules/hm/social.nix index 7ca4f8e9..f5fd7415 100644 --- a/hydenix/modules/hm/social.nix +++ b/hydenix/modules/hm/social.nix @@ -50,7 +50,7 @@ in home.file = { ".config/electron-flags.conf" = { - source = "${pkgs.hyde}/Configs/.config/electron-flags.conf"; + source = "${pkgs.hydenix.hyde}/Configs/.config/electron-flags.conf"; }; }; }; diff --git a/hydenix/modules/hm/spotify.nix b/hydenix/modules/hm/spotify.nix index 0df8394e..5d6ba9a2 100644 --- a/hydenix/modules/hm/spotify.nix +++ b/hydenix/modules/hm/spotify.nix @@ -24,10 +24,10 @@ in home.file = { ".config/spotify-flags.conf" = { - source = "${pkgs.hyde}/Configs/.config/spotify-flags.conf"; + source = "${pkgs.hydenix.hyde}/Configs/.config/spotify-flags.conf"; }; ".config/electron-flags.conf" = { - source = "${pkgs.hyde}/Configs/.config/electron-flags.conf"; + source = "${pkgs.hydenix.hyde}/Configs/.config/electron-flags.conf"; }; }; }; diff --git a/hydenix/modules/hm/terminals.nix b/hydenix/modules/hm/terminals.nix index eb9b502e..b1012aa9 100644 --- a/hydenix/modules/hm/terminals.nix +++ b/hydenix/modules/hm/terminals.nix @@ -37,10 +37,10 @@ in home.file = { ".config/xdg-terminals.list" = { - source = "${pkgs.hyde}/Configs/.config/xdg-terminals.list"; + source = "${pkgs.hydenix.hyde}/Configs/.config/xdg-terminals.list"; }; ".config/kitty/hyde.conf" = { - source = "${pkgs.hyde}/Configs/.config/kitty/hyde.conf"; + source = "${pkgs.hydenix.hyde}/Configs/.config/kitty/hyde.conf"; }; ".config/kitty/kitty.conf" = { text = '' @@ -57,7 +57,7 @@ in # stateful file for kitty wallbash ".config/kitty/theme.conf" = { - source = "${pkgs.hyde}/Configs/.config/kitty/theme.conf"; + source = "${pkgs.hydenix.hyde}/Configs/.config/kitty/theme.conf"; force = true; mutable = true; }; diff --git a/hydenix/modules/hm/theme.nix b/hydenix/modules/hm/theme.nix index d6895df4..1726ea30 100644 --- a/hydenix/modules/hm/theme.nix +++ b/hydenix/modules/hm/theme.nix @@ -9,7 +9,7 @@ let cfg = config.hydenix.hm.theme; # Helper function to find a theme package by name, returns null if not found - findThemeByName = themeName: pkgs.hydenix-themes.${themeName} or null; + findThemeByName = themeName: pkgs.hydenix.themes.${themeName} or null; # Filter out themes that don't have corresponding packages availableThemes = lib.filter (themeName: findThemeByName themeName != null) cfg.themes; diff --git a/hydenix/modules/hm/uwsm.nix b/hydenix/modules/hm/uwsm.nix index 65d24112..a5b97b29 100644 --- a/hydenix/modules/hm/uwsm.nix +++ b/hydenix/modules/hm/uwsm.nix @@ -20,19 +20,19 @@ in config = lib.mkIf cfg.enable { home.file = { ".config/uwsm/env" = { - source = "${pkgs.hyde}/Configs/.config/uwsm/env"; + source = "${pkgs.hydenix.hyde}/Configs/.config/uwsm/env"; }; ".config/uwsm/env.d/00-hyde.sh" = { - source = "${pkgs.hyde}/Configs/.config/uwsm/env.d/00-hyde.sh"; + source = "${pkgs.hydenix.hyde}/Configs/.config/uwsm/env.d/00-hyde.sh"; }; ".config/uwsm/env.d/01-gpu.sh" = { - source = "${pkgs.hyde}/Configs/.config/uwsm/env.d/01-gpu.sh"; + source = "${pkgs.hydenix.hyde}/Configs/.config/uwsm/env.d/01-gpu.sh"; }; ".config/uwsm/env-hyprland" = { - source = "${pkgs.hyde}/Configs/.config/uwsm/env-hyprland"; + source = "${pkgs.hydenix.hyde}/Configs/.config/uwsm/env-hyprland"; }; ".config/uwsm/env-hyprland.d/00-hyde.sh" = { - source = "${pkgs.hyde}/Configs/.config/uwsm/env-hyprland.d/00-hyde.sh"; + source = "${pkgs.hydenix.hyde}/Configs/.config/uwsm/env-hyprland.d/00-hyde.sh"; }; }; }; diff --git a/hydenix/modules/hm/waybar.nix b/hydenix/modules/hm/waybar.nix index d785b88b..ed3615e7 100644 --- a/hydenix/modules/hm/waybar.nix +++ b/hydenix/modules/hm/waybar.nix @@ -56,28 +56,28 @@ in # Note: some of these may not work for NixOS # TODO: review waybar modules for nix compatibility ".config/waybar/modules" = { - source = "${pkgs.hyde}/Configs/.config/waybar/modules"; + source = "${pkgs.hydenix.hyde}/Configs/.config/waybar/modules"; recursive = true; }; ".config/waybar/layouts" = { - source = "${pkgs.hyde}/Configs/.config/waybar/layouts"; + source = "${pkgs.hydenix.hyde}/Configs/.config/waybar/layouts"; recursive = true; }; ".config/waybar/menus" = { - source = "${pkgs.hyde}/Configs/.config/waybar/menus"; + source = "${pkgs.hydenix.hyde}/Configs/.config/waybar/menus"; recursive = true; }; ".config/waybar/styles" = { - source = "${pkgs.hyde}/Configs/.config/waybar/styles"; + source = "${pkgs.hydenix.hyde}/Configs/.config/waybar/styles"; recursive = true; }; ".config/waybar/includes/border-radius.css" = { - source = "${pkgs.hyde}/Configs/.config/waybar/includes/border-radius.css"; + source = "${pkgs.hydenix.hyde}/Configs/.config/waybar/includes/border-radius.css"; force = true; mutable = true; }; ".config/waybar/includes/global.css" = { - source = "${pkgs.hyde}/Configs/.config/waybar/includes/global.css"; + source = "${pkgs.hydenix.hyde}/Configs/.config/waybar/includes/global.css"; force = true; mutable = true; }; @@ -239,7 +239,7 @@ in mutable = true; }; ".config/waybar/config.jsonc" = { - source = "${pkgs.hyde}/Configs/.config/waybar/config.jsonc"; + source = "${pkgs.hydenix.hyde}/Configs/.config/waybar/config.jsonc"; force = true; mutable = true; }; diff --git a/hydenix/modules/hm/wlogout.nix b/hydenix/modules/hm/wlogout.nix index 5a9bbb17..01161318 100644 --- a/hydenix/modules/hm/wlogout.nix +++ b/hydenix/modules/hm/wlogout.nix @@ -36,28 +36,28 @@ in # icons ".config/wlogout/icons/" = { - source = "${pkgs.hyde}/Configs/.config/wlogout/icons/"; + source = "${pkgs.hydenix.hyde}/Configs/.config/wlogout/icons/"; recursive = true; }; # Stateful files with themes ".config/wlogout/layout_1" = { - source = "${pkgs.hyde}/Configs/.config/wlogout/layout_1"; + source = "${pkgs.hydenix.hyde}/Configs/.config/wlogout/layout_1"; force = true; mutable = true; }; ".config/wlogout/style_1.css" = { - source = "${pkgs.hyde}/Configs/.config/wlogout/style_1.css"; + source = "${pkgs.hydenix.hyde}/Configs/.config/wlogout/style_1.css"; force = true; mutable = true; }; ".config/wlogout/layout_2" = { - source = "${pkgs.hyde}/Configs/.config/wlogout/layout_2"; + source = "${pkgs.hydenix.hyde}/Configs/.config/wlogout/layout_2"; force = true; mutable = true; }; ".config/wlogout/style_2.css" = { - source = "${pkgs.hyde}/Configs/.config/wlogout/style_2.css"; + source = "${pkgs.hydenix.hyde}/Configs/.config/wlogout/style_2.css"; force = true; mutable = true; }; diff --git a/hydenix/modules/system/boot.nix b/hydenix/modules/system/boot.nix index 6eb7b2db..10d5653c 100644 --- a/hydenix/modules/system/boot.nix +++ b/hydenix/modules/system/boot.nix @@ -67,7 +67,9 @@ in device = "nodev"; useOSProber = true; theme = - pkgs.hyde + "/share/grub/themes/" + (if cfg.grubTheme == "Pochita" then "Pochita" else "Retroboot"); + pkgs.hydenix.hyde + + "/share/grub/themes/" + + (if cfg.grubTheme == "Pochita" then "Pochita" else "Retroboot"); extraConfig = cfg.grubExtraConfig; }; efi.canTouchEfiVariables = true; diff --git a/hydenix/modules/system/sddm.nix b/hydenix/modules/system/sddm.nix index 2cbd163e..b882573c 100644 --- a/hydenix/modules/system/sddm.nix +++ b/hydenix/modules/system/sddm.nix @@ -19,7 +19,7 @@ in config = lib.mkIf cfg.enable { environment.systemPackages = [ - pkgs.hyde + pkgs.hydenix.hyde pkgs.Bibata-Modern-Ice pkgs.sddm-astronaut ]; diff --git a/hydenix/sources/overlay.nix b/hydenix/sources/overlay.nix index 3ea4e7ef..58a2d8aa 100644 --- a/hydenix/sources/overlay.nix +++ b/hydenix/sources/overlay.nix @@ -14,12 +14,15 @@ let python-pyamdgpuinfo = callPackage ./python-pyamdgpuinfo.nix { }; Tela-circle-dracula = callPackage ./Tela-circle-dracula.nix { }; Bibata-Modern-Ice = callPackage ./Bibata-Modern-Ice.nix { }; - hyde = callPackage ./hyde.nix { inherit inputs; }; - hydenix-themes = callPackage ./themes/default.nix { }; - hyq = inputs.hyq.packages.${prev.system}.default; - hydectl = inputs.hydectl.packages.${prev.system}.default; - hyde-ipc = inputs.hyde-ipc.packages.${prev.system}.default; - hyde-config = inputs.hyde-config.packages.${prev.system}.default; + hydenix = { + hyde = callPackage ./hyde.nix { inherit inputs; }; + # Theme packages from the themes directory + themes = callPackage ./themes/default.nix { }; + hyq = inputs.hyq.packages.${prev.system}.default; + hydectl = inputs.hydectl.packages.${prev.system}.default; + hyde-ipc = inputs.hyde-ipc.packages.${prev.system}.default; + hyde-config = inputs.hyde-config.packages.${prev.system}.default; + }; }; in packages diff --git a/template/docs/faq.md b/template/docs/faq.md index 1ec0c0c3..606ecf06 100644 --- a/template/docs/faq.md +++ b/template/docs/faq.md @@ -13,6 +13,7 @@ - [when should I upgrade?](#when-should-i-upgrade) - [how do I fix (nix error / system error / bug / etc)?](#how-do-i-fix-nix-error--system-error--bug--etc) - [common errors](#common-errors) + - [`error: hash mismatch in fixed-output derivation`](#error-hash-mismatch-in-fixed-output-derivation) - [`Existing file '...' is in the way of '...'`](#existing-file--is-in-the-way-of-) - [what are the module options?](#what-are-the-module-options) - [what if I want to customize hydenix?](#what-if-i-want-to-customize-hydenix) @@ -124,6 +125,45 @@ or create an issue in the [hydenix GitHub repository](https://github.com/richen6 ### common errors +#### `error: hash mismatch in fixed-output derivation` + +this error occurs when nix expects a specific hash for a downloaded file, but the actual file has a different hash due to upstream changes. + +these usually happen with themes as they are updated frequently. + +Example: + +```bash +error: hash mismatch in fixed-output derivation '/nix/store/2s2n054di1wg8d3sw50wqhs10yg8svj0-Code-Garden.drv': + specified: sha256-ZAmxhz7MK24htAcPdnNMZF/K7Cw7vru80xZn+7yJgXQ= + got: sha256-HHC15pPHJ+ylQ56yYysEoKjKYUAoye2WHmt4Q2vyffk= +``` + +**solution: override the package in configuration.nix** + +if I haven't updated this in the repo yet, add this overlay to your existing overlays in `configuration.nix` to fix the error: + +```nix +overlays = [ + inputs.hydenix.lib.overlays + # fix hash mismatch errors for catppuccin mocha + (final: prev: { + # replace 'hydenix.themes."catppuccin mocha"' with the actual failing package, for theme names check https://github.com/richen604/hydenix/blob/main/hydenix/sources/themes/default.nix + hydenix.themes."Catppuccin Mocha" = prev.hydenix.themes."Catppuccin Mocha".overrideAttrs (oldAttrs: { + src = prev.fetchFromGitHub { + # use the hash from error message under "got:" + sha256 = "HHC15pPHJ+ylQ56yYysEoKjKYUAoye2WHmt4Q2vyffk="; + }; + }); + }) + (final: prev: { + userPkgs = import inputs.nixpkgs { + config.allowUnfree = true; + }; + }) +]; +``` + #### `Existing file '...' is in the way of '...'` this error occurs when home-manager tries to manage a file that already exists and wasn't created by home-manager. From e82c636bb3af8cf1a7635bb329364ee7285a4675 Mon Sep 17 00:00:00 2001 From: Richard Henninger <56615615+richen604@users.noreply.github.com> Date: Mon, 6 Oct 2025 23:35:05 -0700 Subject: [PATCH 02/24] Revert "feat: new themes" This reverts commit abd911a8f4d9c6e6495504fe094940892f4dc9fc. --- TODO.md | 5 +-- hydenix/sources/hyde-gallery.nix | 4 +-- hydenix/sources/themes/1-Bit.nix | 17 ---------- hydenix/sources/themes/Abyssal-Wave.nix | 2 +- hydenix/sources/themes/Breezy-Autumn.nix | 17 ---------- .../sources/themes/Catppuccin-Macchiato.nix | 17 ---------- hydenix/sources/themes/Joker.nix | 17 ---------- hydenix/sources/themes/Timeless-Dream.nix | 17 ---------- hydenix/sources/themes/default.nix | 28 +++++++---------- lib/config/home.nix | 31 +++++++++---------- 10 files changed, 31 insertions(+), 124 deletions(-) delete mode 100644 hydenix/sources/themes/1-Bit.nix delete mode 100644 hydenix/sources/themes/Breezy-Autumn.nix delete mode 100644 hydenix/sources/themes/Catppuccin-Macchiato.nix delete mode 100644 hydenix/sources/themes/Joker.nix delete mode 100644 hydenix/sources/themes/Timeless-Dream.nix diff --git a/TODO.md b/TODO.md index bea6d21e..5c5fa5d7 100644 --- a/TODO.md +++ b/TODO.md @@ -5,10 +5,11 @@ ## now -- refactor: rename all overlays so there is no namespace nesting +- feat: new themes to build ## next +- refactor: rename all overlays so there is no namespace nesting - feat: home-manager configuration in flake ## 5.0.0 @@ -24,7 +25,7 @@ - waybar - fix: i don't think .config/waybar/modules is supposed to be set anymore - fix: remove duplicate udisks2 setup -- hm.hyprland should have more warnings related to config overrides +- hm.hyprland should have more warnings related to config overrides, i think - feat: hyde config.toml options - demo video? fix demo-vm - fix: wallbash for code diff --git a/hydenix/sources/hyde-gallery.nix b/hydenix/sources/hyde-gallery.nix index 65d3158b..41e09b91 100644 --- a/hydenix/sources/hyde-gallery.nix +++ b/hydenix/sources/hyde-gallery.nix @@ -6,9 +6,9 @@ pkgs.stdenv.mkDerivation { src = pkgs.fetchFromGitHub { owner = "HyDE-Project"; repo = "hyde-gallery"; - rev = "8067df5d450294d3c477f5f40a804e1cafc5336f"; + rev = "9d819748ed54e6b04e25a7909d774d48db8edd58"; name = "hyde-gallery"; - sha256 = ""; + sha256 = "sha256-tEsTnNgsNBwjHWTTPhyUXqdxcoVmxtwYkmMslc/eMWY="; }; installPhase = '' diff --git a/hydenix/sources/themes/1-Bit.nix b/hydenix/sources/themes/1-Bit.nix deleted file mode 100644 index ab9af152..00000000 --- a/hydenix/sources/themes/1-Bit.nix +++ /dev/null @@ -1,17 +0,0 @@ -{ pkgs, mkTheme }: -mkTheme rec { - name = "1-Bit"; - src = pkgs.fetchFromGitHub { - owner = "amit-0i"; - repo = "1-Bit"; - # locking commit - rev = "ee6a133693e676802976fb870567829b941a8624"; - name = name; - sha256 = "sha256-dYRZKGHO0Q8x4h80Q+PrajaPaY/ZJHZgnp3QVI5d0Lc="; - }; - meta = { - name = name; - description = "HyDE Theme: 1-Bit"; - homepage = "https://github.com/amit-0i/1-Bit"; - }; -} diff --git a/hydenix/sources/themes/Abyssal-Wave.nix b/hydenix/sources/themes/Abyssal-Wave.nix index a1cf1b01..2b9aa2a2 100644 --- a/hydenix/sources/themes/Abyssal-Wave.nix +++ b/hydenix/sources/themes/Abyssal-Wave.nix @@ -5,7 +5,7 @@ mkTheme rec { owner = "Itz-Abhishek-Tiwari"; repo = "Abyssal-Wave"; # locking commit - rev = "3094b030739c7673255a2a8fad1707717d725d73"; + rev = "main"; name = name; sha256 = "sha256-JMYjNV2r6/lRwKNQFdz2HmZH7ZxLO0MdiO2iUi5R7As="; }; diff --git a/hydenix/sources/themes/Breezy-Autumn.nix b/hydenix/sources/themes/Breezy-Autumn.nix deleted file mode 100644 index c0af74ab..00000000 --- a/hydenix/sources/themes/Breezy-Autumn.nix +++ /dev/null @@ -1,17 +0,0 @@ -{ pkgs, mkTheme }: -mkTheme rec { - name = "Breezy Autumn"; - src = pkgs.fetchFromGitHub { - owner = "Maroc02"; - repo = "Breezy-Autumn"; - # locking commit - rev = "db980839c1f3daae629a11def5fb479ae3eebf5e"; - name = name; - sha256 = "sha256-ffEKwNoJDk31JMOC0bYevyW9iJMHv4Xg1e9l5sWnpnE="; - }; - meta = { - name = name; - description = "HyDE Theme: Breezy Autumn"; - homepage = "https://github.com/Maroc02/Breezy-Autumn"; - }; -} diff --git a/hydenix/sources/themes/Catppuccin-Macchiato.nix b/hydenix/sources/themes/Catppuccin-Macchiato.nix deleted file mode 100644 index b8142f6f..00000000 --- a/hydenix/sources/themes/Catppuccin-Macchiato.nix +++ /dev/null @@ -1,17 +0,0 @@ -{ pkgs, mkTheme }: -mkTheme rec { - name = "Catppuccin-Macchiato"; - src = pkgs.fetchFromGitHub { - owner = "deepu105"; - repo = "hyde-theme-catppuccin-macchiato"; - # locking commit - rev = "7f1f33e554a342afcc9723d9b87123aa964cf994"; - name = name; - sha256 = "sha256-W5xjs+E//G2uhwzjq2tiWUMNdff6xmWUvH59tUoKjA0="; - }; - meta = { - name = name; - description = "HyDE Theme: Catppuccin-Macchiato"; - homepage = "https://github.com/deepu105/hyde-theme-catppuccin-macchiato"; - }; -} diff --git a/hydenix/sources/themes/Joker.nix b/hydenix/sources/themes/Joker.nix deleted file mode 100644 index c46153c4..00000000 --- a/hydenix/sources/themes/Joker.nix +++ /dev/null @@ -1,17 +0,0 @@ -{ pkgs, mkTheme }: -mkTheme rec { - name = "Joker"; - src = pkgs.fetchFromGitHub { - owner = "saber-88"; - repo = "Joker"; - # locking commit - rev = "b7bae7bd943ca445e9ff53ba6450e63204d94228"; - name = name; - sha256 = "sha256-XtA1pw8019XX3BZ0+ddSkWEMPni63+5AwNxYpgr4do4="; - }; - meta = { - name = name; - description = "HyDE Theme: Joker"; - homepage = "https://github.com/saber-88/Joker"; - }; -} diff --git a/hydenix/sources/themes/Timeless-Dream.nix b/hydenix/sources/themes/Timeless-Dream.nix deleted file mode 100644 index a54786f7..00000000 --- a/hydenix/sources/themes/Timeless-Dream.nix +++ /dev/null @@ -1,17 +0,0 @@ -{ pkgs, mkTheme }: -mkTheme rec { - name = "Timeless Dream"; - src = pkgs.fetchFromGitHub { - owner = "Maroc02"; - repo = "Timeless-Dream"; - # locking commit - rev = "8a10d655dd42ea175e2196b60c57c21d53f96fbd"; - name = name; - sha256 = "sha256-QZnGiMjuL+rgDm0puTwIexeaL/x6lf6SsZ8/dLWvTf4="; - }; - meta = { - name = name; - description = "HyDE Theme: Timeless Dream"; - homepage = "https://github.com/Maroc02/Timeless-Dream"; - }; -} diff --git a/hydenix/sources/themes/default.nix b/hydenix/sources/themes/default.nix index 6e495658..28bebd61 100644 --- a/hydenix/sources/themes/default.nix +++ b/hydenix/sources/themes/default.nix @@ -5,54 +5,42 @@ let callTheme = file: import file { inherit pkgs mkTheme; }; in { - - "1-Bit" = callTheme ./1-Bit.nix; "Abyssal-Wave" = callTheme ./Abyssal-Wave.nix; "AbyssGreen" = callTheme ./AbyssGreen.nix; - "Amethyst-Aura" = callTheme ./Amethyst-Aura.nix; "AncientAliens" = callTheme ./AncientAliens.nix; - "Another World" = callTheme ./Another-World.nix; + "Amethyst-Aura" = callTheme ./Amethyst-Aura.nix; "Bad Blood" = callTheme ./Bad-Blood.nix; - "BlueSky" = callTheme ./BlueSky.nix; - "Breezy Autumn" = callTheme ./Breezy-Autumn.nix; "Cat Latte" = callTheme ./Cat-Latte.nix; "Catppuccin Latte" = callTheme ./Catppuccin-Latte.nix; - "Catppuccin-Macchiato" = callTheme ./Catppuccin-Macchiato.nix; "Catppuccin Mocha" = callTheme ./Catppuccin-Mocha.nix; "Code Garden" = callTheme ./Code-Garden.nix; - "Cosmic Blue" = callTheme ./Cosmic-Blue.nix; "Crimson Blade" = callTheme ./Crimson-Blade.nix; "Crimson-Blue" = callTheme ./Crimson-Blue.nix; "Decay Green" = callTheme ./Decay-Green.nix; - "DoomBringers" = callTheme ./DoomBringers.nix; "Dracula" = callTheme ./Dracula.nix; "Edge Runner" = callTheme ./Edge-Runner.nix; "Electra" = callTheme ./Electra.nix; - "Eternal Arctic" = callTheme ./Eternal-Arctic.nix; - "Ever Blushing" = callTheme ./Ever-Blushing.nix; "Frosted Glass" = callTheme ./Frosted-Glass.nix; "Graphite Mono" = callTheme ./Graphite-Mono.nix; "Green Lush" = callTheme ./Green-Lush.nix; "Greenify" = callTheme ./Greenify.nix; - "Grukai" = callTheme ./Grukai.nix; "Gruvbox Retro" = callTheme ./Gruvbox-Retro.nix; + "Grukai" = callTheme ./Grukai.nix; "Hack the Box" = callTheme ./Hack-the-Box.nix; "Ice Age" = callTheme ./Ice-Age.nix; - "Joker" = callTheme ./Joker.nix; "LimeFrenzy" = callTheme ./LimeFrenzy.nix; "Mac OS" = callTheme ./Mac-OS.nix; "Material Sakura" = callTheme ./Material-Sakura.nix; "Monokai" = callTheme ./Monokai.nix; "Monterey Frost" = callTheme ./Monterey-Frost.nix; - "Moonlight" = callTheme ./Moonlight.nix; - "Nightbrew" = callTheme ./Nightbrew.nix; "Nordic Blue" = callTheme ./Nordic-Blue.nix; + "Nightbrew" = callTheme ./Nightbrew.nix; "Obsidian-Purple" = callTheme ./Obsidian-Purple.nix; "One Dark" = callTheme ./One-Dark.nix; "Oxo Carbon" = callTheme ./Oxo-Carbon.nix; "Paranoid Sweet" = callTheme ./Paranoid-Sweet.nix; - "Peace Of Mind" = callTheme ./Peace-Of-Mind.nix; "Pixel Dream" = callTheme ./Pixel-Dream.nix; + "Peace Of Mind" = callTheme ./Peace-Of-Mind.nix; "Rain Dark" = callTheme ./Rain-Dark.nix; "Red Stone" = callTheme ./Red-Stone.nix; "Rosé Pine" = callTheme ./Rose-Pine.nix; @@ -60,9 +48,15 @@ in "Sci-fi" = callTheme ./Sci-fi.nix; "Solarized Dark" = callTheme ./Solarized-Dark.nix; "Synth Wave" = callTheme ./Synth-Wave.nix; - "Timeless Dream" = callTheme ./Timeless-Dream.nix; "Tokyo Night" = callTheme ./Tokyo-Night.nix; "Tundra" = callTheme ./Tundra.nix; "Vanta Black" = callTheme ./Vanta-Black.nix; "Windows 11" = callTheme ./Windows-11.nix; + "Another World" = callTheme ./Another-World.nix; + "BlueSky" = callTheme ./BlueSky.nix; + "Cosmic Blue" = callTheme ./Cosmic-Blue.nix; + "DoomBringers" = callTheme ./DoomBringers.nix; + "Eternal Arctic" = callTheme ./Eternal-Arctic.nix; + "Ever Blushing" = callTheme ./Ever-Blushing.nix; + "Moonlight" = callTheme ./Moonlight.nix; } diff --git a/lib/config/home.nix b/lib/config/home.nix index c55a0c95..a0ad56cc 100644 --- a/lib/config/home.nix +++ b/lib/config/home.nix @@ -8,53 +8,42 @@ enable = true; active = "BlueSky"; themes = [ - "1-Bit" "Abyssal-Wave" "AbyssGreen" - "Amethyst-Aura" "AncientAliens" - "Another World" + "Amethyst-Aura" "Bad Blood" - "BlueSky" - "Breezy Autumn" "Cat Latte" "Catppuccin Latte" - "Catppuccin-Macchiato" "Catppuccin Mocha" "Code Garden" - "Cosmic Blue" "Crimson Blade" "Crimson-Blue" "Decay Green" - "DoomBringers" "Dracula" "Edge Runner" "Electra" - "Eternal Arctic" - "Ever Blushing" "Frosted Glass" "Graphite Mono" "Green Lush" "Greenify" - "Grukai" "Gruvbox Retro" + "Grukai" "Hack the Box" "Ice Age" - "Joker" "LimeFrenzy" "Mac OS" "Material Sakura" "Monokai" "Monterey Frost" - "Moonlight" - "Nightbrew" "Nordic Blue" + "Nightbrew" "Obsidian-Purple" "One Dark" "Oxo Carbon" "Paranoid Sweet" - "Peace Of Mind" "Pixel Dream" + "Peace Of Mind" "Rain Dark" "Red Stone" "Rosé Pine" @@ -62,12 +51,20 @@ "Sci-fi" "Solarized Dark" "Synth Wave" - "Timeless Dream" - "Tokyo Night" "Tundra" + "Tokyo Night" + #FIXME: theme conflicts with material sakura that wont fix "Vanta Black" "Windows 11" + "Another World" + "BlueSky" + "Cosmic Blue" + "DoomBringers" + "Eternal Arctic" + "Ever Blushing" + "Moonlight" + # Testing that we can add a new string and it won't fail "Some Theme" ]; From e1705078d4ae90fc2ad18796cdc4c8bce1e67e57 Mon Sep 17 00:00:00 2001 From: Richard Henninger <56615615+richen604@users.noreply.github.com> Date: Mon, 6 Oct 2025 23:35:05 -0700 Subject: [PATCH 03/24] Revert "refactor: removed meta priority" This reverts commit 525aea9f1084bb193f39ed7ecb95c1c85a1e17c1. --- hydenix/sources/themes/AbyssGreen.nix | 1 + hydenix/sources/themes/Abyssal-Wave.nix | 1 + hydenix/sources/themes/Amethyst-Aura.nix | 1 + hydenix/sources/themes/AncientAliens.nix | 1 + hydenix/sources/themes/Another-World.nix | 1 + hydenix/sources/themes/Bad-Blood.nix | 1 + hydenix/sources/themes/BlueSky.nix | 1 + hydenix/sources/themes/Cat-Latte.nix | 1 + hydenix/sources/themes/Catppuccin-Latte.nix | 1 + hydenix/sources/themes/Catppuccin-Mocha.nix | 1 + hydenix/sources/themes/Code-Garden.nix | 1 + hydenix/sources/themes/Cosmic-Blue.nix | 1 + hydenix/sources/themes/Crimson-Blade.nix | 1 + hydenix/sources/themes/Crimson-Blue.nix | 1 + hydenix/sources/themes/Decay-Green.nix | 1 + hydenix/sources/themes/DoomBringers.nix | 1 + hydenix/sources/themes/Dracula.nix | 1 + hydenix/sources/themes/Edge-Runner.nix | 1 + hydenix/sources/themes/Electra.nix | 1 + hydenix/sources/themes/Eternal-Arctic.nix | 1 + hydenix/sources/themes/Ever-Blushing.nix | 1 + hydenix/sources/themes/Frosted-Glass.nix | 1 + hydenix/sources/themes/Graphite-Mono.nix | 1 + hydenix/sources/themes/Green-Lush.nix | 1 + hydenix/sources/themes/Greenify.nix | 1 + hydenix/sources/themes/Grukai.nix | 1 + hydenix/sources/themes/Gruvbox-Retro.nix | 1 + hydenix/sources/themes/Hack-the-Box.nix | 1 + hydenix/sources/themes/Ice-Age.nix | 1 + hydenix/sources/themes/LimeFrenzy.nix | 1 + hydenix/sources/themes/Mac-OS.nix | 1 + hydenix/sources/themes/Material-Sakura.nix | 1 + hydenix/sources/themes/Monokai.nix | 1 + hydenix/sources/themes/Monterey-Frost.nix | 1 + hydenix/sources/themes/Moonlight.nix | 1 + hydenix/sources/themes/Nightbrew.nix | 1 + hydenix/sources/themes/Nordic-Blue.nix | 1 + hydenix/sources/themes/Obsidian-Purple.nix | 1 + hydenix/sources/themes/One-Dark.nix | 1 + hydenix/sources/themes/Oxo-Carbon.nix | 1 + hydenix/sources/themes/Paranoid-Sweet.nix | 1 + hydenix/sources/themes/Peace-Of-Mind.nix | 1 + hydenix/sources/themes/Pixel-Dream.nix | 1 + hydenix/sources/themes/Rain-Dark.nix | 1 + hydenix/sources/themes/Red-Stone.nix | 1 + hydenix/sources/themes/Rose-Pine.nix | 1 + hydenix/sources/themes/Scarlet-Night.nix | 1 + hydenix/sources/themes/Sci-fi.nix | 1 + hydenix/sources/themes/Solarized-Dark.nix | 1 + hydenix/sources/themes/Synth-Wave.nix | 1 + hydenix/sources/themes/Tokyo-Night.nix | 1 + hydenix/sources/themes/Tundra.nix | 1 + hydenix/sources/themes/Vanta-Black.nix | 1 + hydenix/sources/themes/Windows-11.nix | 1 + 54 files changed, 54 insertions(+) diff --git a/hydenix/sources/themes/AbyssGreen.nix b/hydenix/sources/themes/AbyssGreen.nix index cee1bae6..bf4af68c 100644 --- a/hydenix/sources/themes/AbyssGreen.nix +++ b/hydenix/sources/themes/AbyssGreen.nix @@ -11,5 +11,6 @@ mkTheme rec { meta = { description = "HyDE Theme: AbyssGreen"; homepage = "https://github.com/Itz-Abhishek-Tiwari/AbyssGreen"; + priority = 10; }; } diff --git a/hydenix/sources/themes/Abyssal-Wave.nix b/hydenix/sources/themes/Abyssal-Wave.nix index 2b9aa2a2..351545a1 100644 --- a/hydenix/sources/themes/Abyssal-Wave.nix +++ b/hydenix/sources/themes/Abyssal-Wave.nix @@ -13,5 +13,6 @@ mkTheme rec { name = name; description = "HyDE Theme: Abyssal-Wave"; homepage = "https://github.com/Itz-Abhishek-Tiwari/Abyssal-Wave"; + priority = 10; }; } diff --git a/hydenix/sources/themes/Amethyst-Aura.nix b/hydenix/sources/themes/Amethyst-Aura.nix index 8fe16e05..a9370b26 100644 --- a/hydenix/sources/themes/Amethyst-Aura.nix +++ b/hydenix/sources/themes/Amethyst-Aura.nix @@ -12,5 +12,6 @@ mkTheme rec { name = name; description = "HyDE Theme: Amethyst-Aura"; homepage = "https://github.com/jackpawlik1/Amethyst-Aura"; + priority = 90; }; } diff --git a/hydenix/sources/themes/AncientAliens.nix b/hydenix/sources/themes/AncientAliens.nix index 33474c8c..8019c757 100644 --- a/hydenix/sources/themes/AncientAliens.nix +++ b/hydenix/sources/themes/AncientAliens.nix @@ -11,5 +11,6 @@ mkTheme rec { meta = { description = "HyDE Theme: AncientAliens"; homepage = "https://github.com/dim-ghub/AncientAliens"; + priority = 100; }; } diff --git a/hydenix/sources/themes/Another-World.nix b/hydenix/sources/themes/Another-World.nix index c54f8b9d..946a468b 100644 --- a/hydenix/sources/themes/Another-World.nix +++ b/hydenix/sources/themes/Another-World.nix @@ -11,5 +11,6 @@ mkTheme rec { meta = { description = "HyDE Theme: Another World"; homepage = "https://github.com/cyb3rgh0u1/Another-World"; + priority = 10; }; } diff --git a/hydenix/sources/themes/Bad-Blood.nix b/hydenix/sources/themes/Bad-Blood.nix index f5430328..2b5a26a7 100644 --- a/hydenix/sources/themes/Bad-Blood.nix +++ b/hydenix/sources/themes/Bad-Blood.nix @@ -11,5 +11,6 @@ mkTheme rec { meta = { description = "HyDE Theme: Bad Blood"; homepage = "https://github.com/HyDE-Project/hyde-gallery/tree/Bad-Blood"; + priority = 10; }; } diff --git a/hydenix/sources/themes/BlueSky.nix b/hydenix/sources/themes/BlueSky.nix index 517327d4..a4c2d982 100644 --- a/hydenix/sources/themes/BlueSky.nix +++ b/hydenix/sources/themes/BlueSky.nix @@ -11,5 +11,6 @@ mkTheme rec { meta = { description = "HyDE Theme: BlueSky"; homepage = "https://github.com/richen604/BlueSky"; + priority = 10; }; } diff --git a/hydenix/sources/themes/Cat-Latte.nix b/hydenix/sources/themes/Cat-Latte.nix index 47159a54..18818d27 100644 --- a/hydenix/sources/themes/Cat-Latte.nix +++ b/hydenix/sources/themes/Cat-Latte.nix @@ -11,5 +11,6 @@ mkTheme rec { meta = { description = "Better Catppuccin-Latte that fixes the inconsistencies of the official theme"; homepage = "https://github.com/rishav12s/Cat-Latte"; + priority = 10; }; } diff --git a/hydenix/sources/themes/Catppuccin-Latte.nix b/hydenix/sources/themes/Catppuccin-Latte.nix index 34fccb00..5ff5e6cf 100644 --- a/hydenix/sources/themes/Catppuccin-Latte.nix +++ b/hydenix/sources/themes/Catppuccin-Latte.nix @@ -9,6 +9,7 @@ mkTheme rec { sha256 = "sha256-dW5DgXFxFNjt54Styzk+Ew3pv4rO1FX/qtfDGIClLuY="; }; meta = { + priority = 100; description = "HyDE Theme: Catppuccin Latte"; homepage = "https://github.com/HyDE-Project/hyde-themes/tree/Catppuccin-Latte"; }; diff --git a/hydenix/sources/themes/Catppuccin-Mocha.nix b/hydenix/sources/themes/Catppuccin-Mocha.nix index c95e20ef..992e5d63 100644 --- a/hydenix/sources/themes/Catppuccin-Mocha.nix +++ b/hydenix/sources/themes/Catppuccin-Mocha.nix @@ -11,5 +11,6 @@ mkTheme rec { meta = { description = "HyDE Theme: Catppuccin Mocha"; homepage = "https://github.com/HyDE-Project/hyde-themes/tree/Catppuccin-Mocha"; + priority = 100; }; } diff --git a/hydenix/sources/themes/Code-Garden.nix b/hydenix/sources/themes/Code-Garden.nix index 50a66e4c..f41866cb 100644 --- a/hydenix/sources/themes/Code-Garden.nix +++ b/hydenix/sources/themes/Code-Garden.nix @@ -12,5 +12,6 @@ mkTheme rec { name = name; description = "HyDE Theme: Code Garden"; homepage = "https://github.com/jacobfranco/Code-Garden"; + priority = 100; }; } diff --git a/hydenix/sources/themes/Cosmic-Blue.nix b/hydenix/sources/themes/Cosmic-Blue.nix index 20f748cf..d85e34bf 100644 --- a/hydenix/sources/themes/Cosmic-Blue.nix +++ b/hydenix/sources/themes/Cosmic-Blue.nix @@ -11,5 +11,6 @@ mkTheme rec { meta = { description = "HyDE Theme: Cosmic Blue"; homepage = "https://github.com/Maroc02/Cosmic-Blue"; + priority = 10; }; } diff --git a/hydenix/sources/themes/Crimson-Blade.nix b/hydenix/sources/themes/Crimson-Blade.nix index 2062c81c..87d6a4c0 100644 --- a/hydenix/sources/themes/Crimson-Blade.nix +++ b/hydenix/sources/themes/Crimson-Blade.nix @@ -11,5 +11,6 @@ mkTheme rec { meta = { description = "HyDE Theme: A striking fusion of sharp elegance, cutting through the darkness with bold hues."; homepage = "https://github.com/cyb3rgh0u1/Crimson-Blade"; + priority = 10; }; } diff --git a/hydenix/sources/themes/Crimson-Blue.nix b/hydenix/sources/themes/Crimson-Blue.nix index 4437e96a..2fbf5cab 100644 --- a/hydenix/sources/themes/Crimson-Blue.nix +++ b/hydenix/sources/themes/Crimson-Blue.nix @@ -12,5 +12,6 @@ mkTheme rec { name = name; description = "HyDE Theme: Crimson-Blue"; homepage = "https://github.com/amit-0i/Crimson-Blue"; + priority = 100; }; } diff --git a/hydenix/sources/themes/Decay-Green.nix b/hydenix/sources/themes/Decay-Green.nix index 61825c10..bca294e1 100644 --- a/hydenix/sources/themes/Decay-Green.nix +++ b/hydenix/sources/themes/Decay-Green.nix @@ -11,5 +11,6 @@ mkTheme rec { meta = { description = "HyDE Theme: Decay Green"; homepage = "https://github.com/HyDE-Project/hyde-themes/tree/Decay-Green"; + priority = 100; }; } diff --git a/hydenix/sources/themes/DoomBringers.nix b/hydenix/sources/themes/DoomBringers.nix index 2e6aeab7..6dfa09d7 100644 --- a/hydenix/sources/themes/DoomBringers.nix +++ b/hydenix/sources/themes/DoomBringers.nix @@ -11,5 +11,6 @@ mkTheme rec { meta = { description = "HyDE Theme: DoomBringers"; homepage = "https://github.com/xaicat/DoomBringers"; + priority = 10; }; } diff --git a/hydenix/sources/themes/Dracula.nix b/hydenix/sources/themes/Dracula.nix index a9e4ca49..075190bd 100644 --- a/hydenix/sources/themes/Dracula.nix +++ b/hydenix/sources/themes/Dracula.nix @@ -11,5 +11,6 @@ mkTheme rec { meta = { description = "HyDE Theme: Dracula"; homepage = "https://github.com/RAprogramm/HyDe-Themes/tree/Dracula"; + priority = 10; }; } diff --git a/hydenix/sources/themes/Edge-Runner.nix b/hydenix/sources/themes/Edge-Runner.nix index 698eb3d4..d6acedac 100644 --- a/hydenix/sources/themes/Edge-Runner.nix +++ b/hydenix/sources/themes/Edge-Runner.nix @@ -11,5 +11,6 @@ mkTheme rec { meta = { description = "HyDE Theme: Edge Runner"; homepage = "https://github.com/HyDE-Project/hyde-themes/tree/Edge-Runner"; + priority = 100; }; } diff --git a/hydenix/sources/themes/Electra.nix b/hydenix/sources/themes/Electra.nix index 8492bb28..276b4caa 100644 --- a/hydenix/sources/themes/Electra.nix +++ b/hydenix/sources/themes/Electra.nix @@ -12,5 +12,6 @@ mkTheme rec { name = name; description = "HyDE Theme: Electra"; homepage = "https://github.com/XBEAST1/Electra"; + priority = 80; }; } diff --git a/hydenix/sources/themes/Eternal-Arctic.nix b/hydenix/sources/themes/Eternal-Arctic.nix index 5bf55065..48862ec8 100644 --- a/hydenix/sources/themes/Eternal-Arctic.nix +++ b/hydenix/sources/themes/Eternal-Arctic.nix @@ -11,5 +11,6 @@ mkTheme rec { meta = { description = "HyDE Theme: Eternal-Arctic"; homepage = "https://github.com/rishav12s/Eternal-Arctic"; + priority = 10; }; } diff --git a/hydenix/sources/themes/Ever-Blushing.nix b/hydenix/sources/themes/Ever-Blushing.nix index d1232815..b970836e 100644 --- a/hydenix/sources/themes/Ever-Blushing.nix +++ b/hydenix/sources/themes/Ever-Blushing.nix @@ -11,5 +11,6 @@ mkTheme rec { meta = { description = "HyDE Theme: Ever-Blushing"; homepage = "https://github.com/rishav12s/Ever-Blushing"; + priority = 10; }; } diff --git a/hydenix/sources/themes/Frosted-Glass.nix b/hydenix/sources/themes/Frosted-Glass.nix index 8ecfc307..ec099455 100644 --- a/hydenix/sources/themes/Frosted-Glass.nix +++ b/hydenix/sources/themes/Frosted-Glass.nix @@ -11,5 +11,6 @@ mkTheme rec { meta = { description = "HyDE Theme: Frosted Glass"; homepage = "https://github.com/HyDE-Project/hyde-themes/tree/Frosted-Glass"; + priority = 100; }; } diff --git a/hydenix/sources/themes/Graphite-Mono.nix b/hydenix/sources/themes/Graphite-Mono.nix index 13ab9a30..57a4bba1 100644 --- a/hydenix/sources/themes/Graphite-Mono.nix +++ b/hydenix/sources/themes/Graphite-Mono.nix @@ -11,5 +11,6 @@ mkTheme rec { meta = { description = "HyDE Theme: Graphite Mono"; homepage = "https://github.com/HyDE-Project/hyde-themes/tree/Graphite-Mono"; + priority = 90; }; } diff --git a/hydenix/sources/themes/Green-Lush.nix b/hydenix/sources/themes/Green-Lush.nix index 7dfd2b24..22cf386a 100644 --- a/hydenix/sources/themes/Green-Lush.nix +++ b/hydenix/sources/themes/Green-Lush.nix @@ -11,5 +11,6 @@ mkTheme rec { meta = { description = "HyDE Theme: Green Lush"; homepage = "https://github.com/abenezerw/Green-Lush"; + priority = 10; }; } diff --git a/hydenix/sources/themes/Greenify.nix b/hydenix/sources/themes/Greenify.nix index e6c53e79..15b24219 100644 --- a/hydenix/sources/themes/Greenify.nix +++ b/hydenix/sources/themes/Greenify.nix @@ -11,5 +11,6 @@ mkTheme rec { meta = { description = "HyDE Theme: Greenify"; homepage = "https://github.com/mahaveergurjar/Theme-Gallery/tree/Greenify"; + priority = 10; }; } diff --git a/hydenix/sources/themes/Grukai.nix b/hydenix/sources/themes/Grukai.nix index 1d1740dc..8c7ef409 100644 --- a/hydenix/sources/themes/Grukai.nix +++ b/hydenix/sources/themes/Grukai.nix @@ -12,5 +12,6 @@ mkTheme rec { name = name; description = "HyDE Theme: Grukai"; homepage = "https://github.com/amit-0i/Grukai"; + priority = 100; }; } diff --git a/hydenix/sources/themes/Gruvbox-Retro.nix b/hydenix/sources/themes/Gruvbox-Retro.nix index 9d1ff21c..19058b3a 100644 --- a/hydenix/sources/themes/Gruvbox-Retro.nix +++ b/hydenix/sources/themes/Gruvbox-Retro.nix @@ -11,5 +11,6 @@ mkTheme rec { meta = { description = "HyDE Theme: Gruvbox Retro"; homepage = "https://github.com/HyDE-Project/hyde-themes/tree/Gruvbox-Retro"; + priority = 100; }; } diff --git a/hydenix/sources/themes/Hack-the-Box.nix b/hydenix/sources/themes/Hack-the-Box.nix index 30cbcbf7..653f57f4 100644 --- a/hydenix/sources/themes/Hack-the-Box.nix +++ b/hydenix/sources/themes/Hack-the-Box.nix @@ -11,5 +11,6 @@ mkTheme rec { meta = { description = "HyDE Theme: Hack the Box"; homepage = "https://github.com/HyDE-Project/hyde-gallery/tree/Hack-the-Box"; + priority = 10; }; } diff --git a/hydenix/sources/themes/Ice-Age.nix b/hydenix/sources/themes/Ice-Age.nix index 532404d8..e057abd6 100644 --- a/hydenix/sources/themes/Ice-Age.nix +++ b/hydenix/sources/themes/Ice-Age.nix @@ -11,5 +11,6 @@ mkTheme rec { meta = { description = "HyDE Theme: Ice Age"; homepage = "https://github.com/saber-88/Ice-Age"; + priority = 15; }; } diff --git a/hydenix/sources/themes/LimeFrenzy.nix b/hydenix/sources/themes/LimeFrenzy.nix index efc39631..7750e699 100644 --- a/hydenix/sources/themes/LimeFrenzy.nix +++ b/hydenix/sources/themes/LimeFrenzy.nix @@ -11,5 +11,6 @@ mkTheme rec { meta = { description = "HyDE Theme: LimeFrenzy"; homepage = "https://github.com/xaicat/LimeFrenzy"; + priority = 100; }; } diff --git a/hydenix/sources/themes/Mac-OS.nix b/hydenix/sources/themes/Mac-OS.nix index 6d4ed8d4..22f9ba33 100644 --- a/hydenix/sources/themes/Mac-OS.nix +++ b/hydenix/sources/themes/Mac-OS.nix @@ -11,5 +11,6 @@ mkTheme rec { meta = { description = "HyDE Theme: Mac OS"; homepage = "https://github.com/HyDE-Project/hyde-gallery/tree/Mac-Os"; + priority = 10; }; } diff --git a/hydenix/sources/themes/Material-Sakura.nix b/hydenix/sources/themes/Material-Sakura.nix index 04177027..ba78610a 100644 --- a/hydenix/sources/themes/Material-Sakura.nix +++ b/hydenix/sources/themes/Material-Sakura.nix @@ -11,5 +11,6 @@ mkTheme rec { meta = { description = "HyDE Theme: Material Sakura"; homepage = "https://github.com/HyDE-Project/hyde-themes/tree/Material-Sakura"; + priority = 95; }; } diff --git a/hydenix/sources/themes/Monokai.nix b/hydenix/sources/themes/Monokai.nix index b4bcdcb2..60ad26fb 100644 --- a/hydenix/sources/themes/Monokai.nix +++ b/hydenix/sources/themes/Monokai.nix @@ -11,5 +11,6 @@ mkTheme rec { meta = { description = "HyDE Theme: Monokai"; homepage = "https://github.com/mahaveergurjar/Theme-Gallery/tree/Monokai"; + priority = 10; }; } diff --git a/hydenix/sources/themes/Monterey-Frost.nix b/hydenix/sources/themes/Monterey-Frost.nix index 74f55e1d..e3e44fab 100644 --- a/hydenix/sources/themes/Monterey-Frost.nix +++ b/hydenix/sources/themes/Monterey-Frost.nix @@ -11,5 +11,6 @@ mkTheme rec { meta = { description = "Mac-OS inspired dark theme"; homepage = "https://github.com/rishav12s/Monterey-Frost"; + priority = 10; }; } diff --git a/hydenix/sources/themes/Moonlight.nix b/hydenix/sources/themes/Moonlight.nix index 63cb0658..e329579a 100644 --- a/hydenix/sources/themes/Moonlight.nix +++ b/hydenix/sources/themes/Moonlight.nix @@ -11,5 +11,6 @@ mkTheme rec { meta = { description = "HyDE Theme: Moonlight"; homepage = "https://github.com/Maroc02/Moonlight"; + priority = 10; }; } diff --git a/hydenix/sources/themes/Nightbrew.nix b/hydenix/sources/themes/Nightbrew.nix index 51ae9f65..95160720 100644 --- a/hydenix/sources/themes/Nightbrew.nix +++ b/hydenix/sources/themes/Nightbrew.nix @@ -12,5 +12,6 @@ mkTheme rec { name = name; description = "HyDE Theme: Nightbrew"; homepage = "https://github.com/jackpawlik1/Nightbrew"; + priority = 100; }; } diff --git a/hydenix/sources/themes/Nordic-Blue.nix b/hydenix/sources/themes/Nordic-Blue.nix index 3941d1d8..0a523b59 100644 --- a/hydenix/sources/themes/Nordic-Blue.nix +++ b/hydenix/sources/themes/Nordic-Blue.nix @@ -11,5 +11,6 @@ mkTheme rec { meta = { description = "HyDE Theme: Nordic Blue"; homepage = "https://github.com/HyDE-Project/hyde-themes/tree/Nordic-Blue"; + priority = 100; }; } diff --git a/hydenix/sources/themes/Obsidian-Purple.nix b/hydenix/sources/themes/Obsidian-Purple.nix index 4fb5585c..dd453008 100644 --- a/hydenix/sources/themes/Obsidian-Purple.nix +++ b/hydenix/sources/themes/Obsidian-Purple.nix @@ -12,5 +12,6 @@ mkTheme rec { name = name; description = "HyDE Theme: Obsidian-Purple"; homepage = "https://github.com/amit-0i/Obsidian-Purple"; + priority = 90; }; } diff --git a/hydenix/sources/themes/One-Dark.nix b/hydenix/sources/themes/One-Dark.nix index 5739189e..efef6270 100644 --- a/hydenix/sources/themes/One-Dark.nix +++ b/hydenix/sources/themes/One-Dark.nix @@ -11,5 +11,6 @@ mkTheme rec { meta = { description = "HyDE Theme: One Dark"; homepage = "https://github.com/RAprogramm/HyDe-Themes/tree/One-Dark"; + priority = 10; }; } diff --git a/hydenix/sources/themes/Oxo-Carbon.nix b/hydenix/sources/themes/Oxo-Carbon.nix index c08270e3..eb09938d 100644 --- a/hydenix/sources/themes/Oxo-Carbon.nix +++ b/hydenix/sources/themes/Oxo-Carbon.nix @@ -11,5 +11,6 @@ mkTheme rec { meta = { description = "HyDE Theme: Oxo Carbon"; homepage = "https://github.com/rishav12s/Oxo-Carbon"; + priority = 10; }; } diff --git a/hydenix/sources/themes/Paranoid-Sweet.nix b/hydenix/sources/themes/Paranoid-Sweet.nix index 47485798..b908181c 100644 --- a/hydenix/sources/themes/Paranoid-Sweet.nix +++ b/hydenix/sources/themes/Paranoid-Sweet.nix @@ -11,5 +11,6 @@ mkTheme rec { meta = { description = "HyDE Theme: Paranoid Sweet"; homepage = "https://github.com/rishav12s/Paranoid-Sweet"; + priority = 10; }; } diff --git a/hydenix/sources/themes/Peace-Of-Mind.nix b/hydenix/sources/themes/Peace-Of-Mind.nix index e4ae7ed3..5c4aaf09 100644 --- a/hydenix/sources/themes/Peace-Of-Mind.nix +++ b/hydenix/sources/themes/Peace-Of-Mind.nix @@ -12,5 +12,6 @@ mkTheme rec { name = name; description = "HyDE Theme: Peace Of Mind"; homepage = "https://github.com/Maroc02/Peace-Of-Mind"; + priority = 100; }; } diff --git a/hydenix/sources/themes/Pixel-Dream.nix b/hydenix/sources/themes/Pixel-Dream.nix index 43db3956..a9891679 100644 --- a/hydenix/sources/themes/Pixel-Dream.nix +++ b/hydenix/sources/themes/Pixel-Dream.nix @@ -11,5 +11,6 @@ mkTheme rec { meta = { description = "Pixel Art inspired theme"; homepage = "https://github.com/rishav12s/Pixel-Dream"; + priority = 10; }; } diff --git a/hydenix/sources/themes/Rain-Dark.nix b/hydenix/sources/themes/Rain-Dark.nix index 59bbdb71..050031dd 100644 --- a/hydenix/sources/themes/Rain-Dark.nix +++ b/hydenix/sources/themes/Rain-Dark.nix @@ -11,5 +11,6 @@ mkTheme rec { meta = { description = "HyDE Theme: Rain Dark"; homepage = "https://github.com/rishav12s/Rain-Dark"; + priority = 10; }; } diff --git a/hydenix/sources/themes/Red-Stone.nix b/hydenix/sources/themes/Red-Stone.nix index 9e42d034..0c1c9da9 100644 --- a/hydenix/sources/themes/Red-Stone.nix +++ b/hydenix/sources/themes/Red-Stone.nix @@ -11,5 +11,6 @@ mkTheme rec { meta = { description = "HyDE Theme: Red Stone"; homepage = "https://github.com/mahaveergurjar/Theme-Gallery/tree/Red-Stone"; + priority = 10; }; } diff --git a/hydenix/sources/themes/Rose-Pine.nix b/hydenix/sources/themes/Rose-Pine.nix index f03f03f0..814c8663 100644 --- a/hydenix/sources/themes/Rose-Pine.nix +++ b/hydenix/sources/themes/Rose-Pine.nix @@ -11,5 +11,6 @@ mkTheme rec { meta = { description = "HyDE Theme: Rosé Pine"; homepage = "https://github.com/HyDE-Project/hyde-themes/tree/Rose-Pine"; + priority = 100; }; } diff --git a/hydenix/sources/themes/Scarlet-Night.nix b/hydenix/sources/themes/Scarlet-Night.nix index 7c1282f3..cc84ab06 100644 --- a/hydenix/sources/themes/Scarlet-Night.nix +++ b/hydenix/sources/themes/Scarlet-Night.nix @@ -11,5 +11,6 @@ mkTheme rec { meta = { description = "HyDE Theme: Scarlet Night"; homepage = "https://github.com/abenezerw/Scarlet-Night"; + priority = 10; }; } diff --git a/hydenix/sources/themes/Sci-fi.nix b/hydenix/sources/themes/Sci-fi.nix index c3e0731b..d7a6af55 100644 --- a/hydenix/sources/themes/Sci-fi.nix +++ b/hydenix/sources/themes/Sci-fi.nix @@ -11,5 +11,6 @@ mkTheme rec { meta = { description = "HyDE Theme: Sci-fi"; homepage = "https://github.com/KaranRaval123/Sci-fi"; + priority = 20; }; } diff --git a/hydenix/sources/themes/Solarized-Dark.nix b/hydenix/sources/themes/Solarized-Dark.nix index 0b774b3a..3e9be7cc 100644 --- a/hydenix/sources/themes/Solarized-Dark.nix +++ b/hydenix/sources/themes/Solarized-Dark.nix @@ -11,5 +11,6 @@ mkTheme rec { meta = { description = "HyDE Theme: Solarized Dark"; homepage = "https://github.com/rishav12s/Solarized-Dark"; + priority = 10; }; } diff --git a/hydenix/sources/themes/Synth-Wave.nix b/hydenix/sources/themes/Synth-Wave.nix index 57c74cbd..61aadffd 100644 --- a/hydenix/sources/themes/Synth-Wave.nix +++ b/hydenix/sources/themes/Synth-Wave.nix @@ -11,5 +11,6 @@ mkTheme rec { meta = { description = "HyDE Theme: Synth Wave"; homepage = "https://github.com/HyDE-Project/hyde-themes/tree/Synth-Wave"; + priority = 100; }; } diff --git a/hydenix/sources/themes/Tokyo-Night.nix b/hydenix/sources/themes/Tokyo-Night.nix index 026af0bd..69004f33 100644 --- a/hydenix/sources/themes/Tokyo-Night.nix +++ b/hydenix/sources/themes/Tokyo-Night.nix @@ -11,5 +11,6 @@ mkTheme rec { meta = { description = "HyDE Theme: Tokyo Night"; homepage = "https://github.com/HyDE-Project/hyde-themes/tree/Tokyo-Night"; + priority = 100; }; } diff --git a/hydenix/sources/themes/Tundra.nix b/hydenix/sources/themes/Tundra.nix index 2fd548a2..aeac3c44 100644 --- a/hydenix/sources/themes/Tundra.nix +++ b/hydenix/sources/themes/Tundra.nix @@ -11,5 +11,6 @@ mkTheme rec { meta = { description = "HyDE Theme: Tundra"; homepage = "https://github.com/Prof-Shiba/Tundra"; + priority = 100; }; } diff --git a/hydenix/sources/themes/Vanta-Black.nix b/hydenix/sources/themes/Vanta-Black.nix index 7b0d4731..0d75ce07 100644 --- a/hydenix/sources/themes/Vanta-Black.nix +++ b/hydenix/sources/themes/Vanta-Black.nix @@ -11,5 +11,6 @@ mkTheme rec { meta = { description = "HyDE Theme: Vanta Black inspired theme having the deepest blacks"; homepage = "https://github.com/rishav12s/Vanta-Black"; + priority = 100; }; } diff --git a/hydenix/sources/themes/Windows-11.nix b/hydenix/sources/themes/Windows-11.nix index 05761296..3c5d2060 100644 --- a/hydenix/sources/themes/Windows-11.nix +++ b/hydenix/sources/themes/Windows-11.nix @@ -11,5 +11,6 @@ mkTheme rec { meta = { description = "HyDE Theme: Windows 11"; homepage = "https://github.com/HyDE-Project/hyde-gallery/tree/Windows-11"; + priority = 10; }; } From 7e77f5d2c4f8de2e28fbe4a89c284fed6ac0cff8 Mon Sep 17 00:00:00 2001 From: Richard Henninger <56615615+richen604@users.noreply.github.com> Date: Mon, 6 Oct 2025 23:35:05 -0700 Subject: [PATCH 04/24] Revert "fix: themes correctly handle conflicts in arcs using symlinkJoin" This reverts commit 22699e6c039adddf5fe6e0ad087c9f8f84b14714. --- TODO.md | 38 +++++++++++++++++++++++------------- hydenix/modules/hm/theme.nix | 13 ++---------- lib/config/home.nix | 2 +- 3 files changed, 27 insertions(+), 26 deletions(-) diff --git a/TODO.md b/TODO.md index 5c5fa5d7..f91e7bf2 100644 --- a/TODO.md +++ b/TODO.md @@ -3,19 +3,16 @@ ## done +- fix: qt5 eol. removed hydenix.sddm.theme, added sddm astronaut theme +- ci: update nixpkgs update script to create only one branch and replace the other + ## now +- use pkgs.buildEnv with `ignoreCollisions=true;` for themes instead of meta.priority - feat: new themes to build ## next -- refactor: rename all overlays so there is no namespace nesting -- feat: home-manager configuration in flake - -## 5.0.0 - -## backlog - - feat: move hyprlock to hyprland module, swaylock should just be swaylock module - assertion to not have both enabled - feat: extending more options for feature parity with hyde @@ -23,25 +20,37 @@ - hyprlock - rofi - waybar +- feat: vscode-nix-ide part of editors, enabled by default - fix: i don't think .config/waybar/modules is supposed to be set anymore + +## 5.0.0 + +- refactor: rename all overlays so there is no namespace nesting +- feat: home-manager configuration in flake +- feat: hydenix major option, show warnings on option for api updates + +## backlog + - fix: remove duplicate udisks2 setup - hm.hyprland should have more warnings related to config overrides, i think - feat: hyde config.toml options -- demo video? fix demo-vm +- complete demo video after 5.0 - fix: wallbash for code - feat: assertions for common requirements - chore: review bug template to make it more clear (easier with scripts?) - feat: enhance `mutable` Home Manager option for `home.file`, `xdg.configFile`, `xdg.dataFile`: - - introduce `mutable.enable` (boolean) and `mutable.mode` (enum: `initOnly`, `replace`) for fine-grained control over file copying behavior. - - implement custom cleanup logic for `mutable.enable = true` files, ensuring they are removed when no longer declared in the configuration. - - largest hurdle is if users remove the module the stale files will exist as mutable.nix is no longer imported - - ensure this cleanup mechanism supports Home Manager generation rollbacks. + - Introduce `mutable.enable` (boolean) and `mutable.mode` (enum: `initOnly`, `replace`) for fine-grained control over file copying behavior. + - Implement custom cleanup logic for `mutable.enable = true` files, ensuring they are removed when no longer declared in the configuration. + - Largest hurdle is if users remove the module the stale files will exist as mutable.nix is no longer imported + - Ensure this cleanup mechanism supports Home Manager generation rollbacks. - create a simple flake to test and export as a full module -- feat: spicetify theme support? flatpak? -## future? +## future - binary cache when i build it + +## notes + - using nixos-anywhere to install hydenix: - must be part of the template flake or a new template flake, as it will be used for the user configuration - document disko configuration clearly, the issue is ive never used disko @@ -49,3 +58,4 @@ - nh by default? - docs: documentation generation using nixosOptionsDoc - refactor: revise module hierarchy to be more clear and concise? +- feat: spicetify theme support? flatpak? diff --git a/hydenix/modules/hm/theme.nix b/hydenix/modules/hm/theme.nix index 1726ea30..38caa7c2 100644 --- a/hydenix/modules/hm/theme.nix +++ b/hydenix/modules/hm/theme.nix @@ -39,17 +39,8 @@ in }; config = lib.mkIf cfg.enable { - # Create a combined theme package using symlinkJoin with only selected themes - home.packages = [ - (pkgs.symlinkJoin { - name = "hydenix-themes"; - paths = lib.filter (p: p != null) (map findThemeByName availableThemes); - meta = { - description = "Combined HyDE themes package"; - platforms = pkgs.lib.platforms.all; - }; - }) - ]; + # Convert theme names to their corresponding packages, filtering out missing ones + home.packages = lib.filter (p: p != null) (map findThemeByName availableThemes); # walks through the themes and creates symlinks in the hyde themes directory home.file = diff --git a/lib/config/home.nix b/lib/config/home.nix index a0ad56cc..ff931371 100644 --- a/lib/config/home.nix +++ b/lib/config/home.nix @@ -54,7 +54,7 @@ "Tundra" "Tokyo Night" #FIXME: theme conflicts with material sakura that wont fix - "Vanta Black" + # "Vanta Black" "Windows 11" "Another World" From 0bd430e0933f7dcc49c1cdf3b93e9aed6f4296a3 Mon Sep 17 00:00:00 2001 From: Richard Henninger <56615615+richen604@users.noreply.github.com> Date: Mon, 6 Oct 2025 23:35:05 -0700 Subject: [PATCH 05/24] Revert "ci: update flake script more robust and automated" This reverts commit b1a41ec9b78c2ab204fb25011b1967f6f2c69c04. --- .github/workflows/update-flake-lock.yml | 74 +++---------------------- 1 file changed, 9 insertions(+), 65 deletions(-) diff --git a/.github/workflows/update-flake-lock.yml b/.github/workflows/update-flake-lock.yml index fb81ef7e..02cb5fe5 100644 --- a/.github/workflows/update-flake-lock.yml +++ b/.github/workflows/update-flake-lock.yml @@ -8,9 +8,6 @@ on: permissions: contents: write pull-requests: write - # Required for `create-pull-request` to create a PR directly against the base branch - # if an existing PR for the branch already exists. - # Also required for auto-merging. jobs: lockfile: @@ -24,7 +21,7 @@ jobs: - name: Update nixpkgs input to unstable run: | - sed -i 's|nixpkgs.url = "github:nixos/nixpkgs/.*"|nixpkgs.url = "github:nixos/nixpkgs/nixos-unstable"|' flake.nix + sed -i 's|nixpkgs.url = "github:nixos/nixpkgs/.*"|nixpkgs.url = "github:nixos/nixpkgs/nixpkgs-unstable"|' flake.nix - name: Update flake.lock run: nix flake update - name: Update flake.nix with new rev @@ -42,81 +39,28 @@ jobs: - name: Check Root Flake id: check_root - continue-on-error: true # Temporarily set to true to capture output even on failure - run: | - ROOT_CHECK_RESULT=$(nix flake check 2>&1 || true) # Capture output, and continue on error - echo "root_check_output<> $GITHUB_OUTPUT - echo "$ROOT_CHECK_RESULT" >> $GITHUB_OUTPUT - echo "EOF" >> $GITHUB_OUTPUT - if echo "$ROOT_CHECK_RESULT" | grep -q 'error'; then - echo "ROOT_CHECK_SUCCESS=false" >> $GITHUB_OUTPUT - else - echo "ROOT_CHECK_SUCCESS=true" >> $GITHUB_OUTPUT - fi + continue-on-error: true + run: nix flake check - name: Check Template Flake id: check_template - continue-on-error: true # Temporarily set to true to capture output even on failure + continue-on-error: true run: | cd template sed -i 's|url = "github:richen604/hydenix"|url = "path:../"|' flake.nix - TEMPLATE_CHECK_RESULT=$(nix flake check 2>&1 || true) # Capture output, and continue on error - echo "template_check_output<> $GITHUB_OUTPUT - echo "$TEMPLATE_CHECK_RESULT" >> $GITHUB_OUTPUT - echo "EOF" >> $GITHUB_OUTPUT - if echo "$TEMPLATE_CHECK_RESULT" | grep -q 'error'; then - echo "TEMPLATE_CHECK_SUCCESS=false" >> $GITHUB_OUTPUT - else - echo "TEMPLATE_CHECK_SUCCESS=true" >> $GITHUB_OUTPUT - fi + nix flake check git checkout flake.nix rm -f flake.lock - name: Create Pull Request - id: create_pr uses: peter-evans/create-pull-request@v5 with: commit-message: "chore(deps): update flake.lock" title: "chore(deps): update flake.lock" - branch: update-flake-lock - token: ${{ secrets.GITHUB_TOKEN }} + branch: update-flake-lock-${{ github.run_id }} + delete-branch: true body: | Updated flake.lock file. - --- - - ### Root Flake Check: ${{ steps.check_root.outputs.ROOT_CHECK_SUCCESS == 'true' && '✅ Passed' || '❌ Failed' }} -
- View output - - ``` - ${{ steps.check_root.outputs.root_check_output }} - ``` - -
- - ### Template Flake Check: ${{ steps.check_template.outputs.TEMPLATE_CHECK_SUCCESS == 'true' && '✅ Passed' || '❌ Failed' }} -
- View output - - ``` - ${{ steps.check_template.outputs.template_check_output }} - ``` - -
- - --- - if: always() - - - name: Enable auto-merge on PR - if: ${{ steps.check_root.outputs.ROOT_CHECK_SUCCESS == 'true' && steps.check_template.outputs.TEMPLATE_CHECK_SUCCESS == 'true' && steps.create_pr.outputs.pull-request-number }} - run: | - gh pr merge ${{ steps.create_pr.outputs.pull-request-number }} --auto --squash - env: - GITHUB_TOKEN: ${{ secrets.GITHUB_TOKEN }} - - - name: Check overall status and fail if necessary - if: ${{ steps.check_root.outputs.ROOT_CHECK_SUCCESS == 'false' || steps.check_template.outputs.TEMPLATE_CHECK_SUCCESS == 'false' }} - run: | - echo "One or more flake checks failed. Failing workflow as requested." - exit 1 + Root Flake check: ${{ steps.check_root.outcome == 'success' && '✅ Passed' || '❌ Failed' }} + Template Flake check: ${{ steps.check_template.outcome == 'success' && '✅ Passed' || '❌ Failed' }} From f9a498f26e6529e35bba0787c8c2d108c81fb90e Mon Sep 17 00:00:00 2001 From: Richard Henninger <56615615+richen604@users.noreply.github.com> Date: Mon, 6 Oct 2025 23:35:05 -0700 Subject: [PATCH 06/24] Revert "feat: qt5 eol. removed hydenix.sddm.theme, added sddm astronaut theme" This reverts commit cb8d92d7a6b135b2a6546c7fe4629bdce3195d8a. --- TODO.md | 4 +--- flake.lock | 8 ++++---- flake.nix | 2 +- hydenix/modules/hm/dolphin.nix | 1 + hydenix/modules/hm/qt.nix | 6 ++++++ hydenix/modules/system/sddm.nix | 28 ++++++++++++++++++++++------ hydenix/sources/hyde.nix | 5 +++++ lib/config/configuration.nix | 1 + template/configuration.nix | 2 -- template/docs/options.md | 6 ++++-- template/flake.nix | 4 +--- 11 files changed, 46 insertions(+), 21 deletions(-) diff --git a/TODO.md b/TODO.md index f91e7bf2..fa80026c 100644 --- a/TODO.md +++ b/TODO.md @@ -3,12 +3,10 @@ ## done -- fix: qt5 eol. removed hydenix.sddm.theme, added sddm astronaut theme -- ci: update nixpkgs update script to create only one branch and replace the other - ## now - use pkgs.buildEnv with `ignoreCollisions=true;` for themes instead of meta.priority +- ci: update nixpkgs update script to create only one branch and replace the other - feat: new themes to build ## next diff --git a/flake.lock b/flake.lock index 009b6de0..ad5aaf46 100644 --- a/flake.lock +++ b/flake.lock @@ -191,17 +191,17 @@ }, "nixpkgs_2": { "locked": { - "lastModified": 1759036355, - "narHash": "sha256-0m27AKv6ka+q270dw48KflE0LwQYrO7Fm4/2//KCVWg=", + "lastModified": 1758446476, + "narHash": "sha256-5rdAi7CTvM/kSs6fHe1bREIva5W3TbImsto+dxG4mBo=", "owner": "nixos", "repo": "nixpkgs", - "rev": "e9f00bd893984bc8ce46c895c3bf7cac95331127", + "rev": "a1f79a1770d05af18111fbbe2a3ab2c42c0f6cd0", "type": "github" }, "original": { "owner": "nixos", "repo": "nixpkgs", - "rev": "e9f00bd893984bc8ce46c895c3bf7cac95331127", + "rev": "a1f79a1770d05af18111fbbe2a3ab2c42c0f6cd0", "type": "github" } }, diff --git a/flake.nix b/flake.nix index 70a1cb02..7e9019bb 100644 --- a/flake.nix +++ b/flake.nix @@ -3,7 +3,7 @@ inputs = { # Hydenix's nixpkgs - nixpkgs.url = "github:nixos/nixpkgs/e9f00bd893984bc8ce46c895c3bf7cac95331127"; + nixpkgs.url = "github:nixos/nixpkgs/a1f79a1770d05af18111fbbe2a3ab2c42c0f6cd0"; home-manager = { url = "github:nix-community/home-manager"; inputs.nixpkgs.follows = "nixpkgs"; diff --git a/hydenix/modules/hm/dolphin.nix b/hydenix/modules/hm/dolphin.nix index 9ec10893..9798b1ed 100644 --- a/hydenix/modules/hm/dolphin.nix +++ b/hydenix/modules/hm/dolphin.nix @@ -19,6 +19,7 @@ in config = lib.mkIf cfg.enable { + #! we are using libsForQt5 because dolphin likes to break things like icons on qt6 home.packages = with pkgs.kdePackages; [ dolphin # KDE file manager qtimageformats # Image format support for Qt5 diff --git a/hydenix/modules/hm/qt.nix b/hydenix/modules/hm/qt.nix index 6200f1c5..8d97d59a 100644 --- a/hydenix/modules/hm/qt.nix +++ b/hydenix/modules/hm/qt.nix @@ -19,6 +19,12 @@ in config = lib.mkIf cfg.enable { home.packages = with pkgs; [ + libsForQt5.qt5ct + libsForQt5.qt5.qtbase + libsForQt5.qtstyleplugin-kvantum + libsForQt5.qtimageformats + libsForQt5.qtsvg + libsForQt5.qt5.qtwayland kdePackages.qt6ct kdePackages.qtbase kdePackages.qtwayland diff --git a/hydenix/modules/system/sddm.nix b/hydenix/modules/system/sddm.nix index b882573c..b9c7982e 100644 --- a/hydenix/modules/system/sddm.nix +++ b/hydenix/modules/system/sddm.nix @@ -15,13 +15,21 @@ in default = true; description = "Enable sddm module"; }; + + theme = lib.mkOption { + type = lib.types.enum [ + "Candy" + "Corners" + ]; + default = "Candy"; + description = "SDDM theme package to use"; + }; }; config = lib.mkIf cfg.enable { environment.systemPackages = [ pkgs.hydenix.hyde pkgs.Bibata-Modern-Ice - pkgs.sddm-astronaut ]; # Add this section to ensure cursor theme is properly loaded @@ -32,17 +40,25 @@ in services.displayManager.sddm = { enable = true; - theme = "sddm-astronaut-theme"; + package = pkgs.libsForQt5.sddm; + theme = pkgs.hydenix.hyde + "/share/sddm/themes/" + cfg.theme; wayland = { enable = true; }; - extraPackages = with pkgs.kdePackages; [ - qtsvg - qtmultimedia - qtvirtualkeyboard + extraPackages = with pkgs; [ + libsForQt5.sddm + libsForQt5.qtsvg + libsForQt5.qtmultimedia + libsForQt5.qtvirtualkeyboard + libsForQt5.qtquickcontrols2 + libsForQt5.qtgraphicaleffects + libsForQt5.qt5.qtwayland + hydenix.hyde + Bibata-Modern-Ice ]; settings = { Theme = { + ThemeDir = "/run/current-system/sw/share/sddm/themes"; CursorTheme = "Bibata-Modern-Ice"; CursorSize = "24"; }; diff --git a/hydenix/sources/hyde.nix b/hydenix/sources/hyde.nix index 4b6d2651..01da084f 100644 --- a/hydenix/sources/hyde.nix +++ b/hydenix/sources/hyde.nix @@ -66,6 +66,11 @@ pkgs.stdenv.mkDerivation { # BUILD GTK THEME mkdir -p $out/share/themes tar xzf ./Source/arcs/Gtk_Wallbash.tar.gz -C $out/share/themes + + # BUILD SDDM THEME + mkdir -p $out/share/sddm/themes + tar xzf ./Source/arcs/Sddm_Candy.tar.gz -C $out/share/sddm/themes + tar xzf ./Source/arcs/Sddm_Corners.tar.gz -C $out/share/sddm/themes ''; installPhase = '' diff --git a/lib/config/configuration.nix b/lib/config/configuration.nix index 1654ffed..54ffa529 100644 --- a/lib/config/configuration.nix +++ b/lib/config/configuration.nix @@ -23,6 +23,7 @@ in inputs.nixos-hardware.nixosModules.common-cpu-intel inputs.nixos-hardware.nixosModules.common-pc inputs.nixos-hardware.nixosModules.common-pc-ssd + ]; home-manager = { diff --git a/template/configuration.nix b/template/configuration.nix index 7a766ff6..7dead465 100644 --- a/template/configuration.nix +++ b/template/configuration.nix @@ -3,8 +3,6 @@ ... }: let - # FOLLOW THE BELOW INSTRUCTIONS LINE BY LINE TO SET UP YOUR SYSTEM - # Package configuration - sets up package system with proper overlays # Most users won't need to modify this section system = "x86_64-linux"; diff --git a/template/docs/options.md b/template/docs/options.md index d7228b4d..eaa5c3f4 100644 --- a/template/docs/options.md +++ b/template/docs/options.md @@ -102,8 +102,10 @@ below are the default options for hydenix. they are in *object format* and any o hardware.enable = true; # enable hardware module network.enable = true; # enable network module nix.enable = true; # enable nix module - sddm.enable = true; # enable sddm module - + sddm = { + enable = true; # enable sddm module + theme = "Candy" # or "Corners" + }; system.enable = true; # enable system module # home-manager hydenix options diff --git a/template/flake.nix b/template/flake.nix index 360aac6a..0ba0e9ad 100644 --- a/template/flake.nix +++ b/template/flake.nix @@ -12,9 +12,7 @@ # Commit: github:richen604/hydenix/ # Version: github:richen604/hydenix/v1.0.0 - note the version may not be compatible with this template url = "github:richen604/hydenix"; - - # uncomment the below if you know what you're doing, hydenix updates nixos-unstable every week or so - # inputs.nixpkgs.follows = "nixpkgs"; + inputs.nixpkgs.follows = "nixpkgs"; }; # Home Manager From 007abc6a2e99384e77b997c1629113cba60ec68d Mon Sep 17 00:00:00 2001 From: Richard Henninger <56615615+richen604@users.noreply.github.com> Date: Mon, 6 Oct 2025 23:35:05 -0700 Subject: [PATCH 07/24] Revert "refactor: improved outputs and how they are used" This reverts commit 24c941d5a53f654fbb692b2625b286cdc0a15a7e. --- .github/workflows/update-flake-lock.yml | 14 +++--- CHANGELOG.md | 2 +- TODO.md | 10 +++++ flake.lock | 58 ++++++++++++------------- flake.nix | 46 ++++++++++++++------ hydenix/modules/hm/comma.nix | 13 +----- hydenix/sources/overlay.nix | 4 +- lib/config/configuration.nix | 18 ++++---- lib/config/default.nix | 2 +- lib/dev-shell.nix | 2 +- lib/hyde-update/default.nix | 2 +- lib/vms/demo-vm.nix | 2 +- template/configuration.nix | 34 +++++++++------ template/flake.nix | 23 ++++------ 14 files changed, 125 insertions(+), 105 deletions(-) diff --git a/.github/workflows/update-flake-lock.yml b/.github/workflows/update-flake-lock.yml index 02cb5fe5..758ab534 100644 --- a/.github/workflows/update-flake-lock.yml +++ b/.github/workflows/update-flake-lock.yml @@ -18,25 +18,25 @@ jobs: - uses: cachix/install-nix-action@v24 with: nix_path: nixpkgs=channel:nixos-unstable - + - name: Update nixpkgs input to unstable run: | - sed -i 's|nixpkgs.url = "github:nixos/nixpkgs/.*"|nixpkgs.url = "github:nixos/nixpkgs/nixpkgs-unstable"|' flake.nix + sed -i 's|hydenix-nixpkgs.url = "github:nixos/nixpkgs/.*"|hydenix-nixpkgs.url = "github:nixos/nixpkgs/nixpkgs-unstable"|' flake.nix - name: Update flake.lock run: nix flake update - name: Update flake.nix with new rev run: | - NEW_REV=$(jq -r '.nodes."nixpkgs".locked.rev' flake.lock) + NEW_REV=$(jq -r '.nodes."hydenix-nixpkgs".locked.rev' flake.lock) if [ -n "$NEW_REV" ] && [ "$NEW_REV" != "null" ]; then - sed -i 's|nixpkgs.url = "github:nixos/nixpkgs/[^"]*"|nixpkgs.url = "github:nixos/nixpkgs/'$NEW_REV'"|' flake.nix + sed -i 's|hydenix-nixpkgs.url = "github:nixos/nixpkgs/[^"]*"|hydenix-nixpkgs.url = "github:nixos/nixpkgs/'$NEW_REV'"|' flake.nix else echo "Failed to extract revision from flake.lock" exit 1 fi - name: Verify flake.nix run: | - grep -q "nixpkgs.url" flake.nix || (echo "Failed to update flake.nix" && exit 1) - + grep -q "hydenix-nixpkgs.url" flake.nix || (echo "Failed to update flake.nix" && exit 1) + - name: Check Root Flake id: check_root continue-on-error: true @@ -51,7 +51,7 @@ jobs: nix flake check git checkout flake.nix rm -f flake.lock - + - name: Create Pull Request uses: peter-evans/create-pull-request@v5 with: diff --git a/CHANGELOG.md b/CHANGELOG.md index 4f79df00..fe8d4c18 100644 --- a/CHANGELOG.md +++ b/CHANGELOG.md @@ -38,7 +38,7 @@ ### Bug Fixes * **editor:** set default applications and add common code mimetypes ([92c05fc](https://github.com/richen604/hydenix/commit/92c05fc3431362a6aee3d9173905fa5341aed2fd)) -* nixpkgs as main version for inputs ([9038178](https://github.com/richen604/hydenix/commit/9038178d9f34dbbaec0306e86369ee22b2910a6e)) +* hydenix-nixpkgs as main version for inputs ([9038178](https://github.com/richen604/hydenix/commit/9038178d9f34dbbaec0306e86369ee22b2910a6e)) * removed unnecessary with lib ([7e1d51f](https://github.com/richen604/hydenix/commit/7e1d51ff611e9473df63bf4eef886ca598751057)) * revert hyprland pkgs, bumped theme. fixes [#143](https://github.com/richen604/hydenix/issues/143) ([bc56c39](https://github.com/richen604/hydenix/commit/bc56c39a77d267712bee0429e269c4c19c91a578)) * sddm pkg ([71a6a49](https://github.com/richen604/hydenix/commit/71a6a49d2b79913643991b035d419ab6efe1b69a)) diff --git a/TODO.md b/TODO.md index fa80026c..32d5cf0e 100644 --- a/TODO.md +++ b/TODO.md @@ -18,12 +18,22 @@ - hyprlock - rofi - waybar +- docs: remove doc for overlays on theme for now i think unless i can fix it + - adding the overlay causes `pkgs.hydenix.hyde` to disappear lol - feat: vscode-nix-ide part of editors, enabled by default - fix: i don't think .config/waybar/modules is supposed to be set anymore ## 5.0.0 +- fix: removed hydenix-inputs from template/configuration.nix +- refactor: removed hydenix.lib to standardize outputs, hydenix nixOsModules to nixosModules - refactor: rename all overlays so there is no namespace nesting +- fix: nix-index should be a module in hydenix only, its declared twice +- fix: rename nix-index home-manager module whatever new name +- feat: user now owns their nixosSystem, depreciated hydenix-nixpkgs.lib.nixosSystem +- feat: hydenix follows its own nixpkgs, no userPkgs overlays, template hydenix follows nixpkgs by default + - update docs to reflect this, as users can remove +- users own their own home-manager - feat: home-manager configuration in flake - feat: hydenix major option, show warnings on option for api updates diff --git a/flake.lock b/flake.lock index ad5aaf46..372f7462 100644 --- a/flake.lock +++ b/flake.lock @@ -21,7 +21,7 @@ "home-manager": { "inputs": { "nixpkgs": [ - "nixpkgs" + "hydenix-nixpkgs" ] }, "locked": { @@ -58,7 +58,7 @@ "hyde-config": { "inputs": { "nixpkgs": [ - "nixpkgs" + "hydenix-nixpkgs" ] }, "locked": { @@ -78,7 +78,7 @@ "hyde-ipc": { "inputs": { "nixpkgs": [ - "nixpkgs" + "hydenix-nixpkgs" ], "rust-overlay": "rust-overlay" }, @@ -99,7 +99,7 @@ "hydectl": { "inputs": { "nixpkgs": [ - "nixpkgs" + "hydenix-nixpkgs" ] }, "locked": { @@ -116,11 +116,27 @@ "type": "github" } }, + "hydenix-nixpkgs": { + "locked": { + "lastModified": 1758446476, + "narHash": "sha256-5rdAi7CTvM/kSs6fHe1bREIva5W3TbImsto+dxG4mBo=", + "owner": "nixos", + "repo": "nixpkgs", + "rev": "a1f79a1770d05af18111fbbe2a3ab2c42c0f6cd0", + "type": "github" + }, + "original": { + "owner": "nixos", + "repo": "nixpkgs", + "rev": "a1f79a1770d05af18111fbbe2a3ab2c42c0f6cd0", + "type": "github" + } + }, "hyq": { "inputs": { "flake-utils": "flake-utils", "nixpkgs": [ - "nixpkgs" + "hydenix-nixpkgs" ] }, "locked": { @@ -140,7 +156,7 @@ "nix-index-database": { "inputs": { "nixpkgs": [ - "nixpkgs" + "hydenix-nixpkgs" ] }, "locked": { @@ -159,15 +175,15 @@ }, "nixos-hardware": { "locked": { - "lastModified": 1758663926, - "narHash": "sha256-6CFdj7Xs616t1W4jLDH7IohAAvl5Dyib3qEv/Uqw1rk=", - "owner": "nixos", + "lastModified": 1757943327, + "narHash": "sha256-w6cDExPBqbq7fTLo4dZ1ozDGeq3yV6dSN4n/sAaS6OM=", + "owner": "NixOS", "repo": "nixos-hardware", - "rev": "170ff93c860b2a9868ed1e1102d4e52cb3d934e1", + "rev": "67a709cfe5d0643dafd798b0b613ed579de8be05", "type": "github" }, "original": { - "owner": "nixos", + "owner": "NixOS", "ref": "master", "repo": "nixos-hardware", "type": "github" @@ -189,22 +205,6 @@ "type": "github" } }, - "nixpkgs_2": { - "locked": { - "lastModified": 1758446476, - "narHash": "sha256-5rdAi7CTvM/kSs6fHe1bREIva5W3TbImsto+dxG4mBo=", - "owner": "nixos", - "repo": "nixpkgs", - "rev": "a1f79a1770d05af18111fbbe2a3ab2c42c0f6cd0", - "type": "github" - }, - "original": { - "owner": "nixos", - "repo": "nixpkgs", - "rev": "a1f79a1770d05af18111fbbe2a3ab2c42c0f6cd0", - "type": "github" - } - }, "root": { "inputs": { "home-manager": "home-manager", @@ -212,10 +212,10 @@ "hyde-config": "hyde-config", "hyde-ipc": "hyde-ipc", "hydectl": "hydectl", + "hydenix-nixpkgs": "hydenix-nixpkgs", "hyq": "hyq", "nix-index-database": "nix-index-database", - "nixos-hardware": "nixos-hardware", - "nixpkgs": "nixpkgs_2" + "nixos-hardware": "nixos-hardware" } }, "rust-overlay": { diff --git a/flake.nix b/flake.nix index 7e9019bb..cba6fa97 100644 --- a/flake.nix +++ b/flake.nix @@ -3,53 +3,70 @@ inputs = { # Hydenix's nixpkgs - nixpkgs.url = "github:nixos/nixpkgs/a1f79a1770d05af18111fbbe2a3ab2c42c0f6cd0"; + hydenix-nixpkgs.url = "github:nixos/nixpkgs/a1f79a1770d05af18111fbbe2a3ab2c42c0f6cd0"; + home-manager = { url = "github:nix-community/home-manager"; - inputs.nixpkgs.follows = "nixpkgs"; + inputs.nixpkgs.follows = "hydenix-nixpkgs"; }; - nixos-hardware.url = "github:nixos/nixos-hardware/master"; + nixos-hardware.url = "github:NixOS/nixos-hardware/master"; # Nix-index-database - for comma and command-not-found nix-index-database = { url = "github:nix-community/nix-index-database"; - inputs.nixpkgs.follows = "nixpkgs"; + inputs.nixpkgs.follows = "hydenix-nixpkgs"; }; + hyde = { url = "github:HyDE-Project/HyDE/f246f2a89b8e862b96042cb2b291b191289c2fde"; flake = false; }; + # HyDE related binaries hyq = { url = "github:richen604/hyprquery"; - inputs.nixpkgs.follows = "nixpkgs"; + inputs.nixpkgs.follows = "hydenix-nixpkgs"; }; hydectl = { url = "github:richen604/hydectl"; - inputs.nixpkgs.follows = "nixpkgs"; + inputs.nixpkgs.follows = "hydenix-nixpkgs"; }; hyde-ipc = { url = "github:richen604/hyde-ipc"; - inputs.nixpkgs.follows = "nixpkgs"; + inputs.nixpkgs.follows = "hydenix-nixpkgs"; }; hyde-config = { url = "github:richen604/hyde-config"; - inputs.nixpkgs.follows = "nixpkgs"; + inputs.nixpkgs.follows = "hydenix-nixpkgs"; }; + }; outputs = - { ... }@inputs: + hydenix-inputs@{ hydenix-nixpkgs, ... }: let system = "x86_64-linux"; + # Create lib attribute that template expects + lib = { + inherit system; + overlays = import ./hydenix/sources/overlay.nix hydenix-inputs; + nixOsModules = ./hydenix/modules/system; + homeModules = ./hydenix/modules/hm; + }; + + # Internal inputs for building packages and configurations + inputs = hydenix-inputs // { + inherit lib; + }; + defaultConfig = import ./lib/config { inherit inputs; }; # Create VM variant of the NixOS configuration vmConfig = import ./lib/vms/nixos-vm.nix { - inherit inputs; nixosConfiguration = defaultConfig; + inherit inputs; }; demoVmConfig = import ./lib/vms/demo-vm.nix { @@ -58,12 +75,15 @@ in { + # Main API that template uses + # Will be depreciated in the next api update + inherit lib; # Direct module access - homeModules.default = import ./hydenix/modules/hm; - nixosModules.default = import ./hydenix/modules/system; + homeModules.default = ./hydenix/modules/hm; + nixosModules.default = ./hydenix/modules/system; - overlays.default = import ./hydenix/sources/overlay.nix { inherit inputs; }; + overlays.default = import ./hydenix/sources/overlay.nix hydenix-inputs; templates.default = { path = ./template; diff --git a/hydenix/modules/hm/comma.nix b/hydenix/modules/hm/comma.nix index c0e46120..5eee9ddb 100644 --- a/hydenix/modules/hm/comma.nix +++ b/hydenix/modules/hm/comma.nix @@ -1,7 +1,7 @@ { config, lib, - inputs, + pkgs, ... }: @@ -14,19 +14,8 @@ */ let cfg = config.hydenix.hm.comma; - in { - imports = [ - # handles both local build and template flake - ( - if inputs ? nix-index-database then - inputs.nix-index-database.homeModules.nix-index - else - inputs.hydenix.inputs.nix-index-database.homeModules.nix-index - ) - ]; - options.hydenix.hm.comma = { enable = lib.mkOption { type = lib.types.bool; diff --git a/hydenix/sources/overlay.nix b/hydenix/sources/overlay.nix index 58a2d8aa..bcf0dfc8 100644 --- a/hydenix/sources/overlay.nix +++ b/hydenix/sources/overlay.nix @@ -1,6 +1,4 @@ -{ inputs }: - -final: prev: +inputs: final: prev: let # Helper function to import a package callPackage = prev.lib.callPackageWith (prev // packages // inputs); diff --git a/lib/config/configuration.nix b/lib/config/configuration.nix index 54ffa529..015c0717 100644 --- a/lib/config/configuration.nix +++ b/lib/config/configuration.nix @@ -3,23 +3,22 @@ ... }: let - system = "x86_64-linux"; - pkgs = import inputs.nixpkgs { - inherit system; + hydenix-pkgs = import inputs.hydenix-nixpkgs { + inherit (inputs.lib) system; config.allowUnfree = true; overlays = [ - inputs.self.overlays.default + inputs.lib.overlays ]; }; in { - nixpkgs.pkgs = pkgs; + nixpkgs.pkgs = hydenix-pkgs; imports = [ inputs.home-manager.nixosModules.home-manager ./hardware-configuration.nix - inputs.self.nixosModules.default + inputs.lib.nixOsModules inputs.nixos-hardware.nixosModules.common-cpu-intel inputs.nixos-hardware.nixosModules.common-pc inputs.nixos-hardware.nixosModules.common-pc-ssd @@ -37,8 +36,11 @@ in { ... }: { imports = [ - inputs.self.homeModules.default + inputs.lib.homeModules ./home.nix + + # Nix-index-database - for comma and command-not-found + inputs.nix-index-database.homeModules.nix-index ]; }; }; @@ -58,7 +60,7 @@ in "networkmanager" "video" ]; - shell = pkgs.zsh; + shell = hydenix-pkgs.zsh; }; system.stateVersion = "25.05"; diff --git a/lib/config/default.nix b/lib/config/default.nix index 33ea4a83..5e16104d 100644 --- a/lib/config/default.nix +++ b/lib/config/default.nix @@ -3,7 +3,7 @@ ... }: -inputs.nixpkgs.lib.nixosSystem { +inputs.hydenix-nixpkgs.lib.nixosSystem { system = "x86_64-linux"; specialArgs = { inherit inputs; diff --git a/lib/dev-shell.nix b/lib/dev-shell.nix index 0b46c49b..08e779f1 100644 --- a/lib/dev-shell.nix +++ b/lib/dev-shell.nix @@ -2,7 +2,7 @@ let system = "x86_64-linux"; - pkgs = import inputs.nixpkgs { + pkgs = import inputs.hydenix-nixpkgs { inherit system; config.allowUnfree = true; }; diff --git a/lib/hyde-update/default.nix b/lib/hyde-update/default.nix index ad65b46a..99ba8a7e 100644 --- a/lib/hyde-update/default.nix +++ b/lib/hyde-update/default.nix @@ -4,7 +4,7 @@ let system = "x86_64-linux"; - pkgs = import inputs.nixpkgs { + pkgs = import inputs.hydenix-nixpkgs { inherit system; config.allowUnfree = true; }; diff --git a/lib/vms/demo-vm.nix b/lib/vms/demo-vm.nix index cdd78ae9..48ee86bf 100644 --- a/lib/vms/demo-vm.nix +++ b/lib/vms/demo-vm.nix @@ -1,5 +1,5 @@ { inputs, ... }: -inputs.nixpkgs.lib.nixosSystem { +inputs.hydenix-nixpkgs.lib.nixosSystem { system = "x86_64-linux"; modules = [ ( diff --git a/template/configuration.nix b/template/configuration.nix index 7dead465..0c7d0a9b 100644 --- a/template/configuration.nix +++ b/template/configuration.nix @@ -5,12 +5,17 @@ let # Package configuration - sets up package system with proper overlays # Most users won't need to modify this section - system = "x86_64-linux"; - pkgs = import inputs.nixpkgs { - inherit system; + pkgs = import inputs.hydenix.inputs.hydenix-nixpkgs { + inherit (inputs.hydenix.lib) system; config.allowUnfree = true; overlays = [ - inputs.hydenix.overlays.default + inputs.hydenix.lib.overlays + (final: prev: { + userPkgs = import inputs.nixpkgs { + inherit (pkgs) system; + config.allowUnfree = true; + }; + }) ]; }; in @@ -19,8 +24,8 @@ in imports = [ # hydenix inputs - Required modules, don't modify unless you know what you're doing - inputs.home-manager.nixosModules.home-manager - inputs.hydenix.nixosModules.default + inputs.hydenix.inputs.home-manager.nixosModules.home-manager + inputs.hydenix.lib.nixOsModules ./modules/system # Your custom system modules ./hardware-configuration.nix # Auto-generated hardware config @@ -28,17 +33,17 @@ in # Run `lshw -short` or `lspci` to identify your hardware # GPU Configuration (choose one): - # inputs.nixos-hardware.nixosModules.common-gpu-nvidia # NVIDIA - # inputs.nixos-hardware.nixosModules.common-gpu-amd # AMD + # inputs.hydenix.inputs.nixos-hardware.nixosModules.common-gpu-nvidia # NVIDIA + # inputs.hydenix.inputs.nixos-hardware.nixosModules.common-gpu-amd # AMD # CPU Configuration (choose one): - # inputs.nixos-hardware.nixosModules.common-cpu-amd # AMD CPUs - # inputs.nixos-hardware.nixosModules.common-cpu-intel # Intel CPUs + # inputs.hydenix.inputs.nixos-hardware.nixosModules.common-cpu-amd # AMD CPUs + # inputs.hydenix.inputs.nixos-hardware.nixosModules.common-cpu-intel # Intel CPUs # Additional Hardware Modules - Uncomment based on your system type: - # inputs.nixos-hardware.nixosModules.common-hidpi # High-DPI displays - # inputs.nixos-hardware.nixosModules.common-pc-laptop # Laptops - # inputs.nixos-hardware.nixosModules.common-pc-ssd # SSD storage + # inputs.hydenix.inputs.nixos-hardware.nixosModules.common-hidpi # High-DPI displays + # inputs.hydenix.inputs.nixos-hardware.nixosModules.common-pc-laptop # Laptops + # inputs.hydenix.inputs.nixos-hardware.nixosModules.common-pc-ssd # SSD storage ]; # If enabling NVIDIA, you will be prompted to configure hardware.nvidia @@ -63,7 +68,8 @@ in { ... }: { imports = [ - inputs.hydenix.homeModules.default + inputs.hydenix.lib.homeModules + inputs.nix-index-database.hmModules.nix-index # Command-not-found and comma tool support ./modules/hm # Your custom home-manager modules (configure hydenix.hm here!) ]; }; diff --git a/template/flake.nix b/template/flake.nix index 0ba0e9ad..125f1e9d 100644 --- a/template/flake.nix +++ b/template/flake.nix @@ -2,35 +2,31 @@ description = "template for hydenix"; inputs = { - # Your nixpkgs + # User's nixpkgs - for user packages nixpkgs.url = "github:nixos/nixpkgs/nixos-unstable"; - # Hydenix + # Hydenix and its nixpkgs - kept separate to avoid conflicts hydenix = { # Available inputs: # Main: github:richen604/hydenix + # Dev: github:richen604/hydenix/dev # Commit: github:richen604/hydenix/ - # Version: github:richen604/hydenix/v1.0.0 - note the version may not be compatible with this template + # Version: github:richen604/hydenix/v1.0.0 url = "github:richen604/hydenix"; - inputs.nixpkgs.follows = "nixpkgs"; }; - # Home Manager - home-manager = { - url = "github:nix-community/home-manager"; + # Nix-index-database - for comma and command-not-found + nix-index-database = { + url = "github:nix-community/nix-index-database"; inputs.nixpkgs.follows = "nixpkgs"; }; - - # Hardware Configuration's, used in ./configuration.nix. Feel free to remove if unused - nixos-hardware.url = "github:nixos/nixos-hardware/master"; }; outputs = { ... }@inputs: let - system = "x86_64-linux"; - hydenixConfig = inputs.nixpkgs.lib.nixosSystem { - inherit system; + hydenixConfig = inputs.hydenix.inputs.hydenix-nixpkgs.lib.nixosSystem { + inherit (inputs.hydenix.lib) system; specialArgs = { inherit inputs; }; @@ -42,6 +38,5 @@ in { nixosConfigurations.hydenix = hydenixConfig; - nixosConfigurations.default = hydenixConfig; }; } From 580628d10fc54016861accb0523cc730c2a7f045 Mon Sep 17 00:00:00 2001 From: Richard Henninger <56615615+richen604@users.noreply.github.com> Date: Mon, 6 Oct 2025 23:35:05 -0700 Subject: [PATCH 08/24] Revert "ci: test commit for update-themes" This reverts commit 12ba807f2dc73a6f94fe0b027116ac632f125777. --- TODO.md | 1 - hydenix/sources/themes/Abyssal-Wave.nix | 2 +- 2 files changed, 1 insertion(+), 2 deletions(-) diff --git a/TODO.md b/TODO.md index 32d5cf0e..0e21d517 100644 --- a/TODO.md +++ b/TODO.md @@ -6,7 +6,6 @@ ## now - use pkgs.buildEnv with `ignoreCollisions=true;` for themes instead of meta.priority -- ci: update nixpkgs update script to create only one branch and replace the other - feat: new themes to build ## next diff --git a/hydenix/sources/themes/Abyssal-Wave.nix b/hydenix/sources/themes/Abyssal-Wave.nix index 351545a1..26119e25 100644 --- a/hydenix/sources/themes/Abyssal-Wave.nix +++ b/hydenix/sources/themes/Abyssal-Wave.nix @@ -5,7 +5,7 @@ mkTheme rec { owner = "Itz-Abhishek-Tiwari"; repo = "Abyssal-Wave"; # locking commit - rev = "main"; + rev = "3094b030739c7673255a2a8fad1707717d725d73"; name = name; sha256 = "sha256-JMYjNV2r6/lRwKNQFdz2HmZH7ZxLO0MdiO2iUi5R7As="; }; From ef0e018cd7bfc40a203784c34aa9ded589bc9d7c Mon Sep 17 00:00:00 2001 From: Richard Henninger <56615615+richen604@users.noreply.github.com> Date: Mon, 6 Oct 2025 23:35:05 -0700 Subject: [PATCH 09/24] Revert "ci: changed update-themes commit message" This reverts commit 8e552ea3bb545285e83410d683222324637246d3. --- .github/workflows/update-themes.yml | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/.github/workflows/update-themes.yml b/.github/workflows/update-themes.yml index bccfc99f..6ba076fe 100644 --- a/.github/workflows/update-themes.yml +++ b/.github/workflows/update-themes.yml @@ -34,8 +34,8 @@ jobs: uses: peter-evans/create-pull-request@v5 with: token: ${{ secrets.GITHUB_TOKEN }} - commit-message: "chore(themes): automated theme updates" - title: "chore(themes): Automated HyDE Theme Updates" + commit-message: "feat(themes): automated theme updates" + title: "feat(themes): Automated HyDE Theme Updates" body: | This PR updates the `sha256` for HyDE themes based on their specified `rev`. Automated by GitHub Actions. From a0de75ac103fcd5d0b03badd629db09bfcee21fb Mon Sep 17 00:00:00 2001 From: Richard Henninger <56615615+richen604@users.noreply.github.com> Date: Mon, 6 Oct 2025 23:35:05 -0700 Subject: [PATCH 10/24] Revert "ci: update-themes" This reverts commit 2342617a7c77c0fd46bc500d5c2b11fbccb9ffa0. --- .github/workflows/update-themes.yml | 26 +++++++------------------- TODO.md | 3 ++- 2 files changed, 9 insertions(+), 20 deletions(-) diff --git a/.github/workflows/update-themes.yml b/.github/workflows/update-themes.yml index 6ba076fe..7eca752d 100644 --- a/.github/workflows/update-themes.yml +++ b/.github/workflows/update-themes.yml @@ -8,9 +8,6 @@ on: jobs: update-themes: runs-on: ubuntu-latest - permissions: - contents: write - pull-requests: write steps: - name: Checkout repository uses: actions/checkout@v3 @@ -48,19 +45,10 @@ jobs: reviewers: ${{ github.actor }} add-paths: "hydenix/sources/themes/*.nix" - - name: Install GitHub CLI - run: | - sudo apt-get update - sudo apt-get install -y gh - - - name: Enable Auto-merge - if: steps.create_pr.outputs.pull-request-number - run: | - PR_NUMBER="${{ steps.create_pr.outputs.pull-request-number }}" - if [ -n "$PR_NUMBER" ]; then - gh pr merge --auto --rebase "$PR_NUMBER" - else - echo "::warning:: No pull request was created. Auto-merge skipped." - fi - env: - GITHUB_TOKEN: ${{ secrets.GITHUB_TOKEN }} + # - name: Enable Auto-merge + # if: steps.create_pr.outputs.pull-request-number + # run: | + # gh pr merge --auto --rebase "$PR_URL" + # env: + # PR_URL: ${{ steps.create_pr.outputs.pull-request-url }} + # GITHUB_TOKEN: ${{ secrets.GITHUB_TOKEN }} diff --git a/TODO.md b/TODO.md index 0e21d517..21737304 100644 --- a/TODO.md +++ b/TODO.md @@ -5,7 +5,6 @@ ## now -- use pkgs.buildEnv with `ignoreCollisions=true;` for themes instead of meta.priority - feat: new themes to build ## next @@ -19,6 +18,8 @@ - waybar - docs: remove doc for overlays on theme for now i think unless i can fix it - adding the overlay causes `pkgs.hydenix.hyde` to disappear lol +- feat: update.sh for themes, map name to hash (check daily), passThru update.sh caller github action and auto merge + - - feat: vscode-nix-ide part of editors, enabled by default - fix: i don't think .config/waybar/modules is supposed to be set anymore From ec83ba321fd9febd698bfce9303f607d6f2f4ccd Mon Sep 17 00:00:00 2001 From: Richard Henninger <56615615+richen604@users.noreply.github.com> Date: Mon, 6 Oct 2025 23:35:05 -0700 Subject: [PATCH 11/24] Revert "feat: update-themes script provisioned" This reverts commit 28a3cf16e94ba7d02fb3bfd930f3d8e5b4c5c7c5. --- hydenix/sources/themes/AbyssGreen.nix | 2 +- hydenix/sources/themes/Abyssal-Wave.nix | 2 +- hydenix/sources/themes/Amethyst-Aura.nix | 2 +- hydenix/sources/themes/AncientAliens.nix | 2 +- hydenix/sources/themes/Another-World.nix | 2 +- hydenix/sources/themes/Bad-Blood.nix | 2 +- hydenix/sources/themes/BlueSky.nix | 2 +- hydenix/sources/themes/Cat-Latte.nix | 2 +- hydenix/sources/themes/Catppuccin-Latte.nix | 2 +- hydenix/sources/themes/Catppuccin-Mocha.nix | 2 +- hydenix/sources/themes/Code-Garden.nix | 2 +- hydenix/sources/themes/Cosmic-Blue.nix | 2 +- hydenix/sources/themes/Crimson-Blade.nix | 2 +- hydenix/sources/themes/Crimson-Blue.nix | 2 +- hydenix/sources/themes/Decay-Green.nix | 2 +- hydenix/sources/themes/DoomBringers.nix | 2 +- hydenix/sources/themes/Dracula.nix | 2 +- hydenix/sources/themes/Edge-Runner.nix | 2 +- hydenix/sources/themes/Electra.nix | 2 +- hydenix/sources/themes/Eternal-Arctic.nix | 2 +- hydenix/sources/themes/Ever-Blushing.nix | 2 +- hydenix/sources/themes/Frosted-Glass.nix | 2 +- hydenix/sources/themes/Graphite-Mono.nix | 2 +- hydenix/sources/themes/Green-Lush.nix | 2 +- hydenix/sources/themes/Greenify.nix | 2 +- hydenix/sources/themes/Grukai.nix | 2 +- hydenix/sources/themes/Gruvbox-Retro.nix | 2 +- hydenix/sources/themes/Hack-the-Box.nix | 2 +- hydenix/sources/themes/Ice-Age.nix | 2 +- hydenix/sources/themes/LimeFrenzy.nix | 2 +- hydenix/sources/themes/Mac-OS.nix | 2 +- hydenix/sources/themes/Material-Sakura.nix | 2 +- hydenix/sources/themes/Monokai.nix | 2 +- hydenix/sources/themes/Monterey-Frost.nix | 2 +- hydenix/sources/themes/Moonlight.nix | 2 +- hydenix/sources/themes/Nightbrew.nix | 2 +- hydenix/sources/themes/Nordic-Blue.nix | 2 +- hydenix/sources/themes/Obsidian-Purple.nix | 2 +- hydenix/sources/themes/One-Dark.nix | 2 +- hydenix/sources/themes/Oxo-Carbon.nix | 2 +- hydenix/sources/themes/Paranoid-Sweet.nix | 2 +- hydenix/sources/themes/Peace-Of-Mind.nix | 2 +- hydenix/sources/themes/Pixel-Dream.nix | 2 +- hydenix/sources/themes/Rain-Dark.nix | 2 +- hydenix/sources/themes/Red-Stone.nix | 2 +- hydenix/sources/themes/Rose-Pine.nix | 2 +- hydenix/sources/themes/Scarlet-Night.nix | 2 +- hydenix/sources/themes/Sci-fi.nix | 2 +- hydenix/sources/themes/Solarized-Dark.nix | 2 +- hydenix/sources/themes/Synth-Wave.nix | 2 +- hydenix/sources/themes/Tokyo-Night.nix | 2 +- hydenix/sources/themes/Tundra.nix | 2 +- hydenix/sources/themes/Vanta-Black.nix | 2 +- hydenix/sources/themes/Windows-11.nix | 2 +- hydenix/sources/themes/utils/update-themes.sh | 72 +++++-------------- 55 files changed, 73 insertions(+), 107 deletions(-) diff --git a/hydenix/sources/themes/AbyssGreen.nix b/hydenix/sources/themes/AbyssGreen.nix index bf4af68c..dc3545c0 100644 --- a/hydenix/sources/themes/AbyssGreen.nix +++ b/hydenix/sources/themes/AbyssGreen.nix @@ -5,7 +5,7 @@ mkTheme rec { owner = "Itz-Abhishek-Tiwari"; repo = "AbyssGreen"; name = name; - rev = "f7e4655f4923a3a4e556b3dab688a5fabadf7675"; + rev = "main"; sha256 = "sha256-cosU+0wJSaQspcjYEZA5dMoZARz+8vQM+49Vyf2JvA8="; }; meta = { diff --git a/hydenix/sources/themes/Abyssal-Wave.nix b/hydenix/sources/themes/Abyssal-Wave.nix index 26119e25..351545a1 100644 --- a/hydenix/sources/themes/Abyssal-Wave.nix +++ b/hydenix/sources/themes/Abyssal-Wave.nix @@ -5,7 +5,7 @@ mkTheme rec { owner = "Itz-Abhishek-Tiwari"; repo = "Abyssal-Wave"; # locking commit - rev = "3094b030739c7673255a2a8fad1707717d725d73"; + rev = "main"; name = name; sha256 = "sha256-JMYjNV2r6/lRwKNQFdz2HmZH7ZxLO0MdiO2iUi5R7As="; }; diff --git a/hydenix/sources/themes/Amethyst-Aura.nix b/hydenix/sources/themes/Amethyst-Aura.nix index a9370b26..35f095f2 100644 --- a/hydenix/sources/themes/Amethyst-Aura.nix +++ b/hydenix/sources/themes/Amethyst-Aura.nix @@ -4,7 +4,7 @@ mkTheme rec { src = pkgs.fetchFromGitHub { owner = "jackpawlik1"; repo = "Amethyst-Aura"; - rev = "821eb5523afb5920b9305dd2dc9206958cedd6a0"; + rev = "main"; name = name; sha256 = "sha256-NjF0QQxqdYIxqv63Hgo9Waxa1arPfFXK65mRo0N9gvk="; }; diff --git a/hydenix/sources/themes/AncientAliens.nix b/hydenix/sources/themes/AncientAliens.nix index 8019c757..7fab6b6d 100644 --- a/hydenix/sources/themes/AncientAliens.nix +++ b/hydenix/sources/themes/AncientAliens.nix @@ -5,7 +5,7 @@ mkTheme rec { owner = "dim-ghub"; repo = "AncientAliens"; name = name; - rev = "822c5126ef727e75570e174e9f54894f203587ee"; + rev = "main"; sha256 = "sha256-lcrl87sYXNg17oxL1hnGvrcZPpPkCRFllIGWf9/1bZU="; }; meta = { diff --git a/hydenix/sources/themes/Another-World.nix b/hydenix/sources/themes/Another-World.nix index 946a468b..f670232a 100644 --- a/hydenix/sources/themes/Another-World.nix +++ b/hydenix/sources/themes/Another-World.nix @@ -4,7 +4,7 @@ mkTheme rec { src = pkgs.fetchFromGitHub { owner = "cyb3rgh0u1"; repo = "Another-World"; - rev = "82d80baed02216017d5800666cb266ded8dffca3"; + rev = "main"; name = name; sha256 = "sha256-DLx+8kuW2DrTWFFrbB670iHKYqUfzNUvfQobKjUlVsY="; }; diff --git a/hydenix/sources/themes/Bad-Blood.nix b/hydenix/sources/themes/Bad-Blood.nix index 2b5a26a7..846bf4ff 100644 --- a/hydenix/sources/themes/Bad-Blood.nix +++ b/hydenix/sources/themes/Bad-Blood.nix @@ -5,7 +5,7 @@ mkTheme rec { owner = "HyDE-Project"; repo = "hyde-gallery"; name = name; - rev = "1a9e8bbcf9b74ff077823304ce6b02a9a79bb06e"; + rev = "Bad-Blood"; sha256 = "sha256-MbHgUbKNN1o72QLPehdcyI22lwBDoWy2G58lgHBFeZ4="; }; meta = { diff --git a/hydenix/sources/themes/BlueSky.nix b/hydenix/sources/themes/BlueSky.nix index a4c2d982..998fa3e7 100644 --- a/hydenix/sources/themes/BlueSky.nix +++ b/hydenix/sources/themes/BlueSky.nix @@ -4,7 +4,7 @@ mkTheme rec { src = pkgs.fetchFromGitHub { owner = "richen604"; repo = "BlueSky"; - rev = "89bc1e372eb53ece7e785f2fd75341e6d25dd1c9"; + rev = "main"; name = name; sha256 = "sha256-MiSgGgbJE3kmFd2FtE88fqrrxB1RWZJYPDfn97BoDpw="; }; diff --git a/hydenix/sources/themes/Cat-Latte.nix b/hydenix/sources/themes/Cat-Latte.nix index 18818d27..4af39b81 100644 --- a/hydenix/sources/themes/Cat-Latte.nix +++ b/hydenix/sources/themes/Cat-Latte.nix @@ -5,7 +5,7 @@ mkTheme rec { owner = "rishav12s"; repo = "Cat-Latte"; name = name; - rev = "132ffcc1fa97ec1d1743741b37abf1de2c8e9aa6"; + rev = "Cat-Latte"; sha256 = "sha256-giarUq0eQS8qLfnpGIKQ6pw6sqAcaYohnxC305OkPLc="; }; meta = { diff --git a/hydenix/sources/themes/Catppuccin-Latte.nix b/hydenix/sources/themes/Catppuccin-Latte.nix index 5ff5e6cf..4c2f52aa 100644 --- a/hydenix/sources/themes/Catppuccin-Latte.nix +++ b/hydenix/sources/themes/Catppuccin-Latte.nix @@ -4,7 +4,7 @@ mkTheme rec { src = pkgs.fetchFromGitHub { owner = "HyDE-Project"; repo = "hyde-themes"; - rev = "9a9332bb660ecb2e05671b7dcd7dd058b0803e48"; + rev = "Catppuccin-Latte"; name = name; sha256 = "sha256-dW5DgXFxFNjt54Styzk+Ew3pv4rO1FX/qtfDGIClLuY="; }; diff --git a/hydenix/sources/themes/Catppuccin-Mocha.nix b/hydenix/sources/themes/Catppuccin-Mocha.nix index 992e5d63..a1f1efa1 100644 --- a/hydenix/sources/themes/Catppuccin-Mocha.nix +++ b/hydenix/sources/themes/Catppuccin-Mocha.nix @@ -4,7 +4,7 @@ mkTheme rec { src = pkgs.fetchFromGitHub { owner = "HyDE-Project"; repo = "hyde-themes"; - rev = "415d22a6bb6348a6d09c11307be54c592fb15138"; + rev = "Catppuccin-Mocha"; name = name; sha256 = "sha256-GoXRPYUFdrw6P8OeOsSiFDC9FhaEyo1+lvta0FCJoPY="; }; diff --git a/hydenix/sources/themes/Code-Garden.nix b/hydenix/sources/themes/Code-Garden.nix index f41866cb..e9f5bbcc 100644 --- a/hydenix/sources/themes/Code-Garden.nix +++ b/hydenix/sources/themes/Code-Garden.nix @@ -4,7 +4,7 @@ mkTheme rec { src = pkgs.fetchFromGitHub { owner = "jacobfranco"; repo = "Code-Garden"; - rev = "4d3ce14a1a17029a7cfe4b1b44c24575b596af8d"; + rev = "main"; name = name; sha256 = "sha256-WvuVrgllMhste24dWGKw3I0eBBJMHoOYQCheLofenUE="; }; diff --git a/hydenix/sources/themes/Cosmic-Blue.nix b/hydenix/sources/themes/Cosmic-Blue.nix index d85e34bf..cd5f732a 100644 --- a/hydenix/sources/themes/Cosmic-Blue.nix +++ b/hydenix/sources/themes/Cosmic-Blue.nix @@ -4,7 +4,7 @@ mkTheme rec { src = pkgs.fetchFromGitHub { owner = "Maroc02"; repo = "Cosmic-Blue"; - rev = "f5e0e85d333f8ae93caa262f46303efe4c35c5a8"; + rev = "main"; name = name; sha256 = "sha256-ed9QxS4onniN+kABewK9kBRu9xFMvHU6em+QcP2GrFM="; }; diff --git a/hydenix/sources/themes/Crimson-Blade.nix b/hydenix/sources/themes/Crimson-Blade.nix index 87d6a4c0..f4cd3cd2 100644 --- a/hydenix/sources/themes/Crimson-Blade.nix +++ b/hydenix/sources/themes/Crimson-Blade.nix @@ -4,7 +4,7 @@ mkTheme rec { src = pkgs.fetchFromGitHub { owner = "cyb3rgh0u1"; repo = "Crimson-Blade"; - rev = "9603993976e4159e7f858abcf618835d39a1e757"; + rev = "main"; name = name; sha256 = "sha256-ooQJN3XcE7ZyC2JIlLCC6jraQC9pnwjRSila0Z19G3I="; }; diff --git a/hydenix/sources/themes/Crimson-Blue.nix b/hydenix/sources/themes/Crimson-Blue.nix index 2fbf5cab..635a0ab5 100644 --- a/hydenix/sources/themes/Crimson-Blue.nix +++ b/hydenix/sources/themes/Crimson-Blue.nix @@ -4,7 +4,7 @@ mkTheme rec { src = pkgs.fetchFromGitHub { owner = "amit-0i"; repo = "Crimson-Blue"; - rev = "5bc78a51f22b0cf4895bb3eda5bab8db412740fb"; + rev = "main"; name = name; sha256 = "sha256-MP2uTpH0rayCwHM2gWIaCbB0tARbMKLY9CUAZXPkM4U="; }; diff --git a/hydenix/sources/themes/Decay-Green.nix b/hydenix/sources/themes/Decay-Green.nix index bca294e1..2c41d094 100644 --- a/hydenix/sources/themes/Decay-Green.nix +++ b/hydenix/sources/themes/Decay-Green.nix @@ -4,7 +4,7 @@ mkTheme rec { src = pkgs.fetchFromGitHub { owner = "HyDE-Project"; repo = "hyde-themes"; - rev = "b5daf8e2717cdac23fcd3a7909869130b2877049"; + rev = "Decay-Green"; name = name; sha256 = "sha256-Vg9WsRPrkpkQMtOT+8rjf7CKiCvTQ12XZYX6hfUU0h0="; }; diff --git a/hydenix/sources/themes/DoomBringers.nix b/hydenix/sources/themes/DoomBringers.nix index 6dfa09d7..39d30f89 100644 --- a/hydenix/sources/themes/DoomBringers.nix +++ b/hydenix/sources/themes/DoomBringers.nix @@ -4,7 +4,7 @@ mkTheme rec { src = pkgs.fetchFromGitHub { owner = "xaicat"; repo = "DoomBringers"; - rev = "f42efdab861c7750fd31ff7e54b0378d363029e7"; + rev = "main"; name = name; sha256 = "sha256-bxV7YSdI1BM63eSV5nkkfvMmqgtWaKo9Xp2JKCpukvM="; }; diff --git a/hydenix/sources/themes/Dracula.nix b/hydenix/sources/themes/Dracula.nix index 075190bd..7aa8cb91 100644 --- a/hydenix/sources/themes/Dracula.nix +++ b/hydenix/sources/themes/Dracula.nix @@ -4,7 +4,7 @@ mkTheme rec { src = pkgs.fetchFromGitHub { owner = "RAprogramm"; repo = "HyDe-Themes"; - rev = "97209d2e3ad2e0c162ccb585f8cefa8c83899515"; + rev = "Dracula"; name = name; sha256 = "sha256-0mfuP8jhPtQM4VCGXKhNStse0HePvT0eew4BNh7sOsE="; }; diff --git a/hydenix/sources/themes/Edge-Runner.nix b/hydenix/sources/themes/Edge-Runner.nix index d6acedac..e60af521 100644 --- a/hydenix/sources/themes/Edge-Runner.nix +++ b/hydenix/sources/themes/Edge-Runner.nix @@ -4,7 +4,7 @@ mkTheme rec { src = pkgs.fetchFromGitHub { owner = "HyDE-Project"; repo = "hyde-themes"; - rev = "969a71e3c8de0d22dfba82b8b2fb8daa2dca50a7"; + rev = "Edge-Runner"; name = name; sha256 = "sha256-wbIIczb2/sVJe97oVFkLxmVf+BwYOlq4aQwDB3x7G2I="; }; diff --git a/hydenix/sources/themes/Electra.nix b/hydenix/sources/themes/Electra.nix index 276b4caa..7ccf0df6 100644 --- a/hydenix/sources/themes/Electra.nix +++ b/hydenix/sources/themes/Electra.nix @@ -4,7 +4,7 @@ mkTheme rec { src = pkgs.fetchFromGitHub { owner = "XBEAST1"; repo = "Electra"; - rev = "61cd9718d7c517c35db11b402e9f958537ae32da"; + rev = "master"; name = name; sha256 = "sha256-PG2Vud9BTMuOkT2dHYNl1sDdTFsMLugc5qfWWs/fYFE="; }; diff --git a/hydenix/sources/themes/Eternal-Arctic.nix b/hydenix/sources/themes/Eternal-Arctic.nix index 48862ec8..0fa11e69 100644 --- a/hydenix/sources/themes/Eternal-Arctic.nix +++ b/hydenix/sources/themes/Eternal-Arctic.nix @@ -4,7 +4,7 @@ mkTheme rec { src = pkgs.fetchFromGitHub { owner = "rishav12s"; repo = "Eternal-Arctic"; - rev = "bc372b1dc266cca591971c9b4e27a4c4b9108635"; + rev = "Eternal-Arctic"; name = name; sha256 = "sha256-Mj/ABDd5o+LCfryNocGju5JUO/hB1v7yxkY2bHe1j3w="; }; diff --git a/hydenix/sources/themes/Ever-Blushing.nix b/hydenix/sources/themes/Ever-Blushing.nix index b970836e..ec724438 100644 --- a/hydenix/sources/themes/Ever-Blushing.nix +++ b/hydenix/sources/themes/Ever-Blushing.nix @@ -4,7 +4,7 @@ mkTheme rec { src = pkgs.fetchFromGitHub { owner = "rishav12s"; repo = "Ever-Blushing"; - rev = "3b90aea08a37ea052296e918e24be0be3400d1be"; + rev = "Ever-Blushing"; name = name; sha256 = "sha256-DCRdN9OeT1sEQEQFYN1F4OAEwcgFgPOTx2bJ8TO6Nj8="; }; diff --git a/hydenix/sources/themes/Frosted-Glass.nix b/hydenix/sources/themes/Frosted-Glass.nix index ec099455..48857c1e 100644 --- a/hydenix/sources/themes/Frosted-Glass.nix +++ b/hydenix/sources/themes/Frosted-Glass.nix @@ -4,7 +4,7 @@ mkTheme rec { src = pkgs.fetchFromGitHub { owner = "HyDE-Project"; repo = "hyde-themes"; - rev = "224e1027e451481db526a095242d261d47a68775"; + rev = "Frosted-Glass"; name = name; sha256 = "sha256-6/KxQNjcFkYPSouvaMDF1cRto9wQS1IhQqFRteGDQUA="; }; diff --git a/hydenix/sources/themes/Graphite-Mono.nix b/hydenix/sources/themes/Graphite-Mono.nix index 57a4bba1..0ce4afa6 100644 --- a/hydenix/sources/themes/Graphite-Mono.nix +++ b/hydenix/sources/themes/Graphite-Mono.nix @@ -4,7 +4,7 @@ mkTheme rec { src = pkgs.fetchFromGitHub { owner = "HyDE-Project"; repo = "hyde-themes"; - rev = "ab5030a3b808b0754e30a2867a2fa217956e66d2"; + rev = "Graphite-Mono"; name = name; sha256 = "sha256-bA07uhuF67ZN6USBsF5fvSFvPe/tiHQzxvV1dFEoXYI="; }; diff --git a/hydenix/sources/themes/Green-Lush.nix b/hydenix/sources/themes/Green-Lush.nix index 22cf386a..2e7f3361 100644 --- a/hydenix/sources/themes/Green-Lush.nix +++ b/hydenix/sources/themes/Green-Lush.nix @@ -4,7 +4,7 @@ mkTheme rec { src = pkgs.fetchFromGitHub { owner = "abenezerw"; repo = "Green-Lush"; - rev = "e3b8b6af05e1f8ec6f2a63c86cf2c7717fd1468d"; + rev = "main"; name = name; sha256 = "sha256-4k3EXKyHkVPrqnZuviHpmSc+kNIVysZTGu0hd/XT+UA="; }; diff --git a/hydenix/sources/themes/Greenify.nix b/hydenix/sources/themes/Greenify.nix index 15b24219..a1159286 100644 --- a/hydenix/sources/themes/Greenify.nix +++ b/hydenix/sources/themes/Greenify.nix @@ -5,7 +5,7 @@ mkTheme rec { owner = "mahaveergurjar"; repo = "Theme-Gallery"; name = name; - rev = "9fcc1105a8d05249f566fe3f6938cd69198b70bb"; + rev = "Greenify"; sha256 = "sha256-jf8CilUopQBqAa3JBPl68S9P7Hg/87KpyEATbiOhg4A="; }; meta = { diff --git a/hydenix/sources/themes/Grukai.nix b/hydenix/sources/themes/Grukai.nix index 8c7ef409..f969cba6 100644 --- a/hydenix/sources/themes/Grukai.nix +++ b/hydenix/sources/themes/Grukai.nix @@ -4,7 +4,7 @@ mkTheme rec { src = pkgs.fetchFromGitHub { owner = "amit-0i"; repo = "Grukai"; - rev = "95e0b92633b3622685cb29662d5e320f21753001"; + rev = "main"; name = name; sha256 = "sha256-N8AErlZCypJSy+P1uO1iYYcdRmpGbiZ1TNhtJvo14Lg="; }; diff --git a/hydenix/sources/themes/Gruvbox-Retro.nix b/hydenix/sources/themes/Gruvbox-Retro.nix index 19058b3a..c3184a1a 100644 --- a/hydenix/sources/themes/Gruvbox-Retro.nix +++ b/hydenix/sources/themes/Gruvbox-Retro.nix @@ -4,7 +4,7 @@ mkTheme rec { src = pkgs.fetchFromGitHub { owner = "HyDE-Project"; repo = "hyde-themes"; - rev = "a00ab7d183c877152c997fdac5d877a38dea30f1"; + rev = "Gruvbox-Retro"; name = name; sha256 = "sha256-GJ3Y9b36mPZMzzIlBx6S862KS3mOB9ItCKIZf5qKIeo="; }; diff --git a/hydenix/sources/themes/Hack-the-Box.nix b/hydenix/sources/themes/Hack-the-Box.nix index 653f57f4..efc08b84 100644 --- a/hydenix/sources/themes/Hack-the-Box.nix +++ b/hydenix/sources/themes/Hack-the-Box.nix @@ -4,7 +4,7 @@ mkTheme rec { src = pkgs.fetchFromGitHub { owner = "HyDE-Project"; repo = "hyde-gallery"; - rev = "f8f6070ec27329c52f145a156dd61929781e2048"; + rev = "Hack-the-Box"; name = name; sha256 = "sha256-VMDs9fnXX0v7iGSftA19UXxANY1sRjrK5ipMsfjU7Tg="; }; diff --git a/hydenix/sources/themes/Ice-Age.nix b/hydenix/sources/themes/Ice-Age.nix index e057abd6..bbc0d095 100644 --- a/hydenix/sources/themes/Ice-Age.nix +++ b/hydenix/sources/themes/Ice-Age.nix @@ -4,7 +4,7 @@ mkTheme rec { src = pkgs.fetchFromGitHub { owner = "saber-88"; repo = "Ice-Age"; - rev = "2691711e8966ce032464be40d22bc1b2a053b9e7"; + rev = "main"; name = name; sha256 = "sha256-IWevprHXKgGh/h/zBUgDu+hSFkEp4VOwbt6qrWgpsuQ="; }; diff --git a/hydenix/sources/themes/LimeFrenzy.nix b/hydenix/sources/themes/LimeFrenzy.nix index 7750e699..6fdbfb42 100644 --- a/hydenix/sources/themes/LimeFrenzy.nix +++ b/hydenix/sources/themes/LimeFrenzy.nix @@ -5,7 +5,7 @@ mkTheme rec { owner = "xaicat"; repo = "LimeFrenzy"; name = name; - rev = "ce1d07c439fbe870a2c58c2c08288e203eb87468"; + rev = "main"; sha256 = "sha256-mQzSm7XtU1swm77uf0h0rOMqa1hc3uLmiLXdn15dz08="; }; meta = { diff --git a/hydenix/sources/themes/Mac-OS.nix b/hydenix/sources/themes/Mac-OS.nix index 22f9ba33..cdfcf705 100644 --- a/hydenix/sources/themes/Mac-OS.nix +++ b/hydenix/sources/themes/Mac-OS.nix @@ -4,7 +4,7 @@ mkTheme rec { src = pkgs.fetchFromGitHub { owner = "HyDE-Project"; repo = "hyde-gallery"; - rev = "2ce4d3eae646b96133df919c87dc052152033a1d"; + rev = "Mac-Os"; name = name; sha256 = "sha256-QmM3JaSLCQn9eqKqSNL13b2DrsxIGiCztbxobsHbbq0="; }; diff --git a/hydenix/sources/themes/Material-Sakura.nix b/hydenix/sources/themes/Material-Sakura.nix index ba78610a..81790bae 100644 --- a/hydenix/sources/themes/Material-Sakura.nix +++ b/hydenix/sources/themes/Material-Sakura.nix @@ -4,7 +4,7 @@ mkTheme rec { src = pkgs.fetchFromGitHub { owner = "HyDE-Project"; repo = "hyde-themes"; - rev = "ada3702994ad480339935f3f14a08d21ad3d6ad9"; + rev = "Material-Sakura"; name = name; sha256 = "sha256-pxVWKIxjLKoTUbRBrAn9SludTLyS+yA5HlqyFRLHdiM="; }; diff --git a/hydenix/sources/themes/Monokai.nix b/hydenix/sources/themes/Monokai.nix index 60ad26fb..cd35dbb2 100644 --- a/hydenix/sources/themes/Monokai.nix +++ b/hydenix/sources/themes/Monokai.nix @@ -4,7 +4,7 @@ mkTheme rec { src = pkgs.fetchFromGitHub { owner = "mahaveergurjar"; repo = "Theme-Gallery"; - rev = "da57d03eddf8a86efd9461fe82fbde290f81559d"; + rev = "Monokai"; name = name; sha256 = "sha256-bwjFzGVemYCU9zOT7v5gVvnrzsxZ09YlYt87P73nA3I="; }; diff --git a/hydenix/sources/themes/Monterey-Frost.nix b/hydenix/sources/themes/Monterey-Frost.nix index e3e44fab..9b84f85a 100644 --- a/hydenix/sources/themes/Monterey-Frost.nix +++ b/hydenix/sources/themes/Monterey-Frost.nix @@ -4,7 +4,7 @@ mkTheme rec { src = pkgs.fetchFromGitHub { owner = "rishav12s"; repo = "Monterey-Frost"; - rev = "4675ddd4abae2d86ce3d2c3940b29071ce1b4580"; + rev = "Monterey-Frost"; name = name; sha256 = "sha256-ECG7wyIa0RdZteTEdQjpVjhbf62XXz0rW3Ea494461E="; }; diff --git a/hydenix/sources/themes/Moonlight.nix b/hydenix/sources/themes/Moonlight.nix index e329579a..43d177e9 100644 --- a/hydenix/sources/themes/Moonlight.nix +++ b/hydenix/sources/themes/Moonlight.nix @@ -4,7 +4,7 @@ mkTheme rec { src = pkgs.fetchFromGitHub { owner = "Maroc02"; repo = "Moonlight"; - rev = "cc389fdcd8ac9903bbb33895717f710c1bf94f34"; + rev = "main"; name = name; sha256 = "sha256-MEjuTBNt/C6bKt5TR1yYPJ1fsDVvWO4hHTD49Dc9Phk="; }; diff --git a/hydenix/sources/themes/Nightbrew.nix b/hydenix/sources/themes/Nightbrew.nix index 95160720..621960b5 100644 --- a/hydenix/sources/themes/Nightbrew.nix +++ b/hydenix/sources/themes/Nightbrew.nix @@ -4,7 +4,7 @@ mkTheme rec { src = pkgs.fetchFromGitHub { owner = "jackpawlik1"; repo = "Nightbrew"; - rev = "7cd0355316c1d302cda31076d0a713549007d1bd"; + rev = "main"; name = name; sha256 = "sha256-yoAU7x8blO2pTQCy64+c8Y4XKdlFF04Wx8aAkX2xMUc="; }; diff --git a/hydenix/sources/themes/Nordic-Blue.nix b/hydenix/sources/themes/Nordic-Blue.nix index 0a523b59..f4555ad6 100644 --- a/hydenix/sources/themes/Nordic-Blue.nix +++ b/hydenix/sources/themes/Nordic-Blue.nix @@ -4,7 +4,7 @@ mkTheme rec { src = pkgs.fetchFromGitHub { owner = "HyDE-Project"; repo = "hyde-themes"; - rev = "7dd56df71c355ffdc847b43b6bea6c20e00f2726"; + rev = "Nordic-Blue"; name = name; sha256 = "sha256-b1w1EpS0GlAXAEPNSEOYqVtZnoHamqSqlsGSucTzPVg="; }; diff --git a/hydenix/sources/themes/Obsidian-Purple.nix b/hydenix/sources/themes/Obsidian-Purple.nix index dd453008..7cc15833 100644 --- a/hydenix/sources/themes/Obsidian-Purple.nix +++ b/hydenix/sources/themes/Obsidian-Purple.nix @@ -4,7 +4,7 @@ mkTheme rec { src = pkgs.fetchFromGitHub { owner = "amit-0i"; repo = "Obsidian-Purple"; - rev = "d1c90091117da83ad121027d2d32c6cd9b72b55f"; + rev = "main"; name = name; sha256 = "sha256-wmply5k/FP1QKobCp+ZeaCzdHIlURAxdur3xXAF7qD0="; }; diff --git a/hydenix/sources/themes/One-Dark.nix b/hydenix/sources/themes/One-Dark.nix index efef6270..87e6e4f3 100644 --- a/hydenix/sources/themes/One-Dark.nix +++ b/hydenix/sources/themes/One-Dark.nix @@ -4,7 +4,7 @@ mkTheme rec { src = pkgs.fetchFromGitHub { owner = "RAprogramm"; repo = "HyDe-Themes"; - rev = "4109ebca756257b63f22b2b74a5597e1650f3434"; + rev = "One-Dark"; name = name; sha256 = "sha256-j4KXbLb7gvVNCrdqMscsIinhBZoBp4oIzEbwws4fstU="; }; diff --git a/hydenix/sources/themes/Oxo-Carbon.nix b/hydenix/sources/themes/Oxo-Carbon.nix index eb09938d..d3ea2534 100644 --- a/hydenix/sources/themes/Oxo-Carbon.nix +++ b/hydenix/sources/themes/Oxo-Carbon.nix @@ -4,7 +4,7 @@ mkTheme rec { src = pkgs.fetchFromGitHub { owner = "rishav12s"; repo = "Oxo-Carbon"; - rev = "815812951eba40f71f6f2871be4ff3bd5159cfc7"; + rev = "Oxo-Carbon"; name = name; sha256 = "sha256-w+7Gky7L2crF4F7myhA64fXgjoWulLb/hWBaI6OMwBo="; }; diff --git a/hydenix/sources/themes/Paranoid-Sweet.nix b/hydenix/sources/themes/Paranoid-Sweet.nix index b908181c..93be2960 100644 --- a/hydenix/sources/themes/Paranoid-Sweet.nix +++ b/hydenix/sources/themes/Paranoid-Sweet.nix @@ -4,7 +4,7 @@ mkTheme rec { src = pkgs.fetchFromGitHub { owner = "rishav12s"; repo = "Paranoid-Sweet"; - rev = "303ec22d4d1276a636466f61eb71be28a1ef2a85"; + rev = "Paranoid-Sweet"; name = name; sha256 = "sha256-j4fjX2fWSBajNKFSovVsy+FydUcq5FEtk6B9iiDURAs="; }; diff --git a/hydenix/sources/themes/Peace-Of-Mind.nix b/hydenix/sources/themes/Peace-Of-Mind.nix index 5c4aaf09..94c66ec1 100644 --- a/hydenix/sources/themes/Peace-Of-Mind.nix +++ b/hydenix/sources/themes/Peace-Of-Mind.nix @@ -4,7 +4,7 @@ mkTheme rec { src = pkgs.fetchFromGitHub { owner = "Maroc02"; repo = "Peace-Of-Mind"; - rev = "45ee6f24bc7f4cabdc8478e00c44172e907ba9e4"; + rev = "main"; name = name; sha256 = "sha256-9FpH9PvykUHzJOp3NkWeExoM2taesHmVmruUge5xH3M="; }; diff --git a/hydenix/sources/themes/Pixel-Dream.nix b/hydenix/sources/themes/Pixel-Dream.nix index a9891679..bbcfb1a2 100644 --- a/hydenix/sources/themes/Pixel-Dream.nix +++ b/hydenix/sources/themes/Pixel-Dream.nix @@ -4,7 +4,7 @@ mkTheme rec { src = pkgs.fetchFromGitHub { owner = "rishav12s"; repo = "Pixel-Dream"; - rev = "79607bbf37c356acb80992c8302ada3336f9d8fa"; + rev = "Pixel-Dream"; name = name; sha256 = "sha256-uuqktN19CBY8EDleC+8U/vXrPgwH/lStS8G6hyN+fWE="; }; diff --git a/hydenix/sources/themes/Rain-Dark.nix b/hydenix/sources/themes/Rain-Dark.nix index 050031dd..042fa5a0 100644 --- a/hydenix/sources/themes/Rain-Dark.nix +++ b/hydenix/sources/themes/Rain-Dark.nix @@ -4,7 +4,7 @@ mkTheme rec { src = pkgs.fetchFromGitHub { owner = "rishav12s"; repo = "Rain-Dark"; - rev = "da26bafb755fcd96d107cc7b60db43e85e3a3876"; + rev = "Rain-Dark"; name = name; sha256 = "sha256-zv66a/fh3xqOIYVD6OUi4ZEpn3L29J2vvBnPBjeQW7w="; }; diff --git a/hydenix/sources/themes/Red-Stone.nix b/hydenix/sources/themes/Red-Stone.nix index 0c1c9da9..f94e3f47 100644 --- a/hydenix/sources/themes/Red-Stone.nix +++ b/hydenix/sources/themes/Red-Stone.nix @@ -4,7 +4,7 @@ mkTheme rec { src = pkgs.fetchFromGitHub { owner = "mahaveergurjar"; repo = "Theme-Gallery"; - rev = "44c499a0a7f0018b06e89b6f41e335566aabf10d"; + rev = "Red_Stone"; name = name; sha256 = "sha256-cbg7hBjXg0xTRCZqbo1UUQM7zNoQHEQO6it2VkahYqI="; }; diff --git a/hydenix/sources/themes/Rose-Pine.nix b/hydenix/sources/themes/Rose-Pine.nix index 814c8663..d5f78a62 100644 --- a/hydenix/sources/themes/Rose-Pine.nix +++ b/hydenix/sources/themes/Rose-Pine.nix @@ -4,7 +4,7 @@ mkTheme rec { src = pkgs.fetchFromGitHub { owner = "HyDE-Project"; repo = "hyde-themes"; - rev = "4bf9d2cd07cd8f68d62f2b7af28d5f064c66409b"; + rev = "Rose-Pine"; name = name; sha256 = "sha256-ySrHzOyySxDYMomuatoz1JFfkWnSg8SUSCbe5QkrJwY="; }; diff --git a/hydenix/sources/themes/Scarlet-Night.nix b/hydenix/sources/themes/Scarlet-Night.nix index cc84ab06..88a1a47b 100644 --- a/hydenix/sources/themes/Scarlet-Night.nix +++ b/hydenix/sources/themes/Scarlet-Night.nix @@ -4,7 +4,7 @@ mkTheme rec { src = pkgs.fetchFromGitHub { owner = "abenezerw"; repo = "Scarlet-Night"; - rev = "5edc142b5fad20985ee4049ee497479bfe03776a"; + rev = "main"; name = name; sha256 = "sha256-+RNKfwc8mfgSnNifMcxlHyBTzDvY5DXAJeNKbJsD8AU="; }; diff --git a/hydenix/sources/themes/Sci-fi.nix b/hydenix/sources/themes/Sci-fi.nix index d7a6af55..1d86842c 100644 --- a/hydenix/sources/themes/Sci-fi.nix +++ b/hydenix/sources/themes/Sci-fi.nix @@ -4,7 +4,7 @@ mkTheme rec { src = pkgs.fetchFromGitHub { owner = "KaranRaval123"; repo = "Sci-fi"; - rev = "52091e9658319a4d0da0bc19c57f55f3c1b539f0"; + rev = "main"; name = name; sha256 = "sha256-gnAvPuHBfH+PspSxkzOA2jIIHox2Fi+nMSsoZAJHGlw="; }; diff --git a/hydenix/sources/themes/Solarized-Dark.nix b/hydenix/sources/themes/Solarized-Dark.nix index 3e9be7cc..84f36a26 100644 --- a/hydenix/sources/themes/Solarized-Dark.nix +++ b/hydenix/sources/themes/Solarized-Dark.nix @@ -4,7 +4,7 @@ mkTheme rec { src = pkgs.fetchFromGitHub { owner = "rishav12s"; repo = "Solarized-Dark"; - rev = "06908339fb4e89adddca3a11d7aec5738e5e17a0"; + rev = "Solarized-Dark"; name = name; sha256 = "sha256-naLPzGyGK3jQSILdP5vkG2coEOqkQ4Q/dHUBJlUa2pI="; }; diff --git a/hydenix/sources/themes/Synth-Wave.nix b/hydenix/sources/themes/Synth-Wave.nix index 61aadffd..6c6e3281 100644 --- a/hydenix/sources/themes/Synth-Wave.nix +++ b/hydenix/sources/themes/Synth-Wave.nix @@ -4,7 +4,7 @@ mkTheme rec { src = pkgs.fetchFromGitHub { owner = "HyDE-Project"; repo = "hyde-themes"; - rev = "e42e1a10da90f74afda663af122fff996e6585b9"; + rev = "Synth-Wave"; name = name; sha256 = "sha256-/r9vPTzGrZOx1EhtfxPZFIax08O9EY1PyB3l5XKKtXo="; }; diff --git a/hydenix/sources/themes/Tokyo-Night.nix b/hydenix/sources/themes/Tokyo-Night.nix index 69004f33..30c5adeb 100644 --- a/hydenix/sources/themes/Tokyo-Night.nix +++ b/hydenix/sources/themes/Tokyo-Night.nix @@ -4,7 +4,7 @@ mkTheme rec { src = pkgs.fetchFromGitHub { owner = "HyDE-Project"; repo = "hyde-themes"; - rev = "4c4bda0ce67385fe865dc42be75b8931608793c6"; + rev = "Tokyo-Night"; name = name; sha256 = "sha256-ntM6cfHI4BBiFkp1ylqDjZxAqefV4x/rG0A6gqD1jR4="; }; diff --git a/hydenix/sources/themes/Tundra.nix b/hydenix/sources/themes/Tundra.nix index aeac3c44..61e3a748 100644 --- a/hydenix/sources/themes/Tundra.nix +++ b/hydenix/sources/themes/Tundra.nix @@ -5,7 +5,7 @@ mkTheme rec { owner = "Prof-Shiba"; repo = "Tundra"; name = name; - rev = "70548d07f50e76c59927c989be23b5cc1b2e0a07"; + rev = "main"; sha256 = "sha256-bxBXY8YU77w2MCtgOgSU4ujgPwA/MURJUPw1GnIijFM="; }; meta = { diff --git a/hydenix/sources/themes/Vanta-Black.nix b/hydenix/sources/themes/Vanta-Black.nix index 0d75ce07..d088956a 100644 --- a/hydenix/sources/themes/Vanta-Black.nix +++ b/hydenix/sources/themes/Vanta-Black.nix @@ -4,7 +4,7 @@ mkTheme rec { src = pkgs.fetchFromGitHub { owner = "rishav12s"; repo = "Vanta-Black"; - rev = "2ad0f0c041bd90479f4b5e94e139804c2264d8ae"; + rev = "Vanta-Black"; name = name; sha256 = "sha256-4UZSpJPIzs2ZLQMt1QQz7VoyDW4jiOWZ9Xp1yU4k4Zs="; }; diff --git a/hydenix/sources/themes/Windows-11.nix b/hydenix/sources/themes/Windows-11.nix index 3c5d2060..9a77d675 100644 --- a/hydenix/sources/themes/Windows-11.nix +++ b/hydenix/sources/themes/Windows-11.nix @@ -4,7 +4,7 @@ mkTheme rec { src = pkgs.fetchFromGitHub { owner = "HyDE-Project"; repo = "hyde-gallery"; - rev = "a641e958ad3f54375c9e102ba4be449016d8bfce"; + rev = "Windows-11"; name = name; sha256 = "sha256-rAg4iPOD8sRvKX32N9+8DekwvvmizFC9Q2QwWA7mKz0="; }; diff --git a/hydenix/sources/themes/utils/update-themes.sh b/hydenix/sources/themes/utils/update-themes.sh index b9eac75d..143859b3 100755 --- a/hydenix/sources/themes/utils/update-themes.sh +++ b/hydenix/sources/themes/utils/update-themes.sh @@ -1,5 +1,5 @@ #!/usr/bin/env nix-shell -#! nix-shell -i bash -p nix-prefetch-git gnused git +#! nix-shell -i bash -p nix-prefetch-git gnused set -eo pipefail @@ -9,71 +9,37 @@ THEMES_DIR="hydenix/sources/themes" find "$THEMES_DIR" -name "*.nix" ! -name "default.nix" ! -path "*/utils/*" | while read -r NIX_FILE; do echo "Processing $NIX_FILE..." - # Extract owner, repo, current rev, and current sha256 from the .nix file + # Extract owner, repo, rev, and current sha256 from the .nix file OWNER=$(grep -oP 'owner = "\K[^"]+' "$NIX_FILE" || true) REPO=$(grep -oP 'repo = "\K[^"]+' "$NIX_FILE" || true) - CURRENT_REV=$(grep -oP 'rev = "\K[^"]+' "$NIX_FILE" || true) + REV=$(grep -oP 'rev = "\K[^"]+' "$NIX_FILE" || true) CURRENT_SHA256=$(grep -oP 'sha256 = "\K[^"]+' "$NIX_FILE" || true) NAME=$(basename "$NIX_FILE" .nix) # Get theme name from filename - if [ -z "$OWNER" ] || [ -z "$REPO" ] || [ -z "$CURRENT_REV" ]; then + if [ -z "$OWNER" ] || [ -z "$REPO" ] || [ -z "$REV" ]; then echo "Warning: Could not extract owner, repo, or rev from $NIX_FILE. Skipping." continue fi - echo " Owner: $OWNER, Repo: $REPO, Current Rev: $CURRENT_REV" + echo " Owner: $OWNER, Repo: $REPO, Rev: $REV" - # Determine latest commit hash for the current branch/ref - LATEST_COMMIT_HASH="" - if [[ "$CURRENT_REV" =~ ^[0-9a-f]{40}$ ]]; then - # CURRENT_REV is already a commit hash - LATEST_COMMIT_HASH="$CURRENT_REV" - echo " Rev is already a commit hash: $CURRENT_REV" - else - # CURRENT_REV is likely a branch name, fetch the latest commit hash for it - echo " Rev is a branch name: $CURRENT_REV. Fetching latest commit hash..." - REMOTE_URL="https://github.com/$OWNER/$REPO" - LATEST_COMMIT_HASH=$(git ls-remote "$REMOTE_URL" "refs/heads/$CURRENT_REV" | awk '{print $1}') - if [ -z "$LATEST_COMMIT_HASH" ]; then - echo "Error: Could not fetch latest commit hash for $REMOTE_URL/$CURRENT_REV. Skipping." - continue - fi - echo " Latest commit hash for $CURRENT_REV: $LATEST_COMMIT_HASH" - fi - - # Check if the current REV in the nix file is already the latest commit hash - if [ "$CURRENT_REV" = "$LATEST_COMMIT_HASH" ] && [ -n "$CURRENT_SHA256" ]; then - echo " Theme $NAME is already at the latest commit ($CURRENT_REV). Checking SHA256 only." - # If the rev is already the latest, let's still verify the sha256 - # Construct the URL for nix-prefetch-url using the LATEST_COMMIT_HASH - FETCH_URL="https://github.com/$OWNER/$REPO/archive/$LATEST_COMMIT_HASH.tar.gz" - VERIFIED_SHA256=$(nix-prefetch-url --unpack "$FETCH_URL") - VERIFIED_SHA256=$(nix hash to-sri --type sha256 "$VERIFIED_SHA256") - - if [ "$CURRENT_SHA256" == "$VERIFIED_SHA256" ]; then - echo " Theme $NAME (rev: $LATEST_COMMIT_HASH) is already up to date. Skipping." - else - echo " Updating $NAME: sha256 $CURRENT_SHA256 -> $VERIFIED_SHA256 (rev unchanged: $LATEST_COMMIT_HASH)" - sed -i -E "s|^([[:space:]]*)sha256 = .*$|\1sha256 = \"$VERIFIED_SHA256\";|" "$NIX_FILE" - echo " Updated $NIX_FILE" - fi - else - echo " Theme $NAME needs update (rev changed from $CURRENT_REV to $LATEST_COMMIT_HASH or initial update)." - # Construct the URL for nix-prefetch-url using the LATEST_COMMIT_HASH - FETCH_URL="https://github.com/$OWNER/$REPO/archive/$LATEST_COMMIT_HASH.tar.gz" + # Construct the URL for nix-prefetch-url + FETCH_URL="https://github.com/$OWNER/$REPO/archive/$REV.tar.gz" - NEW_SHA256=$(nix-prefetch-url --unpack "$FETCH_URL") - # Convert to SRI format (sha256-) - NEW_SHA256=$(nix hash to-sri --type sha256 "$NEW_SHA256") + NEW_SHA256=$(nix-prefetch-url --unpack "$FETCH_URL") + # Convert to SRI format (sha256-) + NEW_SHA256=$(nix hash to-sri --type sha256 "$NEW_SHA256") - if [ -z "$NEW_SHA256" ]; then - echo "Error: Could not prefetch URL for $NAME ($FETCH_URL). Skipping." - continue - fi + if [ -z "$NEW_SHA256" ]; then + echo "Error: Could not prefetch URL for $NAME ($FETCH_URL). Skipping." + continue + fi - echo " Updating $NAME: rev $CURRENT_REV -> $LATEST_COMMIT_HASH, sha256 $CURRENT_SHA256 -> $NEW_SHA256" - # Update both the rev and sha256 lines - sed -i -E "s|^([[:space:]]*)rev = .*$|\1rev = \"$LATEST_COMMIT_HASH\";|" "$NIX_FILE" + if [ "$CURRENT_SHA256" == "$NEW_SHA256" ]; then + echo " Theme $NAME is already up to date. Skipping." + else + echo " Updating $NAME: sha256 $CURRENT_SHA256 -> $NEW_SHA256" + # Update only the sha256 line sed -i -E "s|^([[:space:]]*)sha256 = .*$|\1sha256 = \"$NEW_SHA256\";|" "$NIX_FILE" echo " Updated $NIX_FILE" fi From 9656f6100e6a827137f4b36d1bffa88c518323bc Mon Sep 17 00:00:00 2001 From: Richard Henninger <56615615+richen604@users.noreply.github.com> Date: Mon, 6 Oct 2025 23:35:05 -0700 Subject: [PATCH 12/24] Revert "feat: xdg terminals list" This reverts commit c8d5a8443bf1f2d6f5eba426b84c84a3f5768630. --- TODO.md | 10 ++-------- flake.lock | 2 +- hydenix/modules/hm/terminals.nix | 3 --- 3 files changed, 3 insertions(+), 12 deletions(-) diff --git a/TODO.md b/TODO.md index 21737304..03814cda 100644 --- a/TODO.md +++ b/TODO.md @@ -1,16 +1,16 @@ # todo -## done - ## now - feat: new themes to build ## next +- fix: hydenix.hm.hyprland options with presets should by type str to allow for overrides, example should show default lists - feat: move hyprlock to hyprland module, swaylock should just be swaylock module - assertion to not have both enabled +- feat: hyde config.toml options - feat: extending more options for feature parity with hyde - fastfetch - hyprlock @@ -33,15 +33,9 @@ - feat: user now owns their nixosSystem, depreciated hydenix-nixpkgs.lib.nixosSystem - feat: hydenix follows its own nixpkgs, no userPkgs overlays, template hydenix follows nixpkgs by default - update docs to reflect this, as users can remove -- users own their own home-manager -- feat: home-manager configuration in flake -- feat: hydenix major option, show warnings on option for api updates ## backlog -- fix: remove duplicate udisks2 setup -- hm.hyprland should have more warnings related to config overrides, i think -- feat: hyde config.toml options - complete demo video after 5.0 - fix: wallbash for code - feat: assertions for common requirements diff --git a/flake.lock b/flake.lock index 372f7462..b4ef87b7 100644 --- a/flake.lock +++ b/flake.lock @@ -127,8 +127,8 @@ }, "original": { "owner": "nixos", + "ref": "nixpkgs-unstable", "repo": "nixpkgs", - "rev": "a1f79a1770d05af18111fbbe2a3ab2c42c0f6cd0", "type": "github" } }, diff --git a/hydenix/modules/hm/terminals.nix b/hydenix/modules/hm/terminals.nix index b1012aa9..afe544b9 100644 --- a/hydenix/modules/hm/terminals.nix +++ b/hydenix/modules/hm/terminals.nix @@ -36,9 +36,6 @@ in ]; home.file = { - ".config/xdg-terminals.list" = { - source = "${pkgs.hydenix.hyde}/Configs/.config/xdg-terminals.list"; - }; ".config/kitty/hyde.conf" = { source = "${pkgs.hydenix.hyde}/Configs/.config/kitty/hyde.conf"; }; From c68c073b32b54126b654c132462f43417f531755 Mon Sep 17 00:00:00 2001 From: Richard Henninger <56615615+richen604@users.noreply.github.com> Date: Mon, 6 Oct 2025 23:35:05 -0700 Subject: [PATCH 13/24] Revert "fix: removed unnecessary sound in vm" This reverts commit b3de3ad3a7a76e03c71830e8b1b12b4ee3c15f34. --- lib/vms/nixos-vm.nix | 5 ++++- 1 file changed, 4 insertions(+), 1 deletion(-) diff --git a/lib/vms/nixos-vm.nix b/lib/vms/nixos-vm.nix index 34c0520e..333119cf 100644 --- a/lib/vms/nixos-vm.nix +++ b/lib/vms/nixos-vm.nix @@ -28,6 +28,9 @@ nixosConfiguration.extendModules { "-cpu host" "-enable-kvm" "-machine q35,accel=kvm" + "-device intel-iommu" + "-device ich9-intel-hda" + "-device hda-output" ]; }; }; @@ -73,7 +76,7 @@ nixosConfiguration.extendModules { ]; # Enable verbose logging for home-manager - home-manager.verbose = true; + # home-manager.verbose = true; } ) ]; From f9b6a8430f2e96c8f0d21937836fe079380f9449 Mon Sep 17 00:00:00 2001 From: Richard Henninger <56615615+richen604@users.noreply.github.com> Date: Mon, 6 Oct 2025 23:35:05 -0700 Subject: [PATCH 14/24] Revert "fix: hyde bins import as pkgs, removed in hyde drv" This reverts commit 0f33c44048311bb26668d57d45caedbb375ea912. --- hydenix/modules/hm/hyde.nix | 35 ++++++++++++++++++++++++----------- hydenix/sources/hyde.nix | 7 ------- 2 files changed, 24 insertions(+), 18 deletions(-) diff --git a/hydenix/modules/hm/hyde.nix b/hydenix/modules/hm/hyde.nix index 8c55273c..bcdcddf7 100644 --- a/hydenix/modules/hm/hyde.nix +++ b/hydenix/modules/hm/hyde.nix @@ -27,10 +27,6 @@ in kdePackages.kconfig # TODO: not sure if this is still needed wf-recorder # screen recorder for wlroots-based compositors such as sway python-pyamdgpuinfo - hydenix.hyq - hydenix.hydectl - hydenix.hyde-ipc - hydenix.hyde-config ]; # ensures hyprland config is available in session as per hyde uwsm update @@ -91,23 +87,41 @@ in executable = true; }; + # TODO: requires nix-ld + ".local/bin/hydectl" = { + source = "${pkgs.hydenix.hydectl}/bin/hydectl"; + executable = true; + }; + + ".local/bin/hyde-ipc" = { + source = "${pkgs.hydenix.hyde-ipc}/bin/hyde-ipc"; + executable = true; + }; + + ".local/bin/hyq" = { + source = "${pkgs.hydenix.hyq}/bin/hyq"; + executable = true; + }; + ".local/lib/hyde" = { source = "${pkgs.hydenix.hyde}/Configs/.local/lib/hyde"; recursive = true; executable = true; - force = true; }; - ".local/lib/hyde/resetxdgportal.sh" = { - text = '' - #!/usr/bin/env bash - - ''; + ".local/lib/hyde-config" = { + source = "${pkgs.hydenix.hyde-config}/bin/hyde-config"; executable = true; + # FIXME: this is a hack to make sure the hyde-config binary is copied after the .local/lib/hyde above mutable = true; force = true; }; + ".local/lib/hyde/globalcontrol.sh" = { + source = "${pkgs.hydenix.hyde}/Configs/.local/lib/hyde/globalcontrol.sh"; + executable = true; + }; + ".local/share/fastfetch/presets/hyde" = { source = "${pkgs.hydenix.hyde}/Configs/.local/share/fastfetch/presets/hyde"; recursive = true; @@ -192,5 +206,4 @@ in }; }; }; - } diff --git a/hydenix/sources/hyde.nix b/hydenix/sources/hyde.nix index 01da084f..6e381157 100644 --- a/hydenix/sources/hyde.nix +++ b/hydenix/sources/hyde.nix @@ -12,13 +12,6 @@ pkgs.stdenv.mkDerivation { # remove assets folder rm -rf Source/assets - rm -rf Configs/.local/lib/hyde/resetxdgportal.sh - rm -rf Configs/.local/bin/hydectl - rm -rf Configs/.local/bin/hyde-ipc - rm -rf Configs/.local/lib/hyde/hyde-config - rm -rf Configs/.local/lib/hyde/hyq - rm -rf Configs/.local/bin/hyq - # Update waybar killall command in all HyDE files find . -type f -print0 | xargs -0 sed -i 's/killall waybar/killall .waybar-wrapped/g' From 374108067f07f829fca505a1940706b0b5eabbbf Mon Sep 17 00:00:00 2001 From: Richard Henninger <56615615+richen604@users.noreply.github.com> Date: Mon, 6 Oct 2025 23:35:05 -0700 Subject: [PATCH 15/24] Revert "fix: new hyprland location" This reverts commit 277a7d760264932601594867c0de6673d945f2d8. --- hydenix/modules/hm/hyde.nix | 6 ------ hydenix/modules/hm/hyprland/default.nix | 7 ++----- 2 files changed, 2 insertions(+), 11 deletions(-) diff --git a/hydenix/modules/hm/hyde.nix b/hydenix/modules/hm/hyde.nix index bcdcddf7..b8061cc9 100644 --- a/hydenix/modules/hm/hyde.nix +++ b/hydenix/modules/hm/hyde.nix @@ -133,12 +133,6 @@ in force = true; mutable = true; }; - ".local/share/wallbash/" = { - source = "${pkgs.hydenix.hyde}/Configs/.local/share/wallbash/"; - recursive = true; - force = true; - mutable = true; - }; ".local/share/waybar/includes" = { source = "${pkgs.hydenix.hyde}/Configs/.local/share/waybar/includes"; recursive = true; diff --git a/hydenix/modules/hm/hyprland/default.nix b/hydenix/modules/hm/hyprland/default.nix index 279e0e34..48008043 100644 --- a/hydenix/modules/hm/hyprland/default.nix +++ b/hydenix/modules/hm/hyprland/default.nix @@ -45,14 +45,9 @@ in chmod 644 "$HOME/.config/hypr/themes/colors.conf" chmod 644 "$HOME/.config/hypr/themes/theme.conf" chmod 644 "$HOME/.config/hypr/themes/wallbash.conf" - ''; home.file = { - ".local/share/hypr/" = { - source = "${pkgs.hydenix.hyde}/Configs/.local/share/hypr/"; - recursive = true; - }; ".config/hypr/hyprland.conf" = if cfg.overrideMain != null then { @@ -65,6 +60,8 @@ in force = true; }; + ".config/hypr/hyde.conf".source = "${pkgs.hydenix.hyde}/Configs/.config/hypr/hyde.conf"; + ".config/hypr/userprefs.conf" = { text = cfg.extraConfig; force = true; From 8dda1cb857467d331fb7e6b13a6636794f2a7018 Mon Sep 17 00:00:00 2001 From: Richard Henninger <56615615+richen604@users.noreply.github.com> Date: Mon, 6 Oct 2025 23:35:05 -0700 Subject: [PATCH 16/24] Revert "feat: pyprland module options for hyprland" This reverts commit 6175f42063dc292cc317ea29b1692ce7b49b47df. --- hydenix/modules/hm/hyprland/options.nix | 17 -------------- hydenix/modules/hm/hyprland/pyprland.nix | 30 ------------------------ template/docs/options.md | 7 ------ 3 files changed, 54 deletions(-) delete mode 100644 hydenix/modules/hm/hyprland/pyprland.nix diff --git a/hydenix/modules/hm/hyprland/options.nix b/hydenix/modules/hm/hyprland/options.nix index 77a259eb..e1dd5b91 100644 --- a/hydenix/modules/hm/hyprland/options.nix +++ b/hydenix/modules/hm/hyprland/options.nix @@ -185,23 +185,6 @@ in }; }; - # Pyprland configurations - pyprland = { - enable = lib.mkEnableOption "pyprland configurations" // { - default = cfg.enable; - }; - extraConfig = lib.mkOption { - type = lib.types.lines; - default = ""; - description = "Additional pyprland configuration"; - }; - overrideConfig = lib.mkOption { - type = lib.types.nullOr lib.types.lines; - default = null; - description = "Complete pyprland configuration override"; - }; - }; - # Monitor configurations monitors = { enable = lib.mkEnableOption "monitor configurations" // { diff --git a/hydenix/modules/hm/hyprland/pyprland.nix b/hydenix/modules/hm/hyprland/pyprland.nix deleted file mode 100644 index df1b6757..00000000 --- a/hydenix/modules/hm/hyprland/pyprland.nix +++ /dev/null @@ -1,30 +0,0 @@ -{ - config, - lib, - pkgs, - ... -}: - -let - cfg = config.hydenix.hm.hyprland; -in -{ - config = lib.mkIf (cfg.enable && cfg.pyprland.enable) { - home.file = { - ".config/hypr/pyprland.toml" = - if cfg.pyprland.overrideConfig != null then - { - text = cfg.pyprland.overrideConfig; - force = true; - } - else - { - text = '' - ${lib.readFile "${pkgs.hydenix.hyde}/Configs/.config/hypr/pyprland.toml"} - ${cfg.pyprland.extraConfig} - ''; - force = true; - }; - }; - }; -} diff --git a/template/docs/options.md b/template/docs/options.md index eaa5c3f4..1cafc6ee 100644 --- a/template/docs/options.md +++ b/template/docs/options.md @@ -180,13 +180,6 @@ below are the default options for hydenix. they are in *object format* and any o extraConfig = ""; # additional NVIDIA configuration overrideConfig = null; # complete NVIDIA configuration override (null or lib.types.lines) }; - # Pyprland configurations - pyprland = { - enable = true; # enable pyprland configurations - extraConfig = ""; # additional pyprland configuration - overrideConfig = null; # complete pyprland configuration override (null or lib.types.lines) - }; - # Monitor configurations monitors = { enable = true; # enable monitor configurations From 7c081e060d07841b40131cbc6f1a1fd8038efc37 Mon Sep 17 00:00:00 2001 From: Richard Henninger <56615615+richen604@users.noreply.github.com> Date: Mon, 6 Oct 2025 23:35:05 -0700 Subject: [PATCH 17/24] Revert "feat: new waybar modules" This reverts commit 419f5fff904af1a52614e23b5e6128ed306fe70b. --- hydenix/modules/hm/waybar.nix | 10 +--------- 1 file changed, 1 insertion(+), 9 deletions(-) diff --git a/hydenix/modules/hm/waybar.nix b/hydenix/modules/hm/waybar.nix index ed3615e7..62fb2fe4 100644 --- a/hydenix/modules/hm/waybar.nix +++ b/hydenix/modules/hm/waybar.nix @@ -173,15 +173,7 @@ in "${config.xdg.dataHome}/waybar/modules/power-profiles-daemon.jsonc", "${config.xdg.dataHome}/waybar/modules/image#hyde-menu.jsonc", "${config.xdg.dataHome}/waybar/modules/custom-hyde-menu.jsonc", - "${config.xdg.dataHome}/waybar/modules/network#bandwidth.jsonc", - "${config.xdg.configHome}/waybar/modules/custom-mediaplayer.jsonc", - "${config.xdg.configHome}/waybar/modules/gamemode.jsonc", - "${config.xdg.configHome}/waybar/modules/group-eyecare.jsonc", - "${config.xdg.configHome}/waybar/modules/group-hide-tray.jsonc", - "${config.xdg.configHome}/waybar/modules/group-mediaplayer.jsonc", - "${config.xdg.configHome}/waybar/modules/group-volumecontrol.jsonc", - "${config.xdg.configHome}/waybar/modules/mpd.jsonc", - "${config.xdg.configHome}/waybar/modules/temperature.jsonc" + "${config.xdg.dataHome}/waybar/modules/network#bandwidth.jsonc" ], "wlr/taskbar#windows": { "icon-size": 16.0, From d2c5373b817da8ae50a01580e4a004b046e337df Mon Sep 17 00:00:00 2001 From: Richard Henninger <56615615+richen604@users.noreply.github.com> Date: Mon, 6 Oct 2025 23:35:05 -0700 Subject: [PATCH 18/24] Revert "fix: rofi themes and launch fix in hyde drv" This reverts commit 21c86179951f44e35e70f498b2c31d7448ecb51e. --- hydenix/modules/hm/rofi.nix | 17 ----------------- hydenix/sources/hyde.nix | 3 --- 2 files changed, 20 deletions(-) diff --git a/hydenix/modules/hm/rofi.nix b/hydenix/modules/hm/rofi.nix index 9092fc13..8b6da48f 100644 --- a/hydenix/modules/hm/rofi.nix +++ b/hydenix/modules/hm/rofi.nix @@ -36,22 +36,5 @@ in $DRY_RUN_CMD mkdir -p "$HOME/.local/share/rofi/themes" $DRY_RUN_CMD find "$HOME/.local/share/hyde/rofi/themes" -type f -o -type l -exec ln -snf {} "$HOME/.local/share/rofi/themes/" \; 2>/dev/null || true ''; - - home.file = { - - ".local/share/hyde/rofi/assets/" = { - source = "${pkgs.hydenix.hyde}/Configs/.local/share/hyde/rofi/assets/"; - recursive = true; - force = true; - mutable = true; - }; - - ".local/share/hyde/rofi/themes/" = { - source = "${pkgs.hydenix.hyde}/Configs/.local/share/hyde/rofi/themes/"; - recursive = true; - force = true; - mutable = true; - }; - }; }; } diff --git a/hydenix/sources/hyde.nix b/hydenix/sources/hyde.nix index 6e381157..d45fd67f 100644 --- a/hydenix/sources/hyde.nix +++ b/hydenix/sources/hyde.nix @@ -30,9 +30,6 @@ pkgs.stdenv.mkDerivation { # fixes gtk4 themes sed -i '187,190d' Configs/.local/lib/hyde/theme.switch.sh - # remove pkill command from rofilaunch.sh - sed -i '5d' Configs/.local/lib/hyde/rofilaunch.sh - # BUILD FONTS mkdir -p $out/share/fonts/truetype for fontarchive in ./Source/arcs/Font_*.tar.gz; do From ee511d55fd59671cd586bf2696f2998781bd0a51 Mon Sep 17 00:00:00 2001 From: Richard Henninger <56615615+richen604@users.noreply.github.com> Date: Mon, 6 Oct 2025 23:35:05 -0700 Subject: [PATCH 19/24] Revert "feat: greetd hyprlock" This reverts commit 0597f90e59a7139166ea15ca8c6a268aaccabc54. --- hydenix/modules/hm/lockscreen.nix | 18 ++++++++++-------- 1 file changed, 10 insertions(+), 8 deletions(-) diff --git a/hydenix/modules/hm/lockscreen.nix b/hydenix/modules/hm/lockscreen.nix index c9e823ce..ced4393e 100644 --- a/hydenix/modules/hm/lockscreen.nix +++ b/hydenix/modules/hm/lockscreen.nix @@ -40,37 +40,39 @@ in (lib.mkIf cfg.hyprlock { ".config/hypr/hyprlock.conf" = { source = "${pkgs.hydenix.hyde}/Configs/.config/hypr/hyprlock.conf"; + force = true; }; ".config/hypr/hyprlock/theme.conf" = { source = "${pkgs.hydenix.hyde}/Configs/.config/hypr/hyprlock/theme.conf"; - mutable = true; - force = true; - }; - ".config/hypr/hyprlock/greetd-wallbash.conf" = { - source = "${pkgs.hydenix.hyde}/Configs/.config/hypr/hyprlock/greetd-wallbash.conf"; - mutable = true; force = true; }; ".config/hypr/hyprlock/Anurati.conf" = { source = "${pkgs.hydenix.hyde}/Configs/.config/hypr/hyprlock/Anurati.conf"; + force = true; }; ".config/hypr/hyprlock/Arfan on Clouds.conf" = { source = "${pkgs.hydenix.hyde}/Configs/.config/hypr/hyprlock/Arfan on Clouds.conf"; + force = true; }; ".config/hypr/hyprlock/IBM Plex.conf" = { source = "${pkgs.hydenix.hyde}/Configs/.config/hypr/hyprlock/IBM Plex.conf"; + force = true; }; ".config/hypr/hyprlock/SF Pro.conf" = { source = "${pkgs.hydenix.hyde}/Configs/.config/hypr/hyprlock/SF Pro.conf"; + force = true; }; ".config/hypr/hyprlock/IBM Xtented.conf" = { source = "${pkgs.hydenix.hyde}/Configs/.config/hypr/hyprlock/IBM Xtented.conf"; + force = true; }; ".config/hypr/hyprlock/greetd.conf" = { source = "${pkgs.hydenix.hyde}/Configs/.config/hypr/hyprlock/greetd.conf"; + force = true; }; - ".config/hypr/hyprlock/HyDE.conf" = { - source = "${pkgs.hydenix.hyde}/Configs/.config/hypr/hyprlock/HyDE.conf"; + ".config/hypr/hyprlock/greetd-wallbash.conf" = { + source = "${pkgs.hydenix.hyde}/Configs/.config/hypr/hyprlock/greetd-wallbash.conf"; + force = true; }; }) From 537ae4e060c670b07ef778fd6855766e2a00e039 Mon Sep 17 00:00:00 2001 From: Richard Henninger <56615615+richen604@users.noreply.github.com> Date: Mon, 6 Oct 2025 23:35:05 -0700 Subject: [PATCH 20/24] Revert "fix: gtk4 theme works correctly on theme changes" This reverts commit 3ca07ac612a31dfd882305ea0879caa138fdede0. --- hydenix/sources/hyde.nix | 4 ---- 1 file changed, 4 deletions(-) diff --git a/hydenix/sources/hyde.nix b/hydenix/sources/hyde.nix index d45fd67f..4d8a3b14 100644 --- a/hydenix/sources/hyde.nix +++ b/hydenix/sources/hyde.nix @@ -26,10 +26,6 @@ pkgs.stdenv.mkDerivation { find . -type f -executable -print0 | xargs -0 sed -i 's/find "/find -L "/g' find . -type f -name "*.sh" -print0 | xargs -0 sed -i 's/find "/find -L "/g' - # remove lines 187-190 from Configs/.local/lib/hyde/theme.switch.sh - # fixes gtk4 themes - sed -i '187,190d' Configs/.local/lib/hyde/theme.switch.sh - # BUILD FONTS mkdir -p $out/share/fonts/truetype for fontarchive in ./Source/arcs/Font_*.tar.gz; do From 08c13684eaa9c5238e054fe9e6bf57f0aae97dab Mon Sep 17 00:00:00 2001 From: Richard Henninger <56615615+richen604@users.noreply.github.com> Date: Mon, 6 Oct 2025 23:35:05 -0700 Subject: [PATCH 21/24] Revert "fix: theme correctly loads at boot with dconf" This reverts commit c5bb23ecb10a1eff7c791f428b29177fbd20cd7f. --- hydenix/modules/hm/theme.nix | 90 ++---------------------------------- 1 file changed, 3 insertions(+), 87 deletions(-) diff --git a/hydenix/modules/hm/theme.nix b/hydenix/modules/hm/theme.nix index 38caa7c2..dd9cb30e 100644 --- a/hydenix/modules/hm/theme.nix +++ b/hydenix/modules/hm/theme.nix @@ -64,15 +64,7 @@ in }) themesList ); - /* - We require both an activation script and a service to set the theme. - theme.set.sh uses dconf partially to set vars, which requires graphical targets to run - This is only an issue for the *first* rebuild, as dbus has never been started - - #TODO: this works but a more robust implementation is possible. just do what theme.set.sh/dconf.set.sh does and use home.file to set the correct gtk/qt/etc options - */ - - # applies what it can before graphical.target, think of this like a "first content paint" + # Add activation script to set the active theme home.activation.setTheme = lib.hm.dag.entryAfter [ "mutableGeneration" ] '' # Define path with required tools export PATH="${ @@ -91,12 +83,13 @@ in coreutils parallel imagemagick + hydenix.hyde which util-linux dconf ] ) - }:$HOME/.local/bin:$PATH" + }:$PATH" # Set up logging LOG_FILE="$HOME/.local/state/hyde/theme-switch.log" @@ -114,82 +107,5 @@ in echo "Theme switch completed. Log saved to $LOG_FILE" | tee -a "$LOG_FILE" ''; - - # sets dconf settings correctly - systemd.user.services.setThemeDconf = { - Unit = { - Description = "Apply Hyde theme dconf settings"; - After = [ - "graphical-session.target" - "dbus.service" - ]; - Wants = [ "dbus.service" ]; - PartOf = [ "graphical-session.target" ]; - }; - Service = { - Type = "oneshot"; - ExecStart = '' - ${config.home.homeDirectory}/.local/lib/hyde/dconf.set.sh - ''; - Path = with pkgs; [ - dconf - glib - hyprland - util-linux - which - coreutils - imagemagick - gawk - parallel - swww - waybar - kitty - dunst - libnotify - "${config.home.homeDirectory}/.local/bin" - ]; - }; - Install.WantedBy = [ "graphical-session.target" ]; - }; - - # reapplies the theme to fix dconf - systemd.user.services.setTheme = { - Unit = { - Description = "Apply Hyde theme settings (full theme switch)"; - After = [ - "graphical-session.target" - "dbus.service" - "setThemeDconf.service" - ]; - Wants = [ "dbus.service" ]; - PartOf = [ "graphical-session.target" ]; - }; - Service = { - Type = "oneshot"; - ExecStart = '' - ${config.home.homeDirectory}/.local/lib/hyde/theme.switch.sh -s "${cfg.active}" || true - ''; - Path = with pkgs; [ - swww - killall - hyprland - dunst - libnotify - systemd - waybar - kitty - gawk - coreutils - parallel - imagemagick - which - util-linux - dconf - "${config.home.homeDirectory}/.local/bin" - ]; - }; - Install.WantedBy = [ "graphical-session.target" ]; - }; - }; } From 4997ad09a2ca97780d9afbc28a837a1f8e6ac4b1 Mon Sep 17 00:00:00 2001 From: Richard Henninger <56615615+richen604@users.noreply.github.com> Date: Mon, 6 Oct 2025 23:35:05 -0700 Subject: [PATCH 22/24] Revert "feat: nixpkgs and hyde uwsm update wip" This reverts commit dc277bb7c56daa1270d8573fd2c2994f6388c78d. --- flake.lock | 22 ++++++++--------- flake.nix | 4 ++-- hydenix/modules/hm/default.nix | 1 - hydenix/modules/hm/hyde.nix | 5 ---- hydenix/modules/hm/uwsm.nix | 39 ------------------------------- hydenix/modules/system/system.nix | 20 ++++++++++++++-- lib/hyde-update/default.nix | 4 ++-- 7 files changed, 33 insertions(+), 62 deletions(-) delete mode 100644 hydenix/modules/hm/uwsm.nix diff --git a/flake.lock b/flake.lock index b4ef87b7..fbd6f5c4 100644 --- a/flake.lock +++ b/flake.lock @@ -41,17 +41,17 @@ "hyde": { "flake": false, "locked": { - "lastModified": 1758290412, - "narHash": "sha256-fXW+yxDQ0iLFX2YuKDpv82lIPbGDgii5kpsWCDp3m4s=", + "lastModified": 1752889605, + "narHash": "sha256-hT7xLsfqsVwcYS/YscRwVOPqK8ZpubhGdpK58INkdJ0=", "owner": "HyDE-Project", "repo": "HyDE", - "rev": "f246f2a89b8e862b96042cb2b291b191289c2fde", + "rev": "168287f2f10e95a4a9a623c955c7e08147c48472", "type": "github" }, "original": { "owner": "HyDE-Project", "repo": "HyDE", - "rev": "f246f2a89b8e862b96042cb2b291b191289c2fde", + "rev": "168287f2f10e95a4a9a623c955c7e08147c48472", "type": "github" } }, @@ -118,17 +118,17 @@ }, "hydenix-nixpkgs": { "locked": { - "lastModified": 1758446476, - "narHash": "sha256-5rdAi7CTvM/kSs6fHe1bREIva5W3TbImsto+dxG4mBo=", + "lastModified": 1758262103, + "narHash": "sha256-aBGl3XEOsjWw6W3AHiKibN7FeoG73dutQQEqnd/etR8=", "owner": "nixos", "repo": "nixpkgs", - "rev": "a1f79a1770d05af18111fbbe2a3ab2c42c0f6cd0", + "rev": "12bd230118a1901a4a5d393f9f56b6ad7e571d01", "type": "github" }, "original": { "owner": "nixos", - "ref": "nixpkgs-unstable", "repo": "nixpkgs", + "rev": "12bd230118a1901a4a5d393f9f56b6ad7e571d01", "type": "github" } }, @@ -140,11 +140,11 @@ ] }, "locked": { - "lastModified": 1758584112, - "narHash": "sha256-pCpT45dyylVxXaNf9/0qEx+cLdcfVTciXu/O3+H/4sM=", + "lastModified": 1756353138, + "narHash": "sha256-2G8YwNzELvklrYftaRAzNLZ2AbDtIrWzgRgnhReNnuk=", "owner": "richen604", "repo": "hyprquery", - "rev": "8ec7f74d0c3c5421861d008786e3c13d03d0e211", + "rev": "afe6da39cf94f3e24dcfd13abf88da6ea5d661ac", "type": "github" }, "original": { diff --git a/flake.nix b/flake.nix index cba6fa97..06f85ad7 100644 --- a/flake.nix +++ b/flake.nix @@ -3,7 +3,7 @@ inputs = { # Hydenix's nixpkgs - hydenix-nixpkgs.url = "github:nixos/nixpkgs/a1f79a1770d05af18111fbbe2a3ab2c42c0f6cd0"; + hydenix-nixpkgs.url = "github:nixos/nixpkgs/12bd230118a1901a4a5d393f9f56b6ad7e571d01"; home-manager = { url = "github:nix-community/home-manager"; @@ -18,7 +18,7 @@ }; hyde = { - url = "github:HyDE-Project/HyDE/f246f2a89b8e862b96042cb2b291b191289c2fde"; + url = "github:HyDE-Project/HyDE/168287f2f10e95a4a9a623c955c7e08147c48472"; flake = false; }; diff --git a/hydenix/modules/hm/default.nix b/hydenix/modules/hm/default.nix index 673455ae..331f22d3 100644 --- a/hydenix/modules/hm/default.nix +++ b/hydenix/modules/hm/default.nix @@ -27,7 +27,6 @@ ./swww.nix ./terminals.nix ./theme.nix - ./uwsm.nix ./waybar.nix ./wlogout.nix ./xdg.nix diff --git a/hydenix/modules/hm/hyde.nix b/hydenix/modules/hm/hyde.nix index b8061cc9..6ae689db 100644 --- a/hydenix/modules/hm/hyde.nix +++ b/hydenix/modules/hm/hyde.nix @@ -29,11 +29,6 @@ in python-pyamdgpuinfo ]; - # ensures hyprland config is available in session as per hyde uwsm update - home.sessionVariables = { - HYPRLAND_CONFIG = "${config.xdg.dataHome}/hypr/hyprland.conf"; - }; - fonts.fontconfig.enable = true; # fixes cava from not initializing on boot diff --git a/hydenix/modules/hm/uwsm.nix b/hydenix/modules/hm/uwsm.nix deleted file mode 100644 index a5b97b29..00000000 --- a/hydenix/modules/hm/uwsm.nix +++ /dev/null @@ -1,39 +0,0 @@ -{ - config, - lib, - pkgs, - ... -}: - -let - cfg = config.hydenix.hm.uwsm; -in -{ - options.hydenix.hm.uwsm = { - enable = lib.mkOption { - type = lib.types.bool; - default = config.hydenix.hm.enable; - description = "Enable uwsm module"; - }; - }; - - config = lib.mkIf cfg.enable { - home.file = { - ".config/uwsm/env" = { - source = "${pkgs.hydenix.hyde}/Configs/.config/uwsm/env"; - }; - ".config/uwsm/env.d/00-hyde.sh" = { - source = "${pkgs.hydenix.hyde}/Configs/.config/uwsm/env.d/00-hyde.sh"; - }; - ".config/uwsm/env.d/01-gpu.sh" = { - source = "${pkgs.hydenix.hyde}/Configs/.config/uwsm/env.d/01-gpu.sh"; - }; - ".config/uwsm/env-hyprland" = { - source = "${pkgs.hydenix.hyde}/Configs/.config/uwsm/env-hyprland"; - }; - ".config/uwsm/env-hyprland.d/00-hyde.sh" = { - source = "${pkgs.hydenix.hyde}/Configs/.config/uwsm/env-hyprland.d/00-hyde.sh"; - }; - }; - }; -} diff --git a/hydenix/modules/system/system.nix b/hydenix/modules/system/system.nix index 40614328..14e69bca 100644 --- a/hydenix/modules/system/system.nix +++ b/hydenix/modules/system/system.nix @@ -66,11 +66,24 @@ in package = pkgs.hyprland; portalPackage = pkgs.xdg-desktop-portal-hyprland; enable = true; - withUWSM = true; + withUWSM = false; }; programs.nix-ld.enable = true; + environment.pathsToLink = [ + "/share/icons" + "/share/themes" + "/share/fonts" + "/share/xdg-desktop-portal" + "/share/applications" + "/share/mime" + "/share/wayland-sessions" + "/share/zsh" + "/share/bash-completion" + "/share/fish" + ]; + hardware.bluetooth = { enable = true; powerOnBoot = true; @@ -84,10 +97,13 @@ in services = { dbus.enable = true; - upower.enable = true; openssh.enable = true; libinput.enable = true; + udisks2 = { + enable = true; + mountOnMedia = true; + }; }; programs.dconf.enable = true; diff --git a/lib/hyde-update/default.nix b/lib/hyde-update/default.nix index 99ba8a7e..507f59ab 100644 --- a/lib/hyde-update/default.nix +++ b/lib/hyde-update/default.nix @@ -27,8 +27,8 @@ let pkgs.fetchFromGitHub { owner = "HyDE-Project"; repo = "HyDE"; - rev = "f246f2a89b8e862b96042cb2b291b191289c2fde"; - sha256 = "sha256-fXW+yxDQ0iLFX2YuKDpv82lIPbGDgii5kpsWCDp3m4s="; + rev = "168287f2f10e95a4a9a623c955c7e08147c48472"; + sha256 = "sha256-hT7xLsfqsVwcYS/YscRwVOPqK8ZpubhGdpK58INkdJ0="; } ); in From 6bd1f8bc22c2b4f1cdfd12faa5bd721fe444339a Mon Sep 17 00:00:00 2001 From: Richard Henninger <56615615+richen604@users.noreply.github.com> Date: Mon, 6 Oct 2025 23:35:05 -0700 Subject: [PATCH 23/24] Revert "fix: pyamdgpuinfo support for waybar modules #151" This reverts commit d7ba79eed42f3cfbd3ac8aad7956fd0673578d69. --- hydenix/modules/hm/hyde.nix | 2 +- hydenix/sources/hyde.nix | 11 +++++++++++ 2 files changed, 12 insertions(+), 1 deletion(-) diff --git a/hydenix/modules/hm/hyde.nix b/hydenix/modules/hm/hyde.nix index 6ae689db..4a0ee6a3 100644 --- a/hydenix/modules/hm/hyde.nix +++ b/hydenix/modules/hm/hyde.nix @@ -75,7 +75,7 @@ in }; ".local/bin/hyde-shell" = { - source = pkgs.writeShellScript "hyde-shell" '' + source = pkgs.writeShellScript "hyde-shell-wrapped" '' export PYTHONPATH="${pkgs.python-pyamdgpuinfo}/${pkgs.python3.sitePackages}:$PYTHONPATH" exec "${pkgs.hydenix.hyde}/Configs/.local/bin/hyde-shell" "$@" ''; diff --git a/hydenix/sources/hyde.nix b/hydenix/sources/hyde.nix index 4d8a3b14..9dc49137 100644 --- a/hydenix/sources/hyde.nix +++ b/hydenix/sources/hyde.nix @@ -26,6 +26,17 @@ pkgs.stdenv.mkDerivation { find . -type f -executable -print0 | xargs -0 sed -i 's/find "/find -L "/g' find . -type f -name "*.sh" -print0 | xargs -0 sed -i 's/find "/find -L "/g' + # fix pyamdgpuinfo imports - replace pip_env.v_import with direct import + find . -type f -name "*.py" -print0 | xargs -0 sed -i 's/pip_env\.v_import("pyamdgpuinfo")/import pyamdgpuinfo/g' + + # remove pip_env import lines where only pyamdgpuinfo is being imported + find . -type f -name "*.py" -exec grep -l "pip_env" {} \; | while read file; do + if grep -q 'pip_env\.v_import("pyamdgpuinfo")' "$file" && ! grep -q 'pip_env\.v_import(' "$file" | grep -v pyamdgpuinfo; then + sed -i '/from.*pip_env import/d' "$file" + sed -i '/import.*pip_env/d' "$file" + fi + done + # BUILD FONTS mkdir -p $out/share/fonts/truetype for fontarchive in ./Source/arcs/Font_*.tar.gz; do From 416af78e06e5fd48996e8ee0a6be9975f791c805 Mon Sep 17 00:00:00 2001 From: Richard Henninger <56615615+richen604@users.noreply.github.com> Date: Mon, 6 Oct 2025 23:35:05 -0700 Subject: [PATCH 24/24] Revert "fix: update nixpkgs input and fix rofi WIP (#151)" This reverts commit 524633123b0a2032d16b9f6d9b5f7bad8bf27040. --- flake.lock | 26 +++++++++++++------------- flake.nix | 2 +- hydenix/modules/hm/hyde.nix | 6 +----- hydenix/modules/hm/rofi.nix | 2 +- hydenix/sources/hyde.nix | 11 ----------- 5 files changed, 16 insertions(+), 31 deletions(-) diff --git a/flake.lock b/flake.lock index fbd6f5c4..8bfacded 100644 --- a/flake.lock +++ b/flake.lock @@ -25,11 +25,11 @@ ] }, "locked": { - "lastModified": 1758296614, - "narHash": "sha256-l60D1i0aaSqemy9dL7wP0ePMfcv/oZbeKpvUMY+q0kQ=", + "lastModified": 1756261190, + "narHash": "sha256-eiy0klFK5EVJLNilutR7grsZN/7Itj9DyD75eyOf83k=", "owner": "nix-community", "repo": "home-manager", - "rev": "55b1f5b7b191572257545413b98e37abab2fdb00", + "rev": "77f348da3176dc68b20a73dab94852a417daf361", "type": "github" }, "original": { @@ -118,17 +118,17 @@ }, "hydenix-nixpkgs": { "locked": { - "lastModified": 1758262103, - "narHash": "sha256-aBGl3XEOsjWw6W3AHiKibN7FeoG73dutQQEqnd/etR8=", + "lastModified": 1756288264, + "narHash": "sha256-Om8adB1lfkU7D33VpR+/haZ2gI5r3Q+ZbIPzE5sYnwE=", "owner": "nixos", "repo": "nixpkgs", - "rev": "12bd230118a1901a4a5d393f9f56b6ad7e571d01", + "rev": "ddd1826f294a0ee5fdc198ab72c8306a0ea73aa9", "type": "github" }, "original": { "owner": "nixos", "repo": "nixpkgs", - "rev": "12bd230118a1901a4a5d393f9f56b6ad7e571d01", + "rev": "ddd1826f294a0ee5fdc198ab72c8306a0ea73aa9", "type": "github" } }, @@ -160,11 +160,11 @@ ] }, "locked": { - "lastModified": 1757822619, - "narHash": "sha256-3HIpe3P2h1AUPYcAH9cjuX0tZOqJpX01c0iDwoUYNZ8=", + "lastModified": 1756008611, + "narHash": "sha256-rfTBWuTXi9/X7GhtF562FKNXKh2kvKb6dwI5lV1SjPE=", "owner": "nix-community", "repo": "nix-index-database", - "rev": "050a5feb5d1bb5b6e5fc04a7d3d816923a87c9ea", + "rev": "52dec1cb33a614accb9e01307e17816be974d24d", "type": "github" }, "original": { @@ -175,11 +175,11 @@ }, "nixos-hardware": { "locked": { - "lastModified": 1757943327, - "narHash": "sha256-w6cDExPBqbq7fTLo4dZ1ozDGeq3yV6dSN4n/sAaS6OM=", + "lastModified": 1756245047, + "narHash": "sha256-9bHzrVbjAudbO8q4vYFBWlEkDam31fsz0J7GB8k4AsI=", "owner": "NixOS", "repo": "nixos-hardware", - "rev": "67a709cfe5d0643dafd798b0b613ed579de8be05", + "rev": "a65b650d6981e23edd1afa1f01eb942f19cdcbb7", "type": "github" }, "original": { diff --git a/flake.nix b/flake.nix index 06f85ad7..6bbc7e66 100644 --- a/flake.nix +++ b/flake.nix @@ -3,7 +3,7 @@ inputs = { # Hydenix's nixpkgs - hydenix-nixpkgs.url = "github:nixos/nixpkgs/12bd230118a1901a4a5d393f9f56b6ad7e571d01"; + hydenix-nixpkgs.url = "github:nixos/nixpkgs/ddd1826f294a0ee5fdc198ab72c8306a0ea73aa9"; home-manager = { url = "github:nix-community/home-manager"; diff --git a/hydenix/modules/hm/hyde.nix b/hydenix/modules/hm/hyde.nix index 4a0ee6a3..9993a1a2 100644 --- a/hydenix/modules/hm/hyde.nix +++ b/hydenix/modules/hm/hyde.nix @@ -26,7 +26,6 @@ in Tela-circle-dracula kdePackages.kconfig # TODO: not sure if this is still needed wf-recorder # screen recorder for wlroots-based compositors such as sway - python-pyamdgpuinfo ]; fonts.fontconfig.enable = true; @@ -75,10 +74,7 @@ in }; ".local/bin/hyde-shell" = { - source = pkgs.writeShellScript "hyde-shell-wrapped" '' - export PYTHONPATH="${pkgs.python-pyamdgpuinfo}/${pkgs.python3.sitePackages}:$PYTHONPATH" - exec "${pkgs.hydenix.hyde}/Configs/.local/bin/hyde-shell" "$@" - ''; + source = "${pkgs.hydenix.hyde}/Configs/.local/bin/hyde-shell"; executable = true; }; diff --git a/hydenix/modules/hm/rofi.nix b/hydenix/modules/hm/rofi.nix index 8b6da48f..80db7dd4 100644 --- a/hydenix/modules/hm/rofi.nix +++ b/hydenix/modules/hm/rofi.nix @@ -19,7 +19,7 @@ in config = lib.mkIf cfg.enable { home.packages = with pkgs; [ - rofi # application launcher + rofi-wayland # application launcher ]; home.file = { diff --git a/hydenix/sources/hyde.nix b/hydenix/sources/hyde.nix index 9dc49137..4d8a3b14 100644 --- a/hydenix/sources/hyde.nix +++ b/hydenix/sources/hyde.nix @@ -26,17 +26,6 @@ pkgs.stdenv.mkDerivation { find . -type f -executable -print0 | xargs -0 sed -i 's/find "/find -L "/g' find . -type f -name "*.sh" -print0 | xargs -0 sed -i 's/find "/find -L "/g' - # fix pyamdgpuinfo imports - replace pip_env.v_import with direct import - find . -type f -name "*.py" -print0 | xargs -0 sed -i 's/pip_env\.v_import("pyamdgpuinfo")/import pyamdgpuinfo/g' - - # remove pip_env import lines where only pyamdgpuinfo is being imported - find . -type f -name "*.py" -exec grep -l "pip_env" {} \; | while read file; do - if grep -q 'pip_env\.v_import("pyamdgpuinfo")' "$file" && ! grep -q 'pip_env\.v_import(' "$file" | grep -v pyamdgpuinfo; then - sed -i '/from.*pip_env import/d' "$file" - sed -i '/import.*pip_env/d' "$file" - fi - done - # BUILD FONTS mkdir -p $out/share/fonts/truetype for fontarchive in ./Source/arcs/Font_*.tar.gz; do