From 155d7dc0fd51038351e0006abd558c489659c096 Mon Sep 17 00:00:00 2001 From: Lillian-Violet Date: Mon, 8 Jan 2024 19:11:16 +0100 Subject: [PATCH] Let's try this, stop building all the things --- flake.nix | 36 ++++++++++++++------------ nixos/hosts/wheatley/configuration.nix | 2 +- 2 files changed, 21 insertions(+), 17 deletions(-) diff --git a/flake.nix b/flake.nix index 8153813..c9a0573 100644 --- a/flake.nix +++ b/flake.nix @@ -31,25 +31,25 @@ } @ inputs: let inherit (self) outputs; # Supported systems for your flake packages, shell, etc. - systems = [ - "aarch64-linux" - "armv7l-linux" - "i686-linux" - "x86_64-linux" - "aarch64-darwin" - "armv7l-darwin" - "x86_64-darwin" - ]; - # This is a function that generates an attribute by calling a function you - # pass to it, with each system as an argument - forAllSystems = nixpkgs.lib.genAttrs systems; + # systems = [ + # "aarch64-linux" + # "armv7l-linux" + # "i686-linux" + # "x86_64-linux" + # "aarch64-darwin" + # "armv7l-darwin" + # "x86_64-darwin" + # ]; + # # This is a function that generates an attribute by calling a function you + # # pass to it, with each system as an argument + # forAllSystems = nixpkgs.lib.genAttrs systems; in { # Your custom packages # Acessible through 'nix build', 'nix shell', etc - packages = forAllSystems (system: import ./pkgs nixpkgs.legacyPackages.${system}); - # Formatter for your nix files, available through 'nix fmt' - # Other options beside 'alejandra' include 'nixpkgs-fmt' - formatter = forAllSystems (system: nixpkgs.legacyPackages.${system}.alejandra); + # packages = forAllSystems (system: import ./pkgs nixpkgs.legacyPackages.${system}); + # # Formatter for your nix files, available through 'nix fmt' + # # Other options beside 'alejandra' include 'nixpkgs-fmt' + # formatter = forAllSystems (system: nixpkgs.legacyPackages.${system}.alejandra); # Your custom packages and modifications, exported as overlays overlays = import ./overlays {inherit inputs;}; @@ -64,6 +64,7 @@ # Available through 'nixos-rebuild --flake .#your-hostname' nixosConfigurations = { EDI = nixpkgs.lib.nixosSystem { + system = "x86_64-linux"; specialArgs = {inherit inputs outputs;}; modules = [ # > Our main nixos configuration file < @@ -75,6 +76,7 @@ nixosConfigurations = { GLaDOS = nixpkgs.lib.nixosSystem { + system = "x86_64-linux"; specialArgs = {inherit inputs outputs;}; modules = [ # > Our main nixos configuration file < @@ -86,6 +88,7 @@ nixosConfigurations = { queen = nixpkgs.lib.nixosSystem { + system = "x86_64-linux"; specialArgs = {inherit inputs outputs;}; modules = [ # > Our main nixos configuration file < @@ -97,6 +100,7 @@ nixosConfigurations = { shodan = nixpkgs.lib.nixosSystem { + system = "x86_64-linux"; specialArgs = {inherit inputs outputs;}; modules = [ # > Our main nixos configuration file < diff --git a/nixos/hosts/wheatley/configuration.nix b/nixos/hosts/wheatley/configuration.nix index e3995b0..157456a 100644 --- a/nixos/hosts/wheatley/configuration.nix +++ b/nixos/hosts/wheatley/configuration.nix @@ -7,7 +7,7 @@ # NixOS wants to enable GRUB by default boot.loader.grub.enable = false; # Enables the generation of /boot/extlinux/extlinux.conf - #boot.loader.generic-extlinux-compatible.enable = true; + boot.loader.generic-extlinux-compatible.enable = true; # nixos-generate-config should normally set up file systems correctly imports = [