diff --git a/flake.nix b/flake.nix index 0e0f8cd..3e8ec10 100644 --- a/flake.nix +++ b/flake.nix @@ -3,7 +3,7 @@ outputs = inputs: inputs.flake-parts.lib.mkFlake {inherit inputs;} { - systems = ["x86_64-linux"]; + systems = ["x86_64-linux" "aarch64-linux"]; imports = [./hosts ./pkgs]; diff --git a/home/terminal/shell/fish.nix b/home/terminal/shell/fish.nix index c4e438b..03054c3 100644 --- a/home/terminal/shell/fish.nix +++ b/home/terminal/shell/fish.nix @@ -37,7 +37,9 @@ # Custom bindings for mode in insert default bind -M $mode ctrl-backspace backward-kill-word + bind -M $mode ctrl-delete kill-word bind -M $mode alt-backspace backward-kill-token + bind -M $mode alt-delete kill-token bind -M $mode ctrl-z undo end bind -M insert \cx\ce edit_command_buffer @@ -173,8 +175,6 @@ end alias cleanram="sudo sh -c 'sync; echo 3 > /proc/sys/vm/drop_caches'" alias trimall="sudo fstrim -va" alias c="clear" - alias test-build="sudo nixos-rebuild test --flake /etc/nixos#aesthetic" - alias switch-build="sudo nixos-rebuild switch --flake /etc/nixos#aesthetic" alias add="git add ." alias commit="git commit" alias push="git push" diff --git a/hosts/aesthetic/default.nix b/hosts/aesthetic/default.nix index b340224..d2f9156 100644 --- a/hosts/aesthetic/default.nix +++ b/hosts/aesthetic/default.nix @@ -132,8 +132,6 @@ ''; }; - networking.hostName = "aesthetic"; - security.tpm2.enable = true; # Additional security hardening for HSI compliance diff --git a/hosts/default.nix b/hosts/default.nix index f1609bf..3f5293a 100644 --- a/hosts/default.nix +++ b/hosts/default.nix @@ -2,32 +2,44 @@ self, inputs, ... -}: { - flake.nixosConfigurations = let - # shorten paths - inherit (inputs.nixpkgs.lib) nixosSystem; - mod = "${self}/system"; - home = "${self}/home"; +}: let + # shorten paths + inherit (inputs.nixpkgs.lib) nixosSystem; + mod = "${self}/system"; + home = "${self}/home"; - # get the basic config to build on top of - inherit (import "${self}/system") desktop laptop; + # get the basic config to build on top of + inherit (import "${self}/system") tty desktop laptop; - # get these into the module system - specialArgs = {inherit inputs self;}; - in { - aesthetic = nixosSystem { + # get these into the module system + specialArgs = {inherit inputs self;}; + + # shared modules for all configurations + sharedModules = [ + ./aesthetic + "${mod}/services/gnome-services.nix" + "${mod}/core/limine.nix" + "${home}" + inputs.agenix.nixosModules.default + ]; +in { + flake.nixosConfigurations = { + # TTY: desktop headless (no GUI) + tty = nixosSystem { inherit specialArgs; - modules = - desktop - ++ laptop - ++ [ - ./aesthetic - "${mod}/services/gnome-services.nix" - "${mod}/core/limine.nix" - "${home}" + modules = tty ++ sharedModules; + }; - inputs.agenix.nixosModules.default - ]; + # Desktop: desktop with GUI + desktop = nixosSystem { + inherit specialArgs; + modules = desktop ++ sharedModules; + }; + + # Laptop: laptop with GUI + battery + bluetooth + laptop = nixosSystem { + inherit specialArgs; + modules = laptop ++ sharedModules; }; }; } diff --git a/hosts/facter.json b/hosts/facter.json new file mode 100644 index 0000000..d19ed60 --- /dev/null +++ b/hosts/facter.json @@ -0,0 +1,3490 @@ +{ + "version": 1, + "system": "x86_64-linux", + "virtualisation": "none", + "uefi": { + "supported": false + }, + "hardware": { + "bios": { + "apm_info": { + "supported": false, + "enabled": false, + "version": 0, + "sub_version": 0, + "bios_flags": 0 + }, + "vbe_info": { + "version": 0, + "video_memory": 0 + }, + "pnp": true, + "pnp_id": 0, + "lba_support": false, + "low_memory_size": 654336, + "smbios_version": 768 + }, + "bluetooth": [ + { + "index": 35, + "attached_to": 36, + "class_list": [ + "usb", + "bluetooth" + ], + "bus_type": { + "hex": "0086", + "name": "USB", + "value": 134 + }, + "slot": { + "bus": 0, + "number": 0 + }, + "base_class": { + "hex": "0115", + "name": "Bluetooth Device", + "value": 277 + }, + "vendor": { + "hex": "8087", + "value": 32903 + }, + "device": { + "hex": "0a2b", + "value": 2603 + }, + "revision": { + "hex": "0000", + "name": "0.10", + "value": 0 + }, + "model": "Bluetooth Device", + "sysfs_id": "/devices/pci0000:00/0000:00:14.0/usb1/1-7/1-7:1.0", + "sysfs_bus_id": "1-7:1.0", + "resources": [ + { + "type": "baud", + "speed": 12000000, + "bits": 0, + "stop_bits": 0, + "parity": 0, + "handshake": 0 + } + ], + "detail": { + "device_class": { + "hex": "00e0", + "name": "wireless", + "value": 224 + }, + "device_subclass": { + "hex": "0001", + "name": "audio", + "value": 1 + }, + "device_protocol": 1, + "interface_class": { + "hex": "00e0", + "name": "wireless", + "value": 224 + }, + "interface_subclass": { + "hex": "0001", + "name": "audio", + "value": 1 + }, + "interface_protocol": 1, + "interface_number": 0, + "interface_alternate_setting": 0 + }, + "hotplug": "usb", + "driver": "btusb", + "driver_module": "btusb", + "drivers": [ + "btusb" + ], + "driver_modules": [ + "btusb" + ], + "module_alias": "usb:v8087p0A2Bd0010dcE0dsc01dp01icE0isc01ip01in00" + }, + { + "index": 41, + "attached_to": 36, + "class_list": [ + "usb", + "bluetooth" + ], + "bus_type": { + "hex": "0086", + "name": "USB", + "value": 134 + }, + "slot": { + "bus": 0, + "number": 0 + }, + "base_class": { + "hex": "0115", + "name": "Bluetooth Device", + "value": 277 + }, + "vendor": { + "hex": "8087", + "value": 32903 + }, + "device": { + "hex": "0a2b", + "value": 2603 + }, + "revision": { + "hex": "0000", + "name": "0.10", + "value": 0 + }, + "model": "Bluetooth Device", + "sysfs_id": "/devices/pci0000:00/0000:00:14.0/usb1/1-7/1-7:1.1", + "sysfs_bus_id": "1-7:1.1", + "resources": [ + { + "type": "baud", + "speed": 12000000, + "bits": 0, + "stop_bits": 0, + "parity": 0, + "handshake": 0 + } + ], + "detail": { + "device_class": { + "hex": "00e0", + "name": "wireless", + "value": 224 + }, + "device_subclass": { + "hex": "0001", + "name": "audio", + "value": 1 + }, + "device_protocol": 1, + "interface_class": { + "hex": "00e0", + "name": "wireless", + "value": 224 + }, + "interface_subclass": { + "hex": "0001", + "name": "audio", + "value": 1 + }, + "interface_protocol": 1, + "interface_number": 1, + "interface_alternate_setting": 0 + }, + "hotplug": "usb", + "driver": "btusb", + "driver_module": "btusb", + "drivers": [ + "btusb" + ], + "driver_modules": [ + "btusb" + ], + "module_alias": "usb:v8087p0A2Bd0010dcE0dsc01dp01icE0isc01ip01in01" + } + ], + "bridge": [ + { + "index": 10, + "attached_to": 0, + "class_list": [ + "pci", + "bridge" + ], + "bus_type": { + "hex": "0004", + "name": "PCI", + "value": 4 + }, + "slot": { + "bus": 0, + "number": 28 + }, + "base_class": { + "hex": "0006", + "name": "Bridge", + "value": 6 + }, + "sub_class": { + "hex": "0004", + "name": "PCI bridge", + "value": 4 + }, + "pci_interface": { + "hex": "0000", + "name": "Normal decode", + "value": 0 + }, + "vendor": { + "hex": "8086", + "name": "Intel Corporation", + "value": 32902 + }, + "sub_vendor": { + "hex": "8086", + "name": "Intel Corporation", + "value": 32902 + }, + "device": { + "hex": "9d13", + "value": 40211 + }, + "sub_device": { + "hex": "9d13", + "value": 40211 + }, + "revision": { + "hex": "00f1", + "value": 241 + }, + "model": "Intel PCI bridge", + "sysfs_id": "/devices/pci0000:00/0000:00:1c.0", + "sysfs_bus_id": "0000:00:1c.0", + "detail": { + "function": 0, + "command": 1286, + "header_type": 1, + "secondary_bus": 1, + "prog_if": 0 + }, + "driver": "pcieport", + "driver_module": "pcieportdrv", + "drivers": [ + "pcieport" + ], + "driver_modules": [ + "pcieportdrv" + ], + "module_alias": "pci:v00008086d00009D13sv00008086sd00009D13bc06sc04i00" + }, + { + "index": 11, + "attached_to": 0, + "class_list": [ + "pci", + "bridge" + ], + "bus_type": { + "hex": "0004", + "name": "PCI", + "value": 4 + }, + "slot": { + "bus": 0, + "number": 31 + }, + "base_class": { + "hex": "0006", + "name": "Bridge", + "value": 6 + }, + "sub_class": { + "hex": "0001", + "name": "ISA bridge", + "value": 1 + }, + "vendor": { + "hex": "8086", + "name": "Intel Corporation", + "value": 32902 + }, + "sub_vendor": { + "hex": "8086", + "name": "Intel Corporation", + "value": 32902 + }, + "device": { + "hex": "9d4e", + "value": 40270 + }, + "sub_device": { + "hex": "9d4e", + "value": 40270 + }, + "revision": { + "hex": "0021", + "value": 33 + }, + "model": "Intel ISA bridge", + "sysfs_id": "/devices/pci0000:00/0000:00:1f.0", + "sysfs_bus_id": "0000:00:1f.0", + "detail": { + "function": 0, + "command": 7, + "header_type": 0, + "secondary_bus": 0, + "prog_if": 0 + }, + "module_alias": "pci:v00008086d00009D4Esv00008086sd00009D4Ebc06sc01i00" + }, + { + "index": 15, + "attached_to": 0, + "class_list": [ + "pci", + "bridge" + ], + "bus_type": { + "hex": "0004", + "name": "PCI", + "value": 4 + }, + "slot": { + "bus": 0, + "number": 0 + }, + "base_class": { + "hex": "0006", + "name": "Bridge", + "value": 6 + }, + "sub_class": { + "hex": "0000", + "name": "Host bridge", + "value": 0 + }, + "vendor": { + "hex": "8086", + "name": "Intel Corporation", + "value": 32902 + }, + "sub_vendor": { + "hex": "8086", + "name": "Intel Corporation", + "value": 32902 + }, + "device": { + "hex": "5914", + "value": 22804 + }, + "sub_device": { + "hex": "5914", + "value": 22804 + }, + "revision": { + "hex": "0008", + "value": 8 + }, + "model": "Intel Host bridge", + "sysfs_id": "/devices/pci0000:00/0000:00:00.0", + "sysfs_bus_id": "0000:00:00.0", + "detail": { + "function": 0, + "command": 6, + "header_type": 0, + "secondary_bus": 0, + "prog_if": 0 + }, + "driver": "skl_uncore", + "driver_module": "intel_uncore", + "drivers": [ + "skl_uncore" + ], + "driver_modules": [ + "intel_uncore" + ], + "module_alias": "pci:v00008086d00005914sv00008086sd00005914bc06sc00i00" + }, + { + "index": 16, + "attached_to": 0, + "class_list": [ + "pci", + "bridge" + ], + "bus_type": { + "hex": "0004", + "name": "PCI", + "value": 4 + }, + "slot": { + "bus": 0, + "number": 29 + }, + "base_class": { + "hex": "0006", + "name": "Bridge", + "value": 6 + }, + "sub_class": { + "hex": "0004", + "name": "PCI bridge", + "value": 4 + }, + "pci_interface": { + "hex": "0000", + "name": "Normal decode", + "value": 0 + }, + "vendor": { + "hex": "8086", + "name": "Intel Corporation", + "value": 32902 + }, + "sub_vendor": { + "hex": "8086", + "name": "Intel Corporation", + "value": 32902 + }, + "device": { + "hex": "9d18", + "value": 40216 + }, + "sub_device": { + "hex": "9d18", + "value": 40216 + }, + "revision": { + "hex": "00f1", + "value": 241 + }, + "model": "Intel PCI bridge", + "sysfs_id": "/devices/pci0000:00/0000:00:1d.0", + "sysfs_bus_id": "0000:00:1d.0", + "detail": { + "function": 0, + "command": 1286, + "header_type": 1, + "secondary_bus": 4, + "prog_if": 0 + }, + "driver": "pcieport", + "driver_module": "pcieportdrv", + "drivers": [ + "pcieport" + ], + "driver_modules": [ + "pcieportdrv" + ], + "module_alias": "pci:v00008086d00009D18sv00008086sd00009D18bc06sc04i00" + }, + { + "index": 17, + "attached_to": 0, + "class_list": [ + "pci", + "bridge" + ], + "bus_type": { + "hex": "0004", + "name": "PCI", + "value": 4 + }, + "slot": { + "bus": 0, + "number": 28 + }, + "base_class": { + "hex": "0006", + "name": "Bridge", + "value": 6 + }, + "sub_class": { + "hex": "0004", + "name": "PCI bridge", + "value": 4 + }, + "pci_interface": { + "hex": "0000", + "name": "Normal decode", + "value": 0 + }, + "vendor": { + "hex": "8086", + "name": "Intel Corporation", + "value": 32902 + }, + "sub_vendor": { + "hex": "8086", + "name": "Intel Corporation", + "value": 32902 + }, + "device": { + "hex": "9d16", + "value": 40214 + }, + "sub_device": { + "hex": "9d16", + "value": 40214 + }, + "revision": { + "hex": "00f1", + "value": 241 + }, + "model": "Intel PCI bridge", + "sysfs_id": "/devices/pci0000:00/0000:00:1c.6", + "sysfs_bus_id": "0000:00:1c.6", + "detail": { + "function": 6, + "command": 1286, + "header_type": 1, + "secondary_bus": 3, + "prog_if": 0 + }, + "driver": "pcieport", + "driver_module": "pcieportdrv", + "drivers": [ + "pcieport" + ], + "driver_modules": [ + "pcieportdrv" + ], + "module_alias": "pci:v00008086d00009D16sv00008086sd00009D16bc06sc04i00" + }, + { + "index": 20, + "attached_to": 0, + "class_list": [ + "pci", + "bridge" + ], + "bus_type": { + "hex": "0004", + "name": "PCI", + "value": 4 + }, + "slot": { + "bus": 0, + "number": 28 + }, + "base_class": { + "hex": "0006", + "name": "Bridge", + "value": 6 + }, + "sub_class": { + "hex": "0004", + "name": "PCI bridge", + "value": 4 + }, + "pci_interface": { + "hex": "0000", + "name": "Normal decode", + "value": 0 + }, + "vendor": { + "hex": "8086", + "name": "Intel Corporation", + "value": 32902 + }, + "sub_vendor": { + "hex": "8086", + "name": "Intel Corporation", + "value": 32902 + }, + "device": { + "hex": "9d14", + "value": 40212 + }, + "sub_device": { + "hex": "9d14", + "value": 40212 + }, + "revision": { + "hex": "00f1", + "value": 241 + }, + "model": "Intel PCI bridge", + "sysfs_id": "/devices/pci0000:00/0000:00:1c.4", + "sysfs_bus_id": "0000:00:1c.4", + "detail": { + "function": 4, + "command": 1287, + "header_type": 1, + "secondary_bus": 2, + "prog_if": 0 + }, + "driver": "pcieport", + "driver_module": "pcieportdrv", + "drivers": [ + "pcieport" + ], + "driver_modules": [ + "pcieportdrv" + ], + "module_alias": "pci:v00008086d00009D14sv00008086sd00009D14bc06sc04i00" + } + ], + "camera": [ + { + "index": 32, + "attached_to": 36, + "class_list": [ + "camera", + "usb" + ], + "bus_type": { + "hex": "0086", + "name": "USB", + "value": 134 + }, + "slot": { + "bus": 0, + "number": 0 + }, + "base_class": { + "hex": "010f", + "name": "Camera", + "value": 271 + }, + "vendor": { + "hex": "04f2", + "name": "Chicony Electronics Co., Ltd.", + "value": 1266 + }, + "device": { + "hex": "b604", + "name": "Integrated Camera", + "value": 46596 + }, + "revision": { + "hex": "0000", + "name": "0.27", + "value": 0 + }, + "serial": "0001", + "model": "Chicony Electronics Integrated Camera", + "sysfs_id": "/devices/pci0000:00/0000:00:14.0/usb1/1-8/1-8:1.1", + "sysfs_bus_id": "1-8:1.1", + "resources": [ + { + "type": "baud", + "speed": 480000000, + "bits": 0, + "stop_bits": 0, + "parity": 0, + "handshake": 0 + } + ], + "detail": { + "device_class": { + "hex": "00ef", + "name": "miscellaneous", + "value": 239 + }, + "device_subclass": { + "hex": "0002", + "name": "comm", + "value": 2 + }, + "device_protocol": 1, + "interface_class": { + "hex": "000e", + "name": "video", + "value": 14 + }, + "interface_subclass": { + "hex": "0002", + "name": "comm", + "value": 2 + }, + "interface_protocol": 0, + "interface_number": 1, + "interface_alternate_setting": 0, + "interface_association": { + "function_class": { + "hex": "000e", + "name": "video", + "value": 14 + }, + "function_subclass": { + "hex": "0003", + "name": "hid", + "value": 3 + }, + "function_protocol": 0, + "interface_count": 2, + "first_interface": 0 + } + }, + "hotplug": "usb", + "driver": "uvcvideo", + "driver_module": "uvcvideo", + "drivers": [ + "uvcvideo" + ], + "driver_modules": [ + "uvcvideo" + ], + "module_alias": "usb:v04F2pB604d0027dcEFdsc02dp01ic0Eisc02ip00in01" + }, + { + "index": 38, + "attached_to": 36, + "class_list": [ + "camera", + "usb" + ], + "bus_type": { + "hex": "0086", + "name": "USB", + "value": 134 + }, + "slot": { + "bus": 0, + "number": 0 + }, + "base_class": { + "hex": "010f", + "name": "Camera", + "value": 271 + }, + "vendor": { + "hex": "04f2", + "name": "Chicony Electronics Co., Ltd.", + "value": 1266 + }, + "device": { + "hex": "b604", + "name": "Integrated Camera", + "value": 46596 + }, + "revision": { + "hex": "0000", + "name": "0.27", + "value": 0 + }, + "serial": "0001", + "model": "Chicony Electronics Integrated Camera", + "sysfs_id": "/devices/pci0000:00/0000:00:14.0/usb1/1-8/1-8:1.0", + "sysfs_bus_id": "1-8:1.0", + "resources": [ + { + "type": "baud", + "speed": 480000000, + "bits": 0, + "stop_bits": 0, + "parity": 0, + "handshake": 0 + } + ], + "detail": { + "device_class": { + "hex": "00ef", + "name": "miscellaneous", + "value": 239 + }, + "device_subclass": { + "hex": "0002", + "name": "comm", + "value": 2 + }, + "device_protocol": 1, + "interface_class": { + "hex": "000e", + "name": "video", + "value": 14 + }, + "interface_subclass": { + "hex": "0001", + "name": "audio", + "value": 1 + }, + "interface_protocol": 0, + "interface_number": 0, + "interface_alternate_setting": 0, + "interface_association": { + "function_class": { + "hex": "000e", + "name": "video", + "value": 14 + }, + "function_subclass": { + "hex": "0003", + "name": "hid", + "value": 3 + }, + "function_protocol": 0, + "interface_count": 2, + "first_interface": 0 + } + }, + "hotplug": "usb", + "driver": "uvcvideo", + "driver_module": "uvcvideo", + "drivers": [ + "uvcvideo" + ], + "driver_modules": [ + "uvcvideo" + ], + "module_alias": "usb:v04F2pB604d0027dcEFdsc02dp01ic0Eisc01ip00in00" + } + ], + "cpu": [ + { + "architecture": "x86_64", + "vendor_name": "GenuineIntel", + "model_name": "Intel(R) Core(TM) i5-8250U CPU @ 1.60GHz", + "family": 6, + "model": 142, + "stepping": 10, + "features": [ + "fpu", + "vme", + "de", + "pse", + "tsc", + "msr", + "pae", + "mce", + "cx8", + "apic", + "sep", + "mtrr", + "pge", + "mca", + "cmov", + "pat", + "pse36", + "clflush", + "dts", + "acpi", + "mmx", + "fxsr", + "sse", + "sse2", + "ss", + "ht", + "tm", + "pbe", + "syscall", + "nx", + "pdpe1gb", + "rdtscp", + "lm", + "constant_tsc", + "art", + "arch_perfmon", + "pebs", + "bts", + "rep_good", + "nopl", + "xtopology", + "nonstop_tsc", + "cpuid", + "aperfmperf", + "pni", + "pclmulqdq", + "dtes64", + "monitor", + "ds_cpl", + "vmx", + "est", + "tm2", + "ssse3", + "sdbg", + "fma", + "cx16", + "xtpr", + "pdcm", + "pcid", + "sse4_1", + "sse4_2", + "x2apic", + "movbe", + "popcnt", + "tsc_deadline_timer", + "aes", + "xsave", + "avx", + "f16c", + "rdrand", + "lahf_lm", + "abm", + "3dnowprefetch", + "cpuid_fault", + "epb", + "pti", + "ssbd", + "ibrs", + "ibpb", + "stibp", + "tpr_shadow", + "flexpriority", + "ept", + "vpid", + "ept_ad", + "fsgsbase", + "tsc_adjust", + "bmi1", + "avx2", + "smep", + "bmi2", + "erms", + "invpcid", + "mpx", + "rdseed", + "adx", + "smap", + "clflushopt", + "intel_pt", + "xsaveopt", + "xsavec", + "xgetbv1", + "xsaves", + "dtherm", + "ida", + "arat", + "pln", + "pts", + "hwp", + "hwp_notify", + "hwp_act_window", + "hwp_epp", + "vnmi", + "md_clear", + "flush_l1d", + "arch_capabilities" + ], + "bugs": [ + "cpu_meltdown", + "spectre_v1", + "spectre_v2", + "spec_store_bypass", + "l1tf", + "mds", + "swapgs", + "itlb_multihit", + "srbds", + "mmio_stale_data", + "retbleed", + "gds", + "spectre_v2_user", + "vmscape" + ], + "power_management": [ + "" + ], + "bogo": 3600, + "cache": 6144, + "units": 16, + "page_size": 4096, + "physical_id": 0, + "siblings": 4, + "cores": 4, + "fpu": false, + "fpu_exception": false, + "cpuid_level": 22, + "write_protect": false, + "clflush_size": 64, + "cache_alignment": 64, + "address_sizes": { + "physical": "0x27", + "virtual": "0x30" + } + } + ], + "disk": [ + { + "index": 27, + "attached_to": 13, + "class_list": [ + "disk", + "block_device", + "nvme" + ], + "bus_type": { + "hex": "0096", + "name": "NVME", + "value": 150 + }, + "slot": { + "bus": 0, + "number": 0 + }, + "base_class": { + "hex": "0106", + "name": "Mass Storage Device", + "value": 262 + }, + "sub_class": { + "hex": "0000", + "name": "Disk", + "value": 0 + }, + "vendor": { + "hex": "15b7", + "value": 5559 + }, + "sub_vendor": { + "hex": "15b7", + "value": 5559 + }, + "device": { + "hex": "5005", + "name": "WDC PC SN520 SDAPMUW-128G-1101", + "value": 20485 + }, + "sub_device": { + "hex": "5005", + "value": 20485 + }, + "serial": "2048EM456813", + "model": "WDC PC SN520 SDAPMUW-128G-1101", + "sysfs_id": "/class/block/nvme0n1", + "sysfs_bus_id": "nvme0", + "sysfs_device_link": "/devices/pci0000:00/0000:00:1c.0/0000:01:00.0/nvme/nvme0", + "unix_device_names": [ + "/dev/disk/by-id/nvme-WDC_PC_SN520_SDAPMUW-128G-1101_2048EM456813", + "/dev/disk/by-id/nvme-WDC_PC_SN520_SDAPMUW-128G-1101_2048EM456813_1", + "/dev/disk/by-id/nvme-eui.e8238fa6bf530001001b444a46baf857", + "/dev/disk/by-path/pci-0000:01:00.0-nvme-1", + "/dev/nvme0n1" + ], + "resources": [ + { + "type": "disk_geo", + "cylinders": 122104, + "heads": 64, + "sectors": 32, + "size": "0x0", + "geo_type": "logical" + }, + { + "type": "size", + "unit": "sectors", + "value_1": 250069680, + "value_2": 512 + } + ], + "driver": "nvme", + "driver_module": "nvme", + "drivers": [ + "nvme" + ], + "driver_modules": [ + "nvme" + ] + }, + { + "index": 28, + "attached_to": 21, + "class_list": [ + "disk", + "block_device", + "nvme" + ], + "bus_type": { + "hex": "0096", + "name": "NVME", + "value": 150 + }, + "slot": { + "bus": 0, + "number": 1 + }, + "base_class": { + "hex": "0106", + "name": "Mass Storage Device", + "value": 262 + }, + "sub_class": { + "hex": "0000", + "name": "Disk", + "value": 0 + }, + "vendor": { + "hex": "8086", + "name": "Intel Corporation", + "value": 32902 + }, + "sub_vendor": { + "hex": "8086", + "name": "Intel Corporation", + "value": 32902 + }, + "device": { + "hex": "f1a6", + "name": "INTEL SSDPEKKF256G8L", + "value": 61862 + }, + "sub_device": { + "hex": "390b", + "value": 14603 + }, + "serial": "PHHH847202C0256B", + "model": "Intel INTEL SSDPEKKF256G8L", + "sysfs_id": "/class/block/nvme1n1", + "sysfs_bus_id": "nvme1", + "sysfs_device_link": "/devices/pci0000:00/0000:00:1d.0/0000:04:00.0/nvme/nvme1", + "unix_device_names": [ + "/dev/disk/by-id/nvme-INTEL_SSDPEKKF256G8L_PHHH847202C0256B", + "/dev/disk/by-id/nvme-INTEL_SSDPEKKF256G8L_PHHH847202C0256B_1", + "/dev/disk/by-id/nvme-eui.5cd2e42291401e1e", + "/dev/disk/by-path/pci-0000:04:00.0-nvme-1", + "/dev/nvme1n1" + ], + "resources": [ + { + "type": "disk_geo", + "cylinders": 244198, + "heads": 64, + "sectors": 32, + "size": "0x0", + "geo_type": "logical" + }, + { + "type": "size", + "unit": "sectors", + "value_1": 500118192, + "value_2": 512 + } + ], + "driver": "nvme", + "driver_module": "nvme", + "drivers": [ + "nvme" + ], + "driver_modules": [ + "nvme" + ] + }, + { + "index": 29, + "attached_to": 23, + "class_list": [ + "disk", + "usb", + "scsi", + "block_device" + ], + "bus_type": { + "hex": "0084", + "name": "SCSI", + "value": 132 + }, + "slot": { + "bus": 0, + "number": 0 + }, + "base_class": { + "hex": "0106", + "name": "Mass Storage Device", + "value": 262 + }, + "sub_class": { + "hex": "0000", + "name": "Disk", + "value": 0 + }, + "vendor": { + "hex": "0bda", + "name": "Generic-", + "value": 3034 + }, + "device": { + "hex": "0316", + "name": "SD/MMC", + "value": 790 + }, + "revision": { + "hex": "0000", + "name": "1.00", + "value": 0 + }, + "serial": "2012090114345300", + "model": "Generic SD/MMC", + "sysfs_id": "/class/block/sda", + "sysfs_bus_id": "0:0:0:0", + "sysfs_device_link": "/devices/pci0000:00/0000:00:14.0/usb2/2-3/2-3:1.0/host0/target0:0:0/0:0:0:0", + "unix_device_names": [ + "/dev/disk/by-id/usb-Generic-_SD_MMC_20120501030900000-0:0", + "/dev/disk/by-path/pci-0000:00:14.0-usb-0:3:1.0-scsi-0:0:0:0", + "/dev/disk/by-path/pci-0000:00:14.0-usbv3-0:3:1.0-scsi-0:0:0:0", + "/dev/sda" + ], + "unix_device_name2": "/dev/sg0", + "resources": [ + { + "type": "disk_geo", + "cylinders": 1024, + "heads": 0, + "sectors": 62, + "size": "0x0", + "geo_type": "logical" + } + ], + "driver": "usb-storage", + "driver_module": "usb_storage", + "drivers": [ + "sd", + "usb-storage" + ], + "driver_modules": [ + "sd_mod", + "usb_storage" + ], + "module_alias": "usb:v0BDAp0316d0204dc00dsc00dp00ic08isc06ip50in00" + }, + { + "index": 30, + "attached_to": 0, + "class_list": [ + "disk", + "block_device" + ], + "base_class": { + "hex": "0106", + "name": "Mass Storage Device", + "value": 262 + }, + "sub_class": { + "hex": "0000", + "name": "Disk", + "value": 0 + }, + "model": "Disk", + "sysfs_id": "/class/block/zram0", + "unix_device_names": [ + "/dev/disk/by-label/zram0", + "/dev/disk/by-uuid/d3eec377-9ba7-49ba-b0c5-70159949e1e1", + "/dev/zram0" + ], + "resources": [ + { + "type": "size", + "unit": "sectors", + "value_1": 2303808, + "value_2": 4096 + } + ] + } + ], + "graphics_card": [ + { + "index": 22, + "attached_to": 0, + "class_list": [ + "graphics_card", + "pci" + ], + "bus_type": { + "hex": "0004", + "name": "PCI", + "value": 4 + }, + "slot": { + "bus": 0, + "number": 2 + }, + "base_class": { + "hex": "0003", + "name": "Display controller", + "value": 3 + }, + "sub_class": { + "hex": "0000", + "name": "VGA compatible controller", + "value": 0 + }, + "pci_interface": { + "hex": "0000", + "name": "VGA", + "value": 0 + }, + "vendor": { + "hex": "8086", + "name": "Intel Corporation", + "value": 32902 + }, + "sub_vendor": { + "hex": "8086", + "name": "Intel Corporation", + "value": 32902 + }, + "device": { + "hex": "5917", + "value": 22807 + }, + "sub_device": { + "hex": "2212", + "value": 8722 + }, + "revision": { + "hex": "0007", + "value": 7 + }, + "model": "Intel VGA compatible controller", + "sysfs_id": "/devices/pci0000:00/0000:00:02.0", + "sysfs_bus_id": "0000:00:02.0", + "resources": [ + { + "type": "io", + "base": 65472, + "range": 64, + "enabled": true, + "access": "read_write" + } + ], + "detail": { + "function": 0, + "command": 1031, + "header_type": 0, + "secondary_bus": 0, + "prog_if": 0 + }, + "driver": "i915", + "driver_module": "i915", + "drivers": [ + "i915" + ], + "driver_modules": [ + "i915" + ], + "module_alias": "pci:v00008086d00005917sv00008086sd00002212bc03sc00i00", + "label": "VGA compatible controller" + } + ], + "hub": [ + { + "index": 36, + "attached_to": 23, + "class_list": [ + "usb", + "hub" + ], + "bus_type": { + "hex": "0086", + "name": "USB", + "value": 134 + }, + "slot": { + "bus": 0, + "number": 0 + }, + "base_class": { + "hex": "010a", + "name": "Hub", + "value": 266 + }, + "vendor": { + "hex": "1d6b", + "name": "Linux 6.19.8 xhci-hcd", + "value": 7531 + }, + "device": { + "hex": "0002", + "name": "xHCI Host Controller", + "value": 2 + }, + "revision": { + "hex": "0000", + "name": "6.19", + "value": 0 + }, + "serial": "0000:00:14.0", + "model": "Linux 6.19.8 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": [ + { + "type": "baud", + "speed": 480000000, + "bits": 0, + "stop_bits": 0, + "parity": 0, + "handshake": 0 + } + ], + "detail": { + "device_class": { + "hex": "0009", + "name": "hub", + "value": 9 + }, + "device_subclass": { + "hex": "0000", + "name": "per_interface", + "value": 0 + }, + "device_protocol": 1, + "interface_class": { + "hex": "0009", + "name": "hub", + "value": 9 + }, + "interface_subclass": { + "hex": "0000", + "name": "per_interface", + "value": 0 + }, + "interface_protocol": 0, + "interface_number": 0, + "interface_alternate_setting": 0 + }, + "hotplug": "usb", + "driver": "hub", + "driver_module": "usbcore", + "drivers": [ + "hub" + ], + "driver_modules": [ + "usbcore" + ], + "module_alias": "usb:v1D6Bp0002d0619dc09dsc00dp01ic09isc00ip00in00" + }, + { + "index": 42, + "attached_to": 23, + "class_list": [ + "usb", + "hub" + ], + "bus_type": { + "hex": "0086", + "name": "USB", + "value": 134 + }, + "slot": { + "bus": 0, + "number": 0 + }, + "base_class": { + "hex": "010a", + "name": "Hub", + "value": 266 + }, + "vendor": { + "hex": "1d6b", + "name": "Linux 6.19.8 xhci-hcd", + "value": 7531 + }, + "device": { + "hex": "0003", + "name": "xHCI Host Controller", + "value": 3 + }, + "revision": { + "hex": "0000", + "name": "6.19", + "value": 0 + }, + "serial": "0000:00:14.0", + "model": "Linux 6.19.8 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": { + "device_class": { + "hex": "0009", + "name": "hub", + "value": 9 + }, + "device_subclass": { + "hex": "0000", + "name": "per_interface", + "value": 0 + }, + "device_protocol": 3, + "interface_class": { + "hex": "0009", + "name": "hub", + "value": 9 + }, + "interface_subclass": { + "hex": "0000", + "name": "per_interface", + "value": 0 + }, + "interface_protocol": 0, + "interface_number": 0, + "interface_alternate_setting": 0 + }, + "hotplug": "usb", + "driver": "hub", + "driver_module": "usbcore", + "drivers": [ + "hub" + ], + "driver_modules": [ + "usbcore" + ], + "module_alias": "usb:v1D6Bp0003d0619dc09dsc00dp03ic09isc00ip00in00" + } + ], + "keyboard": [ + { + "index": 40, + "attached_to": 36, + "class_list": [ + "keyboard", + "usb" + ], + "bus_type": { + "hex": "0086", + "name": "USB", + "value": 134 + }, + "slot": { + "bus": 0, + "number": 0 + }, + "base_class": { + "hex": "0108", + "name": "Keyboard", + "value": 264 + }, + "sub_class": { + "hex": "0000", + "name": "Keyboard", + "value": 0 + }, + "vendor": { + "hex": "19f5", + "name": "NuPhy", + "value": 6645 + }, + "device": { + "hex": "3245", + "name": "NuPhy Air75 V2", + "value": 12869 + }, + "revision": { + "hex": "0000", + "name": "1.06", + "value": 0 + }, + "model": "NuPhy Air75 V2", + "sysfs_id": "/devices/pci0000:00/0000:00:14.0/usb1/1-1/1-1:1.0", + "sysfs_bus_id": "1-1:1.0", + "unix_device_names": [ + "/dev/input/by-id/usb-NuPhy_NuPhy_Air75_V2-event-kbd", + "/dev/input/by-path/pci-0000:00:14.0-usb-0:1:1.0-event-kbd", + "/dev/input/by-path/pci-0000:00:14.0-usbv2-0:1:1.0-event-kbd", + "/dev/input/event13" + ], + "resources": [ + { + "type": "baud", + "speed": 12000000, + "bits": 0, + "stop_bits": 0, + "parity": 0, + "handshake": 0 + } + ], + "detail": { + "device_class": { + "hex": "0000", + "name": "per_interface", + "value": 0 + }, + "device_subclass": { + "hex": "0000", + "name": "per_interface", + "value": 0 + }, + "device_protocol": 0, + "interface_class": { + "hex": "0003", + "name": "hid", + "value": 3 + }, + "interface_subclass": { + "hex": "0001", + "name": "audio", + "value": 1 + }, + "interface_protocol": 1, + "interface_number": 0, + "interface_alternate_setting": 0 + }, + "hotplug": "usb", + "driver": "usbhid", + "driver_module": "usbhid", + "drivers": [ + "usbhid" + ], + "driver_modules": [ + "usbhid" + ], + "driver_info": { + "type": "keyboard", + "xkb_rules": "xfree86", + "xkb_model": "pc104" + }, + "module_alias": "usb:v19F5p3245d0106dc00dsc00dp00ic03isc01ip01in00" + } + ], + "memory": [ + { + "index": 7, + "attached_to": 0, + "class_list": [ + "memory" + ], + "base_class": { + "hex": "0101", + "name": "Internally Used Class", + "value": 257 + }, + "sub_class": { + "hex": "0002", + "name": "Main Memory", + "value": 2 + }, + "model": "Main Memory", + "resources": [ + { + "type": "phys_mem", + "range": 38654705664 + } + ] + } + ], + "monitor": [ + { + "index": 24, + "attached_to": 22, + "class_list": [ + "monitor" + ], + "base_class": { + "hex": "0100", + "name": "Monitor", + "value": 256 + }, + "sub_class": { + "hex": "0002", + "name": "LCD Monitor", + "value": 2 + }, + "vendor": { + "hex": "06af", + "name": "AUO", + "value": 1711 + }, + "device": { + "hex": "243d", + "value": 9277 + }, + "serial": "0", + "model": "AUO LCD Monitor", + "resources": [ + { + "type": "monitor", + "width": 1920, + "height": 1080, + "vertical_frequency": 60, + "interlaced": false + }, + { + "type": "size", + "unit": "mm", + "value_1": 309, + "value_2": 173 + } + ], + "detail": { + "manufacture_year": 2017, + "manufacture_week": 0, + "vertical_sync": { + "min": 0, + "max": 0 + }, + "horizontal_sync": { + "min": 0, + "max": 0 + }, + "horizontal_sync_timings": { + "disp": 1920, + "sync_start": 1968, + "sync_end": 2068, + "total": 2228 + }, + "vertical_sync_timings": { + "disp": 1080, + "sync_start": 1083, + "sync_end": 1084, + "total": 1120 + }, + "clock": 149800, + "width": 1920, + "height": 1080, + "width_millimetres": 309, + "height_millimetres": 173, + "horizontal_flag": 45, + "vertical_flag": 45, + "vendor": "AUO", + "name": "" + } + }, + { + "index": 25, + "attached_to": 22, + "class_list": [ + "monitor" + ], + "base_class": { + "hex": "0100", + "name": "Monitor", + "value": 256 + }, + "sub_class": { + "hex": "0002", + "name": "LCD Monitor", + "value": 2 + }, + "vendor": { + "hex": "4c2d", + "name": "SAMSUNG", + "value": 19501 + }, + "device": { + "hex": "0180", + "name": "SAMSUNG", + "value": 384 + }, + "serial": "0", + "model": "SAMSUNG", + "resources": [ + { + "type": "monitor", + "width": 1280, + "height": 720, + "vertical_frequency": 60, + "interlaced": false + }, + { + "type": "monitor", + "width": 640, + "height": 480, + "vertical_frequency": 60, + "interlaced": false + }, + { + "type": "size", + "unit": "mm", + "value_1": 885, + "value_2": 498 + } + ], + "detail": { + "manufacture_year": 2004, + "manufacture_week": 44, + "vertical_sync": { + "min": 50, + "max": 61 + }, + "horizontal_sync": { + "min": 15, + "max": 46 + }, + "horizontal_sync_timings": { + "disp": 1280, + "sync_start": 1720, + "sync_end": 1760, + "total": 1980 + }, + "vertical_sync_timings": { + "disp": 720, + "sync_start": 725, + "sync_end": 730, + "total": 750 + }, + "clock": 74250, + "width": 1280, + "height": 720, + "width_millimetres": 885, + "height_millimetres": 498, + "horizontal_flag": 43, + "vertical_flag": 43, + "vendor": "", + "name": "SAMSUNG" + }, + "driver_info": { + "type": "display", + "width": 1280, + "height": 720, + "vertical_sync": { + "min": 50, + "max": 61 + }, + "horizontal_sync": { + "min": 15, + "max": 46 + }, + "bandwidth": 0, + "horizontal_sync_timings": { + "disp": 1280, + "sync_start": 1720, + "sync_end": 1760, + "total": 1980 + }, + "vertical_sync_timings": { + "disp": 720, + "sync_start": 725, + "sync_end": 730, + "total": 750 + }, + "horizontal_flag": 43, + "vertical_flag": 43 + } + } + ], + "mouse": [ + { + "index": 39, + "attached_to": 36, + "class_list": [ + "mouse", + "usb" + ], + "bus_type": { + "hex": "0086", + "name": "USB", + "value": 134 + }, + "slot": { + "bus": 0, + "number": 0 + }, + "base_class": { + "hex": "0105", + "name": "Mouse", + "value": 261 + }, + "sub_class": { + "hex": "0003", + "name": "USB Mouse", + "value": 3 + }, + "vendor": { + "hex": "19f5", + "name": "NuPhy", + "value": 6645 + }, + "device": { + "hex": "3245", + "name": "NuPhy Air75 V2", + "value": 12869 + }, + "revision": { + "hex": "0000", + "name": "1.06", + "value": 0 + }, + "compat_vendor": "Unknown", + "compat_device": "Generic USB Mouse", + "model": "NuPhy Air75 V2", + "sysfs_id": "/devices/pci0000:00/0000:00:14.0/usb1/1-1/1-1:1.2", + "sysfs_bus_id": "1-1:1.2", + "unix_device_names": [ + "/dev/input/mice" + ], + "unix_device_name2": "/dev/input/mouse2", + "resources": [ + { + "type": "baud", + "speed": 12000000, + "bits": 0, + "stop_bits": 0, + "parity": 0, + "handshake": 0 + } + ], + "detail": { + "device_class": { + "hex": "0000", + "name": "per_interface", + "value": 0 + }, + "device_subclass": { + "hex": "0000", + "name": "per_interface", + "value": 0 + }, + "device_protocol": 0, + "interface_class": { + "hex": "0003", + "name": "hid", + "value": 3 + }, + "interface_subclass": { + "hex": "0000", + "name": "per_interface", + "value": 0 + }, + "interface_protocol": 0, + "interface_number": 2, + "interface_alternate_setting": 0 + }, + "hotplug": "usb", + "driver": "usbhid", + "driver_module": "usbhid", + "drivers": [ + "usbhid" + ], + "driver_modules": [ + "usbhid" + ], + "driver_info": { + "type": "mouse", + "db_entry_0": [ + "explorerps/2", + "exps2" + ], + "xf86": "explorerps/2", + "gpm": "exps2", + "buttons": -1, + "wheels": -1 + }, + "module_alias": "usb:v19F5p3245d0106dc00dsc00dp00ic03isc00ip00in02" + }, + { + "index": 47, + "attached_to": 0, + "bus_type": { + "hex": "0080", + "name": "ps2", + "value": 128 + }, + "base_class": { + "hex": "0118", + "name": "touchpad", + "value": 280 + }, + "sub_class": { + "hex": "0000", + "name": "ps2", + "value": 0 + }, + "vendor": { + "hex": "0002", + "value": 2 + }, + "device": { + "hex": "000e", + "value": 14 + }, + "sysfs_id": "/devices/platform/i8042/serio1/input/input6", + "unix_device_names": [ + "/dev/input/event5", + "/dev/input/ + handler" + ] + } + ], + "network_controller": [ + { + "index": 8, + "attached_to": 17, + "class_list": [ + "network_controller", + "pci", + "wlan_card" + ], + "bus_type": { + "hex": "0004", + "name": "PCI", + "value": 4 + }, + "slot": { + "bus": 3, + "number": 0 + }, + "base_class": { + "hex": "0002", + "name": "Network controller", + "value": 2 + }, + "sub_class": { + "hex": "0082", + "name": "WLAN controller", + "value": 130 + }, + "vendor": { + "hex": "8086", + "name": "Intel Corporation", + "value": 32902 + }, + "sub_vendor": { + "hex": "8086", + "name": "Intel Corporation", + "value": 32902 + }, + "device": { + "hex": "24fd", + "value": 9469 + }, + "sub_device": { + "hex": "0010", + "value": 16 + }, + "revision": { + "hex": "0078", + "value": 120 + }, + "model": "Intel WLAN controller", + "sysfs_id": "/devices/pci0000:00/0000:00:1c.6/0000:03:00.0", + "sysfs_bus_id": "0000:03:00.0", + "unix_device_names": [ + "wlp3s0" + ], + "resources": [ + { + "type": "hwaddr", + "address": 100 + }, + { + "type": "phwaddr", + "address": 100 + }, + { + "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": 1030, + "header_type": 0, + "secondary_bus": 0, + "prog_if": 0 + }, + "driver": "iwlwifi", + "driver_module": "iwlwifi", + "drivers": [ + "iwlwifi" + ], + "driver_modules": [ + "iwlwifi" + ], + "module_alias": "pci:v00008086d000024FDsv00008086sd00000010bc02sc80i00" + }, + { + "index": 19, + "attached_to": 0, + "class_list": [ + "network_controller", + "pci" + ], + "bus_type": { + "hex": "0004", + "name": "PCI", + "value": 4 + }, + "slot": { + "bus": 0, + "number": 31 + }, + "base_class": { + "hex": "0002", + "name": "Network controller", + "value": 2 + }, + "sub_class": { + "hex": "0000", + "name": "Ethernet controller", + "value": 0 + }, + "vendor": { + "hex": "8086", + "name": "Intel Corporation", + "value": 32902 + }, + "sub_vendor": { + "hex": "17aa", + "value": 6058 + }, + "device": { + "hex": "15d8", + "value": 5592 + }, + "sub_device": { + "hex": "2258", + "value": 8792 + }, + "revision": { + "hex": "0021", + "value": 33 + }, + "model": "Intel Ethernet controller", + "sysfs_id": "/devices/pci0000:00/0000:00:1f.6", + "sysfs_bus_id": "0000:00:1f.6", + "unix_device_names": [ + "eno0" + ], + "resources": [ + { + "type": "hwaddr", + "address": 57 + }, + { + "type": "phwaddr", + "address": 57 + } + ], + "detail": { + "function": 6, + "command": 1030, + "header_type": 0, + "secondary_bus": 0, + "prog_if": 0 + }, + "driver": "e1000e", + "driver_module": "e1000e", + "drivers": [ + "e1000e" + ], + "driver_modules": [ + "e1000e" + ], + "module_alias": "pci:v00008086d000015D8sv000017AAsd00002258bc02sc00i00", + "label": "Ethernet controller" + } + ], + "network_interface": [ + { + "index": 43, + "attached_to": 19, + "class_list": [ + "network_interface" + ], + "base_class": { + "hex": "0107", + "name": "Network Interface", + "value": 263 + }, + "sub_class": { + "hex": "0001", + "name": "Ethernet", + "value": 1 + }, + "model": "Ethernet network interface", + "sysfs_id": "/class/net/eno0", + "sysfs_device_link": "/devices/pci0000:00/0000:00:1f.6", + "unix_device_names": [ + "eno0" + ], + "resources": [ + { + "type": "hwaddr", + "address": 57 + }, + { + "type": "phwaddr", + "address": 57 + } + ], + "driver": "e1000e", + "driver_module": "e1000e", + "drivers": [ + "e1000e" + ], + "driver_modules": [ + "e1000e" + ] + }, + { + "index": 44, + "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": 46, + "attached_to": 8, + "class_list": [ + "network_interface" + ], + "base_class": { + "hex": "0107", + "name": "Network Interface", + "value": 263 + }, + "sub_class": { + "hex": "0001", + "name": "Ethernet", + "value": 1 + }, + "model": "Ethernet network interface", + "sysfs_id": "/class/net/wlp3s0", + "sysfs_device_link": "/devices/pci0000:00/0000:00:1c.6/0000:03:00.0", + "unix_device_names": [ + "wlp3s0" + ], + "resources": [ + { + "type": "hwaddr", + "address": 100 + }, + { + "type": "phwaddr", + "address": 100 + } + ], + "driver": "iwlwifi", + "driver_module": "iwlwifi", + "drivers": [ + "iwlwifi" + ], + "driver_modules": [ + "iwlwifi" + ] + } + ], + "pci": [ + { + "index": 9, + "attached_to": 0, + "class_list": [ + "pci", + "unknown" + ], + "bus_type": { + "hex": "0004", + "name": "PCI", + "value": 4 + }, + "slot": { + "bus": 0, + "number": 31 + }, + "base_class": { + "hex": "0005", + "name": "Memory controller", + "value": 5 + }, + "sub_class": { + "hex": "0080", + "name": "Memory controller", + "value": 128 + }, + "vendor": { + "hex": "8086", + "name": "Intel Corporation", + "value": 32902 + }, + "sub_vendor": { + "hex": "8086", + "name": "Intel Corporation", + "value": 32902 + }, + "device": { + "hex": "9d21", + "value": 40225 + }, + "sub_device": { + "hex": "9d21", + "value": 40225 + }, + "revision": { + "hex": "0021", + "value": 33 + }, + "model": "Intel Memory controller", + "sysfs_id": "/devices/pci0000:00/0000:00:1f.2", + "sysfs_bus_id": "0000:00:1f.2", + "detail": { + "function": 2, + "command": 2, + "header_type": 0, + "secondary_bus": 0, + "prog_if": 0 + }, + "module_alias": "pci:v00008086d00009D21sv00008086sd00009D21bc05sc80i00" + }, + { + "index": 12, + "attached_to": 0, + "class_list": [ + "pci", + "unknown" + ], + "bus_type": { + "hex": "0004", + "name": "PCI", + "value": 4 + }, + "slot": { + "bus": 0, + "number": 4 + }, + "base_class": { + "hex": "0011", + "name": "Signal processing controller", + "value": 17 + }, + "sub_class": { + "hex": "0080", + "name": "Signal processing controller", + "value": 128 + }, + "vendor": { + "hex": "8086", + "name": "Intel Corporation", + "value": 32902 + }, + "sub_vendor": { + "hex": "8086", + "name": "Intel Corporation", + "value": 32902 + }, + "device": { + "hex": "1903", + "value": 6403 + }, + "sub_device": { + "hex": "1903", + "value": 6403 + }, + "revision": { + "hex": "0008", + "value": 8 + }, + "model": "Intel Signal processing controller", + "sysfs_id": "/devices/pci0000:00/0000:00:04.0", + "sysfs_bus_id": "0000:00:04.0", + "detail": { + "function": 0, + "command": 2, + "header_type": 0, + "secondary_bus": 0, + "prog_if": 0 + }, + "module_alias": "pci:v00008086d00001903sv00008086sd00001903bc11sc80i00" + }, + { + "index": 18, + "attached_to": 0, + "class_list": [ + "pci", + "unknown" + ], + "bus_type": { + "hex": "0004", + "name": "PCI", + "value": 4 + }, + "slot": { + "bus": 0, + "number": 20 + }, + "base_class": { + "hex": "0011", + "name": "Signal processing controller", + "value": 17 + }, + "sub_class": { + "hex": "0080", + "name": "Signal processing controller", + "value": 128 + }, + "vendor": { + "hex": "8086", + "name": "Intel Corporation", + "value": 32902 + }, + "sub_vendor": { + "hex": "8086", + "name": "Intel Corporation", + "value": 32902 + }, + "device": { + "hex": "9d31", + "value": 40241 + }, + "sub_device": { + "hex": "9d31", + "value": 40241 + }, + "revision": { + "hex": "0021", + "value": 33 + }, + "model": "Intel Signal processing controller", + "sysfs_id": "/devices/pci0000:00/0000:00:14.2", + "sysfs_bus_id": "0000:00:14.2", + "detail": { + "function": 2, + "command": 2, + "header_type": 0, + "secondary_bus": 0, + "prog_if": 0 + }, + "driver": "intel_pch_thermal", + "driver_module": "intel_pch_thermal", + "drivers": [ + "intel_pch_thermal" + ], + "driver_modules": [ + "intel_pch_thermal" + ], + "module_alias": "pci:v00008086d00009D31sv00008086sd00009D31bc11sc80i00" + } + ], + "sound": [ + { + "index": 14, + "attached_to": 0, + "class_list": [ + "sound", + "pci" + ], + "bus_type": { + "hex": "0004", + "name": "PCI", + "value": 4 + }, + "slot": { + "bus": 0, + "number": 31 + }, + "base_class": { + "hex": "0004", + "name": "Multimedia controller", + "value": 4 + }, + "sub_class": { + "hex": "0003", + "value": 3 + }, + "vendor": { + "hex": "8086", + "name": "Intel Corporation", + "value": 32902 + }, + "device": { + "hex": "9d71", + "value": 40305 + }, + "revision": { + "hex": "0021", + "value": 33 + }, + "model": "Intel Multimedia controller", + "sysfs_id": "/devices/pci0000:00/0000:00:1f.3", + "sysfs_bus_id": "0000:00:1f.3", + "detail": { + "function": 3, + "command": 1030, + "header_type": 0, + "secondary_bus": 0, + "prog_if": 0 + }, + "driver": "snd_hda_intel", + "driver_module": "snd_hda_intel", + "drivers": [ + "snd_hda_intel" + ], + "driver_modules": [ + "snd_hda_intel" + ], + "module_alias": "pci:v00008086d00009D71sv00000000sd00000000bc04sc03i00" + } + ], + "storage_controller": [ + { + "index": 13, + "attached_to": 10, + "class_list": [ + "storage_controller", + "pci" + ], + "bus_type": { + "hex": "0004", + "name": "PCI", + "value": 4 + }, + "slot": { + "bus": 1, + "number": 0 + }, + "base_class": { + "hex": "0001", + "name": "Mass storage controller", + "value": 1 + }, + "sub_class": { + "hex": "0008", + "value": 8 + }, + "pci_interface": { + "hex": "0002", + "value": 2 + }, + "vendor": { + "hex": "15b7", + "value": 5559 + }, + "sub_vendor": { + "hex": "15b7", + "value": 5559 + }, + "device": { + "hex": "5005", + "value": 20485 + }, + "sub_device": { + "hex": "5005", + "value": 20485 + }, + "revision": { + "hex": "0001", + "value": 1 + }, + "model": "Mass storage controller", + "sysfs_id": "/devices/pci0000:00/0000:00:1c.0/0000:01:00.0", + "sysfs_bus_id": "0000:01:00.0", + "detail": { + "function": 0, + "command": 1030, + "header_type": 0, + "secondary_bus": 0, + "prog_if": 2 + }, + "driver": "nvme", + "driver_module": "nvme", + "drivers": [ + "nvme" + ], + "driver_modules": [ + "nvme" + ], + "module_alias": "pci:v000015B7d00005005sv000015B7sd00005005bc01sc08i02" + }, + { + "index": 21, + "attached_to": 16, + "class_list": [ + "storage_controller", + "pci" + ], + "bus_type": { + "hex": "0004", + "name": "PCI", + "value": 4 + }, + "slot": { + "bus": 4, + "number": 0 + }, + "base_class": { + "hex": "0001", + "name": "Mass storage controller", + "value": 1 + }, + "sub_class": { + "hex": "0008", + "value": 8 + }, + "pci_interface": { + "hex": "0002", + "value": 2 + }, + "vendor": { + "hex": "8086", + "name": "Intel Corporation", + "value": 32902 + }, + "sub_vendor": { + "hex": "8086", + "name": "Intel Corporation", + "value": 32902 + }, + "device": { + "hex": "f1a6", + "value": 61862 + }, + "sub_device": { + "hex": "390b", + "value": 14603 + }, + "revision": { + "hex": "0003", + "value": 3 + }, + "model": "Intel Mass storage controller", + "sysfs_id": "/devices/pci0000:00/0000:00:1d.0/0000:04:00.0", + "sysfs_bus_id": "0000:04:00.0", + "detail": { + "function": 0, + "command": 1030, + "header_type": 0, + "secondary_bus": 0, + "prog_if": 2 + }, + "driver": "nvme", + "driver_module": "nvme", + "drivers": [ + "nvme" + ], + "driver_modules": [ + "nvme" + ], + "module_alias": "pci:v00008086d0000F1A6sv00008086sd0000390Bbc01sc08i02" + } + ], + "system": { + "form_factor": "laptop" + }, + "unknown": [ + { + "index": 26, + "attached_to": 0, + "class_list": [ + "unknown" + ], + "base_class": { + "hex": "0007", + "name": "Communication controller", + "value": 7 + }, + "sub_class": { + "hex": "0000", + "name": "Serial controller", + "value": 0 + }, + "pci_interface": { + "hex": "0002", + "name": "16550", + "value": 2 + }, + "device": { + "hex": "0000", + "name": "16550A", + "value": 0 + }, + "model": "16550A", + "unix_device_names": [ + "/dev/ttyS0" + ], + "resources": [ + { + "type": "io", + "base": 1016, + "range": 0, + "enabled": true, + "access": "read_write" + } + ] + } + ], + "usb": [ + { + "index": 31, + "attached_to": 36, + "class_list": [ + "usb", + "unknown" + ], + "bus_type": { + "hex": "0086", + "name": "USB", + "value": 134 + }, + "slot": { + "bus": 0, + "number": 0 + }, + "base_class": { + "hex": "0000", + "name": "Unclassified device", + "value": 0 + }, + "sub_class": { + "hex": "0000", + "name": "Unclassified device", + "value": 0 + }, + "vendor": { + "hex": "06cb", + "value": 1739 + }, + "device": { + "hex": "009a", + "value": 154 + }, + "revision": { + "hex": "0000", + "name": "1.64", + "value": 0 + }, + "serial": "18c7b4863726", + "model": "Unclassified device", + "sysfs_id": "/devices/pci0000:00/0000:00:14.0/usb1/1-9/1-9:1.0", + "sysfs_bus_id": "1-9:1.0", + "resources": [ + { + "type": "baud", + "speed": 12000000, + "bits": 0, + "stop_bits": 0, + "parity": 0, + "handshake": 0 + } + ], + "detail": { + "device_class": { + "hex": "00ff", + "name": "vendor_spec", + "value": 255 + }, + "device_subclass": { + "hex": "0010", + "name": "audio_video", + "value": 16 + }, + "device_protocol": 255, + "interface_class": { + "hex": "00ff", + "name": "vendor_spec", + "value": 255 + }, + "interface_subclass": { + "hex": "0000", + "name": "per_interface", + "value": 0 + }, + "interface_protocol": 0, + "interface_number": 0, + "interface_alternate_setting": 0 + }, + "hotplug": "usb", + "module_alias": "usb:v06CBp009Ad0164dcFFdsc10dpFFicFFisc00ip00in00" + }, + { + "index": 33, + "attached_to": 36, + "class_list": [ + "usb", + "unknown" + ], + "bus_type": { + "hex": "0086", + "name": "USB", + "value": 134 + }, + "slot": { + "bus": 0, + "number": 0 + }, + "base_class": { + "hex": "0000", + "name": "Unclassified device", + "value": 0 + }, + "sub_class": { + "hex": "0000", + "name": "Unclassified device", + "value": 0 + }, + "vendor": { + "hex": "19f5", + "name": "NuPhy", + "value": 6645 + }, + "device": { + "hex": "3245", + "name": "NuPhy Air75 V2", + "value": 12869 + }, + "revision": { + "hex": "0000", + "name": "1.06", + "value": 0 + }, + "model": "NuPhy Air75 V2", + "sysfs_id": "/devices/pci0000:00/0000:00:14.0/usb1/1-1/1-1:1.3", + "sysfs_bus_id": "1-1:1.3", + "resources": [ + { + "type": "baud", + "speed": 12000000, + "bits": 0, + "stop_bits": 0, + "parity": 0, + "handshake": 0 + } + ], + "detail": { + "device_class": { + "hex": "0000", + "name": "per_interface", + "value": 0 + }, + "device_subclass": { + "hex": "0000", + "name": "per_interface", + "value": 0 + }, + "device_protocol": 0, + "interface_class": { + "hex": "0003", + "name": "hid", + "value": 3 + }, + "interface_subclass": { + "hex": "0000", + "name": "per_interface", + "value": 0 + }, + "interface_protocol": 0, + "interface_number": 3, + "interface_alternate_setting": 0 + }, + "hotplug": "usb", + "driver": "usbhid", + "driver_module": "usbhid", + "drivers": [ + "usbhid" + ], + "driver_modules": [ + "usbhid" + ], + "module_alias": "usb:v19F5p3245d0106dc00dsc00dp00ic03isc00ip00in03" + }, + { + "index": 34, + "attached_to": 36, + "class_list": [ + "usb", + "unknown" + ], + "bus_type": { + "hex": "0086", + "name": "USB", + "value": 134 + }, + "slot": { + "bus": 0, + "number": 0 + }, + "base_class": { + "hex": "0000", + "name": "Unclassified device", + "value": 0 + }, + "sub_class": { + "hex": "0000", + "name": "Unclassified device", + "value": 0 + }, + "vendor": { + "hex": "19f5", + "name": "NuPhy", + "value": 6645 + }, + "device": { + "hex": "3245", + "name": "NuPhy Air75 V2", + "value": 12869 + }, + "revision": { + "hex": "0000", + "name": "1.06", + "value": 0 + }, + "model": "NuPhy Air75 V2", + "sysfs_id": "/devices/pci0000:00/0000:00:14.0/usb1/1-1/1-1:1.1", + "sysfs_bus_id": "1-1:1.1", + "resources": [ + { + "type": "baud", + "speed": 12000000, + "bits": 0, + "stop_bits": 0, + "parity": 0, + "handshake": 0 + } + ], + "detail": { + "device_class": { + "hex": "0000", + "name": "per_interface", + "value": 0 + }, + "device_subclass": { + "hex": "0000", + "name": "per_interface", + "value": 0 + }, + "device_protocol": 0, + "interface_class": { + "hex": "0003", + "name": "hid", + "value": 3 + }, + "interface_subclass": { + "hex": "0000", + "name": "per_interface", + "value": 0 + }, + "interface_protocol": 0, + "interface_number": 1, + "interface_alternate_setting": 0 + }, + "hotplug": "usb", + "driver": "usbhid", + "driver_module": "usbhid", + "drivers": [ + "usbhid" + ], + "driver_modules": [ + "usbhid" + ], + "module_alias": "usb:v19F5p3245d0106dc00dsc00dp00ic03isc00ip00in01" + } + ], + "usb_controller": [ + { + "index": 23, + "attached_to": 0, + "class_list": [ + "usb_controller", + "pci" + ], + "bus_type": { + "hex": "0004", + "name": "PCI", + "value": 4 + }, + "slot": { + "bus": 0, + "number": 20 + }, + "base_class": { + "hex": "000c", + "name": "Serial bus controller", + "value": 12 + }, + "sub_class": { + "hex": "0003", + "name": "USB Controller", + "value": 3 + }, + "pci_interface": { + "hex": "0030", + "value": 48 + }, + "vendor": { + "hex": "8086", + "name": "Intel Corporation", + "value": 32902 + }, + "device": { + "hex": "9d2f", + "value": 40239 + }, + "revision": { + "hex": "0021", + "value": 33 + }, + "model": "Intel USB Controller", + "sysfs_id": "/devices/pci0000:00/0000:00:14.0", + "sysfs_bus_id": "0000:00:14.0", + "detail": { + "function": 0, + "command": 1030, + "header_type": 0, + "secondary_bus": 0, + "prog_if": 48 + }, + "driver": "xhci_hcd", + "driver_module": "xhci_pci", + "drivers": [ + "xhci_hcd" + ], + "driver_modules": [ + "xhci_pci" + ], + "module_alias": "pci:v00008086d00009D2Fsv00000000sd00000000bc0Csc03i30" + } + ] + }, + "smbios": { + "bios": { + "handle": 0, + "vendor": "coreboot", + "version": "20241206rev10", + "date": "02/19/2025", + "features": [ + "PCI supported", + "PCMCIA supported", + "BIOS flashable", + "Selectable boot supported", + "ACPI supported" + ], + "start_address": "0x0", + "rom_size": 16777216 + }, + "board": { + "handle": 2, + "manufacturer": "LENOVO", + "product": "T480S", + "version": "1.0", + "board_type": { + "hex": "000a", + "name": "Motherboard", + "value": 10 + }, + "features": null, + "location": "", + "chassis": 3 + }, + "cache": [ + { + "handle": 5, + "socket": "CACHE1", + "size_max": 128, + "size_current": 128, + "speed": 0, + "mode": { + "hex": "0003", + "name": "Unknown", + "value": 3 + }, + "enabled": true, + "location": { + "hex": "0000", + "name": "Internal", + "value": 0 + }, + "socketed": false, + "level": 0, + "ecc": { + "hex": "0002", + "name": "Unknown", + "value": 2 + }, + "cache_type": { + "hex": "0004", + "name": "Data", + "value": 4 + }, + "associativity": { + "hex": "0007", + "name": "8-way Set-Associative", + "value": 7 + }, + "sram_type_current": [ + "Unknown" + ], + "sram_type_supported": [ + "Unknown" + ] + }, + { + "handle": 6, + "socket": "CACHE1", + "size_max": 128, + "size_current": 128, + "speed": 0, + "mode": { + "hex": "0003", + "name": "Unknown", + "value": 3 + }, + "enabled": true, + "location": { + "hex": "0000", + "name": "Internal", + "value": 0 + }, + "socketed": false, + "level": 0, + "ecc": { + "hex": "0002", + "name": "Unknown", + "value": 2 + }, + "cache_type": { + "hex": "0003", + "name": "Instruction", + "value": 3 + }, + "associativity": { + "hex": "0007", + "name": "8-way Set-Associative", + "value": 7 + }, + "sram_type_current": [ + "Unknown" + ], + "sram_type_supported": [ + "Unknown" + ] + }, + { + "handle": 7, + "socket": "CACHE2", + "size_max": 1024, + "size_current": 1024, + "speed": 0, + "mode": { + "hex": "0003", + "name": "Unknown", + "value": 3 + }, + "enabled": true, + "location": { + "hex": "0000", + "name": "Internal", + "value": 0 + }, + "socketed": false, + "level": 1, + "ecc": { + "hex": "0002", + "name": "Unknown", + "value": 2 + }, + "cache_type": { + "hex": "0005", + "name": "Unified", + "value": 5 + }, + "associativity": { + "hex": "0005", + "name": "4-way Set-Associative", + "value": 5 + }, + "sram_type_current": [ + "Unknown" + ], + "sram_type_supported": [ + "Unknown" + ] + }, + { + "handle": 8, + "socket": "CACHE3", + "size_max": 6144, + "size_current": 6144, + "speed": 0, + "mode": { + "hex": "0003", + "name": "Unknown", + "value": 3 + }, + "enabled": true, + "location": { + "hex": "0000", + "name": "Internal", + "value": 0 + }, + "socketed": false, + "level": 2, + "ecc": { + "hex": "0002", + "name": "Unknown", + "value": 2 + }, + "cache_type": { + "hex": "0005", + "name": "Unified", + "value": 5 + }, + "associativity": { + "hex": "0009", + "name": "Other", + "value": 9 + }, + "sram_type_current": [ + "Unknown" + ], + "sram_type_supported": [ + "Unknown" + ] + } + ], + "chassis": [ + { + "handle": 3, + "manufacturer": "LENOVO", + "version": "", + "chassis_type": { + "hex": "0009", + "name": "LapTop", + "value": 9 + }, + "lock_present": false, + "bootup_state": { + "hex": "0003", + "name": "Safe", + "value": 3 + }, + "power_state": { + "hex": "0003", + "name": "Safe", + "value": 3 + }, + "thermal_state": { + "hex": "0003", + "name": "Safe", + "value": 3 + }, + "security_state": { + "hex": "0003", + "name": "None", + "value": 3 + }, + "oem": "0x0" + } + ], + "memory_array": [ + { + "handle": 10, + "location": { + "hex": "0003", + "name": "Motherboard", + "value": 3 + }, + "usage": { + "hex": "0003", + "name": "System memory", + "value": 3 + }, + "ecc": { + "hex": "0003", + "name": "None", + "value": 3 + }, + "max_size": "0x4000000", + "error_handle": 65534, + "slots": 2 + } + ], + "memory_array_mapped_address": [ + { + "handle": 13, + "array_handle": 10, + "start_address": "0x0", + "end_address": "0x900000000", + "part_width": 2 + } + ], + "memory_device": [ + { + "handle": 11, + "location": "Channel-0-DIMM-0", + "bank_location": "BANK 0", + "manufacturer": "Hynix/Hyundai", + "part_number": "HMA851S6AFR6N-UH", + "array_handle": 10, + "error_handle": 65534, + "width": 64, + "ecc_bits": 0, + "size": 4194304, + "form_factor": { + "hex": "000d", + "name": "SODIMM", + "value": 13 + }, + "set": 0, + "memory_type": { + "hex": "001a", + "name": "Other", + "value": 26 + }, + "memory_type_details": [ + "Unknown", + "Synchronous" + ], + "speed": 2400 + }, + { + "handle": 12, + "location": "Channel-1-DIMM-0", + "bank_location": "BANK 0", + "manufacturer": "Micron", + "part_number": "CT32G4SFD832A.M16FF", + "array_handle": 10, + "error_handle": 65534, + "width": 64, + "ecc_bits": 0, + "size": 33554432, + "form_factor": { + "hex": "000d", + "name": "SODIMM", + "value": 13 + }, + "set": 0, + "memory_type": { + "hex": "001a", + "name": "Other", + "value": 26 + }, + "memory_type_details": [ + "Unknown", + "Synchronous" + ], + "speed": 2400 + } + ], + "memory_device_mapped_address": [ + { + "handle": 14, + "memory_device_handle": 11, + "array_map_handle": 13, + "start_address": "0x0", + "end_address": "0x100000000", + "row_position": 255, + "interleave_position": 255, + "interleave_depth": 255 + }, + { + "handle": 15, + "memory_device_handle": 11, + "array_map_handle": 13, + "start_address": "0x100000000", + "end_address": "0x900000000", + "row_position": 255, + "interleave_position": 255, + "interleave_depth": 255 + } + ], + "processor": [ + { + "handle": 4, + "socket": "CPU0", + "socket_type": { + "hex": "0002", + "name": "Unknown", + "value": 2 + }, + "socket_populated": true, + "manufacturer": "GenuineIntel", + "version": "Intel(R) Core(TM) i5-8250U CPU @ 1.60GHz", + "part": "", + "processor_type": { + "hex": "0003", + "name": "CPU", + "value": 3 + }, + "processor_family": { + "hex": "000c", + "name": "Pentium Pro", + "value": 12 + }, + "processor_status": { + "hex": "0001", + "name": "Enabled", + "value": 1 + }, + "clock_ext": 100, + "clock_max": 3400, + "cache_handle_l1": 6, + "cache_handle_l2": 7, + "cache_handle_l3": 8 + } + ], + "system": { + "handle": 1, + "manufacturer": "LENOVO", + "product": "T480S", + "version": "1.0", + "wake_up": { + "hex": "0000", + "name": "Reserved", + "value": 0 + } + } + } +} \ No newline at end of file diff --git a/pkgs/default.nix b/pkgs/default.nix index e037e45..51adc21 100644 --- a/pkgs/default.nix +++ b/pkgs/default.nix @@ -1,5 +1,5 @@ { - systems = ["x86_64-linux"]; + systems = ["x86_64-linux" "aarch64-linux"]; perSystem = {pkgs, ...}: { packages = { diff --git a/secrets/secrets.nix b/secrets/secrets.nix index 5bcd108..92b314c 100644 --- a/secrets/secrets.nix +++ b/secrets/secrets.nix @@ -1,5 +1,5 @@ let - host = "ssh-ed25519 AAAAC3NzaC1lZDI1NTE5AAAAICL0B9moxOPY4XYim8826M+Tf0sWErwWljz1gkDZPwuF root@aesthetic"; + host = "ssh-ed25519 AAAAC3NzaC1lZDI1NTE5AAAAICL0B9moxOPY4XYim8826M+Tf0sWErwWljz1gkDZPwuF"; in { "gitea_laptop.age".publicKeys = [ host diff --git a/system/default.nix b/system/default.nix index 663c48b..1c94db9 100644 --- a/system/default.nix +++ b/system/default.nix @@ -1,28 +1,37 @@ let - desktop = [ - ./core/boot.nix + # Base system - common for all configurations + base = [ ./core/default.nix - ./hardware/graphics.nix ./hardware/fwupd.nix - ./network/default.nix ./programs - ./services ./services/docker.nix - ./services/greetd.nix - ./services/pipewire.nix ./services/xdg-portal-fix.nix ]; - laptop = - desktop - ++ [ - ./hardware/bluetooth.nix - ./services/power.nix - ]; + # GUI-specific modules (display manager, GPU, pipewire) + gui = [ + ./core/boot.nix # plymouth boot splash + ./hardware/graphics.nix # GPU drivers + ./services/greetd.nix # display manager + ./services/pipewire.nix # audio + ]; + + # Laptop-specific modules (battery, bluetooth) + laptop = [ + ./hardware/bluetooth.nix + ./services/power.nix + ]; in { - inherit desktop laptop; + # TTY: desktop headless (no GUI) + tty = base; + + # Desktop: desktop with GUI + desktop = base ++ gui; + + # Laptop: laptop with GUI + battery + bluetooth + laptop = base ++ gui ++ laptop; } diff --git a/system/services/default.nix b/system/services/default.nix index 075b850..28a43c7 100644 --- a/system/services/default.nix +++ b/system/services/default.nix @@ -11,7 +11,6 @@ irqbalance.enable = true; thermald.enable = true; - speechd.enable = lib.mkForce false; }; # Use in place of hypridle's before_sleep_cmd, since systemd does not wait for