Compare commits

...

2 Commits

Author SHA1 Message Date
Sravan Balaji
cb9150aa12 Add AwesomeWM 2024-03-30 08:22:34 -04:00
Sravan Balaji
28e2523bad Modify disko BTRFS Subvolume Layout
- Decrease swapfile size to 10G (don't really need hibernation)
- Remove extra BTRFS mount options like disarcd=async, space_cache=v2,
  and ssd
- Add a games subvolume
- Add a subvolume for /var/log
2024-03-30 08:15:50 -04:00
3 changed files with 36 additions and 9 deletions

View File

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

View File

@@ -26,7 +26,7 @@
locale = "en_US.UTF-8"; # Locale locale = "en_US.UTF-8"; # Locale
diskoConfig = "luks-btrfs-subvolumes"; # Select the disko config that was used to partition drive diskoConfig = "luks-btrfs-subvolumes"; # Select the disko config that was used to partition drive
hwConfig = "oryp7"; # Select the hardware config from hardware directory hwConfig = "oryp7"; # Select the hardware config from hardware directory
desktop = "dwm"; # Selected window manager or desktop environment desktop = "awesome"; # Selected window manager or desktop environment
desktopType = "x11"; # x11 or wayland desktopType = "x11"; # x11 or wayland
}; };

19
system/gui/awesome.nix Normal file
View File

@@ -0,0 +1,19 @@
{ config, lib, pkgs, userSettings, ... }:
{
imports = [
./default.nix
./lightdm.nix
./x11.nix
];
services.xserver.windowManager.awesome = {
enable = true;
luaModules = with pkgs.luaPackages; [
luarocks
luadbi-mysql
];
};
services.xserver.displayManager.defaultSession = "none+awesome";
}