From f9003db1670631cb32abdf7d7e17a7f553973f34 Mon Sep 17 00:00:00 2001 From: kB01 Date: Wed, 11 Dec 2024 23:53:25 +0100 Subject: [PATCH] Enabled i686 Support in Flake --- flake.nix | 71 ++++++++++++++------------- systems/i686-linux/Rubtrm/default.nix | 14 ++++-- 2 files changed, 47 insertions(+), 38 deletions(-) diff --git a/flake.nix b/flake.nix index 951d18d..b4efe02 100644 --- a/flake.nix +++ b/flake.nix @@ -14,45 +14,46 @@ nix-minecraft.inputs.nixpkgs.follows = "nixpkgs"; }; - # outputs = inputs: inputs.snowfall-lib.mkFlake { - # inherit inputs; - # src = ./.; + outputs = inputs: inputs.snowfall-lib.mkFlake { + inherit inputs; + src = ./.; - # channels-config.allowUnfree = false; + channels-config.allowUnfree = false; + supportedSystems = inputs.snowfall-lib.inputs.flake-utils-plus.lib.defaultSystems ++ ["i686-linux"]; - # nix.gc = { - # automatic = true; - # options = "--delete-older-than 30d"; - # }; - # nix.optimise.automatic = true; - - # # Modules for Host HyperC - # systems.hosts.HyperC.modules = with inputs; [ - # ]; - - # # Modules for Host voloxo - # systems.hosts.voloxo.modules = with inputs; [ - # ]; - - # # Modules for Host kb-games-01 - # systems.hosts.kb-games-01.modules = with inputs; [ - # ]; - - # # Modules that get imported to every NixOS system - # systems.modules.nixos = with inputs; [ - # lix-module.nixosModules.default - # ]; - - # outputs-builder = channels: { formatter = channels.nixpkgs.nixfmt-rfc-style; }; - - # }; - - outputs = { self, nixpkgs, ... }@inputs: { - nixosConfigurations."Rubtrm" = nixpkgs.lib.nixosSystem { - system = "i686-linux"; - modules = [ ./systems/i686-linux/Rubtrm/default.nix ]; + nix.gc = { + automatic = true; + options = "--delete-older-than 30d"; }; + nix.optimise.automatic = true; + + # Modules for Host HyperC + systems.hosts.HyperC.modules = with inputs; [ + ]; + + # Modules for Host voloxo + systems.hosts.voloxo.modules = with inputs; [ + ]; + + # Modules for Host kb-games-01 + systems.hosts.kb-games-01.modules = with inputs; [ + ]; + + # Modules that get imported to every NixOS system + systems.modules.nixos = with inputs; [ + lix-module.nixosModules.default + ]; + + outputs-builder = channels: { formatter = channels.nixpkgs.nixfmt-rfc-style; }; + }; + # outputs = { self, nixpkgs, ... }@inputs: { + # nixosConfigurations."Rubtrm" = nixpkgs.lib.nixosSystem { + # system = "i686-linux"; + # modules = [ ./systems/i686-linux/Rubtrm/default.nix ]; + # }; + # }; + } diff --git a/systems/i686-linux/Rubtrm/default.nix b/systems/i686-linux/Rubtrm/default.nix index 8740276..1a071d9 100644 --- a/systems/i686-linux/Rubtrm/default.nix +++ b/systems/i686-linux/Rubtrm/default.nix @@ -10,6 +10,17 @@ ./hardware.nix ]; + # Configure Nix + nix.settings = { + experimental-features = [ "nix-command" "flakes" ]; + substituters = [ + "https://cache.games01.kb-one.de" + ]; + trusted-public-keys = [ + "cache.games01.kb-one.de:JF++7CgrasYciQeB5jlziqT5BTjaknEk9cMeh4lQf30=" + ]; + }; + # Use the GRUB 2 boot loader. boot.loader.grub.enable = true; # Define on which hard drive you want to install Grub. @@ -78,9 +89,6 @@ # networking.firewall.allowedTCPPorts = [ ... ]; # networking.firewall.allowedUDPPorts = [ ... ]; - # Configure Nix - nix.settings.experimental-features = [ "nix-command" "flakes" ]; - # Do NOT change this value unless you have manually inspected all the changes it would make to your configuration, # and migrated your data accordingly. # For more information, see `man configuration.nix` or https://nixos.org/manual/nixos/stable/options#opt-system.stateVersion .