refactor: rename legacyPackages to scopedPackages

README.md

@@ -43,7 +43,7 @@ sudo ln -sf /home/matt/.nix /etc/nixos
 | `nixosConfigurations`              | [devices](https://git.nelim.org/matt1432/nixos-configs/src/branch/master/devices)' + ISO's configurations |
 | `nixOnDroidConfigurations.default` | [Nix-On-Droid](https://git.nelim.org/matt1432/nixos-configs/src/branch/master/devices/android)'s configuration |
 | `packages`                         | Some custom [packages](https://git.nelim.org/matt1432/nixos-configs/src/branch/master/packages) not available in nixpkgs or modified from it |
-| `legacyPackages`                   | Some custom [package scopes](https://git.nelim.org/matt1432/nixos-configs/src/branch/master/legacyPackages) not available in nixpkgs or modified from it |
+| `scopedPackages`                   | Some custom [package scopes](https://git.nelim.org/matt1432/nixos-configs/src/branch/master/scopedPackages) not available in nixpkgs or modified from it |
 | `apps`                             | Scripts ran from the flake defined [here](https://git.nelim.org/matt1432/nixos-configs/src/branch/master/apps) |
 | `homeManagerModules`               | [Modules](https://git.nelim.org/matt1432/nixos-configs/src/branch/master/homeManagerModules) made for home-manager |
 | `homeManagerModules`               | [Modules](https://git.nelim.org/matt1432/nixos-configs/src/branch/master/nixosModules) made for NixOS systems |

apps/update-sources/src/firefox.ts

@@ -8,7 +8,7 @@ const FLAKE = process.env.FLAKE;
 export const updateFirefoxAddons = () => {
     console.log('Updating firefox addons using mozilla-addons-to-nix');
 
-    const DIR = `${FLAKE}/legacyPackages/firefox-addons`;
+    const DIR = `${FLAKE}/scopedPackages/firefox-addons`;
     const GENERATED_FILE = `${DIR}/generated-firefox-addons.nix`;
     const SLUGS = `${DIR}/addons.json`;
 
@@ -27,7 +27,7 @@ export const updateFirefoxAddons = () => {
 
     const OLD_VERS = Object.fromEntries([...JSON.parse(spawnSync('nix', [
         'eval',
-        '.#legacyPackages.x86_64-linux.firefoxAddons',
+        '.#scopedPackages.x86_64-linux.firefoxAddons',
         '--apply',
         nixExpr,
         '--json',

common/home/bash/programs.nix

@@ -44,7 +44,7 @@
       enable = true;
 
       config.theme = "dracula-bat";
-      themes.dracula-bat.src = self.legacyPackages.${pkgs.system}.dracula.bat;
+      themes.dracula-bat.src = self.scopedPackages.${pkgs.system}.dracula.bat;
 
       extraPackages = builtins.attrValues {
         inherit (pkgs.bat-extras) batman;

common/home/git/default.nix

@@ -17,7 +17,7 @@ in {
       lfs.enable = true;
 
       includes = [
-        {path = toString self.legacyPackages.${pkgs.system}.dracula.git;}
+        {path = toString self.scopedPackages.${pkgs.system}.dracula.git;}
 
         (mkDefaultRemote "https://github.com")
         (mkDefaultRemote "git@github.com")

devices/homie/modules/home-assistant/assist.nix

@@ -53,7 +53,7 @@
 
       customComponents = builtins.attrValues {
         inherit
-          (self.legacyPackages.${pkgs.system}.hass-components)
+          (self.scopedPackages.${pkgs.system}.hass-components)
           extended-ollama-conversation # url is without subdirectory
           ha-fallback-conversation
           tuya-local

devices/homie/modules/home-assistant/default.nix

@@ -33,7 +33,7 @@
 
     customComponents = builtins.attrValues {
       inherit
-        (self.legacyPackages.${pkgs.system}.hass-components)
+        (self.scopedPackages.${pkgs.system}.hass-components)
         yamaha-soundbar
         ;
     };

devices/homie/modules/home-assistant/frontend.nix

@@ -83,7 +83,7 @@ in {
 
     customComponents = builtins.attrValues {
       inherit
-        (self.legacyPackages.${pkgs.system}.hass-components)
+        (self.scopedPackages.${pkgs.system}.hass-components)
         material-symbols
         ;
     };
@@ -96,7 +96,7 @@ in {
         ;
 
       inherit
-        (self.legacyPackages.${pkgs.system}.lovelace-components)
+        (self.scopedPackages.${pkgs.system}.lovelace-components)
         custom-sidebar
         ;
     };

devices/homie/modules/home-assistant/netdaemon/default.nix

@@ -34,7 +34,7 @@ in {
   services.home-assistant = {
     customComponents = attrValues {
       inherit
-        (self.legacyPackages.${pkgs.system}.hass-components)
+        (self.scopedPackages.${pkgs.system}.hass-components)
         netdaemon
         ;
     };

devices/homie/modules/home-assistant/spotify.nix

@@ -7,7 +7,7 @@
   services.home-assistant = {
     customComponents = builtins.attrValues {
       inherit
-        (self.legacyPackages.${pkgs.system}.hass-components)
+        (self.scopedPackages.${pkgs.system}.hass-components)
         spotifyplus
         ;
     };

devices/wim/default.nix

@@ -92,7 +92,7 @@ in {
     enable = true;
     theme = "dracula";
     themePackages = [
-      self.legacyPackages.${pkgs.system}.dracula.plymouth
+      self.scopedPackages.${pkgs.system}.dracula.plymouth
     ];
   };
 

homeManagerModules/firefox/default.nix

@@ -3,7 +3,7 @@ self: {
   pkgs,
   ...
 }: let
-  inherit (self.legacyPackages.${pkgs.system}) firefoxAddons;
+  inherit (self.scopedPackages.${pkgs.system}) firefoxAddons;
 
   rounding = (config.wayland.windowManager.hyprland.settings.decoration.rounding or 2) - 2;
 
@@ -22,6 +22,7 @@ in {
 
     programs.firefox = {
       enable = true;
+
       profiles.matt = {
         isDefault = true;
         id = 0;

nixosModules/desktop/environment/home/mpv.nix

@@ -1,6 +1,6 @@
 self: {pkgs, ...}: {
   config = let
-    inherit (self.legacyPackages.${pkgs.system}) mpvScripts;
+    inherit (self.scopedPackages.${pkgs.system}) mpvScripts;
   in {
     # For kdialog-open-files
     home.packages = [

nixosModules/desktop/environment/modules/packages.nix

@@ -71,7 +71,7 @@ in {
           startup_commands = "toggle_custom_color";
           ui_font = "JetBrainsMono Nerd Font Mono Regular";
           font_size = "24";
-          source = toString self.legacyPackages.${pkgs.system}.dracula.sioyek;
+          source = toString self.scopedPackages.${pkgs.system}.dracula.sioyek;
         };
       };
 

nixosModules/desktop/theme/cursors.nix

@@ -1,6 +1,6 @@
 self: {pkgs, ...}: {
   config = let
-    inherit (self.legacyPackages.${pkgs.system}) dracula;
+    inherit (self.scopedPackages.${pkgs.system}) dracula;
 
     cursorTheme = dracula.hyprcursor;
     cursorThemeName = "Dracula-cursors";

nixosModules/desktop/theme/hyprpaper.nix

@@ -5,7 +5,7 @@ self: {
 }: {
   config = let
     hyprpaper = self.inputs.hyprpaper.packages.${pkgs.system}.default;
-    wallpaper = toString self.legacyPackages.${pkgs.system}.dracula.wallpaper;
+    wallpaper = toString self.scopedPackages.${pkgs.system}.dracula.wallpaper;
   in {
     home.packages = [hyprpaper];
 

nixosModules/desktop/theme/qt.nix

@@ -5,7 +5,7 @@ self: {
   ...
 }: {
   config = let
-    inherit (self.legacyPackages.${pkgs.system}) dracula;
+    inherit (self.scopedPackages.${pkgs.system}) dracula;
 
     cfg = osConfig.roles.desktop;
   in {

outputs.nix

@@ -123,9 +123,9 @@
     nixOnDroidConfigurations.default =
       mkNixOnDroid [./devices/android];
 
-    legacyPackages =
+    scopedPackages =
       perSystem (pkgs:
-        import ./legacyPackages {inherit inputs mkVersion pkgs;});
+        import ./scopedPackages {inherit inputs mkVersion pkgs;});
 
     packages =
       perSystem (pkgs:

scopedPackages/README.md

@@ -1,8 +1,8 @@
-# LegacyPackages
+# ScopedPackages
 
 This directory encompasses every derivation scopes for packages exposed by my flake.
 
-## List of package scopes found in `self.legacyPackages`
+## List of package scopes found in `self.scopedPackages`
 
 | Name            | Description |
 | --------------- | ----------- |

scopedPackages/lovelace-components/custom-sidebar/update.sh

@@ -1,6 +1,6 @@
 #!/usr/bin/env bash
 
-file="$FLAKE/legacyPackages/lovelace-components/custom-sidebar/default.nix"
+file="$FLAKE/scopedPackages/lovelace-components/custom-sidebar/default.nix"
 old_hash="$(sed -n 's/.*hash = "\(.*\)";/\1/p' "$file")"
 
 sed -i "s/hash = .*/hash = \"\";/" "$file"