diff --git a/homes/aarch64-linux/matt@macbook-pro-nixos/default.nix b/homes/aarch64-linux/matt@macbook-pro-nixos/default.nix index 7a99cdd..f19703b 100755 --- a/homes/aarch64-linux/matt@macbook-pro-nixos/default.nix +++ b/homes/aarch64-linux/matt@macbook-pro-nixos/default.nix @@ -124,9 +124,9 @@ in }; }; - home.packages = with pkgs; [ - pkgs.${namespace}.bolt-launcher - # pkgs.${namespace}.librepods + home.packages = with pkgs.${namespace}; [ + bolt-launcher + # librepods iw iwd diff --git a/homes/x86_64-linux/deck@steamdeck/default.nix b/homes/x86_64-linux/deck@steamdeck/default.nix index 782bec3..4f36fde 100755 --- a/homes/x86_64-linux/deck@steamdeck/default.nix +++ b/homes/x86_64-linux/deck@steamdeck/default.nix @@ -71,7 +71,6 @@ in }; home.packages = with pkgs; [ - pkgs.${namespace}.discord-krisp dolphin-emu heroic mgba @@ -79,5 +78,7 @@ in prismlauncher ryubing omnissa-horizon-client - ]; + ] ++ (with pkgs.${namespace}; [ + discord-krisp + ]); } diff --git a/homes/x86_64-linux/matt@matt-nixos/default.nix b/homes/x86_64-linux/matt@matt-nixos/default.nix index d8add02..b72ca25 100755 --- a/homes/x86_64-linux/matt@matt-nixos/default.nix +++ b/homes/x86_64-linux/matt@matt-nixos/default.nix @@ -164,10 +164,6 @@ in }; home.packages = with pkgs; [ - pkgs.${namespace}.bolt-launcher - pkgs.${namespace}.discord-krisp - # pkgs.${namespace}.librepods - compose2nix distrobox heroic @@ -188,7 +184,11 @@ in virt-manager vorta waydroid-helper - ]; + ] ++ (with pkgs.${namespace}; [ + bolt-launcher + discord-krisp + # librepods + ]); specialisation = { "cosmic".configuration = { diff --git a/modules/home/programs/hyprland/default.nix b/modules/home/programs/hyprland/default.nix index 3d1089c..678a3bb 100644 --- a/modules/home/programs/hyprland/default.nix +++ b/modules/home/programs/hyprland/default.nix @@ -66,11 +66,10 @@ in xorg.xhost xsettingsd xwayland - - pkgs.${namespace}.pipewire-python ] ++ (if cfg.notificationDaemon == "mako" then [ mako ] else [ dunst ]) - ++ (if cfg.launcher == "wofi" then [ wofi ] else [ rofi ]) + ++ (if cfg.launcher == "wofi" then [ wofi ] else [ rofi ]) + ++ (with pkgs.${namespace}; [ pipewire-python ]) ); # Session variables diff --git a/modules/home/programs/waybar/scripts/hass.nix b/modules/home/programs/waybar/scripts/hass.nix index 265cb80..c388a5b 100755 --- a/modules/home/programs/waybar/scripts/hass.nix +++ b/modules/home/programs/waybar/scripts/hass.nix @@ -8,8 +8,8 @@ let cfg = config.${namespace}.programs.waybar; - pythonEnv = pkgs.python3.withPackages (_ps: [ - pkgs.${namespace}.homeassistant-api + pythonEnv = pkgs.python3.withPackages (_ps: with pkgs.${namespace}; [ + homeassistant-api ]); waybar-hass = pkgs.writeScriptBin "waybar-hass" '' diff --git a/modules/nixos/gaming/default.nix b/modules/nixos/gaming/default.nix index 00da874..dd505aa 100755 --- a/modules/nixos/gaming/default.nix +++ b/modules/nixos/gaming/default.nix @@ -39,12 +39,12 @@ in dedicatedServer.openFirewall = true; extraCompatPackages = with pkgs; [ proton-ge-bin - - pkgs.${namespace}.proton-cachyos - pkgs.${namespace}.proton-cachyos-v3 - pkgs.${namespace}.proton-cachyos-v2 - pkgs.${namespace}.proton-cachyos-v1 - ]; + ] ++ (with pkgs.${namespace}; [ + proton-cachyos + proton-cachyos-v3 + proton-cachyos-v2 + proton-cachyos-v1 + ]); gamescopeSession = { enable = true; args = [ diff --git a/modules/nixos/hardware/raspberry-pi/audio.nix b/modules/nixos/hardware/raspberry-pi/audio.nix index 0af0485..8429707 100644 --- a/modules/nixos/hardware/raspberry-pi/audio.nix +++ b/modules/nixos/hardware/raspberry-pi/audio.nix @@ -18,24 +18,22 @@ in hardware.deviceTree = { overlays = [ ] - ++ ( + ++ (with pkgs.${namespace}; ( if (variant == "5") then [ { name = "pisound-pi5-overlay"; - dtsFile = "${ - pkgs.${namespace}.raspberrypi-overlays - }/dtbs/raspberrypi-overlays/pisound-pi5-overlay.dts"; + dtsFile = "${raspberrypi-overlays}/dtbs/raspberrypi-overlays/pisound-pi5-overlay.dts"; } ] else [ { name = "pisound-overlay"; - dtsFile = "${pkgs.${namespace}.raspberrypi-overlays}/dtbs/raspberrypi-overlays/pisound-overlay.dts"; + dtsFile = "${raspberrypi-overlays}/dtbs/raspberrypi-overlays/pisound-overlay.dts"; } ] - ); + )); }; }; } diff --git a/modules/nixos/homeassistant/services/homeassistant/default.nix b/modules/nixos/homeassistant/services/homeassistant/default.nix index 0cfda60..4c0cad7 100644 --- a/modules/nixos/homeassistant/services/homeassistant/default.nix +++ b/modules/nixos/homeassistant/services/homeassistant/default.nix @@ -233,21 +233,20 @@ in roborock_custom_map smartir versatile_thermostat - - # /packages - pkgs.${namespace}.ha-anycubic - pkgs.${namespace}.ha-bambulab - pkgs.${namespace}.ha-bedjet - pkgs.${namespace}.ha-gehome - pkgs.${namespace}.ha-icloud3 - pkgs.${namespace}.ha-local-llm - pkgs.${namespace}.ha-mail-and-packages - pkgs.${namespace}.ha-nanokvm - pkgs.${namespace}.ha-openhasp - pkgs.${namespace}.ha-overseerr - pkgs.${namespace}.ha-petlibro - pkgs.${namespace}.ha-wyzeapi - ]; + ] ++ (with pkgs.${namespace}; [ + ha-anycubic + ha-bambulab + ha-bedjet + ha-gehome + ha-icloud3 + ha-local-llm + ha-mail-and-packages + ha-nanokvm + ha-openhasp + ha-overseerr + ha-petlibro + ha-wyzeapi + ]); customLovelaceModules = with pkgs.home-assistant-custom-lovelace-modules; [ atomic-calendar-revive diff --git a/modules/nixos/nix/ccache/default.nix b/modules/nixos/nix/ccache/default.nix new file mode 100644 index 0000000..a6e42c3 --- /dev/null +++ b/modules/nixos/nix/ccache/default.nix @@ -0,0 +1,53 @@ +{ ... }: +{ + imports = [ ./overlays.nix ]; + + programs.ccache = { + enable = true; + packageNames = [ + "bcachefs" + "bcachefs-tools" + "dolphin-emu" + "ffmpeg" + "ffmpeg_8" + "ffmpeg_7" + "ffmpeg_6" + "ffmpeg-full" + "ffmpeg-headless" + "gamescope" + "gjs" + "gst-plugins-bad" + "gst-plugins-rs" + "gtk4" + "hipblaslt" + "jemalloc" + "jupiter-fan-control" + "libcamera-rpi" + "libsecret" + "linux" + "mesa" + "mesa_i686" + "mesa-radeonsi-jupiter" + "mesa-radv-jupiter" + "mgba" + "orca-slicer" + "opencv" + "opencv4" + "opencv4WithoutCuda" + "pipewire" + "qemu" + "qemu_kvm" + "qemu_full" + "qemu-host-cpu-only" + "qt3d" + "qtdeclarative" + "qtmultimedia" + "ryubing" + "sdl" + "sdl2" + "sdl3" + "webkitgtk" + ]; + cacheDir = "/var/cache/ccache"; + }; +} \ No newline at end of file diff --git a/modules/nixos/nix/ccache/overlays.nix b/modules/nixos/nix/ccache/overlays.nix new file mode 100644 index 0000000..8041e77 --- /dev/null +++ b/modules/nixos/nix/ccache/overlays.nix @@ -0,0 +1,177 @@ +{ pkgs, namespace, ... }: +{ + nixpkgs.overlays = [ + (_self: super: { + ${namespace} = + let + # clangCcacheStdenv = super.overrideCC super.llvmPackages.stdenv ( + # super.ccacheWrapper.override { + # cc = super.llvmPackages.stdenv.cc; + # extraConfig = '' + # export CCACHE_SLOPPINESS=include_file_ctime,time_macros + # export CCACHE_DIR=/var/cache/ccache + # ''; + # } + # ); + clangCcacheStdenv = pkgs.llvmPackages.stdenv; # pkgs.overrideCC pkgs.clangStdenv (pkgs.ccacheWrapper.override { cc = pkgs.llvmPackages.clangUseLLVM; }); + in + super.${namespace} + // { + linuxPackages_rpi5 = super.linuxPackagesFor ( + super.${namespace}.linux-rpi.override { stdenv = super.ccacheStdenv; } + ); + linuxPackages_rpi4 = super.linuxPackagesFor ( + super.${namespace}.linux-rpi.override { + stdenv = super.ccacheStdenv; + rpiVersion = 4; + } + ); + libraspberrypi = super.${namespace}.libraspberrypi.override { stdenv = super.ccacheStdenv; }; + raspberrypi-utils = super.${namespace}.raspberrypi-utils.override { stdenv = super.ccacheStdenv; }; + + linuxPackages_cachyos = super.${namespace}.linuxPackages_cachyos.override { + stdenv = super.ccacheStdenv; + }; + # linuxPackages_cachyos-lto = super.${namespace}.linuxPackages_cachyos-lto.override { + # stdenv = clangCcacheStdenv; + # }; + # linuxPackages_cachyos-lto-full = super.${namespace}.linuxPackages_cachyos-lto-full.override { + # stdenv = clangCcacheStdenv; + # }; + linuxPackages_cachyos-lts = super.${namespace}.linuxPackages_cachyos-lts.override { + stdenv = super.ccacheStdenv; + }; + # linuxPackages_cachyos-lts-lto = super.${namespace}.linuxPackages_cachyos-lts-lto.override { + # stdenv = clangCcacheStdenv; + # }; + # linuxPackages_cachyos-lto-znver4 = super.${namespace}.linuxPackages_cachyos-lto-znver4.override { + # stdenv = clangCcacheStdenv; + # }; + linuxPackages_cachyos-server = super.${namespace}.linuxPackages_cachyos-server.override { + stdenv = super.ccacheStdenv; + }; + # linuxPackages_cachyos-server-lto = super.${namespace}.linuxPackages_cachyos-server-lto.override { + # stdenv = clangCcacheStdenv; + # }; + # linuxPackages_cachyos-server-lto-znver4 = + # super.${namespace}.linuxPackages_cachyos-server-lto-znver4.override + # { stdenv = clangCcacheStdenv; }; + linuxPackages_cachyos-rc = super.${namespace}.linuxPackages_cachyos-rc.override { + stdenv = super.ccacheStdenv; + }; + # linuxPackages_cachyos-rc-lto = super.${namespace}.linuxPackages_cachyos-rc-lto.override { + # stdenv = clangCcacheStdenv; + # }; + # linuxPackages_cachyos-rc-lto-znver4 = + # super.${namespace}.linuxPackages_cachyos-rc-lto-znver4.override + # { stdenv = clangCcacheStdenv; }; + linuxPackages_cachyos-hardened = super.${namespace}.linuxPackages_cachyos-hardened.override { + stdenv = super.ccacheStdenv; + }; + # linuxPackages_cachyos-hardened-lto = + # super.${namespace}.linuxPackages_cachyos-hardened-lto.override + # { stdenv = clangCcacheStdenv; }; + # linuxPackages_cachyos-hardened-lto-znver4 = + # super.${namespace}.linuxPackages_cachyos-hardened-lto-znver4.override + # { stdenv = clangCcacheStdenv; }; + linuxPackages_cachyos-deckify = super.${namespace}.linuxPackages_cachyos-deckify.override { + stdenv = super.ccacheStdenv; + }; + # linuxPackages_cachyos-deckify-lto = super.${namespace}.linuxPackages_cachyos-deckify-lto.override { + # stdenv = clangCcacheStdenv; + # }; + }; + }) + + (_self: super: { + raspberrypi-utils = super.${namespace}.raspberrypi-utils; + raspberrypi-udev-rules = super.${namespace}.udev-rules; + }) + (_self: super: { + mesa = super.mesa.override { buildPackages.stdenv = super.ccacheStdenv; }; + }) + (_self: super: { + electron = super.stable.electron-bin; + electron_36 = super.stable.electron_36-bin; + electron_37 = super.stable.electron_37-bin; + }) + # (_self: super: { + # "webkitgtk_4_1" = super.stable."webkitgtk_4_1".override { clangStdenv = super.ccacheStdenv; }; + # }) + # (_self: super: { + # "webkitgtk_6_0" = super."webkitgtk_6_0".override { clangStdenv = super.ccacheStdenv; }; + # }) + (_self: super: { + "jellyfin-ffmpeg" = super."jellyfin-ffmpeg".override { + ffmpeg_7-full = super.ffmpeg_7-full.override { stdenv = super.ccacheStdenv; }; + }; + }) + # (self: super: { + # "ffmpeg-headless-rpi" = super."ffmpeg-headless-rpi".override { ffmpeg = super.ffmpeg_7.override { stdenv = super.ccacheStdenv; }; }; + # }) + + # todo: make these work + (_self: super: { + rocmPackages = super.stable.rocmPackages; + uv = super.stable.uv; + piper-tts = super.stable.piper-tts; + python3Packages = super.python3Packages // { + torch = super.stable.python3Packages.torch; + }; + }) + # (_self: super: { + # rocmPackages = super.rocmPackages // { + # hipblaslt = super.rocmPackages.hipblaslt.override { + # stdenv = super.ccacheStdenv; + # inherit gpuTargets; + # }; + # rocblas = super.rocmPackages.rocblas.override { + # # stdenv = super.ccacheStdenv; + # inherit gpuTargets; + # }; + # rocsolver = super.rocmPackages.rocsolver.override { + # # stdenv = super.ccacheStdenv; + # inherit gpuTargets; + # }; + # }; + # }) + (_self: super: { + pcsx2 = super.pcsx2.override { + llvmPackages = super.llvmPackages // { + stdenv = super.ccacheStdenv; + }; + }; + }) + (_self: super: { + driversi686Linux = super.driversi686Linux // { + mesa = super.driversi686Linux.mesa.override { + stdenv = super.ccacheStdenv; + buildPackages = super.driversi686Linux.mesa.buildPackages // { + stdenv = super.ccacheStdenv; + }; + }; + }; + }) + (_self: super: { + kdePackages = super.kdePackages // { + qt3d = super.kdePackages.qt3d.override { + qtbase = super.kdePackages.qtbase.override { stdenv = super.ccacheStdenv; }; + }; + qtwebengine = super.stable.kdePackages.qtwebengine; # .override { stdenv = super.ccacheStdenv; }; + }; + }) + # (_self: super: { + # python3Packages = super.python3Packages // { + # torch = super.python3Packages.torch.override { + # stdenv = super.ccacheStdenv; + # inherit gpuTargets; + # }; + # }; + # }) + # (_self: super: { + # piper-tts = super.piper-tts.overridePythonAttrs (oldAttrs: { + # pythonCatchConflictsPhase = null; + # }); + # }) + ]; +} \ No newline at end of file diff --git a/modules/nixos/nix/default.nix b/modules/nixos/nix/default.nix index 713b830..913d219 100644 --- a/modules/nixos/nix/default.nix +++ b/modules/nixos/nix/default.nix @@ -6,236 +6,6 @@ ... }: { - programs.ccache = { - enable = true; - packageNames = [ - "bcachefs" - "bcachefs-tools" - "dolphin-emu" - # "ffmpeg" - "ffmpeg_8" - "ffmpeg_7" - "ffmpeg_6" - "ffmpeg-full" - "ffmpeg-headless" - "gamescope" - "gjs" - "gst-plugins-bad" - "gst-plugins-rs" - "gtk4" - "hipblaslt" - "jemalloc" - "jupiter-fan-control" - "libcamera-rpi" - "libsecret" - "linux" - "mesa" - "mesa_i686" - "mesa-radeonsi-jupiter" - "mesa-radv-jupiter" - "mgba" - "orca-slicer" - # "onnxruntime" - "opencv" - "opencv4" - "opencv4WithoutCuda" - "pipewire" - "qemu" - "qemu_kvm" - "qemu_full" - "qemu-host-cpu-only" - "qt3d" - "qtdeclarative" - "qtmultimedia" - "ryubing" - "sdl" - "sdl2" - "sdl3" - # "uv" - "webkitgtk" - ]; - cacheDir = "/var/cache/ccache"; # default location - }; - - nixpkgs.overlays = [ - (_self: super: { - ${namespace} = - let - # clangCcacheStdenv = super.overrideCC super.llvmPackages.stdenv ( - # super.ccacheWrapper.override { - # cc = super.llvmPackages.stdenv.cc; - # extraConfig = '' - # export CCACHE_SLOPPINESS=include_file_ctime,time_macros - # export CCACHE_DIR=/var/cache/ccache - # ''; - # } - # ); - clangCcacheStdenv = pkgs.overrideCC pkgs.ccacheStdenv (pkgs.ccacheWrapper.override { cc = pkgs.clang; }); - in - super.${namespace} - // { - linuxPackages_rpi5 = super.linuxPackagesFor ( - super.${namespace}.linux-rpi.override { stdenv = super.ccacheStdenv; } - ); - linuxPackages_rpi4 = super.linuxPackagesFor ( - super.${namespace}.linux-rpi.override { - stdenv = super.ccacheStdenv; - rpiVersion = 4; - } - ); - libraspberrypi = super.${namespace}.libraspberrypi.override { stdenv = super.ccacheStdenv; }; - raspberrypi-utils = super.${namespace}.raspberrypi-utils.override { stdenv = super.ccacheStdenv; }; - - linuxPackages_cachyos = super.${namespace}.linuxPackages_cachyos.override { - stdenv = super.ccacheStdenv; - }; - # linuxPackages_cachyos-lto = super.${namespace}.linuxPackages_cachyos-lto.override { - # stdenv = clangCcacheStdenv; - # }; - # linuxPackages_cachyos-lto-full = super.${namespace}.linuxPackages_cachyos-lto-full.override { - # stdenv = clangCcacheStdenv; - # }; - linuxPackages_cachyos-lts = super.${namespace}.linuxPackages_cachyos-lts.override { - stdenv = super.ccacheStdenv; - }; - # linuxPackages_cachyos-lts-lto = super.${namespace}.linuxPackages_cachyos-lts-lto.override { - # stdenv = clangCcacheStdenv; - # }; - # linuxPackages_cachyos-lto-znver4 = super.${namespace}.linuxPackages_cachyos-lto-znver4.override { - # stdenv = clangCcacheStdenv; - # }; - linuxPackages_cachyos-server = super.${namespace}.linuxPackages_cachyos-server.override { - stdenv = super.ccacheStdenv; - }; - # linuxPackages_cachyos-server-lto = super.${namespace}.linuxPackages_cachyos-server-lto.override { - # stdenv = clangCcacheStdenv; - # }; - # linuxPackages_cachyos-server-lto-znver4 = - # super.${namespace}.linuxPackages_cachyos-server-lto-znver4.override - # { stdenv = clangCcacheStdenv; }; - linuxPackages_cachyos-rc = super.${namespace}.linuxPackages_cachyos-rc.override { - stdenv = super.ccacheStdenv; - }; - # linuxPackages_cachyos-rc-lto = super.${namespace}.linuxPackages_cachyos-rc-lto.override { - # stdenv = clangCcacheStdenv; - # }; - # linuxPackages_cachyos-rc-lto-znver4 = - # super.${namespace}.linuxPackages_cachyos-rc-lto-znver4.override - # { stdenv = clangCcacheStdenv; }; - linuxPackages_cachyos-hardened = super.${namespace}.linuxPackages_cachyos-hardened.override { - stdenv = super.ccacheStdenv; - }; - # linuxPackages_cachyos-hardened-lto = - # super.${namespace}.linuxPackages_cachyos-hardened-lto.override - # { stdenv = clangCcacheStdenv; }; - # linuxPackages_cachyos-hardened-lto-znver4 = - # super.${namespace}.linuxPackages_cachyos-hardened-lto-znver4.override - # { stdenv = clangCcacheStdenv; }; - linuxPackages_cachyos-deckify = super.${namespace}.linuxPackages_cachyos-deckify.override { - stdenv = super.ccacheStdenv; - }; - linuxPackages_cachyos-deckify-lto = super.${namespace}.linuxPackages_cachyos-deckify-lto.override { - stdenv = clangCcacheStdenv; - }; - }; - }) - - (_self: super: { - "raspberrypi-utils" = super.${namespace}."raspberrypi-utils"; - "raspberrypi-udev-rules" = super.${namespace}."udev-rules"; - }) - (_self: super: { - "mesa" = super."mesa".override { buildPackages.stdenv = super.ccacheStdenv; }; - }) - (_self: super: { - "raspberrypi-utils" = super.${namespace}."raspberrypi-utils"; - }) - (_self: super: { - electron = super.stable.electron-bin; - electron_36 = super.stable.electron_36-bin; - electron_37 = super.stable.electron_37-bin; - }) - # (_self: super: { - # "webkitgtk_4_1" = super.stable."webkitgtk_4_1".override { clangStdenv = super.ccacheStdenv; }; - # }) - # (_self: super: { - # "webkitgtk_6_0" = super."webkitgtk_6_0".override { clangStdenv = super.ccacheStdenv; }; - # }) - (_self: super: { - "jellyfin-ffmpeg" = super."jellyfin-ffmpeg".override { - ffmpeg_7-full = super.ffmpeg_7-full.override { stdenv = super.ccacheStdenv; }; - }; - }) - # (self: super: { - # "ffmpeg-headless-rpi" = super."ffmpeg-headless-rpi".override { ffmpeg = super.ffmpeg_7.override { stdenv = super.ccacheStdenv; }; }; - # }) - - # todo: make these work - (_self: super: { - rocmPackages = super.stable.rocmPackages; - uv = super.stable.uv; - # libsecret = super.stable.libsecret; - piper-tts = super.stable.piper-tts; - python3Packages = super.python3Packages // { - torch = super.stable.python3Packages.torch; - }; - }) - # (_self: super: { - # rocmPackages = super.rocmPackages // { - # hipblaslt = super.rocmPackages.hipblaslt.override { - # stdenv = super.ccacheStdenv; - # inherit gpuTargets; - # }; - # rocblas = super.rocmPackages.rocblas.override { - # # stdenv = super.ccacheStdenv; - # inherit gpuTargets; - # }; - # rocsolver = super.rocmPackages.rocsolver.override { - # # stdenv = super.ccacheStdenv; - # inherit gpuTargets; - # }; - # }; - # }) - (_self: super: { - pcsx2 = super.pcsx2.override { - llvmPackages = super.llvmPackages // { - stdenv = super.ccacheStdenv; - }; - }; - }) - (_self: super: { - driversi686Linux = super.driversi686Linux // { - mesa = super.driversi686Linux.mesa.override { - stdenv = super.ccacheStdenv; - buildPackages = super.driversi686Linux.mesa.buildPackages // { - stdenv = super.ccacheStdenv; - }; - }; - }; - }) - (_self: super: { - kdePackages = super.kdePackages // { - qt3d = super.kdePackages.qt3d.override { - qtbase = super.kdePackages.qtbase.override { stdenv = super.ccacheStdenv; }; - }; - qtwebengine = super.stable.kdePackages.qtwebengine; # .override { stdenv = super.ccacheStdenv; }; - }; - }) - # (_self: super: { - # python3Packages = super.python3Packages // { - # torch = super.python3Packages.torch.override { - # stdenv = super.ccacheStdenv; - # inherit gpuTargets; - # }; - # }; - # }) - # (_self: super: { - # piper-tts = super.piper-tts.overridePythonAttrs (oldAttrs: { - # pythonCatchConflictsPhase = null; - # }); - # }) - ]; - nix = { settings = { extra-sandbox-paths = [ config.programs.ccache.cacheDir ]; diff --git a/overlays/age-plugin-yubikey/default.nix b/overlays/age-plugin-yubikey/default.nix index a644b2d..0bbb05b 100644 --- a/overlays/age-plugin-yubikey/default.nix +++ b/overlays/age-plugin-yubikey/default.nix @@ -9,10 +9,16 @@ final: prev: # librsvg = final.stable.librsvg; fish = final.stable.fish; vesktop = final.stable.vesktop; + showtime = final.stable.showtime; rustPlatform = final.unstable.rustPlatform // { cargo-deps-vendor = final.stable.rustPlatform.cargo-deps-vendor; }; python3Packages = final.unstable.python3Packages // { aiohttp = final.stable.python3Packages.aiohttp; + torch = final.stable.python3Packages.torch; }; + rocmPackages = final.stable.rocmPackages; + uv = final.stable.uv; + piper-tts = final.stable.piper-tts; + elfutils = final.stable.elfutils; } diff --git a/packages/homeassistant/ha-anycubic/default.nix b/packages/homeassistant/ha-anycubic/default.nix index e27b313..bf242b9 100644 --- a/packages/homeassistant/ha-anycubic/default.nix +++ b/packages/homeassistant/ha-anycubic/default.nix @@ -18,8 +18,8 @@ buildHomeAssistantComponent rec { # PYTHONPATH = [ "${src}/uart-wifi" ]; - propagatedBuildInputs = [ - pkgs.${namespace}.uart-wifi + nativeBuildInputs = with pkgs.${namespace}; [ + uart-wifi ]; meta = { diff --git a/packages/homeassistant/ha-bambulab/default.nix b/packages/homeassistant/ha-bambulab/default.nix index c1005c2..2e1bb53 100644 --- a/packages/homeassistant/ha-bambulab/default.nix +++ b/packages/homeassistant/ha-bambulab/default.nix @@ -16,7 +16,7 @@ buildHomeAssistantComponent rec { hash = "sha256-47u2oG8MvEX0B8fu1Hs9sV7EXwPyOVRWNn6Mb4BpHGI="; }; - propagatedBuildInputs = with python3Packages; [ + nativeBuildInputs = with python3Packages; [ beautifulsoup4 ]; diff --git a/packages/homeassistant/ha-bedjet/default.nix b/packages/homeassistant/ha-bedjet/default.nix index 41cccbb..f190532 100644 --- a/packages/homeassistant/ha-bedjet/default.nix +++ b/packages/homeassistant/ha-bedjet/default.nix @@ -16,7 +16,7 @@ buildHomeAssistantComponent rec { hash = "sha256-Zuidx6YrjqDzgtOTW380Rfzi1zHqJ07IrgBYztfM2II="; }; - propagatedBuildInputs = with python3Packages; [ + nativeBuildInputs = with python3Packages; [ beautifulsoup4 ]; diff --git a/packages/homeassistant/ha-gehome/default.nix b/packages/homeassistant/ha-gehome/default.nix index 364555d..476c6a4 100644 --- a/packages/homeassistant/ha-gehome/default.nix +++ b/packages/homeassistant/ha-gehome/default.nix @@ -3,6 +3,7 @@ fetchFromGitHub, python3Packages, namespace, + pkgs, ... }: buildHomeAssistantComponent rec { @@ -17,13 +18,13 @@ buildHomeAssistantComponent rec { hash = "sha256-hxgQsHb0E/XQEZoVFtKOgdHEVsU5UgqhOjjkgKqlI1I="; }; - propagatedBuildInputs = with python3Packages; [ + nativeBuildInputs = with python3Packages; [ # gehomesdk slixmpp - - pkgs.${namespace}.gehomesdk - pkgs.${namespace}.magicattr - ]; + ] ++ (with pkgs.${namespace}; [ + gehomesdk + magicattr + ]); meta = { changelog = "https://github.com/simbaja/ha_gehome/releases/tag/${version}"; diff --git a/packages/homeassistant/ha-icloud3/default.nix b/packages/homeassistant/ha-icloud3/default.nix index b35b625..2413b84 100644 --- a/packages/homeassistant/ha-icloud3/default.nix +++ b/packages/homeassistant/ha-icloud3/default.nix @@ -16,7 +16,7 @@ buildHomeAssistantComponent rec { hash = "sha256-5uw1guGLTpaLPjhXQ6jP7kA0iWdbEgNZ/vnBjJWeCPA="; }; - propagatedBuildInputs = with python3Packages; [ + nativeBuildInputs = with python3Packages; [ fido2 srp ]; diff --git a/packages/homeassistant/ha-local-llm/default.nix b/packages/homeassistant/ha-local-llm/default.nix index 05df846..e0b97f8 100644 --- a/packages/homeassistant/ha-local-llm/default.nix +++ b/packages/homeassistant/ha-local-llm/default.nix @@ -16,7 +16,7 @@ buildHomeAssistantComponent rec { hash = "sha256-be4cW3f30G32MGl49YGja9/SlMHdnQ9IguuY14wgKGI="; }; - propagatedBuildInputs = with python3Packages; [ + nativeBuildInputs = with python3Packages; [ huggingface-hub ollama webcolors diff --git a/packages/homeassistant/ha-mail-and-packages/default.nix b/packages/homeassistant/ha-mail-and-packages/default.nix index c282bdb..26ef574 100644 --- a/packages/homeassistant/ha-mail-and-packages/default.nix +++ b/packages/homeassistant/ha-mail-and-packages/default.nix @@ -16,7 +16,7 @@ buildHomeAssistantComponent rec { hash = "sha256-8UNmtHxioyrmYd9ILkbLOByzu+K+r2svKkzv9mzc3eA="; }; - propagatedBuildInputs = with python3Packages; [ + nativeBuildInputs = with python3Packages; [ beautifulsoup4 dateparser pillow diff --git a/packages/homeassistant/ha-nanokvm/default.nix b/packages/homeassistant/ha-nanokvm/default.nix index 122129e..582400d 100644 --- a/packages/homeassistant/ha-nanokvm/default.nix +++ b/packages/homeassistant/ha-nanokvm/default.nix @@ -17,8 +17,8 @@ buildHomeAssistantComponent rec { hash = "sha256-vXVl+9TIWswNemoUqjeQsTJDPh/OjHUf237QU3OaqJU="; }; - propagatedBuildInputs = [ - pkgs.${namespace}.python-nanokvm + nativeBuildInputs = with pkgs.${namespace}; [ + python-nanokvm ]; postPatch = '' diff --git a/packages/homeassistant/ha-openhasp/default.nix b/packages/homeassistant/ha-openhasp/default.nix index e1cee54..ccec107 100644 --- a/packages/homeassistant/ha-openhasp/default.nix +++ b/packages/homeassistant/ha-openhasp/default.nix @@ -17,7 +17,7 @@ buildHomeAssistantComponent rec { hash = "sha256-5h1EqwpnsmWexqB3J/X4OcN9bfBYUxGxLF1Hrmoi5LY="; }; - propagatedBuildInputs = with pkgs.python3Packages; [ + nativeBuildInputs = with pkgs.python3Packages; [ jsonschema ]; diff --git a/packages/homeassistant/ha-overseerr/default.nix b/packages/homeassistant/ha-overseerr/default.nix index 041039a..cfa841c 100644 --- a/packages/homeassistant/ha-overseerr/default.nix +++ b/packages/homeassistant/ha-overseerr/default.nix @@ -17,8 +17,8 @@ buildHomeAssistantComponent rec { hash = "sha256-UvUowCgfay9aRV+iC/AQ9vvJzhGZbH+/1kVjxPFBKcI="; }; - propagatedBuildInputs = [ - pkgs.${namespace}.pyoverseerr + nativeBuildInputs = with pkgs.${namespace}; [ + pyoverseerr ]; meta = { diff --git a/packages/homeassistant/ha-wyzeapi/default.nix b/packages/homeassistant/ha-wyzeapi/default.nix index 6fe0044..694994e 100644 --- a/packages/homeassistant/ha-wyzeapi/default.nix +++ b/packages/homeassistant/ha-wyzeapi/default.nix @@ -17,8 +17,8 @@ buildHomeAssistantComponent rec { hash = "sha256-J9VFNImri0xF8RfND1bZl12CreKA023eHsXFNVt1YNQ="; }; - propagatedBuildInputs = [ - pkgs.${namespace}.wyzeapy + nativeBuildInputs = with pkgs.${namespace}; [ + wyzeapy ]; postPatch = '' diff --git a/packages/linux-cachyos/config-nix/x86_64-linux/cachyos-lto.x86_64-linux.nix b/packages/linux-cachyos/config-nix/x86_64-linux/cachyos-lto.x86_64-linux.nix index 5b29e19..8420f9d 100644 --- a/packages/linux-cachyos/config-nix/x86_64-linux/cachyos-lto.x86_64-linux.nix +++ b/packages/linux-cachyos/config-nix/x86_64-linux/cachyos-lto.x86_64-linux.nix @@ -1,13 +1,13 @@ { - "CONFIG_CC_VERSION_TEXT" = "clang version 21.1.2"; + "CONFIG_CC_VERSION_TEXT" = "clang version 21.1.7"; "CONFIG_GCC_VERSION" = "0"; "CONFIG_CC_IS_CLANG" = "y"; - "CONFIG_CLANG_VERSION" = "210102"; + "CONFIG_CLANG_VERSION" = "210107"; "CONFIG_AS_IS_LLVM" = "y"; - "CONFIG_AS_VERSION" = "210102"; + "CONFIG_AS_VERSION" = "210107"; "CONFIG_LD_VERSION" = "0"; "CONFIG_LD_IS_LLD" = "y"; - "CONFIG_LLD_VERSION" = "210102"; + "CONFIG_LLD_VERSION" = "210107"; "CONFIG_RUSTC_VERSION" = "0"; "CONFIG_RUSTC_LLVM_VERSION" = "0"; "CONFIG_CC_HAS_ASM_GOTO_OUTPUT" = "y"; @@ -19,7 +19,7 @@ "CONFIG_CC_HAS_COUNTED_BY" = "y"; "CONFIG_CC_HAS_MULTIDIMENSIONAL_NONSTRING" = "y"; "CONFIG_LD_CAN_USE_KEEP_IN_OVERLAY" = "y"; - "CONFIG_PAHOLE_VERSION" = "130"; + "CONFIG_PAHOLE_VERSION" = "131"; "CONFIG_IRQ_WORK" = "y"; "CONFIG_BUILDTIME_TABLE_SORT" = "y"; "CONFIG_THREAD_INFO_IN_TASK" = "y"; diff --git a/packages/linux-cachyos/config-nix/x86_64-linux/cachyos-server-lto.x86_64-linux.nix b/packages/linux-cachyos/config-nix/x86_64-linux/cachyos-server-lto.x86_64-linux.nix index 2cadaa5..11f2f37 100644 --- a/packages/linux-cachyos/config-nix/x86_64-linux/cachyos-server-lto.x86_64-linux.nix +++ b/packages/linux-cachyos/config-nix/x86_64-linux/cachyos-server-lto.x86_64-linux.nix @@ -1,13 +1,13 @@ { - "CONFIG_CC_VERSION_TEXT" = "clang version 21.1.2"; + "CONFIG_CC_VERSION_TEXT" = "clang version 21.1.7"; "CONFIG_GCC_VERSION" = "0"; "CONFIG_CC_IS_CLANG" = "y"; - "CONFIG_CLANG_VERSION" = "210102"; + "CONFIG_CLANG_VERSION" = "210107"; "CONFIG_AS_IS_LLVM" = "y"; - "CONFIG_AS_VERSION" = "210102"; + "CONFIG_AS_VERSION" = "210107"; "CONFIG_LD_VERSION" = "0"; "CONFIG_LD_IS_LLD" = "y"; - "CONFIG_LLD_VERSION" = "210102"; + "CONFIG_LLD_VERSION" = "210107"; "CONFIG_RUSTC_VERSION" = "0"; "CONFIG_RUSTC_LLVM_VERSION" = "0"; "CONFIG_CC_HAS_ASM_GOTO_OUTPUT" = "y"; @@ -19,7 +19,7 @@ "CONFIG_CC_HAS_COUNTED_BY" = "y"; "CONFIG_CC_HAS_MULTIDIMENSIONAL_NONSTRING" = "y"; "CONFIG_LD_CAN_USE_KEEP_IN_OVERLAY" = "y"; - "CONFIG_PAHOLE_VERSION" = "130"; + "CONFIG_PAHOLE_VERSION" = "131"; "CONFIG_IRQ_WORK" = "y"; "CONFIG_BUILDTIME_TABLE_SORT" = "y"; "CONFIG_THREAD_INFO_IN_TASK" = "y"; diff --git a/packages/steamdeck-bios-manager/default.nix b/packages/steamdeck-bios-manager/default.nix index 4c095e7..000fee2 100644 --- a/packages/steamdeck-bios-manager/default.nix +++ b/packages/steamdeck-bios-manager/default.nix @@ -27,7 +27,7 @@ stdenv.mkDerivation { ''; # runtime deps - propagatedBuildInputs = [ + nativeBuildInputs = [ pciutils bash ];