Add missing file system info.

This commit is contained in:
jay
2025-06-29 02:36:09 +00:00
parent 76341b5369
commit 8d0dfec9ea
4 changed files with 67 additions and 61 deletions

82
flake.lock generated
View File

@@ -1,43 +1,6 @@
{ {
"nodes": { "nodes": {
"disko": { "disko": {
"inputs": {
"nixpkgs": "nixpkgs"
},
"locked": {
"lastModified": 1750903843,
"narHash": "sha256-Ng9+f0H5/dW+mq/XOKvB9uwvGbsuiiO6HrPdAcVglCs=",
"owner": "nix-community",
"repo": "disko",
"rev": "83c4da299c1d7d300f8c6fd3a72ac46cb0d59aae",
"type": "github"
},
"original": {
"id": "disko",
"type": "indirect"
}
},
"disko-stable-nixos": {
"inputs": {
"nixpkgs": [
"nixpkgs-stable-nixos"
]
},
"locked": {
"lastModified": 1750903843,
"narHash": "sha256-Ng9+f0H5/dW+mq/XOKvB9uwvGbsuiiO6HrPdAcVglCs=",
"owner": "nix-community",
"repo": "disko",
"rev": "83c4da299c1d7d300f8c6fd3a72ac46cb0d59aae",
"type": "github"
},
"original": {
"owner": "nix-community",
"repo": "disko",
"type": "github"
}
},
"disko_2": {
"inputs": { "inputs": {
"nixpkgs": [ "nixpkgs": [
"nixverse", "nixverse",
@@ -60,6 +23,26 @@
"type": "github" "type": "github"
} }
}, },
"disko-stable-nixos": {
"inputs": {
"nixpkgs": [
"nixpkgs-stable-nixos"
]
},
"locked": {
"lastModified": 1750903843,
"narHash": "sha256-Ng9+f0H5/dW+mq/XOKvB9uwvGbsuiiO6HrPdAcVglCs=",
"owner": "nix-community",
"repo": "disko",
"rev": "83c4da299c1d7d300f8c6fd3a72ac46cb0d59aae",
"type": "github"
},
"original": {
"owner": "nix-community",
"repo": "disko",
"type": "github"
}
},
"flake-parts": { "flake-parts": {
"inputs": { "inputs": {
"nixpkgs-lib": [ "nixpkgs-lib": [
@@ -105,7 +88,7 @@
}, },
"nixos-anywhere": { "nixos-anywhere": {
"inputs": { "inputs": {
"disko": "disko_2", "disko": "disko",
"flake-parts": "flake-parts", "flake-parts": "flake-parts",
"nixos-images": "nixos-images", "nixos-images": "nixos-images",
"nixos-stable": "nixos-stable", "nixos-stable": "nixos-stable",
@@ -183,10 +166,8 @@
"type": "github" "type": "github"
}, },
"original": { "original": {
"owner": "NixOS", "id": "nixpkgs",
"ref": "nixpkgs-unstable", "type": "indirect"
"repo": "nixpkgs",
"type": "github"
} }
}, },
"nixpkgs-stable-nixos": { "nixpkgs-stable-nixos": {
@@ -205,20 +186,6 @@
"type": "github" "type": "github"
} }
}, },
"nixpkgs_2": {
"locked": {
"lastModified": 1750994206,
"narHash": "sha256-3u6rEbIX9CN/5A5/mc3u0wIO1geZ0EhjvPBXmRDHqWM=",
"owner": "NixOS",
"repo": "nixpkgs",
"rev": "80d50fc87924c2a0d346372d242c27973cf8cdbf",
"type": "github"
},
"original": {
"id": "nixpkgs",
"type": "indirect"
}
},
"nixverse": { "nixverse": {
"inputs": { "inputs": {
"nix-darwin": "nix-darwin", "nix-darwin": "nix-darwin",
@@ -243,9 +210,8 @@
}, },
"root": { "root": {
"inputs": { "inputs": {
"disko": "disko",
"disko-stable-nixos": "disko-stable-nixos", "disko-stable-nixos": "disko-stable-nixos",
"nixpkgs": "nixpkgs_2", "nixpkgs": "nixpkgs",
"nixpkgs-stable-nixos": "nixpkgs-stable-nixos", "nixpkgs-stable-nixos": "nixpkgs-stable-nixos",
"nixverse": "nixverse" "nixverse": "nixverse"
} }

View File

@@ -17,7 +17,6 @@
{ {
self, self,
nixpkgs, nixpkgs,
disko,
nixverse, nixverse,
... ...
}: }:

View File

@@ -2,13 +2,13 @@
# your system. Help is available in the configuration.nix(5) man page, on # your system. Help is available in the configuration.nix(5) man page, on
# https://search.nixos.org/options and in the NixOS manual (`nixos-help`). # https://search.nixos.org/options and in the NixOS manual (`nixos-help`).
{ config, lib, pkgs, inputs, ... }: { config, lib, pkgs, ... }:
{ {
imports = imports =
[ # Include the results of the hardware scan. [ # Include the results of the hardware scan.
./hardware-configuration.nix ./hardware-configuration.nix
./disko.nix ./filesystems.nix
]; ];
# Use the systemd-boot EFI boot loader. # Use the systemd-boot EFI boot loader.

View File

@@ -0,0 +1,41 @@
{ ... }: {
fileSystems."/" =
{ device = "/dev/disk/by-uuid/830e6948-9661-47b2-968d-e939b4bb83b1";
fsType = "btrfs";
options = [ "subvol=root" "compress=zstd" "noatime" ];
};
fileSystems."/nix" =
{ device = "/dev/disk/by-uuid/830e6948-9661-47b2-968d-e939b4bb83b1";
fsType = "btrfs";
options = [ "subvol=nix" "compress=zstd" "noatime" ];
};
fileSystems."/var/log" =
{ device = "/dev/disk/by-uuid/830e6948-9661-47b2-968d-e939b4bb83b1";
fsType = "btrfs";
options = [ "subvol=log" "compress=zstd" "noatime" ];
neededForBoot = true;
};
fileSystems."/nix/persist" =
{ device = "/dev/disk/by-uuid/830e6948-9661-47b2-968d-e939b4bb83b1";
fsType = "btrfs";
options = [ "subvol=persist" "compress=zstd" "noatime" ];
neededForBoot = true;
};
fileSystems."/boot" =
{ device = "/dev/disk/by-uuid/60CE-EFBA";
fsType = "vfat";
options = [ "fmask=0077" "dmask=0077" ];
};
swapDevices = [{
device = "/swapfile";
size = 16 * 1024;
}];
}