chris/dotfiles
1
0
Fork 0
Code Issues Pull requests Projects Releases Packages Wiki Activity Actions

[fix] broken git stuff oops

Browse source
This commit is contained in:
Chris Cochrun 2026-05-08 14:50:40 -05:00
parent bc0987c09a
commit 20ff907a08
6 changed files with 0 additions and 69 deletions
Download patch file Download diff file Expand all files Collapse all files

30
systems/kaladin/hardware-configuration.nix
View file

@ -12,27 +12,6 @@
fileSystems."/" =
<<<<<<< HEAD
{ device = "/dev/disk/by-uuid/1ba185c4-8b74-46f3-95d8-9ccaab0be1ad";
fsType = "btrfs";
options = [ "subvol=@" "noatime" "compress=zstd:1" "space_cache=v2" "ssd" ];
};
fileSystems."/home" =
{ device = "/dev/disk/by-uuid/1ba185c4-8b74-46f3-95d8-9ccaab0be1ad";
fsType = "btrfs";
options = [ "subvol=@home" "noatime" "compress=zstd:1" "space_cache=v2" "ssd" ];
};
fileSystems."/snapshots" =
{ device = "/dev/disk/by-uuid/1ba185c4-8b74-46f3-95d8-9ccaab0be1ad";
fsType = "btrfs";
options = [ "subvol=@snapshots" "noatime" "compress=zstd:1" "space_cache=v2" "ssd" ];
};
fileSystems."/boot" =
{ device = "/dev/disk/by-uuid/1D14-97A8";
=======
{ device = "/dev/disk/by-label/ROOT";
fsType = "btrfs";
options = [ "subvol=root" "noatime" "compress=zstd:1" "space_cache=v2" "ssd" ];
@ -52,27 +31,18 @@
fileSystems."/boot" =
{ device = "/dev/disk/by-label/BOOT";
>>>>>>> 4827e2d (updates?)
fsType = "vfat";
options = [ "fmask=0022" "dmask=0022" ];
};
fileSystems."/run/media/chris/Storage" =
<<<<<<< HEAD
{ device = "/dev/disk/by-uuid/4c7d4273-7b72-4aa8-8e1c-e281543d06cb";
=======
{ device = "/dev/disk/by-label/Storage";
>>>>>>> 4827e2d (updates?)
fsType = "btrfs";
options = [ "noatime" "space_cache=v2" "compress=zstd:1" ];
};
fileSystems."/run/media/chris/backup" =
<<<<<<< HEAD
{ device = "/dev/disk/by-uuid/4286b9ef-e8ed-49a0-9eec-91b8ee05b2cb";
=======
{ device = "/dev/disk/by-label/backup";
>>>>>>> 4827e2d (updates?)
fsType = "ext4";
};