diff --git a/configuration.nix b/configuration.nix index 6304d53..e27c943 100644 --- a/configuration.nix +++ b/configuration.nix @@ -5,24 +5,7 @@ { config, pkgs, ... }: { - imports = - [ # Include the results of the hardware scan. - ./hardware-configuration.nix - ]; - - nix = { - settings = { - experimental-features = "nix-command flakes"; - }; - }; - - # Bootloader. - boot.loader.grub.enable = true; - boot.loader.grub.device = "/dev/sda"; - boot.loader.grub.useOSProber = true; - - networking.hostName = "nos"; # Define your hostname. - # networking.wireless.enable = true; # Enables wireless support via wpa_supplicant. + nix.settings = { experimental-features = "nix-command flakes"; }; # Configure network proxy if necessary # networking.proxy.default = "http://user:password@proxy:port/"; diff --git a/flake.nix b/flake.nix index 2455458..60da89f 100644 --- a/flake.nix +++ b/flake.nix @@ -10,7 +10,7 @@ outputs = { self, nixpkgs }@inputs: nixosConfigurations = { nos = nixpkgs.lib.nixosSystem { system = "x86_64-linux"; - modules = [ ./configuration.nix]; + modules = [ ./nos.nix]; }; }; }; diff --git a/hardware-configuration.nix b/nos.nix similarity index 77% rename from hardware-configuration.nix rename to nos.nix index 93fab3d..9a8e4a0 100644 --- a/hardware-configuration.nix +++ b/nos.nix @@ -4,7 +4,15 @@ { config, lib, pkgs, modulesPath, ... }: { - imports = [ ]; + imports = [ ./configuration.nix ]; + + # Bootloader. + boot.loader.grub.enable = true; + boot.loader.grub.device = "/dev/sda"; + boot.loader.grub.useOSProber = true; + + networking.hostName = "nos"; # Define your hostname. + # networking.wireless.enable = true; # Enables wireless support via wpa_supplicant. boot.initrd.availableKernelModules = [ "ata_piix" "mptspi" "uhci_hcd" "ehci_pci" "sd_mod" "sr_mod" ]; boot.initrd.kernelModules = [ ];