From 825a4ffc7d9ce58cfb06b98d12de4b1267bac5bf Mon Sep 17 00:00:00 2001 From: Don Harper Date: Mon, 22 Dec 2025 21:29:09 -0600 Subject: [PATCH] nixos-anywhere | updates --- nixos-anywhere/configuration.nix | 26 +- nixos-anywhere/disk-config.nix | 50 ++- nixos-anywhere/facter.json | 567 +++++++++++++++---------------- 3 files changed, 325 insertions(+), 318 deletions(-) diff --git a/nixos-anywhere/configuration.nix b/nixos-anywhere/configuration.nix index 1c85d15..8115b33 100644 --- a/nixos-anywhere/configuration.nix +++ b/nixos-anywhere/configuration.nix @@ -9,21 +9,39 @@ (modulesPath + "/profiles/qemu-guest.nix") ./disk-config.nix ]; - boot.kernelParams = ["consoleblank=60"]; boot.plymouth = { enable = true; theme = "breeze"; }; - boot.loader.grub = { - efiSupport = true; - efiInstallAsRemovable = true; + + # boot.loader.grub = { + # efiSupport = true; + # efiInstallAsRemovable = true; + # }; + boot = { + binfmt.emulatedSystems = ["aarch64-linux"]; + # kernelPackages = pkgs.linuxPackages_latest; + kernelPackages = pkgs.linuxPackages_zen; + kernelParams = ["consoleblank=60" "mem_sleep_default=deep"]; + # extraModulePackages = [config.boot.kernelPackages.ddcci-driver]; + # kernelModules = ["i2c-dev" "ddcci_backlight"]; + loader = { + systemd-boot = {enable = true;}; + efi = { + canTouchEfiVariables = true; + efiSysMountPoint = "/boot"; + }; + }; + kernel = {sysctl = {"vm.swappiness" = 10;};}; }; + services.openssh.enable = true; time = { timeZone = "America/Chicago"; hardwareClockInLocalTime = false; }; + networking.networkmanager.enable = true; environment.systemPackages = map lib.lowPrio [ pkgs.curl diff --git a/nixos-anywhere/disk-config.nix b/nixos-anywhere/disk-config.nix index 4212db9..ea3bb63 100644 --- a/nixos-anywhere/disk-config.nix +++ b/nixos-anywhere/disk-config.nix @@ -6,34 +6,30 @@ # } {lib, ...}: { disko.devices = { - disk.disk1 = { - device = lib.mkDefault "/dev/sda"; - type = "disk"; - content = { - type = "gpt"; - partitions = { - boot = { - name = "boot"; - size = "1M"; - type = "EF02"; - }; - esp = { - name = "ESP"; - size = "500M"; - type = "EF00"; - content = { - type = "filesystem"; - format = "vfat"; - mountpoint = "/boot"; + disk = { + main = { + device = lib.mkDefault "/dev/sda"; + type = "disk"; + content = { + type = "gpt"; + partitions = { + ESP = { + type = "EF00"; + size = "500M"; + content = { + type = "filesystem"; + format = "vfat"; + mountpoint = "/boot"; + mountOptions = ["umask=0077"]; + }; }; - }; - root = { - name = "root"; - size = "100%"; - content = { - type = "filesystem"; - format = "ext4"; - mountpoint = "/"; + root = { + size = "100%"; + content = { + type = "filesystem"; + format = "ext4"; + mountpoint = "/"; + }; }; }; }; diff --git a/nixos-anywhere/facter.json b/nixos-anywhere/facter.json index 84a5cc9..97a3c8b 100644 --- a/nixos-anywhere/facter.json +++ b/nixos-anywhere/facter.json @@ -23,8 +23,8 @@ }, "bluetooth": [ { - "index": 26, - "attached_to": 27, + "index": 28, + "attached_to": 29, "class_list": [ "usb", "bluetooth" @@ -107,8 +107,8 @@ "module_alias": "usb:v8087p0A2Bd0001dcE0dsc01dp01icE0isc01ip01in00" }, { - "index": 29, - "attached_to": 27, + "index": 31, + "attached_to": 29, "class_list": [ "usb", "bluetooth" @@ -247,20 +247,11 @@ "model": "Intel PCI bridge", "sysfs_id": "/devices/pci0000:00/0000:00:1c.0", "sysfs_bus_id": "0000:00:1c.0", - "resources": [ - { - "type": "irq", - "base": 120, - "triggered": 0, - "enabled": true - } - ], "detail": { "function": 0, "command": 1031, "header_type": 1, "secondary_bus": 2, - "irq": 120, "prog_if": 0 }, "driver": "pcieport", @@ -328,7 +319,6 @@ "command": 7, "header_type": 0, "secondary_bus": 0, - "irq": 0, "prog_if": 0 }, "module_alias": "pci:v00008086d00009D48sv000017AAsd0000504Abc06sc01i00" @@ -388,7 +378,6 @@ "command": 6, "header_type": 0, "secondary_bus": 0, - "irq": 0, "prog_if": 0 }, "driver": "skl_uncore", @@ -456,20 +445,11 @@ "model": "Intel PCI bridge", "sysfs_id": "/devices/pci0000:00/0000:00:1c.2", "sysfs_bus_id": "0000:00:1c.2", - "resources": [ - { - "type": "irq", - "base": 121, - "triggered": 0, - "enabled": true - } - ], "detail": { "function": 2, "command": 1031, "header_type": 1, "secondary_bus": 4, - "irq": 121, "prog_if": 0 }, "driver": "pcieport", @@ -485,8 +465,8 @@ ], "camera": [ { - "index": 25, - "attached_to": 27, + "index": 26, + "attached_to": 29, "class_list": [ "camera", "usb" @@ -587,8 +567,8 @@ "module_alias": "usb:v04F2pB52Cd0029dcEFdsc02dp01ic0Eisc02ip00in01" }, { - "index": 28, - "attached_to": 27, + "index": 30, + "attached_to": 29, "class_list": [ "camera", "usb" @@ -693,6 +673,7 @@ { "architecture": "x86_64", "vendor_name": "GenuineIntel", + "model_name": "Intel(R) Core(TM) i3-6100U CPU @ 2.30GHz", "family": 6, "model": 78, "stepping": 3, @@ -822,22 +803,29 @@ "l1tf", "mds", "swapgs", + "taa", "itlb_multihit", "srbds", "mmio_stale_data", "retbleed", - "gds" + "gds", + "vmscape" ], - "bogo": 4599.93, + "power_management": [ + "" + ], + "bogo": 4599, "cache": 3072, "units": 16, + "page_size": 4096, "physical_id": 0, "siblings": 4, "cores": 2, - "fpu": true, - "fpu_exception": true, + "fpu": false, + "fpu_exception": false, "cpuid_level": 22, "write_protect": false, + "tlb_size": 32553, "clflush_size": 64, "cache_alignment": 64, "address_sizes": { @@ -849,6 +837,97 @@ "disk": [ { "index": 24, + "attached_to": 20, + "class_list": [ + "disk", + "usb", + "scsi", + "block_device" + ], + "bus_type": { + "hex": "0084", + "name": "SCSI", + "value": 132 + }, + "slot": { + "bus": 2, + "number": 0 + }, + "base_class": { + "hex": "0106", + "name": "Mass Storage Device", + "value": 262 + }, + "sub_class": { + "hex": "0000", + "name": "Disk", + "value": 0 + }, + "vendor": { + "hex": "03f0", + "name": "hp", + "value": 1008 + }, + "device": { + "hex": "3307", + "name": "v125w", + "value": 13063 + }, + "revision": { + "hex": "0000", + "name": "8192", + "value": 0 + }, + "serial": "AA12101B00001106", + "model": "hp v125w", + "sysfs_id": "/class/block/sdb", + "sysfs_bus_id": "2:0:0:0", + "sysfs_device_link": "/devices/pci0000:00/0000:00:14.0/usb1/1-6/1-6:1.0/host2/target2:0:0/2:0:0:0", + "unix_device_names": [ + "/dev/disk/by-id/usb-hp_v125w_AA12101B00001106-0:0", + "/dev/disk/by-path/pci-0000:00:14.0-usb-0:6:1.0-scsi-0:0:0:0", + "/dev/disk/by-path/pci-0000:00:14.0-usbv2-0:6:1.0-scsi-0:0:0:0", + "/dev/sdb" + ], + "unix_device_name2": "/dev/sg1", + "resources": [ + { + "type": "baud", + "speed": 480000000, + "bits": 0, + "stop_bits": 0, + "parity": 0, + "handshake": 0 + }, + { + "type": "disk_geo", + "cylinders": 1021, + "heads": 250, + "sectors": 62, + "size": "0x0", + "geo_type": "logical" + }, + { + "type": "size", + "unit": "sectors", + "value_1": 15826944, + "value_2": 512 + } + ], + "driver": "usb-storage", + "driver_module": "usb_storage", + "drivers": [ + "sd", + "usb-storage" + ], + "driver_modules": [ + "sd_mod", + "usb_storage" + ], + "module_alias": "usb:v03F0p3307d8192dc00dsc00dp00ic08isc06ip50in00" + }, + { + "index": 25, "attached_to": 8, "class_list": [ "disk", @@ -894,20 +973,12 @@ "sysfs_id": "/class/block/sda", "sysfs_bus_id": "1:0:0:0", "sysfs_device_link": "/devices/pci0000:00/0000:00:17.0/ata2/host1/target1:0:0/1:0:0:0", - "unix_device_name": "/dev/sda", - "unix_device_number": { - "type": 98, - "major": 8, - "minor": 0, - "range": 16 - }, "unix_device_names": [ "/dev/disk/by-id/ata-SATA_SSD_25042209300019", "/dev/disk/by-path/pci-0000:00:17.0-ata-2", "/dev/disk/by-path/pci-0000:00:17.0-ata-2.0", "/dev/sda" ], - "rom_id": "0x80", "resources": [ { "type": "disk_geo", @@ -999,36 +1070,6 @@ "range": 64, "enabled": true, "access": "read_write" - }, - { - "type": "irq", - "base": 131, - "triggered": 0, - "enabled": true - }, - { - "type": "mem", - "base": 3758096384, - "range": 268435456, - "enabled": true, - "access": "read_only", - "prefetch": "no" - }, - { - "type": "mem", - "base": 4026531840, - "range": 16777216, - "enabled": true, - "access": "read_write", - "prefetch": "no" - }, - { - "type": "mem", - "base": 786432, - "range": 131072, - "enabled": false, - "access": "read_write", - "prefetch": "no" } ], "detail": { @@ -1036,7 +1077,6 @@ "command": 1031, "header_type": 0, "secondary_bus": 0, - "irq": 131, "prog_if": 0 }, "driver": "i915", @@ -1052,7 +1092,7 @@ ], "hub": [ { - "index": 27, + "index": 29, "attached_to": 20, "class_list": [ "usb", @@ -1074,7 +1114,7 @@ }, "vendor": { "hex": "1d6b", - "name": "Linux 6.14.10 xhci-hcd", + "name": "Linux 6.12.62 xhci-hcd", "value": 7531 }, "device": { @@ -1084,11 +1124,11 @@ }, "revision": { "hex": "0000", - "name": "6.14", + "name": "6.12", "value": 0 }, "serial": "0000:00:14.0", - "model": "Linux 6.14.10 xhci-hcd xHCI Host Controller", + "model": "Linux 6.12.62 xhci-hcd xHCI Host Controller", "sysfs_id": "/devices/pci0000:00/0000:00:14.0/usb1/1-0:1.0", "sysfs_bus_id": "1-0:1.0", "resources": [ @@ -1136,10 +1176,10 @@ "driver_modules": [ "usbcore" ], - "module_alias": "usb:v1D6Bp0002d0614dc09dsc00dp01ic09isc00ip00in00" + "module_alias": "usb:v1D6Bp0002d0612dc09dsc00dp01ic09isc00ip00in00" }, { - "index": 30, + "index": 32, "attached_to": 20, "class_list": [ "usb", @@ -1161,7 +1201,7 @@ }, "vendor": { "hex": "1d6b", - "name": "Linux 6.14.10 xhci-hcd", + "name": "Linux 6.12.62 xhci-hcd", "value": 7531 }, "device": { @@ -1171,11 +1211,11 @@ }, "revision": { "hex": "0000", - "name": "6.14", + "name": "6.12", "value": 0 }, "serial": "0000:00:14.0", - "model": "Linux 6.14.10 xhci-hcd xHCI Host Controller", + "model": "Linux 6.12.62 xhci-hcd xHCI Host Controller", "sysfs_id": "/devices/pci0000:00/0000:00:14.0/usb2/2-0:1.0", "sysfs_bus_id": "2-0:1.0", "detail": { @@ -1213,7 +1253,7 @@ "driver_modules": [ "usbcore" ], - "module_alias": "usb:v1D6Bp0003d0614dc09dsc00dp03ic09isc00ip00in00" + "module_alias": "usb:v1D6Bp0003d0612dc09dsc00dp03ic09isc00ip00in00" } ], "memory": [ @@ -1235,14 +1275,6 @@ }, "model": "Main Memory", "resources": [ - { - "type": "mem", - "base": 0, - "range": 16639086592, - "enabled": true, - "access": "read_write", - "prefetch": "unknown" - }, { "type": "phys_mem", "range": 16106127360 @@ -1330,7 +1362,7 @@ ], "mouse": [ { - "index": 33, + "index": 36, "attached_to": 0, "bus_type": { "hex": "0080", @@ -1355,9 +1387,9 @@ "hex": "0007", "value": 7 }, - "sysfs_id": "/devices/platform/i8042/serio1/input/input5", + "sysfs_id": "/devices/platform/i8042/serio1/input/input4", "unix_device_names": [ - "/dev/input/event5", + "/dev/input/event4", "/dev/input/ + handler" ] } @@ -1413,7 +1445,6 @@ "model": "Intel Ethernet controller", "sysfs_id": "/devices/pci0000:00/0000:00:1f.6", "sysfs_bus_id": "0000:00:1f.6", - "unix_device_name": "enp0s31f6", "unix_device_names": [ "enp0s31f6" ], @@ -1422,20 +1453,6 @@ "type": "hwaddr", "address": 53 }, - { - "type": "irq", - "base": 130, - "triggered": 0, - "enabled": true - }, - { - "type": "mem", - "base": 4045406208, - "range": 131072, - "enabled": true, - "access": "read_write", - "prefetch": "no" - }, { "type": "phwaddr", "address": 53 @@ -1446,7 +1463,6 @@ "command": 1030, "header_type": 0, "secondary_bus": 0, - "irq": 130, "prog_if": 0 }, "driver": "e1000e", @@ -1464,7 +1480,8 @@ "attached_to": 22, "class_list": [ "network_controller", - "pci" + "pci", + "wlan_card" ], "bus_type": { "hex": "0004", @@ -1481,9 +1498,9 @@ "value": 2 }, "sub_class": { - "hex": "0080", - "name": "Network controller", - "value": 128 + "hex": "0082", + "name": "WLAN controller", + "value": 130 }, "vendor": { "hex": "8086", @@ -1507,39 +1524,148 @@ "hex": "003a", "value": 58 }, - "model": "Intel Network controller", + "model": "Intel WLAN controller", "sysfs_id": "/devices/pci0000:00/0000:00:1c.2/0000:04:00.0", "sysfs_bus_id": "0000:04:00.0", + "unix_device_names": [ + "wlp4s0" + ], "resources": [ { - "type": "irq", - "base": 18, - "triggered": 0, - "enabled": true + "type": "hwaddr", + "address": 97 }, { - "type": "mem", - "base": 4043309056, - "range": 8192, - "enabled": true, - "access": "read_write", - "prefetch": "no" + "type": "phwaddr", + "address": 97 + }, + { + "type": "wlan", + "channels": [ + "1", + "2", + "3", + "4", + "5", + "6", + "7", + "8", + "9", + "10", + "11", + "12", + "13", + "36", + "40", + "44", + "48", + "52", + "56", + "60", + "64", + "100", + "104", + "108", + "112", + "116", + "120", + "124", + "128", + "132", + "136", + "140" + ], + "frequencies": [ + "2.412", + "2.417", + "2.422", + "2.427", + "2.432", + "2.437", + "2.442", + "2.447", + "2.452", + "2.457", + "2.462", + "2.467", + "2.472", + "5.18", + "5.2", + "5.22", + "5.24", + "5.26", + "5.28", + "5.3", + "5.32", + "5.5", + "5.52", + "5.54", + "5.56", + "5.58", + "5.6", + "5.62", + "5.64", + "5.66", + "5.68", + "5.7" + ], + "auth_modes": [ + "open", + "sharedkey", + "wpa-psk", + "wpa-eap" + ], + "enc_modes": [ + "WEP40", + "WEP104", + "TKIP", + "CCMP" + ] } ], "detail": { "function": 0, - "command": 2, + "command": 1030, "header_type": 0, "secondary_bus": 0, - "irq": 18, "prog_if": 0 }, + "driver": "iwlwifi", + "driver_module": "iwlwifi", + "drivers": [ + "iwlwifi" + ], + "driver_modules": [ + "iwlwifi" + ], "module_alias": "pci:v00008086d000024F3sv00008086sd00000130bc02sc80i00" } ], "network_interface": [ { - "index": 31, + "index": 33, + "attached_to": 0, + "class_list": [ + "network_interface" + ], + "base_class": { + "hex": "0107", + "name": "Network Interface", + "value": 263 + }, + "sub_class": { + "hex": "0000", + "name": "Loopback", + "value": 0 + }, + "model": "Loopback network interface", + "sysfs_id": "/class/net/lo", + "unix_device_names": [ + "lo" + ] + }, + { + "index": 34, "attached_to": 17, "class_list": [ "network_interface" @@ -1557,7 +1683,6 @@ "model": "Ethernet network interface", "sysfs_id": "/class/net/enp0s31f6", "sysfs_device_link": "/devices/pci0000:00/0000:00:1f.6", - "unix_device_name": "enp0s31f6", "unix_device_names": [ "enp0s31f6" ], @@ -1581,8 +1706,8 @@ ] }, { - "index": 32, - "attached_to": 0, + "index": 35, + "attached_to": 18, "class_list": [ "network_interface" ], @@ -1592,15 +1717,33 @@ "value": 263 }, "sub_class": { - "hex": "0000", - "name": "Loopback", - "value": 0 + "hex": "0001", + "name": "Ethernet", + "value": 1 }, - "model": "Loopback network interface", - "sysfs_id": "/class/net/lo", - "unix_device_name": "lo", + "model": "Ethernet network interface", + "sysfs_id": "/class/net/wlp4s0", + "sysfs_device_link": "/devices/pci0000:00/0000:00:1c.2/0000:04:00.0", "unix_device_names": [ - "lo" + "wlp4s0" + ], + "resources": [ + { + "type": "hwaddr", + "address": 97 + }, + { + "type": "phwaddr", + "address": 97 + } + ], + "driver": "iwlwifi", + "driver_module": "iwlwifi", + "drivers": [ + "iwlwifi" + ], + "driver_modules": [ + "iwlwifi" ] } ], @@ -1655,22 +1798,11 @@ "model": "Intel Memory controller", "sysfs_id": "/devices/pci0000:00/0000:00:1f.2", "sysfs_bus_id": "0000:00:1f.2", - "resources": [ - { - "type": "mem", - "base": 4045684736, - "range": 16384, - "enabled": false, - "access": "read_write", - "prefetch": "no" - } - ], "detail": { "function": 2, "command": 0, "header_type": 0, "secondary_bus": 0, - "irq": 0, "prog_if": 0 }, "module_alias": "pci:v00008086d00009D21sv000017AAsd0000504Abc05sc80i00" @@ -1719,28 +1851,11 @@ "model": "Unclassified device", "sysfs_id": "/devices/pci0000:00/0000:00:1c.0/0000:02:00.0", "sysfs_bus_id": "0000:02:00.0", - "resources": [ - { - "type": "irq", - "base": 129, - "triggered": 0, - "enabled": true - }, - { - "type": "mem", - "base": 4044357632, - "range": 4096, - "enabled": true, - "access": "read_write", - "prefetch": "no" - } - ], "detail": { "function": 0, "command": 1030, "header_type": 0, "secondary_bus": 0, - "irq": 129, "prog_if": 0 }, "driver": "rtsx_pci", @@ -1803,28 +1918,11 @@ "model": "Intel Communication controller", "sysfs_id": "/devices/pci0000:00/0000:00:16.0", "sysfs_bus_id": "0000:00:16.0", - "resources": [ - { - "type": "irq", - "base": 128, - "triggered": 0, - "enabled": true - }, - { - "type": "mem", - "base": 4045713408, - "range": 4096, - "enabled": true, - "access": "read_write", - "prefetch": "no" - } - ], "detail": { "function": 0, "command": 1030, "header_type": 0, "secondary_bus": 0, - "irq": 128, "prog_if": 0 }, "driver": "mei_me", @@ -1887,28 +1985,11 @@ "model": "Intel Signal processing controller", "sysfs_id": "/devices/pci0000:00/0000:00:14.2", "sysfs_bus_id": "0000:00:14.2", - "resources": [ - { - "type": "irq", - "base": 18, - "triggered": 0, - "enabled": true - }, - { - "type": "mem", - "base": 4045709312, - "range": 4096, - "enabled": true, - "access": "read_write", - "prefetch": "no" - } - ], "detail": { "function": 2, "command": 2, "header_type": 0, "secondary_bus": 0, - "irq": 18, "prog_if": 0 }, "driver": "intel_pch_thermal", @@ -1978,20 +2059,6 @@ "range": 32, "enabled": true, "access": "read_write" - }, - { - "type": "irq", - "base": 16, - "triggered": 0, - "enabled": true - }, - { - "type": "mem", - "base": 4045721600, - "range": 256, - "enabled": true, - "access": "read_write", - "prefetch": "no" } ], "detail": { @@ -1999,7 +2066,6 @@ "command": 3, "header_type": 0, "secondary_bus": 0, - "irq": 16, "prog_if": 0 }, "driver": "i801_smbus", @@ -2063,36 +2129,11 @@ "model": "Intel Multimedia controller", "sysfs_id": "/devices/pci0000:00/0000:00:1f.3", "sysfs_bus_id": "0000:00:1f.3", - "resources": [ - { - "type": "irq", - "base": 132, - "triggered": 0, - "enabled": true - }, - { - "type": "mem", - "base": 4045602816, - "range": 65536, - "enabled": true, - "access": "read_write", - "prefetch": "no" - }, - { - "type": "mem", - "base": 4045668352, - "range": 16384, - "enabled": true, - "access": "read_write", - "prefetch": "no" - } - ], "detail": { "function": 3, "command": 1030, "header_type": 0, "secondary_bus": 0, - "irq": 132, "prog_if": 0 }, "driver": "snd_hda_intel", @@ -2181,36 +2222,6 @@ "range": 4, "enabled": true, "access": "read_write" - }, - { - "type": "irq", - "base": 127, - "triggered": 0, - "enabled": true - }, - { - "type": "mem", - "base": 4045701120, - "range": 8192, - "enabled": true, - "access": "read_write", - "prefetch": "no" - }, - { - "type": "mem", - "base": 4045717504, - "range": 2048, - "enabled": true, - "access": "read_write", - "prefetch": "no" - }, - { - "type": "mem", - "base": 4045725696, - "range": 256, - "enabled": true, - "access": "read_write", - "prefetch": "no" } ], "detail": { @@ -2218,7 +2229,6 @@ "command": 1031, "header_type": 0, "secondary_bus": 0, - "irq": 127, "prog_if": 1 }, "driver": "ahci", @@ -2290,28 +2300,11 @@ "model": "Intel USB Controller", "sysfs_id": "/devices/pci0000:00/0000:00:14.0", "sysfs_bus_id": "0000:00:14.0", - "resources": [ - { - "type": "irq", - "base": 122, - "triggered": 0, - "enabled": true - }, - { - "type": "mem", - "base": 4045537280, - "range": 65536, - "enabled": true, - "access": "read_write", - "prefetch": "no" - } - ], "detail": { "function": 0, - "command": 1026, + "command": 1030, "header_type": 0, "secondary_bus": 0, - "irq": 122, "prog_if": 48 }, "driver": "xhci_hcd",