HASH 4ac9af3ca8ba
DATE 2024-11-22
SUBJECT ookst480s: update host modules
FILES 5 CHANGED
HASH 4ac9af3ca8ba
DATE 2024-11-22
SUBJECT ookst480s: update host modules
FILES 5 CHANGED
┌─ hosts/ookst480s/default.nix ──────────────────────────────────────────────┐
│ diff --git a/hosts/ookst480s/default.nix b/hosts/ookst480s/default.nix │
│ index cba1b03..1d1b5af 100644 │
│ --- a/hosts/ookst480s/default.nix │
│ +++ b/hosts/ookst480s/default.nix │
│ @@ -3,7 +3,11 @@ │
│ lib, │
│ ... │
│ }: { │
│ - imports = [./file-system.nix]; │
│ + imports = [ │
│ + ./file-system.nix │
│ + ./hardware.nix │
│ + ]; │
│ + │
│ ooknet = { │
│ host = { │
│ admin = { │
│ @@ -20,27 +24,6 @@ │
│ console = { │
│ profile = "standard"; │
│ }; │
│ - hardware = { │
│ - cpu.type = "intel"; │
│ - gpu.type = "intel"; │
│ - features = [ │
│ - "bluetooth" │
│ - "backlight" │
│ - "battery" │
│ - "ssd" │
│ - "audio" │
│ - "video" │
│ - ]; │
│ - monitors = [ │
│ - { │
│ - primary = true; │
│ - name = "eDP-1"; │
│ - width = 1920; │
│ - height = 1080; │
│ - workspace = "1"; │
│ - } │
│ - ]; │
│ - }; │
│ }; │
│ boot.kernelPackages = pkgs.linuxKernel.packages.linux_zen; │
│ system.stateVersion = lib.mkDefault "23.11"; │
└────────────────────────────────────────────────────────────────────────────────────┘
┌─ hosts/ookst480s/default.nix ────────┐
│ diff --git a/hosts/ookst480s/default.nix b/h │
│ osts/ookst480s/default.nix │
│ index cba1b03..1d1b5af 100644 │
│ --- a/hosts/ookst480s/default.nix │
│ +++ b/hosts/ookst480s/default.nix │
│ @@ -3,7 +3,11 @@ │
│ lib, │
│ ... │
│ }: { │
│ - imports = [./file-system.nix]; │
│ + imports = [ │
│ + ./file-system.nix │
│ + ./hardware.nix │
│ + ]; │
│ + │
│ ooknet = { │
│ host = { │
│ admin = { │
│ @@ -20,27 +24,6 @@ │
│ console = { │
│ profile = "standard"; │
│ }; │
│ - hardware = { │
│ - cpu.type = "intel"; │
│ - gpu.type = "intel"; │
│ - features = [ │
│ - "bluetooth" │
│ - "backlight" │
│ - "battery" │
│ - "ssd" │
│ - "audio" │
│ - "video" │
│ - ]; │
│ - monitors = [ │
│ - { │
│ - primary = true; │
│ - name = "eDP-1"; │
│ - width = 1920; │
│ - height = 1080; │
│ - workspace = "1"; │
│ - } │
│ - ]; │
│ - }; │
│ }; │
│ boot.kernelPackages = pkgs.linuxKernel.pa │
│ ckages.linux_zen; │
│ system.stateVersion = lib.mkDefault "23.1 │
│ 1"; │
└──────────────────────────────────────────────┘
┌─ hosts/ookst480s/file-system.nix ──────────────────────────────────────────┐
│ diff --git a/hosts/ookst480s/file-system.nix b/hosts/ookst480s/file-system.nix │
│ index 8516afa..30dbf89 100644 │
│ --- a/hosts/ookst480s/file-system.nix │
│ +++ b/hosts/ookst480s/file-system.nix │
│ @@ -1,63 +1,35 @@ │
│ -# 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, │
│ - modulesPath, │
│ - ... │
│ -}: { │
│ - imports = [ │
│ - (modulesPath + "/installer/scan/not-detected.nix") │
│ - ]; │
│ - │
│ - boot.initrd.availableKernelModules = ["xhci_pci" "nvme" "usb_storage" "sd_mod"] │
│ ; │
│ - boot.initrd.kernelModules = []; │
│ - boot.kernelModules = ["kvm-intel"]; │
│ - boot.extraModulePackages = []; │
│ - │
│ - fileSystems."/" = { │
│ - device = "/dev/disk/by-uuid/19e4cf0f-b5ac-4544-a44b-c017b23fd283"; │
│ - fsType = "btrfs"; │
│ - options = ["subvol=root"]; │
│ - }; │
│ - │
│ boot.initrd.luks.devices."cryptnix".device = "/dev/disk/by-uuid/014d725c-bf13-4 │
│ 0a2-a9ab-0dd6185a95f6"; │
│ │
│ - fileSystems."/nix" = { │
│ - device = "/dev/disk/by-uuid/19e4cf0f-b5ac-4544-a44b-c017b23fd283"; │
│ - fsType = "btrfs"; │
│ - options = ["subvol=nix"]; │
│ + fileSystems = { │
│ + "/" = { │
│ + device = "/dev/disk/by-uuid/19e4cf0f-b5ac-4544-a44b-c017b23fd283"; │
│ + fsType = "btrfs"; │
│ + options = ["subvol=root"]; │
│ + }; │
│ + │
│ + "/nix" = { │
│ + device = "/dev/disk/by-uuid/19e4cf0f-b5ac-4544-a44b-c017b23fd283"; │
│ + fsType = "btrfs"; │
│ + options = ["subvol=nix"]; │
│ + }; │
│ + │
│ + "/persist" = { │
│ + device = "/dev/disk/by-uuid/19e4cf0f-b5ac-4544-a44b-c017b23fd283"; │
│ + fsType = "btrfs"; │
│ + options = ["subvol=persist"]; │
│ + }; │
│ + │
│ + "/swap" = { │
│ + device = "/dev/disk/by-uuid/19e4cf0f-b5ac-4544-a44b-c017b23fd283"; │
│ + fsType = "btrfs"; │
│ + options = ["subvol=swap"]; │
│ + }; │
│ + │
│ + "/boot" = { │
│ + device = "/dev/disk/by-uuid/F356-6F9C"; │
│ + fsType = "vfat"; │
│ + }; │
│ }; │
│ - │
│ - fileSystems."/persist" = { │
│ - device = "/dev/disk/by-uuid/19e4cf0f-b5ac-4544-a44b-c017b23fd283"; │
│ - fsType = "btrfs"; │
│ - options = ["subvol=persist"]; │
│ - }; │
│ - │
│ - fileSystems."/swap" = { │
│ - device = "/dev/disk/by-uuid/19e4cf0f-b5ac-4544-a44b-c017b23fd283"; │
│ - fsType = "btrfs"; │
│ - options = ["subvol=swap"]; │
│ - }; │
│ - │
│ - fileSystems."/boot" = { │
│ - device = "/dev/disk/by-uuid/F356-6F9C"; │
│ - fsType = "vfat"; │
│ - }; │
│ - │
│ swapDevices = []; │
│ - │
│ - # Enables DHCP on each ethernet and wireless interface. In case of scripted net │
│ working │
│ - # (the default) this is the recommended approach. When using systemd-networkd i │
│ t's │
│ - # still possible to use this option, but it's recommended to use it in conjunct │
│ ion │
│ - # with explicit per-interface declarations with `networking.interfaces.<interfa │
│ ce>.useDHCP`. │
│ - networking.useDHCP = lib.mkDefault true; │
│ - # networking.interfaces.enp0s31f6.useDHCP = lib.mkDefault true; │
│ - # networking.interfaces.wlp61s0.useDHCP = lib.mkDefault true; │
│ - # networking.interfaces.wwan0.useDHCP = lib.mkDefault true; │
│ - │
│ - powerManagement.cpuFreqGovernor = lib.mkDefault "powersave"; │
│ - hardware.cpu.intel.updateMicrocode = lib.mkDefault config.hardware.enableRedist │
│ ributableFirmware; │
│ } │
└────────────────────────────────────────────────────────────────────────────────────┘
┌─ hosts/ookst480s/file-system.nix ────┐
│ diff --git a/hosts/ookst480s/file-system.nix │
│ b/hosts/ookst480s/file-system.nix │
│ index 8516afa..30dbf89 100644 │
│ --- a/hosts/ookst480s/file-system.nix │
│ +++ b/hosts/ookst480s/file-system.nix │
│ @@ -1,63 +1,35 @@ │
│ -# Do not modify this file! It was generate │
│ d by 'nixos-generate-config' │
│ -# and may be overwritten by future invocati │
│ ons. Please make changes │
│ -# to /etc/nixos/configuration.nix instead. │
│ { │
│ - config, │
│ - lib, │
│ - modulesPath, │
│ - ... │
│ -}: { │
│ - imports = [ │
│ - (modulesPath + "/installer/scan/not-det │
│ ected.nix") │
│ - ]; │
│ - │
│ - boot.initrd.availableKernelModules = ["xh │
│ ci_pci" "nvme" "usb_storage" "sd_mod"]; │
│ - boot.initrd.kernelModules = []; │
│ - boot.kernelModules = ["kvm-intel"]; │
│ - boot.extraModulePackages = []; │
│ - │
│ - fileSystems."/" = { │
│ - device = "/dev/disk/by-uuid/19e4cf0f-b5 │
│ ac-4544-a44b-c017b23fd283"; │
│ - fsType = "btrfs"; │
│ - options = ["subvol=root"]; │
│ - }; │
│ - │
│ boot.initrd.luks.devices."cryptnix".devic │
│ e = "/dev/disk/by-uuid/014d725c-bf13-40a2-a9 │
│ ab-0dd6185a95f6"; │
│ │
│ - fileSystems."/nix" = { │
│ - device = "/dev/disk/by-uuid/19e4cf0f-b5 │
│ ac-4544-a44b-c017b23fd283"; │
│ - fsType = "btrfs"; │
│ - options = ["subvol=nix"]; │
│ + fileSystems = { │
│ + "/" = { │
│ + device = "/dev/disk/by-uuid/19e4cf0f- │
│ b5ac-4544-a44b-c017b23fd283"; │
│ + fsType = "btrfs"; │
│ + options = ["subvol=root"]; │
│ + }; │
│ + │
│ + "/nix" = { │
│ + device = "/dev/disk/by-uuid/19e4cf0f- │
│ b5ac-4544-a44b-c017b23fd283"; │
│ + fsType = "btrfs"; │
│ + options = ["subvol=nix"]; │
│ + }; │
│ + │
│ + "/persist" = { │
│ + device = "/dev/disk/by-uuid/19e4cf0f- │
│ b5ac-4544-a44b-c017b23fd283"; │
│ + fsType = "btrfs"; │
│ + options = ["subvol=persist"]; │
│ + }; │
│ + │
│ + "/swap" = { │
│ + device = "/dev/disk/by-uuid/19e4cf0f- │
│ b5ac-4544-a44b-c017b23fd283"; │
│ + fsType = "btrfs"; │
│ + options = ["subvol=swap"]; │
│ + }; │
│ + │
│ + "/boot" = { │
│ + device = "/dev/disk/by-uuid/F356-6F9C │
│ "; │
│ + fsType = "vfat"; │
│ + }; │
│ }; │
│ - │
│ - fileSystems."/persist" = { │
│ - device = "/dev/disk/by-uuid/19e4cf0f-b5 │
│ ac-4544-a44b-c017b23fd283"; │
│ - fsType = "btrfs"; │
│ - options = ["subvol=persist"]; │
│ - }; │
│ - │
│ - fileSystems."/swap" = { │
│ - device = "/dev/disk/by-uuid/19e4cf0f-b5 │
│ ac-4544-a44b-c017b23fd283"; │
│ - fsType = "btrfs"; │
│ - options = ["subvol=swap"]; │
│ - }; │
│ - │
│ - fileSystems."/boot" = { │
│ - device = "/dev/disk/by-uuid/F356-6F9C"; │
│ - fsType = "vfat"; │
│ - }; │
│ - │
│ swapDevices = []; │
│ - │
│ - # Enables DHCP on each ethernet and wirel │
│ ess interface. In case of scripted networkin │
│ g │
│ - # (the default) this is the recommended a │
│ pproach. 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 declaration │
│ s with `networking.interfaces.<interface>.us │
│ eDHCP`. │
│ - networking.useDHCP = lib.mkDefault true; │
│ - # networking.interfaces.enp0s31f6.useDHCP │
│ = lib.mkDefault true; │
│ - # networking.interfaces.wlp61s0.useDHCP = │
│ lib.mkDefault true; │
│ - # networking.interfaces.wwan0.useDHCP = l │
│ ib.mkDefault true; │
│ - │
│ - powerManagement.cpuFreqGovernor = lib.mkD │
│ efault "powersave"; │
│ - hardware.cpu.intel.updateMicrocode = lib. │
│ mkDefault config.hardware.enableRedistributa │
│ bleFirmware; │
│ } │
└──────────────────────────────────────────────┘
┌─ hosts/ookst480s/hardware.nix ─────────────────────────────────────────────┐
│ diff --git a/hosts/ookst480s/hardware.nix b/hosts/ookst480s/hardware.nix │
│ new file mode 100644 │
│ index 0000000..d67061d │
│ --- /dev/null │
│ +++ b/hosts/ookst480s/hardware.nix │
│ @@ -0,0 +1,23 @@ │
│ +{ │
│ + ooknet.hardware = { │
│ + cpu.type = "intel"; │
│ + gpu.type = "intel"; │
│ + features = [ │
│ + "bluetooth" │
│ + "backlight" │
│ + "battery" │
│ + "ssd" │
│ + "audio" │
│ + "video" │
│ + ]; │
│ + monitors = [ │
│ + { │
│ + primary = true; │
│ + name = "eDP-1"; │
│ + width = 1920; │
│ + height = 1080; │
│ + workspace = "1"; │
│ + } │
│ + ]; │
│ + }; │
│ +} │
└────────────────────────────────────────────────────────────────────────────────────┘
┌─ hosts/ookst480s/hardware.nix ───────┐
│ diff --git a/hosts/ookst480s/hardware.nix b/ │
│ hosts/ookst480s/hardware.nix │
│ new file mode 100644 │
│ index 0000000..d67061d │
│ --- /dev/null │
│ +++ b/hosts/ookst480s/hardware.nix │
│ @@ -0,0 +1,23 @@ │
│ +{ │
│ + ooknet.hardware = { │
│ + cpu.type = "intel"; │
│ + gpu.type = "intel"; │
│ + features = [ │
│ + "bluetooth" │
│ + "backlight" │
│ + "battery" │
│ + "ssd" │
│ + "audio" │
│ + "video" │
│ + ]; │
│ + monitors = [ │
│ + { │
│ + primary = true; │
│ + name = "eDP-1"; │
│ + width = 1920; │
│ + height = 1080; │
│ + workspace = "1"; │
│ + } │
│ + ]; │
│ + }; │
│ +} │
└──────────────────────────────────────────────┘
┌─ hosts/ookst480s/host.nix ─────────────────────────────────────────────────┐
│ diff --git a/hosts/ookst480s/host.nix b/hosts/ookst480s/host.nix │
│ deleted file mode 100644 │
│ index e69de29..0000000 │
└────────────────────────────────────────────────────────────────────────────────────┘
┌─ hosts/ookst480s/host.nix ───────────┐
│ diff --git a/hosts/ookst480s/host.nix b/host │
│ s/ookst480s/host.nix │
│ deleted file mode 100644 │
│ index e69de29..0000000 │
└──────────────────────────────────────────────┘
┌─ hosts/ookst480s/workstation.nix ──────────────────────────────────────────┐
│ diff --git a/hosts/ookst480s/workstation.nix b/hosts/ookst480s/workstation.nix │
│ deleted file mode 100644 │
│ index 39fce43..0000000 │
│ --- a/hosts/ookst480s/workstation.nix │
│ +++ /dev/null │
│ @@ -1,12 +0,0 @@ │
│ -{ │
│ - config = { │
│ - ooknet.workstation = { │
│ - appearance = { │
│ - theme = "minimal"; │
│ - }; │
│ - desktop = { │
│ - environment = "hyprland"; │
│ - }; │
│ - }; │
│ - }; │
│ -} │
└────────────────────────────────────────────────────────────────────────────────────┘
┌─ hosts/ookst480s/workstation.nix ────┐
│ diff --git a/hosts/ookst480s/workstation.nix │
│ b/hosts/ookst480s/workstation.nix │
│ deleted file mode 100644 │
│ index 39fce43..0000000 │
│ --- a/hosts/ookst480s/workstation.nix │
│ +++ /dev/null │
│ @@ -1,12 +0,0 @@ │
│ -{ │
│ - config = { │
│ - ooknet.workstation = { │
│ - appearance = { │
│ - theme = "minimal"; │
│ - }; │
│ - desktop = { │
│ - environment = "hyprland"; │
│ - }; │
│ - }; │
│ - }; │
│ -} │
└──────────────────────────────────────────────┘
[ BACK TO LOG ]
──────────────────────────────────────────────────────────────────────────────────────
OOKNET
────────────────────────────────────────────────
OOKNET