Merge branch 'main' into btrfs
This commit is contained in:
commit
20464d7350
5 files changed
+207
-8
No files matched your search
@@ -18,6 +18,11 @@
|
||||
options = [ "subvol=@root" "compress=zstd" ];
|
||||
};
|
||||
|
||||
fileSystems."/root-btrfs" =
|
||||
{ device = "/dev/disk/by-uuid/adaad601-f79c-4342-ba3a-9eab53ec4cd1";
|
||||
fsType = "btrfs";
|
||||
};
|
||||
|
||||
fileSystems."/home" =
|
||||
{ device = "/dev/disk/by-uuid/adaad601-f79c-4342-ba3a-9eab53ec4cd1";
|
||||
fsType = "btrfs";
|
||||
@@ -29,6 +34,13 @@
|
||||
fsType = "btrfs";
|
||||
options = [ "subvol=@nix" "compress=zstd" "noatime" ];
|
||||
};
|
||||
|
||||
fileSystems."/swap" =
|
||||
{ device = "/dev/disk/by-uuid/adaad601-f79c-4342-ba3a-9eab53ec4cd1";
|
||||
fsType = "btrfs";
|
||||
options = [ "subvol=@swap" "noatime" ];
|
||||
};
|
||||
|
||||
fileSystems."/mnt/Data" = {
|
||||
device = "/dev/disk/by-uuid/239db4ac-762d-4d76-8297-ccd37bcdfd8b";
|
||||
fsType = "ext4";
|
||||
@@ -39,7 +51,7 @@
|
||||
fsType = "vfat";
|
||||
options = [ "fmask=0022" "dmask=0022" ];
|
||||
};
|
||||
|
||||
swapDevices = [ { device = "/swap/swapfile"; } ];
|
||||
networking.useDHCP = lib.mkDefault true;
|
||||
nixpkgs.hostPlatform = lib.mkDefault "x86_64-linux";
|
||||
hardware.cpu.amd.updateMicrocode =
|
||||
|
||||
+2
-7
@@ -29,6 +29,7 @@ in
|
||||
cosmic.enable = true;
|
||||
kde.enable = false;
|
||||
crypto.enable = true;
|
||||
gnome.enable = true;
|
||||
};
|
||||
};
|
||||
networkDrives = {
|
||||
@@ -42,13 +43,7 @@ in
|
||||
# Desktop Env
|
||||
services.xserver.displayManager.gdm.enable = true;
|
||||
services.xserver.displayManager.gdm.wayland = true;
|
||||
# services.displayManager.defaultSession = "cosmic";
|
||||
services.xserver.desktopManager.gnome.enable = true;
|
||||
environment.gnome.excludePackages = with pkgs; [
|
||||
gnome-tour
|
||||
gnome-text-editor
|
||||
gnome-console
|
||||
];
|
||||
services.displayManager.defaultSession = "cosmic";
|
||||
|
||||
# Firmware updater
|
||||
services.fwupd.enable = true;
|
||||
|
||||
Reference in new issue
Block a user