diff --git a/README.md b/README.md index aae81d2..f1d01d2 100644 --- a/README.md +++ b/README.md @@ -34,30 +34,47 @@ ``` bash # 使用parted分区 -parted /dev/sda mklabel gpt -parted /dev/sda mkpart primary fat32 1MiB 512MiB -parted /dev/sda mkpart primary ext4 512MiB 100% +parted /dev/nvme0n1 mklabel gpt +parted /dev/nvme0n1 mkpart primary fat32 1MiB 1024MiB +parted /dev/nvme0n1 mkpart primary btrfs 1024MiB 95% ``` 2. 格式化分区 ```bash - mkfs.fat -F 32 /dev/sda1 # boot / EFI 分区 - mkfs.ext4 /dev/sda2 # 系统分区 + mkfs.fat -F 32 /dev/nvme0n1p1 # boot / EFI 分区 + mkfs.btrfs /dev/nvme0n1p2 # 系统分区 ``` 3. 挂载 ```bash - mkdir -p /mnt/{boot,nix} - mount /dev/sda2 /mnt/nix - mount /dev/sda1 /mnt/boot + mount /dev/nvme0n1p2 /mnt + btrfs subvolume create /mnt/home # home 分区 + btrfs subvolume create /mnt/nix # nix 分区 + btrfs subvolume create /mnt/swap # swap 分区 + + umount /mnt + mount -o compress=zstd /dev/nvme0n1p2 /mnt + mkdir -p /mnt/{boot,nix,home,swap} + mount /dev/nvme0n1p1 /mnt/boot + mount -o compress=zstd,noatime,subvol=nix /dev/nvme0n1p2 /mnt/nix + mount -o compress=noatime,subvol=swap /dev/nvme0n1p2 /mnt/swap + mount -o compress=zstd,subvol=home /dev/nvme0n1p2 /mnt/home + + btrfs filesystem mkswapfile --size 16g --uuid clear /mnt/swap/swapfile ``` 3.1 不变系统 如何希望使用不变原子系统, 在 profile 中引入 `modules/nixos/sysatomic.nix` 模块. +```bash + mkdir -p /mnt/{boot,nix} + mount /dev/nvme0n1p2 /mnt/nix + mount /dev/nvme0n1p1 /mnt/boot +``` + 4. 生成一个基本的配置 ```bash diff --git a/modules/home/hyprland/conf/waybar/config.jsonc b/modules/home/hyprland/conf/waybar/config.jsonc index 92625a5..dd1e195 100644 --- a/modules/home/hyprland/conf/waybar/config.jsonc +++ b/modules/home/hyprland/conf/waybar/config.jsonc @@ -166,9 +166,9 @@ "tooltip-format-enumerate-connected": " {device_alias}" }, - "pulseaudio": { + "wireplumber": { "format": "{icon} {volume}", - "format-muted": "婢", + "format-muted": "󰝟", "on-click": "pavucontrol -t 3", "on-click-middle": "~/.config/hypr/scripts/volumecontrol.sh -o m", "on-scroll-up": "~/.config/hypr/scripts/volumecontrol.sh -o i", @@ -186,11 +186,11 @@ } }, - "pulseaudio#microphone": { + "wireplumber#microphone": { "format": "{format_source}", "format-source": "", "format-source-muted": "", - "on-click": "pavucontrol -t 4", + "on-click": "c -t 4", "on-click-middle": "~/.config/hypr/scripts/volumecontrol.sh -i m", "on-scroll-up": "~/.config/hypr/scripts/volumecontrol.sh -i i", "on-scroll-down": "~/.config/hypr/scripts/volumecontrol.sh -i d", diff --git a/profiles/apollo/hardware-configuration.nix b/profiles/apollo/hardware-configuration.nix index c341963..f6d40aa 100644 --- a/profiles/apollo/hardware-configuration.nix +++ b/profiles/apollo/hardware-configuration.nix @@ -13,6 +13,11 @@ boot.kernelModules = [ "kvm-intel" ]; boot.extraModulePackages = [ ]; + fileSystems."/" = + { device = "/dev/disk/by-uuid/9d79b1dc-da5a-456c-a691-9bda5aebcea3"; + fsType = "btrfs"; + }; + fileSystems."/boot" = { device = "/dev/disk/by-uuid/7C34-E13E"; fsType = "vfat"; @@ -22,6 +27,19 @@ fileSystems."/nix" = { device = "/dev/disk/by-uuid/9d79b1dc-da5a-456c-a691-9bda5aebcea3"; fsType = "btrfs"; + options = [ "subvol=nix" ]; + }; + + fileSystems."/swap" = + { device = "/dev/disk/by-uuid/9d79b1dc-da5a-456c-a691-9bda5aebcea3"; + fsType = "btrfs"; + options = [ "subvol=swap" ]; + }; + + fileSystems."/home" = + { device = "/dev/disk/by-uuid/9d79b1dc-da5a-456c-a691-9bda5aebcea3"; + fsType = "btrfs"; + options = [ "subvol=home" ]; }; swapDevices = [ ]; diff --git a/profiles/apollo/hardware.nix b/profiles/apollo/hardware.nix index 52e9108..35d2ab4 100644 --- a/profiles/apollo/hardware.nix +++ b/profiles/apollo/hardware.nix @@ -49,7 +49,7 @@ }; swapDevices = [{ - device = "/var/swapfile"; + device = "/swap/swapfile"; size = 16 * 1024; }]; } diff --git a/profiles/apollo/networking.nix b/profiles/apollo/networking.nix index bf2413b..20217c0 100644 --- a/profiles/apollo/networking.nix +++ b/profiles/apollo/networking.nix @@ -1,6 +1,6 @@ { config, pkgs, hostname, ... }: { networking = { - hostId = "5def12be"; + hostId = "6fa8b74d"; hostName = "${hostname}"; wireless.enable = false; # Enables wireless support via wpa_supplicant.