schmittlauch/nixconfigs
2
0
Fork 0
Code Issues 1 Pull requests Releases Wiki Activity

reinstallation on different SSD

Browse source 
TODO: split hw-specific config
This commit is contained in:
Trolli Schmittlauch 2018-10-12 11:08:52 +02:00
parent 67c5bd07d0
commit ad8df0fae4
2 changed files with 12 additions and 15 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

9
nixos/configuration.nix
View file

@ -12,15 +12,14 @@ in {
[ # Include the results of the hardware scan. [ # Include the results of the hardware scan.
./hardware-configuration.nix ./hardware-configuration.nix
./packages.nix ./packages.nix
/home/spiollinux/src/nixos-hardware/lenovo/thinkpad/t440s ../../home/spiollinux/src/nixos-hardware/lenovo/thinkpad/t440s
]; ];
# encrypted partitions # encrypted partitions
boot.initrd.luks = boot.initrd.luks =
{ devices = { devices =
{ "systemA".device = "/dev/disk/by-uuid/1d57fb8c-301b-4d8c-8652-dcda39910404"; { "system".device = "/dev/disk/by-uuid/85154131-b2a8-4ef5-9d74-47429cb267ef";
"systemB".device = "/dev/disk/by-uuid/d68d217b-5443-49ca-af1b-9f2eacb73d8b"; "cryptswap".device = "/dev/disk/by-uuid/ac586df6-6332-4809-beb1-f51906a2adaa";
"cryptswap".device = "/dev/disk/by-uuid/472d5c58-d834-4ff8-82f1-f98d627e9163";
}; };
reusePassphrases = true; reusePassphrases = true;
}; };
@ -138,6 +137,6 @@ boot.kernel.sysctl."vm.overcommit_memory" = "1";
# compatible, in order to avoid breaking some software such as database # compatible, in order to avoid breaking some software such as database
# servers. You should change this only after NixOS release notes say you # servers. You should change this only after NixOS release notes say you
# should. # should.
system.stateVersion = "18.03"; # Did you read the comment? system.stateVersion = "18.09"; # Did you read the comment?
} }

18
nixos/hardware-configuration.nix
View file

@ -13,24 +13,22 @@
boot.extraModulePackages = [ ]; boot.extraModulePackages = [ ];
fileSystems."/" = fileSystems."/" =
{ device = "/dev/disk/by-uuid/0cd6d909-dba3-4542-a3b3-bffa16f6ce78"; { device = "/dev/disk/by-uuid/cb5998ae-cfc9-447f-8756-1ceaec6ca4c4";
fsType = "btrfs"; fsType = "btrfs";
options = [ "subvol=nixos_root" ];
};
fileSystems."/home" =
{ device = "/dev/disk/by-uuid/0cd6d909-dba3-4542-a3b3-bffa16f6ce78";
fsType = "btrfs";
options = [ "subvol=home" ];
}; };
fileSystems."/boot" = fileSystems."/boot" =
{ device = "/dev/disk/by-uuid/B8CE-E83B"; { device = "/dev/disk/by-uuid/DED9-661B";
fsType = "vfat"; fsType = "vfat";
}; };
fileSystems."/home" =
{ device = "/dev/disk/by-uuid/cb5998ae-cfc9-447f-8756-1ceaec6ca4c4";
fsType = "btrfs";
};
swapDevices = swapDevices =
[ { device = "/dev/disk/by-uuid/d6dce42c-56c6-4477-b4fe-d1b35c92bc38"; } [ { device = "/dev/disk/by-uuid/bf928178-4e92-4e7e-8df2-18fbd658eecf"; }
]; ];
nix.maxJobs = lib.mkDefault 4; nix.maxJobs = lib.mkDefault 4;