diff --git a/home-manager/modules/sway/default.nix b/home-manager/modules/sway/default.nix
index 0448e1b..bde72e9 100644
--- a/home-manager/modules/sway/default.nix
+++ b/home-manager/modules/sway/default.nix
@@ -67,6 +67,8 @@ in
           };
         };
 
+        defaultWorkspace = "workspace number 1";
+
         left = "n";
         down = "e";
         up = "i";
@@ -227,14 +229,14 @@ in
         for_window [app_id="gnome-calculator"] floating enable
         for_window [shell="xwayland"] title_format "%title [XWayland]"
 
-        # exec_always --no-startup-id systemctl --user import-environment _JAVA_AWT_WM_NONREPARENTING MOZ_ENABLE_WAYLAND MOZ_DBUS_REMOTE QT_QPA_PLATFORM QT_WAYLAND_DISABLE_WINDOWDECORATION QT_QPA_PLATFORMTHEME SDL_VIDEODRIVER SSH_AUTH_SOCK
-        # exec_always --no-startup-id dbus-update-activation-environment --systemd _JAVA_AWT_WM_NONREPARENTING MOZ_ENABLE_WAYLAND MOZ_DBUS_REMOTE QT_QPA_PLATFORM QT_WAYLAND_DISABLE_WINDOWDECORATION QT_QPA_PLATFORMTHEME SDL_VIDEODRIVER SSH_AUTH_SOCK
         exec --no-startup-id ${pkgs.networkmanagerapplet}/bin/nm-applet --indicator
         exec --no-startup-id ${pkgs.swayidle}/bin/swayidle -w timeout 900 "${swaylockcmd}"
-        exec --no-startup-id ${pkgs.swayidle}/bin/swayidle -w timeout 1200 "${pkgs.sway}/bin/swaymsg 'output * dpms off' resume ${pkgs.sway}/bin/swaymsg 'output * dpms on'"
+        exec --no-startup-id ${pkgs.swayidle}/bin/swayidle -w timeout 1200 "${pkgs.sway}/bin/swaymsg 'output * dpms off'" resume "${pkgs.sway}/bin/swaymsg 'output * dpms on'"
 
         include /etc/sway/config.d/*
       '';
+      # exec_always --no-startup-id systemctl --user import-environment _JAVA_AWT_WM_NONREPARENTING MOZ_ENABLE_WAYLAND MOZ_DBUS_REMOTE QT_QPA_PLATFORM QT_WAYLAND_DISABLE_WINDOWDECORATION QT_QPA_PLATFORMTHEME SDL_VIDEODRIVER SSH_AUTH_SOCK
+      # exec_always --no-startup-id dbus-update-activation-environment --systemd _JAVA_AWT_WM_NONREPARENTING MOZ_ENABLE_WAYLAND MOZ_DBUS_REMOTE QT_QPA_PLATFORM QT_WAYLAND_DISABLE_WINDOWDECORATION QT_QPA_PLATFORMTHEME SDL_VIDEODRIVER SSH_AUTH_SOCK
 
       # extraSessionCommands =
       #   ''
@@ -254,6 +256,8 @@ in
       };
 
       xwayland = true;
+
+      systemdIntegration = false;
     };
 
     home = {
diff --git a/modules/base/default.nix b/modules/base/default.nix
index 588d9a3..3c476c7 100644
--- a/modules/base/default.nix
+++ b/modules/base/default.nix
@@ -44,6 +44,7 @@ in
       file
       usbutils
       ht-rust
+      nix-template
     ];
 
     services.udev = {