diff --git a/rebuild.sh b/apply.sh similarity index 100% rename from rebuild.sh rename to apply.sh diff --git a/features/factorio.nix b/features/factorio.nix index ddc924b..3a06afa 100644 --- a/features/factorio.nix +++ b/features/factorio.nix @@ -1,5 +1,6 @@ -{ pkgs, unstable, ... }: { - environment.systemPackages = with unstable; [ +{ pkgs, pkgs-unstable, ... }: { + + environment.systemPackages = with pkgs-unstable; [ (factorio.override { username = ""; token = ""; diff --git a/flake.lock b/flake.lock index bf7a142..aa8d9dc 100644 --- a/flake.lock +++ b/flake.lock @@ -139,11 +139,11 @@ "locked": { "lastModified": 1, "narHash": "sha256-tEq3iB8LaBpgig/fDrM9uvcMkoyKj8nghUAcqa1vxe8=", - "path": "/nix/store/yhhsnncsi6azid2vaa7zkh9s7l3hlw0l-source/users/lauren_lagarde/home-manager", + "path": "/nix/store/wxpfil70w1hsbhzk4wh4smwhbwbqlwlh-source/users/lauren_lagarde/home-manager", "type": "path" }, "original": { - "path": "/nix/store/yhhsnncsi6azid2vaa7zkh9s7l3hlw0l-source/users/lauren_lagarde/home-manager", + "path": "/nix/store/wxpfil70w1hsbhzk4wh4smwhbwbqlwlh-source/users/lauren_lagarde/home-manager", "type": "path" } }, diff --git a/flake.nix b/flake.nix index 986e90e..c530348 100644 --- a/flake.nix +++ b/flake.nix @@ -4,12 +4,6 @@ # https://grahamc.com/blog/erase-your-darlings/ # https://github.com/Misterio77/nix-starter-configs -## Build System -# sudo rm -rf /etc/nixos/ && sudo cp ./ /etc/nixos/ && sudo nixos-rebuild switch - -## Build Iso -# nix build -L .#packages.x86_64-linux.ll-nixos-full-iso - ## Update Packages # nix flake update @@ -20,7 +14,6 @@ # https://github.com/nix-community/home-manager/issues/3415 ## Declarative Disk Partioning -# https://github.com/nix-community/disko # https://github.com/nix-community/nixos-anywhere-examples/blob/main/configuration.nix { @@ -55,8 +48,11 @@ locale = "en_US.UTF-8"; stateVersion = "24.11"; - pkgs = import nixpkgs { inherit system; }; - pkgs-unstable = import nixpkgs-unstable { inherit system; }; + pkgs = import nixpkgs {inherit system; }; + pkgs-unstable = import nixpkgs-unstable { + inherit system; + config.allowUnfree = true; + }; iso_modules = [ "${nixpkgs}/nixos/modules/installer/cd-dvd/iso-image.nix" diff --git a/systems/ll-latitude-e5591.nix b/systems/ll-latitude-e5591.nix index d46dace..0a44ae3 100644 --- a/systems/ll-latitude-e5591.nix +++ b/systems/ll-latitude-e5591.nix @@ -36,6 +36,7 @@ # ll-latitude-e5591 ../features/gpu/intel.nix ../features/systemd-boot.nix + ../features/factorio.nix ]; hardware.enableRedistributableFirmware = true; diff --git a/users/lauren_lagarde/home-manager b/users/lauren_lagarde/home-manager index 110fa22..2d878c3 160000 --- a/users/lauren_lagarde/home-manager +++ b/users/lauren_lagarde/home-manager @@ -1 +1 @@ -Subproject commit 110fa225d48f599a7459c207e8fdb8d0f6f36d28 +Subproject commit 2d878c34486115db6573e2da995e1572e36cd8ee