diff --git a/README.md b/README.md
index 06bc3b6d..a53ee303 100644
--- a/README.md
+++ b/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 |
diff --git a/apps/update-sources/src/firefox.ts b/apps/update-sources/src/firefox.ts
index 04c82afc..0cc05066 100644
--- a/apps/update-sources/src/firefox.ts
+++ b/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',
diff --git a/common/home/bash/programs.nix b/common/home/bash/programs.nix
index ef0708fa..07795f56 100644
--- a/common/home/bash/programs.nix
+++ b/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;
diff --git a/common/home/git/default.nix b/common/home/git/default.nix
index b36b1a8c..ff25b551 100644
--- a/common/home/git/default.nix
+++ b/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")
diff --git a/devices/homie/modules/home-assistant/assist.nix b/devices/homie/modules/home-assistant/assist.nix
index d9ec9718..84a1cc29 100644
--- a/devices/homie/modules/home-assistant/assist.nix
+++ b/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
diff --git a/devices/homie/modules/home-assistant/default.nix b/devices/homie/modules/home-assistant/default.nix
index 9a364353..4d0d82c5 100644
--- a/devices/homie/modules/home-assistant/default.nix
+++ b/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
;
};
diff --git a/devices/homie/modules/home-assistant/frontend.nix b/devices/homie/modules/home-assistant/frontend.nix
index aa6b62cb..6df9bdd2 100644
--- a/devices/homie/modules/home-assistant/frontend.nix
+++ b/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
;
};
diff --git a/devices/homie/modules/home-assistant/netdaemon/default.nix b/devices/homie/modules/home-assistant/netdaemon/default.nix
index e1c03ba9..b873a5e1 100644
--- a/devices/homie/modules/home-assistant/netdaemon/default.nix
+++ b/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
;
};
diff --git a/devices/homie/modules/home-assistant/spotify.nix b/devices/homie/modules/home-assistant/spotify.nix
index 0e0a8f9b..e3255557 100644
--- a/devices/homie/modules/home-assistant/spotify.nix
+++ b/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
;
};
diff --git a/devices/wim/default.nix b/devices/wim/default.nix
index a9dabcd7..46e1ab63 100644
--- a/devices/wim/default.nix
+++ b/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
];
};
diff --git a/homeManagerModules/firefox/default.nix b/homeManagerModules/firefox/default.nix
index 22bd6438..d904d920 100644
--- a/homeManagerModules/firefox/default.nix
+++ b/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;
diff --git a/nixosModules/desktop/environment/home/mpv.nix b/nixosModules/desktop/environment/home/mpv.nix
index 6798231c..8475c4c6 100644
--- a/nixosModules/desktop/environment/home/mpv.nix
+++ b/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 = [
diff --git a/nixosModules/desktop/environment/modules/packages.nix b/nixosModules/desktop/environment/modules/packages.nix
index 856e7767..7148f0fe 100644
--- a/nixosModules/desktop/environment/modules/packages.nix
+++ b/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;
};
};
diff --git a/nixosModules/desktop/theme/cursors.nix b/nixosModules/desktop/theme/cursors.nix
index c38b6ac7..20b62b50 100644
--- a/nixosModules/desktop/theme/cursors.nix
+++ b/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";
diff --git a/nixosModules/desktop/theme/hyprpaper.nix b/nixosModules/desktop/theme/hyprpaper.nix
index 96fdb600..e96ce437 100644
--- a/nixosModules/desktop/theme/hyprpaper.nix
+++ b/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];
diff --git a/nixosModules/desktop/theme/qt.nix b/nixosModules/desktop/theme/qt.nix
index 942e74bc..c5eb6094 100644
--- a/nixosModules/desktop/theme/qt.nix
+++ b/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 {
diff --git a/outputs.nix b/outputs.nix
index bc4a3c74..a7ad1c1b 100644
--- a/outputs.nix
+++ b/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:
diff --git a/legacyPackages/README.md b/scopedPackages/README.md
similarity index 85%
rename from legacyPackages/README.md
rename to scopedPackages/README.md
index 49013200..5560b889 100644
--- a/legacyPackages/README.md
+++ b/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 |
| --------------- | ----------- |
diff --git a/legacyPackages/default.nix b/scopedPackages/default.nix
similarity index 100%
rename from legacyPackages/default.nix
rename to scopedPackages/default.nix
diff --git a/legacyPackages/dracula/bat.nix b/scopedPackages/dracula/bat.nix
similarity index 100%
rename from legacyPackages/dracula/bat.nix
rename to scopedPackages/dracula/bat.nix
diff --git a/legacyPackages/dracula/default.nix b/scopedPackages/dracula/default.nix
similarity index 100%
rename from legacyPackages/dracula/default.nix
rename to scopedPackages/dracula/default.nix
diff --git a/legacyPackages/dracula/git.nix b/scopedPackages/dracula/git.nix
similarity index 100%
rename from legacyPackages/dracula/git.nix
rename to scopedPackages/dracula/git.nix
diff --git a/legacyPackages/dracula/gtk.nix b/scopedPackages/dracula/gtk.nix
similarity index 100%
rename from legacyPackages/dracula/gtk.nix
rename to scopedPackages/dracula/gtk.nix
diff --git a/legacyPackages/dracula/hyprcursor.nix b/scopedPackages/dracula/hyprcursor.nix
similarity index 100%
rename from legacyPackages/dracula/hyprcursor.nix
rename to scopedPackages/dracula/hyprcursor.nix
diff --git a/legacyPackages/dracula/plymouth.nix b/scopedPackages/dracula/plymouth.nix
similarity index 100%
rename from legacyPackages/dracula/plymouth.nix
rename to scopedPackages/dracula/plymouth.nix
diff --git a/legacyPackages/dracula/sioyek.nix b/scopedPackages/dracula/sioyek.nix
similarity index 100%
rename from legacyPackages/dracula/sioyek.nix
rename to scopedPackages/dracula/sioyek.nix
diff --git a/legacyPackages/dracula/wallpaper.nix b/scopedPackages/dracula/wallpaper.nix
similarity index 100%
rename from legacyPackages/dracula/wallpaper.nix
rename to scopedPackages/dracula/wallpaper.nix
diff --git a/legacyPackages/firefox-addons/addons.json b/scopedPackages/firefox-addons/addons.json
similarity index 100%
rename from legacyPackages/firefox-addons/addons.json
rename to scopedPackages/firefox-addons/addons.json
diff --git a/legacyPackages/firefox-addons/default.nix b/scopedPackages/firefox-addons/default.nix
similarity index 100%
rename from legacyPackages/firefox-addons/default.nix
rename to scopedPackages/firefox-addons/default.nix
diff --git a/legacyPackages/firefox-addons/generated-firefox-addons.nix b/scopedPackages/firefox-addons/generated-firefox-addons.nix
similarity index 100%
rename from legacyPackages/firefox-addons/generated-firefox-addons.nix
rename to scopedPackages/firefox-addons/generated-firefox-addons.nix
diff --git a/legacyPackages/hass-components/default.nix b/scopedPackages/hass-components/default.nix
similarity index 100%
rename from legacyPackages/hass-components/default.nix
rename to scopedPackages/hass-components/default.nix
diff --git a/legacyPackages/hass-components/extended-ollama-conversation/default.nix b/scopedPackages/hass-components/extended-ollama-conversation/default.nix
similarity index 100%
rename from legacyPackages/hass-components/extended-ollama-conversation/default.nix
rename to scopedPackages/hass-components/extended-ollama-conversation/default.nix
diff --git a/legacyPackages/hass-components/ha-fallback-conversation/default.nix b/scopedPackages/hass-components/ha-fallback-conversation/default.nix
similarity index 100%
rename from legacyPackages/hass-components/ha-fallback-conversation/default.nix
rename to scopedPackages/hass-components/ha-fallback-conversation/default.nix
diff --git a/legacyPackages/hass-components/material-symbols/default.nix b/scopedPackages/hass-components/material-symbols/default.nix
similarity index 100%
rename from legacyPackages/hass-components/material-symbols/default.nix
rename to scopedPackages/hass-components/material-symbols/default.nix
diff --git a/legacyPackages/hass-components/netdaemon/default.nix b/scopedPackages/hass-components/netdaemon/default.nix
similarity index 100%
rename from legacyPackages/hass-components/netdaemon/default.nix
rename to scopedPackages/hass-components/netdaemon/default.nix
diff --git a/legacyPackages/hass-components/spotifyplus/default.nix b/scopedPackages/hass-components/spotifyplus/default.nix
similarity index 100%
rename from legacyPackages/hass-components/spotifyplus/default.nix
rename to scopedPackages/hass-components/spotifyplus/default.nix
diff --git a/legacyPackages/hass-components/spotifyplus/smartinspect.nix b/scopedPackages/hass-components/spotifyplus/smartinspect.nix
similarity index 100%
rename from legacyPackages/hass-components/spotifyplus/smartinspect.nix
rename to scopedPackages/hass-components/spotifyplus/smartinspect.nix
diff --git a/legacyPackages/hass-components/spotifyplus/spotifyplus.nix b/scopedPackages/hass-components/spotifyplus/spotifyplus.nix
similarity index 100%
rename from legacyPackages/hass-components/spotifyplus/spotifyplus.nix
rename to scopedPackages/hass-components/spotifyplus/spotifyplus.nix
diff --git a/legacyPackages/hass-components/spotifyplus/spotifywebapi.nix b/scopedPackages/hass-components/spotifyplus/spotifywebapi.nix
similarity index 100%
rename from legacyPackages/hass-components/spotifyplus/spotifywebapi.nix
rename to scopedPackages/hass-components/spotifyplus/spotifywebapi.nix
diff --git a/legacyPackages/hass-components/tuya-local/default.nix b/scopedPackages/hass-components/tuya-local/default.nix
similarity index 100%
rename from legacyPackages/hass-components/tuya-local/default.nix
rename to scopedPackages/hass-components/tuya-local/default.nix
diff --git a/legacyPackages/hass-components/yamaha-soundbar/default.nix b/scopedPackages/hass-components/yamaha-soundbar/default.nix
similarity index 100%
rename from legacyPackages/hass-components/yamaha-soundbar/default.nix
rename to scopedPackages/hass-components/yamaha-soundbar/default.nix
diff --git a/legacyPackages/lovelace-components/custom-sidebar/default.nix b/scopedPackages/lovelace-components/custom-sidebar/default.nix
similarity index 100%
rename from legacyPackages/lovelace-components/custom-sidebar/default.nix
rename to scopedPackages/lovelace-components/custom-sidebar/default.nix
diff --git a/legacyPackages/lovelace-components/custom-sidebar/update.sh b/scopedPackages/lovelace-components/custom-sidebar/update.sh
similarity index 85%
rename from legacyPackages/lovelace-components/custom-sidebar/update.sh
rename to scopedPackages/lovelace-components/custom-sidebar/update.sh
index 1e0c966e..bd44124d 100644
--- a/legacyPackages/lovelace-components/custom-sidebar/update.sh
+++ b/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"
diff --git a/legacyPackages/lovelace-components/default.nix b/scopedPackages/lovelace-components/default.nix
similarity index 100%
rename from legacyPackages/lovelace-components/default.nix
rename to scopedPackages/lovelace-components/default.nix
diff --git a/legacyPackages/mpv-scripts/default.nix b/scopedPackages/mpv-scripts/default.nix
similarity index 100%
rename from legacyPackages/mpv-scripts/default.nix
rename to scopedPackages/mpv-scripts/default.nix
diff --git a/legacyPackages/mpv-scripts/kdialog-open-files.nix b/scopedPackages/mpv-scripts/kdialog-open-files.nix
similarity index 100%
rename from legacyPackages/mpv-scripts/kdialog-open-files.nix
rename to scopedPackages/mpv-scripts/kdialog-open-files.nix
diff --git a/legacyPackages/mpv-scripts/modernx.nix b/scopedPackages/mpv-scripts/modernx.nix
similarity index 100%
rename from legacyPackages/mpv-scripts/modernx.nix
rename to scopedPackages/mpv-scripts/modernx.nix
diff --git a/legacyPackages/mpv-scripts/persist-properties.nix b/scopedPackages/mpv-scripts/persist-properties.nix
similarity index 100%
rename from legacyPackages/mpv-scripts/persist-properties.nix
rename to scopedPackages/mpv-scripts/persist-properties.nix
diff --git a/legacyPackages/mpv-scripts/pointer-event.nix b/scopedPackages/mpv-scripts/pointer-event.nix
similarity index 100%
rename from legacyPackages/mpv-scripts/pointer-event.nix
rename to scopedPackages/mpv-scripts/pointer-event.nix
diff --git a/legacyPackages/mpv-scripts/touch-gestures.nix b/scopedPackages/mpv-scripts/touch-gestures.nix
similarity index 100%
rename from legacyPackages/mpv-scripts/touch-gestures.nix
rename to scopedPackages/mpv-scripts/touch-gestures.nix
diff --git a/legacyPackages/mpv-scripts/undo-redo.nix b/scopedPackages/mpv-scripts/undo-redo.nix
similarity index 100%
rename from legacyPackages/mpv-scripts/undo-redo.nix
rename to scopedPackages/mpv-scripts/undo-redo.nix