diff --git a/tree/.config/fish/config.fish.tpl b/tree/.config/fish/config.fish.tpl
index 0fa958b..96705f8 100644
--- a/tree/.config/fish/config.fish.tpl
+++ b/tree/.config/fish/config.fish.tpl
@@ -2,6 +2,7 @@ set -x PATH $HOME/.local/bin $HOME/.cargo/bin $PATH
 set -x GPG_TTY (tty)
 set -x BROWSER firefox
 set -x EDITOR nvim
+set -x MOZ_ENABLE_WAYLAND 1
 
 {% if hostname == "vostok" %}
 set -x QT_STYLE_OVERRIDE Oxygen
@@ -53,7 +54,14 @@ zoxide init fish | source
 
 starship init fish | source
 
-{% if hostname == "buran" %}
+{% if hostname == "sputnik" %}
+# start sway if logging in on tty 1
+if status is-login
+	if test $XDG_SESSION_TYPE = "tty" -a $XDG_VTNR = "1"
+		exec sway
+	end
+end
+{% elif hostname == "buran" %}
 # start sway if logging in on tty 1
 if status is-login
 	if test $XDG_SESSION_TYPE = "tty" -a $XDG_VTNR = "1"
diff --git a/tree/.config/sway/config.tpl b/tree/.config/sway/config.tpl
index 457744d..d820780 100644
--- a/tree/.config/sway/config.tpl
+++ b/tree/.config/sway/config.tpl
@@ -9,10 +9,17 @@
 # Logo key. Use Mod1 for Alt.
 set $mod Alt
 # Home row direction keys, like vim
+{% if hostname == "sputnik" %}
+set $left h
+set $down t
+set $up n
+set $right s
+{% else %}
 set $left h
 set $down j
 set $up k
 set $right l
+{% end %}
 # Your preferred terminal emulator
 set $term alacritty
 # Your preferred application launcher
@@ -36,6 +43,8 @@ output DP-1 scale 1.5
 {% elif hostname == "buran" %}
 output eDP-1 scale 2.0
 output DP-1 scale 1.5
+{% elif hostname == "sputnik" %}
+output DP-3 mode 3440x1440@144Hz
 {% end %}
 output * bg ~/.config/wallpapers/2560x1440/rocket.jpg fill
 
@@ -79,8 +88,11 @@ exec swayidle -w \
 # Read `man 5 sway-input` for more information about this section.
 input * {
     xkb_layout "se"
-    #xkb_variant "svdvorak"
     xkb_options "caps:escape"
+
+{% if hostname == "sputnik" %}
+    xkb_variant "svdvorak"
+{% end %}
 }
 
 ### Key bindings
@@ -90,11 +102,19 @@ input * {
     # Start a terminal
     bindsym $mod+Return exec $term
 
+{% if hostname == "sputnik" %}
+    # Kill focused window
+    bindsym $mod+Shift+aring kill
+
+    # Start your launcher
+    bindsym $mod+e exec $menu
+{% else %}
     # Kill focused window
     bindsym $mod+Shift+q kill
 
     # Start your launcher
     bindsym $mod+d exec $menu
+{% end %}
 
     # Lock the screen
     bindsym $mod+Shift+Plus exec "screenlock -fFe"
@@ -106,11 +126,19 @@ input * {
     # mouse button for dragging.
     floating_modifier $mod normal
 
+{% if hostname == "sputnik" %}
+    # Reload the configuration file
+    bindsym $mod+Shift+j reload
+
+    # Exit sway (logs you out of your Wayland session)
+    bindsym $mod+Shift+period exec swaynag -t warning -m 'You pressed the exit shortcut. Do you really want to exit sway? This will end your Wayland session.' -b 'Yes, exit sway' 'swaymsg exit'
+{% else %}
     # Reload the configuration file
     bindsym $mod+Shift+c reload
 
     # Exit sway (logs you out of your Wayland session)
     bindsym $mod+Shift+e exec swaynag -t warning -m 'You pressed the exit shortcut. Do you really want to exit sway? This will end your Wayland session.' -b 'Yes, exit sway' 'swaymsg exit'
+{% end %}
 #
 # Volume & Brightness
 #
@@ -179,6 +207,21 @@ input * {
 #
 # Layout stuff:
 #
+{% if hostname == "sputnik" %}
+    # You can "split" the current object of your focus with
+    # $mod+b or $mod+v, for horizontal and vertical splits
+    # respectively.
+    bindsym $mod+x splith
+    bindsym $mod+k splitv
+
+    # Switch the current container between different layout styles
+    bindsym $mod+o layout stacking
+    bindsym $mod+comma layout tabbed
+    bindsym $mod+period layout toggle split
+
+    # Make the current focus fullscreen
+    bindsym $mod+u fullscreen
+{% else %}
     # You can "split" the current object of your focus with
     # $mod+b or $mod+v, for horizontal and vertical splits
     # respectively.
@@ -192,7 +235,7 @@ input * {
 
     # Make the current focus fullscreen
     bindsym $mod+f fullscreen
-
+{% end %}
     # Toggle the current focus between tiling and floating mode
     bindsym $mod+Shift+space floating toggle