Simplify something

This commit is contained in:
jimjam4real 2024-09-23 14:41:31 -04:00
parent b896a064f4
commit 3f0a235dc8
7 changed files with 4 additions and 11 deletions

View file

@ -1,10 +1,9 @@
# This file defines overlays # This file defines overlays
{inputs, ...}: { {inputs, ...}: {
# This one brings our custom packages from the 'pkgs' directory # This one brings our custom packages from the 'pkgs' directory
additions = final: _prev: import ../pkgs {pkgs = final;}; additions = final: _prev: import ./pkgs {pkgs = final;};
# This one contains whatever you want to overlay # This one contains whatever you want to overlay
# https://nixos.wiki/wiki/Overlays
selfsuper = (self: super: { selfsuper = (self: super: {
mpv = super.mpv.override { mpv = super.mpv.override {
scripts = with self.mpvScripts; [mpris sponsorblock thumbnail]; scripts = with self.mpvScripts; [mpris sponsorblock thumbnail];
@ -12,14 +11,9 @@
}); });
finalprev = (final: prev: { finalprev = (final: prev: {
# Patches go here
});
# Unstable nixpkgs
unstable-packages = final: _prev: {
unstable = import inputs.nixpkgs-unstable { unstable = import inputs.nixpkgs-unstable {
system = final.system; system = final.system;
config.allowUnfree = true; config.allowUnfree = true;
}; };
}; });
} }

View file

@ -37,10 +37,10 @@
in rec { in rec {
# Your custom packages # Your custom packages
# Accessible through 'nix build', 'nix shell', etc # Accessible through 'nix build', 'nix shell', etc
packages = forAllSystems (system: import ./pkgs nixpkgs.legacyPackages.${system}); packages = forAllSystems (system: import ./extras/pkgs nixpkgs.legacyPackages.${system});
# Your custom packages and modifications, exported as overlays # Your custom packages and modifications, exported as overlays
overlays = import ./overlays {inherit inputs;}; overlays = import ./extras/overlays.nix {inherit inputs;};
# Secrets defined so they can be accessed globally # Secrets defined so they can be accessed globally
secrets = import ./secrets.nix; secrets = import ./secrets.nix;

View file

@ -12,7 +12,6 @@
outputs.overlays.additions outputs.overlays.additions
outputs.overlays.selfsuper outputs.overlays.selfsuper
outputs.overlays.finalprev outputs.overlays.finalprev
outputs.overlays.unstable-packages
]; ];
# Configure your nixpkgs instance # Configure your nixpkgs instance