diff --git a/modules/hosts/test/configuration.nix b/modules/hosts/test/configuration.nix index e2920ee..561a3fb 100644 --- a/modules/hosts/test/configuration.nix +++ b/modules/hosts/test/configuration.nix @@ -3,7 +3,7 @@ { # host module declaration - flake.nixosModules.test-configuration = + flake.nixosModules.installer-configuration = { pkgs, @@ -17,7 +17,7 @@ imports = [ ]; # set hostname - networking.hostName = "test"; + networking.hostName = "serenityos"; # bootloader settings boot.loader = { @@ -29,27 +29,12 @@ boot.supportedFilesystems = [ "vfat" "ext4" - #"ntfs" + "ntfs" ]; - # enable printing support - services.printing.enable = true; - - # fstrim for ssd - services.fstrim.enable = true; - - # corsair mouse software - hardware.ckb-next.enable = true; - - # other packages for hades peripherals - environment.systemPackages = with pkgs; [ - - #input-remapper - #razergenie - #openrazer-daemon - #openrgb-with-all-plugins - - ]; + # specifies x64 uArch + nixpkgs.hostPlatform = lib.mkDefault "x86_64-linux"; }; + } diff --git a/modules/hosts/test/default.nix b/modules/hosts/test/default.nix index 1b08574..15fa0a5 100644 --- a/modules/hosts/test/default.nix +++ b/modules/hosts/test/default.nix @@ -3,7 +3,7 @@ { # defines the hades specific configuration - flake.nixosConfigurations.test = inputs.nixpkgs.lib.nixosSystem { + flake.nixosConfigurations.iso-installer = inputs.nixpkgs.lib.nixosSystem { # modules that comprise the host specific configuration modules = with self.nixosModules; [ @@ -12,21 +12,14 @@ core # host-specific options - test-configuration - test-hardware + install-configuration # extra modules to include on host - # in order of priority terminal - desktop - multimedia zfs-support - gaming - music - music-production virtual-reality network-proxy - #virtualisation + virtualisation # users to include on host #user-options diff --git a/modules/hosts/test/hardware.nix b/modules/hosts/test/hardware.nix deleted file mode 100644 index bff54b0..0000000 --- a/modules/hosts/test/hardware.nix +++ /dev/null @@ -1,85 +0,0 @@ -{ ... }: - -{ - - # hardware module declaration - flake.nixosModules.test-hardware = - - { - config, - lib, - modulesPath, - ... - }: - - { - - # important - imports = [ - (modulesPath + "/installer/scan/not-detected.nix") - ]; - - # kernel modules to include - boot.initrd.availableKernelModules = [ - "ehci_pci" - "xhci_pci" - "ahci" - "nvme" - "usbhid" - "usb_storage" - "sd_mod" - ]; - - # enable amd radeon gpu drivers - # https://nixos.wiki/wiki/AMD_GPU - boot = { - # exposes gpu drivers - kernelModules = [ - "amdgpu" - "kvm-amd" - ]; - # gpu drivers during boot and pre boot - initrd.kernelModules = [ "amdgpu" ]; - }; - hardware = { - # discrete graphics support - graphics.enable = true; - # fixes early video issues - amdgpu.initrd.enable = true; - }; - - # luks device mapping - boot.initrd.luks.devices."luks-35440a88-293e-455b-a018-ee1086b07321".device = - "/dev/disk/by-uuid/35440a88-293e-455b-a018-ee1086b07321"; - boot.initrd.luks.devices."luks-55f7d546-fac9-4ea0-a21e-4c50ecc0d67d".device = - "/dev/disk/by-uuid/55f7d546-fac9-4ea0-a21e-4c50ecc0d67d"; - - # root partition - fileSystems."/" = { - device = "/dev/mapper/luks-35440a88-293e-455b-a018-ee1086b07321"; - fsType = "ext4"; - }; - - # boot partition - fileSystems."/boot" = { - device = "/dev/disk/by-uuid/2C83-7F40"; - fsType = "vfat"; - options = [ - "fmask=0077" - "dmask=0077" - ]; - }; - - # swap - swapDevices = [ - { - device = "/dev/mapper/luks-55f7d546-fac9-4ea0-a21e-4c50ecc0d67d"; - } - ]; - - # specifies x64 uArch - nixpkgs.hostPlatform = lib.mkDefault "x86_64-linux"; - hardware.cpu.amd.updateMicrocode = lib.mkDefault config.hardware.enableRedistributableFirmware; - }; - -}