diff --git a/modules/home/stylix/default.nix b/modules/home/stylix/default.nix index e2b68db..e4eaf3f 100644 --- a/modules/home/stylix/default.nix +++ b/modules/home/stylix/default.nix @@ -33,6 +33,7 @@ in { stylix = { enable = true; + overlays.enable = false; enableReleaseChecks = false; base16Scheme = "${pkgs.base16-schemes}/share/themes/nord.yaml"; polarity = "dark"; diff --git a/modules/nixos/home/default.nix b/modules/nixos/home/default.nix index 8502e8f..ff4dc2c 100644 --- a/modules/nixos/home/default.nix +++ b/modules/nixos/home/default.nix @@ -48,7 +48,7 @@ in backupFileExtension = "backup"; useGlobalPkgs = true; - useUserPackages = true; + useUserPackages = false; # Pass inputs so external modules can access them extraSpecialArgs = { diff --git a/modules/nixos/nix/ccache/overlays.nix b/modules/nixos/nix/ccache/overlays.nix deleted file mode 100644 index 23b8139..0000000 --- a/modules/nixos/nix/ccache/overlays.nix +++ /dev/null @@ -1,148 +0,0 @@ -{ pkgs, namespace, ... }: -{ - nixpkgs.overlays = [ - (_self: super: { - ${namespace} = 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: { - # "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; }; }; - # }) - # (_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; - # }); - # }) - ]; -} diff --git a/overlays/ccache/default.nix b/overlays/ccache/default.nix new file mode 100644 index 0000000..e051776 --- /dev/null +++ b/overlays/ccache/default.nix @@ -0,0 +1,129 @@ +{ namespace, ... }: +final: super: { + # ${namespace} = 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; + # # }; + # }; + + # raspberrypi-utils = super.${namespace}.raspberrypi-utils; + # raspberrypi-udev-rules = super.${namespace}.udev-rules; + # mesa = super.mesa.override { buildPackages.stdenv = super.ccacheStdenv; }; + + # # "webkitgtk_4_1" = super.stable."webkitgtk_4_1".override { clangStdenv = super.ccacheStdenv; }; + # # "webkitgtk_6_0" = super."webkitgtk_6_0".override { clangStdenv = super.ccacheStdenv; }; + + # "jellyfin-ffmpeg" = super."jellyfin-ffmpeg".override { + # ffmpeg_7-full = super.ffmpeg_7-full.override { stdenv = super.ccacheStdenv; }; + # }; + + # # "ffmpeg-headless-rpi" = super."ffmpeg-headless-rpi".override { ffmpeg = super.ffmpeg_7.override { stdenv = super.ccacheStdenv; }; }; + + # # 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; + # # }; + # # }; + + # pcsx2 = super.pcsx2.override { + # llvmPackages = super.llvmPackages // { + # stdenv = super.ccacheStdenv; + # }; + # }; + + # driversi686Linux = super.driversi686Linux // { + # mesa = super.driversi686Linux.mesa.override { + # stdenv = super.ccacheStdenv; + # buildPackages = super.driversi686Linux.mesa.buildPackages // { + # stdenv = super.ccacheStdenv; + # }; + # }; + # }; + + # 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; }; + # }; + + # # python3Packages = super.python3Packages // { + # # torch = super.python3Packages.torch.override { + # # stdenv = super.ccacheStdenv; + # # inherit gpuTargets; + # # }; + # # }; + + # # piper-tts = super.piper-tts.overridePythonAttrs (oldAttrs: { + # # pythonCatchConflictsPhase = null; + # # }); +}