sravan/nixos-config
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

Fix Disko Config for Current System and Fix dwm polybar override

Browse Source 
- Restore luks-btrfs-subvolumes.nix to old subvolume / swap size
- Make a copy of modified luks-btrfs-subvolumes.nix for future use
- Disable the polybar patch step which doesn't work
- Add git as a build input for polybar-dwm-module
This commit is contained in:
Sravan Balaji
2024-03-30 16:38:59 -04:00
parent aa28eb8e3d
commit b2ecd969fd
3 changed files with 88 additions and 16 deletions
Download Patch File Download Diff File Expand all files Collapse all files

77
disko/luks-btrfs-subvolumes-new.nix Normal file
View File

@@ -0,0 +1,77 @@
let
installDisk = "sda";
bootPartitionSize = "512M";
swapfileSize = "10G";
in {
disko.devices = {
disk = {
main = {
type = "disk";
device = "/dev/" + installDisk;
content = {
type = "gpt";
partitions = {
boot = {
size = "1M";
type = "EF02"; # for grub MBR
};
ESP = {
size = bootPartitionSize;
type = "EF00";
content = {
type = "filesystem";
format = "vfat";
mountpoint = "/boot";
mountOptions = [
"defaults"
];
};
};
luks = {
size = "100%";
content = {
type = "luks";
name = "cryptroot";
settings.allowDiscards = true;
content = {
type = "btrfs";
extraArgs = [ "-f" ];
subvolumes = {
"@root" = {
mountpoint = "/";
mountOptions = [ "compress=zstd" "noatime" ];
};
"@home" = {
mountpoint = "/home";
mountOptions = [ "compress=zstd" "noatime" ];
};
"@games" = {
mountpoint = "/games";
mountOptions = [ "compress=zstd" "noatime" ];
};
"@nix" = {
mountpoint = "/nix";
mountOptions = [ "compress=zstd" "noatime" ];
};
"@log" = {
mountpoint = "/var/log";
mountOptions = [ "compress=zstd" "noatime" ];
};
"@swap" = {
mountpoint = "/swap";
swap.swapfile.size = swapfileSize;
};
"@.snapshots" = {
mountpoint = "/.snapshots";
mountOptions = [ "compress=zstd" "noatime" ];
};
};
};
};
};
};
};
};
};
};
}

24
disko/luks-btrfs-subvolumes.nix
View File

@@ -1,7 +1,7 @@
let
installDisk = "sda";
bootPartitionSize = "512M";
swapfileSize = "10G";
swapfileSize = "34G";
in {
disko.devices = {
disk = {
@@ -37,34 +37,26 @@ in {
type = "btrfs";
extraArgs = [ "-f" ];
subvolumes = {
"@root" = {
"@" = {
mountpoint = "/";
mountOptions = [ "compress=zstd" "noatime" ];
mountOptions = [ "compress=zstd" "noatime" "discard=async" "space_cache=v2" "ssd" ];
};
"@home" = {
mountpoint = "/home";
mountOptions = [ "compress=zstd" "noatime" ];
mountOptions = [ "compress=zstd" "noatime" "discard=async" "space_cache=v2" "ssd" ];
};
"@games" = {
mountpoint = "/games";
mountOptions = [ "compress=zstd" "noatime" ];
"@.snapshots" = {
mountpoint = "/.snapshots";
mountOptions = [ "compress=zstd" "noatime" "discard=async" "space_cache=v2" "ssd" ];
};
"@nix" = {
mountpoint = "/nix";
mountOptions = [ "compress=zstd" "noatime" ];
};
"@log" = {
mountpoint = "/var/log";
mountOptions = [ "compress=zstd" "noatime" ];
mountOptions = [ "compress=zstd" "noatime" "discard=async" "space_cache=v2" "ssd" ];
};
"@swap" = {
mountpoint = "/swap";
swap.swapfile.size = swapfileSize;
};
"@.snapshots" = {
mountpoint = "/.snapshots";
mountOptions = [ "compress=zstd" "noatime" ];
};
};
};
};

3
system/gui/dwm.nix
View File

@@ -58,7 +58,10 @@
buildInputs = previousAttrs.buildInputs ++ [
jsoncpp
git
];
patches = [];
}))
];
}