Changes to the flake, thanks Jules

This commit is contained in:
Jimbo 2024-10-09 23:52:50 -04:00
parent 35dabb4249
commit 87fbcda3d3
2 changed files with 32 additions and 27 deletions

View file

@ -33,13 +33,8 @@
lanzaboote, lanzaboote,
home-manager, home-manager,
... ...
} @inputs: let } @inputs:
inherit (self) outputs; let
forAllSystems = nixpkgs.lib.genAttrs [
"aarch64-linux"
"x86_64-linux"
];
in rec {
channels = { channels = {
master = import nixpkgs { master = import nixpkgs {
inherit (flake) system overlays; inherit (flake) system overlays;
@ -49,19 +44,31 @@
nur = import nur { nurpkgs = import nixpkgs { inherit (flake) system; }; }; nur = import nur { nurpkgs = import nixpkgs { inherit (flake) system; }; };
}; };
flake = {
overlays = [
nur.overlay
minecraft.overlay
(import ./overlays/mpv { inherit (self) inputs channels; })
];
packages = import ./packages/default.nix { inherit (nix) pkgs; }; packages = import ./packages/default.nix { inherit (nix) pkgs; };
# Variables defined so they can be accessed globally
secrets = import ./extras/secrets.nix; secrets = import ./extras/secrets.nix;
cmd = import ./extras/cmd.nix; cmd = import ./extras/cmd.nix;
displays = import ./extras/displays.nix; displays = import ./extras/displays.nix;
ips = import ./extras/ips.nix; ips = import ./extras/ips.nix;
look = import ./extras/look.nix; look = import ./extras/look.nix;
ws = import ./extras/workspaces.nix; ws = import ./extras/workspaces.nix;
};
nix = rec {
pkgs = channels.master // flake.packages;
inherit (pkgs) lib;
inherit (flake) channels-config;
};
in {
# NixOS config entrypoint, use 'nixos-rebuild --flake .#your-hostname' # NixOS config entrypoint, use 'nixos-rebuild --flake .#your-hostname'
nixosConfigurations = { nixosConfigurations = {
JimDesktop = nixpkgs.lib.nixosSystem { JimDesktop = nixpkgs.lib.nixosSystem {
inherit (nix) pkgs;
specialArgs = { inherit inputs outputs; }; specialArgs = { inherit inputs outputs; };
modules = [ modules = [
./system/hosts/JimDesktop/configuration.nix ./system/hosts/JimDesktop/configuration.nix

View file

@ -10,8 +10,6 @@
./servers/uberbeta ./servers/uberbeta
]; ];
nixpkgs.overlays = [ inputs.minecraft.overlay ];
services.minecraft-servers = { services.minecraft-servers = {
enable = true; enable = true;
eula = true; eula = true;