christoph/flake-nixinator
1
Fork 0
Code Activity

System/Nixinator: Remove root/boot/swap filesystem config from hardware-configuration (to use disko instead)

Browse Source
This commit is contained in:
Christoph Urlacher
2025-07-15 15:03:34 +02:00
parent cae39c8ca8
commit 6e9968b449
2 changed files with 24 additions and 18 deletions
Download Patch File Download Diff File Expand all files Collapse all files

8
shell.nix
View File

@ -1,4 +1,5 @@
{pkgs, ...}: {pkgs, ...}:
# TODO: Use pkgs.mkShell or Navi for this...
pkgs.devshell.mkShell { pkgs.devshell.mkShell {
name = "NixFlake Shell"; name = "NixFlake Shell";
@ -31,8 +32,6 @@ pkgs.devshell.mkShell {
help = "Run NixOS store verification with repair (slow)"; help = "Run NixOS store verification with repair (slow)";
command = "nix-store --verify --check-contents"; command = "nix-store --verify --check-contents";
} }
# TODO: Use navi for this
{ {
name = "help-store-path"; name = "help-store-path";
help = "Display the location of a binary in the nix store"; help = "Display the location of a binary in the nix store";
@ -48,5 +47,10 @@ pkgs.devshell.mkShell {
help = "Display the closure of a package"; help = "Display the closure of a package";
command = "echo 'nix path-info --recursive --size --closure-size --human-readable (readlink -f (which <arg>))'"; command = "echo 'nix path-info --recursive --size --closure-size --human-readable (readlink -f (which <arg>))'";
} }
{
name = "help-disko";
help = "Partition disk using disko";
command = ''echo "sudo nix run 'github:nix-community/disko/latest#disko-install' -- --flake .#<target> --disk <disk-name> <disk-device>"'';
}
]; ];
} }

34
system/nixinator/hardware-configuration.nix
View File

@ -42,16 +42,17 @@
}; };
fileSystems = { fileSystems = {
"/" = { # Done by disko
device = "/dev/disk/by-uuid/68bd46a0-e95c-4764-a006-44bd9975a6c2"; # "/" = {
fsType = "ext4"; # device = "/dev/disk/by-uuid/68bd46a0-e95c-4764-a006-44bd9975a6c2";
options = ["defaults" "rw" "relatime"]; # fsType = "ext4";
}; # options = ["defaults" "rw" "relatime"];
# };
"/boot/efi" = { #
device = "/dev/disk/by-uuid/36A9-3D74"; # "/boot/efi" = {
fsType = "vfat"; # device = "/dev/disk/by-uuid/36A9-3D74";
}; # fsType = "vfat";
# };
"/home/christoph/Games" = { "/home/christoph/Games" = {
device = "/dev/disk/by-uuid/e57c1831-09d7-4046-9c62-086d3596f825"; device = "/dev/disk/by-uuid/e57c1831-09d7-4046-9c62-086d3596f825";
@ -91,12 +92,13 @@
}; };
}; };
swapDevices = lib.mkForce [ # Done by disko
{ # swapDevices = lib.mkForce [
device = "/var/swap"; # {
size = 1024 * 16; # Without hibernation 4.0 GB to 0.5 x RAM # device = "/var/swap";
} # size = 1024 * 16; # Without hibernation 4.0 GB to 0.5 x RAM
]; # }
# ];
hardware = { hardware = {
# Use all redistributable firmware (i.e. nonfree) # Use all redistributable firmware (i.e. nonfree)