From e2abbf224b8b9303e8fd40d381f3e009558d4acb Mon Sep 17 00:00:00 2001 From: h7x4 Date: Sat, 18 Apr 2026 23:58:53 +0900 Subject: [PATCH] lupine-{1,2,4}: update hardware config --- .../hardware-configuration/lupine-1.nix | 23 +++++++++--------- .../hardware-configuration/lupine-2.nix | 20 ++++++++-------- .../hardware-configuration/lupine-4.nix | 24 ++++++++++++------- 3 files changed, 37 insertions(+), 30 deletions(-) diff --git a/hosts/lupine/hardware-configuration/lupine-1.nix b/hosts/lupine/hardware-configuration/lupine-1.nix index d97536c..1d82870 100644 --- a/hosts/lupine/hardware-configuration/lupine-1.nix +++ b/hosts/lupine/hardware-configuration/lupine-1.nix @@ -1,4 +1,4 @@ -# Do not modify this file! It was generated by 'nixos-generate-config' +# Do not modify this file! It was generated by ‘nixos-generate-config’ # and may be overwritten by future invocations. Please make changes # to /etc/nixos/configuration.nix instead. { config, lib, pkgs, modulesPath, ... }: @@ -14,27 +14,28 @@ boot.extraModulePackages = [ ]; fileSystems."/" = - { device = "/dev/disk/by-uuid/a949e2e8-d973-4925-83e4-bcd815e65af7"; - fsType = "ext4"; + { device = "/dev/disk/by-uuid/e88adbb7-de01-4f9b-b338-fffed743c259"; + fsType = "btrfs"; + options = [ "subvol=@root" "compress=zstd" ]; + }; + + fileSystems."/nix" = + { device = "/dev/disk/by-uuid/e88adbb7-de01-4f9b-b338-fffed743c259"; + fsType = "btrfs"; + options = [ "subvol=@nix" "compress=zstd" "noatime" ]; }; fileSystems."/boot" = { device = "/dev/disk/by-uuid/81D6-38D3"; fsType = "vfat"; - options = [ "fmask=0077" "dmask=0077" ]; + options = [ "fmask=0022" "dmask=0022" ]; }; swapDevices = [ { device = "/dev/disk/by-uuid/82c2d7fa-7cd0-4398-8cf6-c892bc56264b"; } ]; - # Enables DHCP on each ethernet and wireless interface. In case of scripted networking - # (the default) this is the recommended approach. When using systemd-networkd it's - # still possible to use this option, but it's recommended to use it in conjunction - # with explicit per-interface declarations with `networking.interfaces..useDHCP`. - networking.useDHCP = lib.mkDefault true; - # networking.interfaces.enp0s31f6.useDHCP = lib.mkDefault true; - nixpkgs.hostPlatform = lib.mkDefault "x86_64-linux"; hardware.cpu.intel.updateMicrocode = lib.mkDefault config.hardware.enableRedistributableFirmware; } + diff --git a/hosts/lupine/hardware-configuration/lupine-2.nix b/hosts/lupine/hardware-configuration/lupine-2.nix index e1b480c..10ea718 100644 --- a/hosts/lupine/hardware-configuration/lupine-2.nix +++ b/hosts/lupine/hardware-configuration/lupine-2.nix @@ -14,27 +14,27 @@ boot.extraModulePackages = [ ]; fileSystems."/" = - { device = "/dev/disk/by-uuid/aa81d439-800b-403d-ac10-9d2aac3619d0"; - fsType = "ext4"; + { device = "/dev/disk/by-uuid/ab2e1a13-8e95-48d8-970c-64fa2fab52d0"; + fsType = "btrfs"; + options = [ "subvol=@root" "compress=zstd" ]; + }; + + fileSystems."/nix" = + { device = "/dev/disk/by-uuid/ab2e1a13-8e95-48d8-970c-64fa2fab52d0"; + fsType = "btrfs"; + options = [ "subvol=@nix" "noatime" "compress=zstd" ]; }; fileSystems."/boot" = { device = "/dev/disk/by-uuid/4A34-6AE5"; fsType = "vfat"; - options = [ "fmask=0077" "dmask=0077" ]; + options = [ "fmask=0022" "dmask=0022" ]; }; swapDevices = [ { device = "/dev/disk/by-uuid/efb7cd0c-c1ae-4a86-8bc2-8e7fd0066650"; } ]; - # Enables DHCP on each ethernet and wireless interface. In case of scripted networking - # (the default) this is the recommended approach. When using systemd-networkd it's - # still possible to use this option, but it's recommended to use it in conjunction - # with explicit per-interface declarations with `networking.interfaces..useDHCP`. - networking.useDHCP = lib.mkDefault true; - # networking.interfaces.enp0s31f6.useDHCP = lib.mkDefault true; - nixpkgs.hostPlatform = lib.mkDefault "x86_64-linux"; hardware.cpu.intel.updateMicrocode = lib.mkDefault config.hardware.enableRedistributableFirmware; } diff --git a/hosts/lupine/hardware-configuration/lupine-4.nix b/hosts/lupine/hardware-configuration/lupine-4.nix index 803830a..022a2a9 100644 --- a/hosts/lupine/hardware-configuration/lupine-4.nix +++ b/hosts/lupine/hardware-configuration/lupine-4.nix @@ -14,21 +14,27 @@ boot.extraModulePackages = [ ]; fileSystems."/" = - { device = "/dev/disk/by-uuid/c7bbb293-a0a3-4995-8892-0ec63e8c67dd"; - fsType = "ext4"; + { device = "/dev/disk/by-uuid/fcd51970-f040-4c45-94cf-2b372d4599a2"; + fsType = "btrfs"; + options = [ "subvol=@root" "compress=zstd" ]; + }; + + fileSystems."/nix" = + { device = "/dev/disk/by-uuid/fcd51970-f040-4c45-94cf-2b372d4599a2"; + fsType = "btrfs"; + options = [ "subvol=@nix" "noatime" "compress=zstd" ]; + }; + + fileSystems."/boot" = + { device = "/dev/disk/by-uuid/A22E-E41A"; + fsType = "vfat"; + options = [ "fmask=0022" "dmask=0022" ]; }; swapDevices = [ { device = "/dev/disk/by-uuid/a86ffda8-8ecb-42a1-bf9f-926072e90ca5"; } ]; - # Enables DHCP on each ethernet and wireless interface. In case of scripted networking - # (the default) this is the recommended approach. When using systemd-networkd it's - # still possible to use this option, but it's recommended to use it in conjunction - # with explicit per-interface declarations with `networking.interfaces..useDHCP`. - networking.useDHCP = lib.mkDefault true; - # networking.interfaces.enp0s31f6.useDHCP = lib.mkDefault true; - nixpkgs.hostPlatform = lib.mkDefault "x86_64-linux"; hardware.cpu.intel.updateMicrocode = lib.mkDefault config.hardware.enableRedistributableFirmware; }