diff options
| author | Soispha <soispha@vhack.eu> | 2023-04-22 13:24:51 +0200 |
|---|---|---|
| committer | Soispha <soispha@vhack.eu> | 2023-05-09 19:31:21 +0200 |
| commit | 2c6442dfae0cb5c911867f46fcd1ff9100566c8d (patch) | |
| tree | 6d2b26afa9c9670abbdd780f7e86d9ab97f713d5 | |
| parent | Feat(flake): Modularize (diff) | |
| download | nixos-config-2c6442dfae0cb5c911867f46fcd1ff9100566c8d.tar.gz nixos-config-2c6442dfae0cb5c911867f46fcd1ff9100566c8d.zip | |
Fix(hosts/marduk): Active GNOME iso
| -rw-r--r-- | hosts/marduk/default.nix | 6 | ||||
| -rw-r--r-- | hosts/marduk/hardware/default.nix | 19 |
2 files changed, 9 insertions, 16 deletions
diff --git a/hosts/marduk/default.nix b/hosts/marduk/default.nix index ff50f404..aae467a5 100644 --- a/hosts/marduk/default.nix +++ b/hosts/marduk/default.nix @@ -3,9 +3,11 @@ imports = [ ./hardware ./networking.nix - - ../../system ]; + console = { + keyMap = "dvorak"; + }; + system.stateVersion = "23.05"; } diff --git a/hosts/marduk/hardware/default.nix b/hosts/marduk/hardware/default.nix index f6500ed5..3a7b0a0a 100644 --- a/hosts/marduk/hardware/default.nix +++ b/hosts/marduk/hardware/default.nix @@ -1,28 +1,19 @@ +# vim: ts=2 { - config, lib, pkgs, modulesPath, ... }: { imports = [ - (modulesPath + "/installer/scan/not-detected.nix") - (modulesPath + "/installer/scan/detected.nix") - # (modulesPath + "/installer/cd-dvd/installation-cd-base.nix") - - (modulesPath + "/profiles/base.nix") - (modulesPath + "/profiles/minimal.nix") - (modulesPath + "/profiles/all-hardware.nix") + (modulesPath + "/installer/cd-dvd/installation-cd-graphical-gnome.nix") ]; nixpkgs.hostPlatform = lib.mkDefault "x86_64-linux"; - system.fileSystemLayouts = { - enable = true; - mainDisk = "/dev/disk/by-uuid/<uuid>"; - efiDisk = "/dev/disk/by-uuid/<uuid>"; - }; - boot = { + kernelModules = ["rtw89"]; + kernelPackages = pkgs.linuxPackages_latest; + zfs.enableUnstable = true; # Default zfs is "broken" (to nixos) on the newest kernel }; } |