From c20c3e53a6618aa5146ddc73ccd07fa56a1876ca Mon Sep 17 00:00:00 2001
From: Erwin Boskma <erwin@horus.nu>
Date: Tue, 7 May 2024 08:47:08 +0200
Subject: [PATCH] mimir: Switch back to sway

---
 machines/mimir/configuration.nix | 2 +-
 users/erwin/work.nix             | 8 ++++----
 2 files changed, 5 insertions(+), 5 deletions(-)

diff --git a/machines/mimir/configuration.nix b/machines/mimir/configuration.nix
index 1b8e70a..00f4354 100644
--- a/machines/mimir/configuration.nix
+++ b/machines/mimir/configuration.nix
@@ -318,7 +318,7 @@
   programs = {
     sway = {
       enable = true;
-      package = pkgs.swayfx;
+      package = pkgs.sway;
       wrapperFeatures = {
         gtk = true;
         base = true;
diff --git a/users/erwin/work.nix b/users/erwin/work.nix
index c5026d9..71b2184 100644
--- a/users/erwin/work.nix
+++ b/users/erwin/work.nix
@@ -145,17 +145,17 @@ in
           starship.enable = true;
           sway = {
             enable = true;
-            package = pkgs.swayfx;
+            package = pkgs.sway;
             wayvnc = true;
             lock-wallpaper = "${homeCfg.home.homeDirectory}/.wallpapers/river-3840.png";
             output = {
               "DP-1" = {
-                bg = "${homeCfg.home.homeDirectory}/.wallpapers/river-3840.png fill";
+                bg = "${../../wallpapers/river-3840.png} fill";
                 mode = "3840x2160@60Hz";
                 position = "0 0";
               };
               "DP-3" = {
-                bg = "${homeCfg.home.homeDirectory}/.wallpapers/river-3840.png fill";
+                bg = "${../../wallpapers/river-3840.png} fill";
                 mode = "3840x2160@60Hz";
                 position = "3840 0";
               };
@@ -409,7 +409,7 @@ in
 
     services = {
       livebook = {
-        enableUserService = true;
+        enableUserService = false;
         environmentFile = pkgs.writeText "livebook-env" ''
           LIVEBOOK_TOKEN_ENABLED=false
           LIVEBOOK_IDENTITY_PROVIDER=tailscale:/run/tailscale/tailscaled.sock