First attempt at adding polybar-dwm-module

- Update flake.lock
- Switch from awesome back to dwm
- Attempt to modify existing polybar nix package
  to point to mihirlad55's polybar-dwm-module

disko/luks-btrfs-subvolumes.nix

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

flake.lock

@@ -313,11 +313,11 @@
     },
     "nixpkgs-stable": {
       "locked": {
-        "lastModified": 1711460390,
+        "lastModified": 1711668574,
-        "narHash": "sha256-akSgjDZL6pVHEfSE6sz1DNSXuYX6hq+P/1Z5IoYWs7E=",
+        "narHash": "sha256-u1dfs0ASQIEr1icTVrsKwg2xToIpn7ZXxW3RHfHxshg=",
         "owner": "NixOS",
         "repo": "nixpkgs",
-        "rev": "44733514b72e732bd49f5511bd0203dea9b9a434",
+        "rev": "219951b495fc2eac67b1456824cc1ec1fd2ee659",
         "type": "github"
       },
       "original": {
@@ -329,11 +329,11 @@
     },
     "nixpkgs_2": {
       "locked": {
-        "lastModified": 1711523803,
+        "lastModified": 1711703276,
-        "narHash": "sha256-UKcYiHWHQynzj6CN/vTcix4yd1eCu1uFdsuarupdCQQ=",
+        "narHash": "sha256-iMUFArF0WCatKK6RzfUJknjem0H9m4KgorO/p3Dopkk=",
         "owner": "NixOS",
         "repo": "nixpkgs",
-        "rev": "2726f127c15a4cc9810843b96cad73c7eb39e443",
+        "rev": "d8fe5e6c92d0d190646fb9f1056741a229980089",
         "type": "github"
       },
       "original": {

system/gui/awesome.nix

@@ -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";
+}

system/gui/dwm.nix

@@ -24,4 +24,23 @@
   };
 
   services.xserver.displayManager.defaultSession = "none+dwm";
+
+  environment.systemPackages = with pkgs; [
+    (polybar.overrideAttrs (finalAttrs: previousAttrs: {
+      pname = previousAttrs.pname + "-dwm-module";
+      version = "3.5.2";
+
+      src = fetchFromGithub {
+        owner = "mihirlad55";
+        repo = "polybar-dwm-module";
+        rev = "0c3e139ac54e081c06ef60548927e679d80d4297";
+        hash = "sha256-DGij8dNp5nnQ05vA+6LcAdPoXAN0eYJHBimXC2Gt5JQ=";
+        fetchSubmodules = true;
+      };
+
+      buildInputs = previousAttrs.buildInputs ++ [
+        pkgs.jsoncpp
+      ];
+    }))
+  ];
 }

system/utilities/backups.nix

@@ -0,0 +1,7 @@
+{ config, lib, pkgs, ... }:
+
+{
+  environment.systemPackages = with pkgs; [
+    btrbk
+  ];
+}

system/utilities/default.nix

@@ -6,5 +6,6 @@
     ./gnome-keyring.nix
     ./miscellaneous.nix
     ./gaming.nix
+    ./backups.nix
   ];
 }