From 22483cd7c2cc522d12c8c4fbf632fe5d0ceaf069 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Laure=CE=B7t?= Date: Sun, 31 Mar 2024 16:28:07 +0200 Subject: [PATCH] =?UTF-8?q?=F0=9F=91=BB=20(aurum/system)=20disable=20disko?= =?UTF-8?q?=20(temporary)?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- hosts/aurum/system/default.nix | 2 +- hosts/aurum/system/disko/default.nix | 49 ++++++++++++++-------- hosts/aurum/system/hardware/default.nix | 31 +++++++++++++- hosts/aurum/system/hardware/partitions.nix | 15 +++++++ 4 files changed, 78 insertions(+), 19 deletions(-) create mode 100644 hosts/aurum/system/hardware/partitions.nix diff --git a/hosts/aurum/system/default.nix b/hosts/aurum/system/default.nix index 28055dc..f11ef7d 100644 --- a/hosts/aurum/system/default.nix +++ b/hosts/aurum/system/default.nix @@ -10,7 +10,7 @@ imports = [ ./audio ./boot - ./disko + # ./disko ./docker ./fonts ./hardware diff --git a/hosts/aurum/system/disko/default.nix b/hosts/aurum/system/disko/default.nix index 0f965d8..b5336c6 100644 --- a/hosts/aurum/system/disko/default.nix +++ b/hosts/aurum/system/disko/default.nix @@ -8,7 +8,7 @@ type = "gpt"; partitions = { esp = { - size = "512MiB"; + size = "512M"; type = "EF00"; content = { type = "filesystem"; @@ -27,22 +27,8 @@ settings.allowDiscards = true; passwordFile = "/tmp/secret.key"; content = { - type = "btrfs"; - extraArgs = ["-f"]; - subvolumes = { - "@persistent" = { - mountpoint = "/persistent"; - mountOptions = ["compress=zstd" "noatime"]; - }; - "@nix" = { - mountpoint = "/nix"; - mountOptions = ["compress=zstd" "noatime"]; - }; - "@swap" = { - mountpoint = "/.swapvol"; - swap.swapfile.size = "10G"; - }; - }; + type = "lvm_pv"; + vg = "pool"; }; }; }; @@ -50,5 +36,34 @@ }; }; }; + lvm_vg = { + pool = { + type = "lvm_vg"; + lvs = { + root = { + size = "100M"; + content = { + type = "filesystem"; + format = "ext4"; + mountpoint = "/"; + mountOptions = [ + "defaults" + ]; + }; + }; + home = { + size = "10M"; + content = { + type = "filesystem"; + format = "ext4"; + mountpoint = "/home"; + }; + }; + raw = { + size = "10M"; + }; + }; + }; + }; }; } diff --git a/hosts/aurum/system/hardware/default.nix b/hosts/aurum/system/hardware/default.nix index a146c71..3b760ae 100644 --- a/hosts/aurum/system/hardware/default.nix +++ b/hosts/aurum/system/hardware/default.nix @@ -1,4 +1,4 @@ -{...}: { +{pkgs, ...}: { # hardware hardware = { enableRedistributableFirmware = true; @@ -28,4 +28,33 @@ # backlight intensity programs.light.enable = true; + + imports = [ + ./partitions.nix + ]; + + # tests, temporary or move this shit to nixos-hardware public repo + # services.thermald.enable = lib.mkDefault true; + + # Includes the Wi-Fi and Bluetooth firmware for the QCA6390. ?????? + # hardware.enableRedistributableFirmware = true; + + # enable finger print sensor. + # this has to be configured with `sudo fprintd-enroll `. + services.fprintd.enable = true; + services.fprintd.tod.enable = true; + services.fprintd.tod.driver = pkgs.libfprint-2-tod1-goodix; + + # Allows for updating firmware via `fwupdmgr`. + services.fwupd.enable = true; + + # webcam bullshit fuck you intel + # bugged my power down ? try to uninstall ? doesn't work anyway + # hardware.firmware = [ + # pkgs.ivsc-firmware + # ]; + # hardware.ipu6 = { + # enable = true; + # platform = "ipu6ep"; + # }; } diff --git a/hosts/aurum/system/hardware/partitions.nix b/hosts/aurum/system/hardware/partitions.nix new file mode 100644 index 0000000..846a15a --- /dev/null +++ b/hosts/aurum/system/hardware/partitions.nix @@ -0,0 +1,15 @@ +{...}: { + fileSystems."/" = + { device = "/dev/disk/by-uuid/288c6720-f583-4756-b74d-27eabf496d09"; + fsType = "ext4"; + }; + + fileSystems."/boot" = + { device = "/dev/disk/by-uuid/CBDD-1148"; + fsType = "vfat"; + }; + + swapDevices = + [ { device = "/dev/disk/by-uuid/ccdd234e-b58a-440b-b951-4fef68c3812c"; } + ]; +}