Refactoring

system/boot.nix

@@ -1,5 +1,14 @@
 { pkgs, hostname, ... }:
 
+let
+# Found by running sudo btrfs inspect-internal map-swapfile -r /.swapvol/swapfile
+hibernateBootOffsets = {
+    stationette = "533760";
+    station = "533760";
+};
+
+resumeOffset = hibernateBootOffsets."${hostname}" or "0";
+in
 {
     boot = {
         loader = {
@@ -26,22 +35,22 @@
                     '';
             };
             efi.canTouchEfiVariables = true;
-            # timeout = 0;
+            # timeout = 0; # Skips the menu and uses default entry
         };
+        # Creates a cool animation for booting
         plymouth = {
             enable = true;
             theme = "black_hud";
             themePackages = with pkgs; [
                 (adi1090x-plymouth-themes.override {
-                 selected_themes = [ "black_hud" ];
-                 })
+                    selected_themes = [ "black_hud" ];
+                })
             ];
         };
         initrd.verbose = false;
 
-# Found by running sudo btrfs inspect-internal map-swapfile -r /.swapvol/swapfile
         kernelParams = [
-            "resume_offset=533760"
+            "resume_offset=${hibernateBootOffset}"
             "quiet"
             "udev.log_level=3"
             "systemd.show_status=auto"

system/fonts.nix

@@ -4,7 +4,7 @@
     fonts = {
         packages = with pkgs; [
             nerd-fonts.jetbrains-mono
-                nerd-fonts.fira-code
+            nerd-fonts.fira-code
         ];
     };
 }

system/impermanence.nix

@@ -1,5 +1,6 @@
 { impermanence, ... }:
 
+# Define which files and directories should persist between boots
 {
     imports = [ impermanence.nixosModules.impermanence ];
 
@@ -7,12 +8,12 @@
         hideMounts = true;
         directories = [
             "/var/log"
-                "/var/lib/bluetooth"
-                "/var/lib/networkmanager"
-                "/var/lib/nixos"
-                "/etc/ssh"
-                "/var/lib/systemd/coredump"
-                "/etc/NetworkManager/system-connections"
+            "/var/lib/bluetooth"
+            "/var/lib/networkmanager"
+            "/var/lib/nixos"
+            "/var/lib/systemd/coredump"
+            "/etc/NetworkManager/system-connections"
+            "/etc/ssh"
         ];
         files = [
             "/etc/machine-id"

system/users.nix

@@ -8,8 +8,8 @@
         shell = pkgs.zsh;
         extraGroups = [
             "chris"
-                "wheel"
-                "networkmanager"
+            "wheel"
+            "networkmanager"
         ];
     };
 }