diff --git a/flake.nix b/flake.nix index b7984a8..b04a1c5 100644 --- a/flake.nix +++ b/flake.nix @@ -58,7 +58,7 @@ workDir = "/home/me/work"; secretsDir = "/home/me/.mysecrets"; persistentDir = "/home/me/work/app-data"; - specialArgs = { + specialArgs = { inherit inputs confDir workDir secretsDir persistentDir self; pkgs = import nixpkgs { system = "x86_64-linux"; config = { allowUnfree = true; @@ -99,44 +99,17 @@ # my raspberry to try out stuff with "luna" = nixpkgs.lib.nixosSystem { - inherit specialArgs; system = "aarch64-linux"; - #system = "armv7l-linux"; modules = [ "${nixpkgs}/nixos/modules/installer/sd-card/sd-image-aarch64.nix" - #"${inputs.rpi-nixpkgs}/nixos/modules/installer/sd-card/sd-image-raspberrypi4.nix" inputs.nixos-hardware.nixosModules.raspberry-pi-4 ./hosts/luna.nix { system.stateVersion = "23.05"; # Did you read the comment? - nixpkgs.overlays = [ - { - ubootRaspberryPi4_64bit = nixpkgs.legacyPackages.x86_64.pkgsCross.aarch64-multiplatform.ubootRaspberryPi4_64bit; - ubootRaspberryPi3_64bit = nixpkgs.legacyPackages.x86_64.pkgsCross.aarch64-multiplatform.ubootRaspberryPi3_64bit; - - ubootRaspberryPi4_32bit = nixpkgs.legacyPackages.x86_64.pkgsCross.aarch64-multiplatform.ubootRaspberryPi4_32bit; - ubootRaspberryPi3_3264bit = nixpkgs.legacyPackages.x86_64.pkgsCross.aarch64-multiplatform.ubootRaspberryPi3_32bit; - raspberrypi-armstubs = nixpkgs.legacyPackages.x86_64.pkgsCross.raspberryPi.raspberrypi-armstubs; - } - ]; - - - #nixpkgs.crossSystem.system = "armv7l-linux"; - #nixpkgs.config.allowUnsupportedSystem = true; - #nixpkgs.hostPlatform.system = "armv7l-linux"; - #nixpkgs.buildPlatform.system = "x86_64-linux"; #If you build on x86 other wise changes this. - - # ... extra configs as above - - #nixpkgs.config.allowUnsupportedSystem = true; - #nixpkgs.hostPlatform.system = "armv7l-linux"; nixpkgs.hostPlatform.system = "aarch64-linux"; nixpkgs.buildPlatform.system = "x86_64-linux"; #If you build on x86 other wise changes this. - #nixpkgs.crossSystem.system = "armv7l-linux"; - # ... extra configs as above - hardware.enableRedistributableFirmware = true; } ]; diff --git a/hosts/luna.nix b/hosts/luna.nix index 287471f..1ade70d 100644 --- a/hosts/luna.nix +++ b/hosts/luna.nix @@ -11,7 +11,6 @@ fsType = "ext4"; }; - /* boot = { kernelPackages = lib.mkForce pkgs.linuxPackages_latest; loader = { @@ -19,7 +18,6 @@ grub.enable = lib.mkDefault false; }; }; - */ nix.settings = { experimental-features = lib.mkDefault "nix-command flakes";