diff --git a/Makefile b/Makefile
index f8fb0fe4..f0079e12 100644
--- a/Makefile
+++ b/Makefile
@@ -32,6 +32,7 @@ $(HOMEMANAGER_CONFIG_DIR)/home.nix: $(HOMEMANAGER_CONFIG) $(HOMEMANAGER_CONFIG_D
 
 $(CONFIG_DIR)/nvim: $(CONFIG_DIR)
 	-nix-shell -p git --run "git clone https://git.xenia.me.uk/xenia/nvim.git $@"
+	-nix-shell -p git --run "git -C $@ pull --ff-only"
 
 $(CONFIG_DIR) $(HOMEMANAGER_CONFIG_DIR):
 	mkdir -p $@
diff --git a/home/desktop/sway.nix b/home/desktop/sway.nix
index 668de907..88c31b25 100644
--- a/home/desktop/sway.nix
+++ b/home/desktop/sway.nix
@@ -35,12 +35,72 @@ in {
         inner = lib.mkDefault 5;
         outer = lib.mkDefault 20;
       };
-      bars = [];
-      startup = [{command = "dunst";} {command = "waybar";}];
+      bars = [{command = "${pkgs.waybar}/bin/waybar";}];
+      colors = {
+        focused = {
+          border = "#4c7899";
+          background = "#285577";
+          text = "#ffffff";
+          indicator = "#2e9ef4";
+          childBorder = "#285577";
+        };
+        focusedInactive = {
+          border = "#333333";
+          background = "#5f676a";
+          text = "#ffffff";
+          indicator = "#484e50";
+          childBorder = "#5f676a";
+        };
+        unfocused = {
+          border = "#333333";
+          background = "#222222";
+          text = "#888888";
+          indicator = "#292d2e";
+          childBorder = "#222222";
+        };
+        urgent = {
+          border = "#2f343a";
+          background = "#900000";
+          text = "#ffffff";
+          indicator = "#900000";
+          childBorder = "#900000";
+        };
+        placeholder = {
+          border = "#000000";
+          background = "#0c0c0c";
+          text = "#ffffff";
+          indicator = "#000000";
+          childBorder = "#0c0c0c";
+        };
+        background = "#ffffff";
+      };
+      assigns = {
+        "1" = [{app_id = "org.wezfurlong.wezterm";}];
+        "2" = [{app_id = "firefox";}];
+        "3" = [
+          {app_id = "Signal";}
+          {app_id = "fractal";}
+          {app_id = "discord";}
+          {class = "teams-for-linux";}
+        ];
+        "4" = [{class = "Nxplayer.bin";}];
+      };
+      floating.criteria = [
+        {app_id = "foot";}
+        {app_id = "pavucontrol";}
+        {app_id = ".blueman-manager-wrapped";}
+        {app_id = "otpclient";}
+        {app_id = "thunar";}
+        {class = "Nxplayer.bin";}
+      ];
+      startup = [{command = "dunst";}];
       modifier = lib.mkDefault "Mod1";
       terminal = lib.mkDefault "${pkgs.wezterm}/bin/wezterm";
+      window.titlebar = false;
+      workspaceAutoBackAndForth = true;
       keybindings = lib.mkOptionDefault {
         "${modifier}+Return" = "exec ${term}";
+        "${modifier}+Shift+Return" = "exec ${pkgs.foot}/bin/foot";
         "${modifier}+q" = "kill";
         "${modifier}+e" = "exec power-profiles";
         "${modifier}+p" = "exec powermenu";
diff --git a/home/desktop/waybar.nix b/home/desktop/waybar.nix
index 8abe4395..0cfbfd46 100644
--- a/home/desktop/waybar.nix
+++ b/home/desktop/waybar.nix
@@ -9,6 +9,28 @@
   };
   programs.waybar = {
     enable = true;
-    settings.main = {"include" = ["~/.config/waybar/modules.json" "~/.config/waybar/layout.json"];};
+    settings.main = {
+      "include" = [
+        "~/.config/waybar/modules.json"
+        "~/.config/waybar/layout.json"
+      ];
+      "modules-left" = [
+        "sway/workspaces"
+        "cpu"
+        "memory"
+        "temperature"
+      ];
+      "modules-center" = [
+        "clock"
+      ];
+      "modules-right" = [
+        "pulseaudio"
+        "bluetooth"
+        "network#compact"
+        "backlight"
+        "battery"
+        "tray"
+      ];
+    };
   };
 }
diff --git a/machines/N0245/elitherl.nix b/machines/N0245/elitherl.nix
index a0abb471..f5a38671 100644
--- a/machines/N0245/elitherl.nix
+++ b/machines/N0245/elitherl.nix
@@ -16,61 +16,22 @@
   ];
   programs.firefox.package = pkgs.firefox-wayland;
 
-  # wayland.windowManager.hyprland.extraConfig = ''
-  #   source=./common.conf
-  #   monitor=eDP-1,preferred,auto,auto
-  #   monitor=DP-3,preferred,auto,auto
-  #   monitor=DP-4,preferred,auto,auto,transform,1
-  #   windowrule = float, title:^([Zz]oom).*$
-  #   windowrule = center, title:^([Zz]oom).*$
-  #   windowrule = float, ^(Nxplayer.bin)$
-  #   windowrule = center, ^(Nxplayer.bin)$
-  #   windowrule = workspace 3, title:^([Zz]oom).*$
-  #   windowrule = workspace 4, ^(Nxplayer.bin)$
-  # '';
-  wayland.windowManager.sway.config.output.eDP-2.scale = "1.5";
+  wayland.windowManager.sway.config = {
+    output = {
+      # eDP-1 = {};
+      # "Iiyama North America PLB2403WS 0574281251316" = {};
+      "Dell Inc. DELL U2417H 5K9YD872FY1L".transform = "270";
+    };
+    workspaceOutputAssign = [
+      {output="Iiyama North America PLB2403WS 0574281251316"; workspace="1";}
+      {output="Iiyama North America PLB2403WS 0574281251316"; workspace="2";}
+      {output="Iiyama North America PLB2403WS 0574281251316"; workspace="3";}
+      {output="Iiyama North America PLB2403WS 0574281251316"; workspace="4";}
+    ];
+  };
   programs.waybar.settings = {
-    main = {
-      "output" = "DP-3";
-      "modules-left" = [
-        "sway/workspaces"
-        "cpu"
-        "memory"
-        "temperature"
-      ];
-      "modules-center" = ["clock"];
-      "modules-right" = [
-        "pulseaudio"
-        "bluetooth"
-        "network#compact"
-        "backlight"
-        "battery"
-        "tray"
-      ];
-    };
-    alt-integrated = {
-      "include" = [
-        "~/.config/waybar/modules.json"
-        "~/.config/waybar/layout.json"
-      ];
-      "output" = "eDP-1";
-      "modules-left" = [
-        "sway/workspaces"
-        "cpu"
-        "memory"
-        "temperature"
-      ];
-      "modules-center" = ["clock#compact"];
-      "modules-right" = [
-        "pulseaudio#compact"
-        "bluetooth"
-        "network#compact"
-        "backlight"
-        "battery"
-        "tray"
-      ];
-    };
-    alt-vertical = {
+    main."output" = "!DP-4";
+    alt = {
       "include" = [
         "~/.config/waybar/modules.json"
         "~/.config/waybar/layout.json"