tdpeuter/sisyphus
tdpeuter/sisyphus
1
Fork 0
Code Issues 5 Pull requests Projects Releases Packages Wiki Activity

Fix merge conflicts

Browse source
This commit is contained in:
Tibo De Peuter 2023-05-24 21:38:30 +02:00
parent 71af83cd05
commit 120945a313
3 changed files with 86 additions and 70 deletions
Download patch file Download diff file Expand all files Collapse all files

8
nixos/hosts/Tibo-NixDesk/hardware-configuration.nix
View file

@ -14,20 +14,12 @@
boot.extraModulePackages = [ ];
fileSystems."/" =
<<<<<<< HEAD
{ device = "/dev/disk/by-label/NIXROOT";
=======
{ device = "/dev/disk/by-uuid/5e4bacff-07fb-4d3a-8ac6-d535c913659b";
>>>>>>> 63c6be3 (Add desktop)
fsType = "ext4";
};
fileSystems."/boot/efi" =
<<<<<<< HEAD
{ device = "/dev/disk/by-label/NIXBOOT";
=======
{ device = "/dev/disk/by-uuid/4D30-B01D";
>>>>>>> 63c6be3 (Add desktop)
fsType = "vfat";
};