From 0c4987ede101bd0348e599409626e74314f43ffd Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Benjamin=20B=C3=A4dorf?= <hello@benjaminbaedorf.eu>
Date: Sun, 1 May 2022 17:29:21 +0200
Subject: [PATCH] Add resume device

---
 .../config/config.d/custom-keybindings.conf   |  2 +-
 modules/x-os/boot.nix                         | 24 +++++++++++--------
 2 files changed, 15 insertions(+), 11 deletions(-)

diff --git a/modules/sway/config/config.d/custom-keybindings.conf b/modules/sway/config/config.d/custom-keybindings.conf
index 157ae8ee..172b7e53 100644
--- a/modules/sway/config/config.d/custom-keybindings.conf
+++ b/modules/sway/config/config.d/custom-keybindings.conf
@@ -23,7 +23,7 @@ bindsym $mod+F5 exec $term -e 'mocp -C $XDG_CONFIG_DIR/mocp/config'
 bindsym $mod+Shift+m exec mu
 bindsym $mod+Shift+h exec xdg-open /usr/share/doc/manjaro/i3_help.pdf
 
-# Screenshofts
+# Screenshots
 bindsym $mod+Ctrl+p exec grim -g "$(slurp -d -b \#ffffff11)" ~/Pictures/Screenshots/$(date +%Y%m%d_%Hh%Mm%Ss)_grim.png
 bindsym $mod+Shift+p exec grim ~/Pictures/Screenshots/$(date +%Y%m%d_%Hh%Mm%Ss)_grim.png
 bindsym $mod+Ctrl+f exec "( pkill flameshot || true && flameshot & ) && ( sleep 0.5s && flameshot gui )"
diff --git a/modules/x-os/boot.nix b/modules/x-os/boot.nix
index 0633bec4..268f1547 100644
--- a/modules/x-os/boot.nix
+++ b/modules/x-os/boot.nix
@@ -10,18 +10,22 @@ in
     description = "Feature flag for iso builds";
   };
   config = {
-    # Enable plymouth for better experience of booting
-    boot.plymouth.enable = true;
+    boot = {
+      # Enable plymouth for better experience of booting
+      plymouth.enable = true;
 
-    # Mount / luks device in initrd
-    # Allow fstrim to work on it.
-    # The ! makes this enabled by default
-    boot.initrd = mkIf (!cfg.iso-options.enable) {
-      luks.devices."cryptroot" = {
-        allowDiscards = true;
+      # Mount / luks device in initrd
+      # Allow fstrim to work on it.
+      # The ! makes this enabled by default
+      initrd = mkIf (!cfg.iso-options.enable) {
+        luks.devices."cryptroot" = {
+          allowDiscards = true;
+        };
       };
-    };
 
-    boot.loader.systemd-boot.enable = true;
+      resumeDevice = "/swapfile";
+
+      loader.systemd-boot.enable = true;
+    };
   };
 }