diff --git a/home/dot_config/rofi/config.rasi b/home/dot_config/rofi/config.rasi
index 6af1f39..a96dea9 100644
--- a/home/dot_config/rofi/config.rasi
+++ b/home/dot_config/rofi/config.rasi
@@ -30,9 +30,9 @@
 
 }
 element {
-    padding: 1px ;
+    padding: 5px;
     cursor:  pointer;
-    spacing: 5px ;
+    spacing: 15px ;
     border:  0;
 }
 element normal.normal {
diff --git a/home/dot_config/sway/config b/home/dot_config/sway/config
new file mode 100644
index 0000000..a7863bc
--- /dev/null
+++ b/home/dot_config/sway/config
@@ -0,0 +1,217 @@
+# Default config for sway
+#
+# Copy this to ~/.config/sway/config and edit it to your liking.
+#
+# Read `man 5 sway` for a complete reference.
+
+### Variables
+#
+# Logo key. Use Mod1 for Alt.
+set $mod Mod4
+# Home row direction keys, like vim
+set $left h
+set $down j
+set $up k
+set $right l
+set $term kitty
+set $menu rofi -show drun -icon-theme Papirus -show-icons
+
+### Output configuration
+#
+# Default wallpaper (more resolutions are available in /run/current-system/sw/share/backgrounds/sway/)
+output * bg /run/current-system/sw/share/backgrounds/sway/Sway_Wallpaper_Blue_1920x1080.png fill
+#
+# Example configuration:
+#
+#   output HDMI-A-1 resolution 1920x1080 position 1920,0
+#
+# You can get the names of your outputs by running: swaymsg -t get_outputs
+
+### Idle configuration
+#
+# Example configuration:
+#
+# exec swayidle -w \
+#          timeout 300 'swaylock -f -c 000000' \
+#          timeout 600 'swaymsg "output * power off"' resume 'swaymsg "output * power on"' \
+#          before-sleep 'swaylock -f -c 000000'
+#
+# This will lock your screen after 300 seconds of inactivity, then turn off
+# your displays after another 300 seconds, and turn your screens back on when
+# resumed. It will also lock your screen before your computer goes to sleep.
+
+### Input configuration
+#
+# Example configuration:
+#
+  input type:touchpad {
+      dwt enabled
+      tap enabled
+      natural_scroll enabled
+  }
+
+### Key bindings
+#
+# Basics:
+#
+    # Start a terminal
+    bindsym $mod+Return exec $term
+
+    # Kill focused window
+    bindsym $mod+q kill
+
+    # Start your launcher
+    bindsym alt+space exec $menu
+
+    # Drag floating windows by holding down $mod and left mouse button.
+    # Resize them with right mouse button + $mod.
+    # Despite the name, also works for non-floating windows.
+    # Change normal to inverse to use left mouse button for resizing and right
+    # mouse button for dragging.
+    floating_modifier $mod normal
+
+    # Reload the configuration file
+    bindsym $mod+Shift+r reload
+
+    # Exit sway (logs you out of your Wayland session)
+#
+# Moving around:
+#
+    # Move your focus around
+    bindsym $mod+$left focus left
+    bindsym $mod+$down focus down
+    bindsym $mod+$up focus up
+    bindsym $mod+$right focus right
+    # Or use $mod+[up|down|left|right]
+    bindsym $mod+Left focus left
+    bindsym $mod+Down focus down
+    bindsym $mod+Up focus up
+    bindsym $mod+Right focus right
+
+    # Move the focused window with the same, but add Shift
+    bindsym $mod+Shift+$left move left
+    bindsym $mod+Shift+$down move down
+    bindsym $mod+Shift+$up move up
+    bindsym $mod+Shift+$right move right
+    # Ditto, with arrow keys
+    bindsym $mod+Shift+Left move left
+    bindsym $mod+Shift+Down move down
+    bindsym $mod+Shift+Up move up
+    bindsym $mod+Shift+Right move right
+#
+# Workspaces:
+#
+    # Switch to workspace
+    bindsym $mod+1 workspace number 1
+    bindsym $mod+2 workspace number 2
+    bindsym $mod+3 workspace number 3
+    bindsym $mod+4 workspace number 4
+    bindsym $mod+5 workspace number 5
+    bindsym $mod+6 workspace number 6
+    bindsym $mod+7 workspace number 7
+    bindsym $mod+8 workspace number 8
+    bindsym $mod+9 workspace number 9
+    bindsym $mod+0 workspace number 10
+    # Move focused container to workspace
+    bindsym $mod+Shift+1 move container to workspace number 1
+    bindsym $mod+Shift+2 move container to workspace number 2
+    bindsym $mod+Shift+3 move container to workspace number 3
+    bindsym $mod+Shift+4 move container to workspace number 4
+    bindsym $mod+Shift+5 move container to workspace number 5
+    bindsym $mod+Shift+6 move container to workspace number 6
+    bindsym $mod+Shift+7 move container to workspace number 7
+    bindsym $mod+Shift+8 move container to workspace number 8
+    bindsym $mod+Shift+9 move container to workspace number 9
+    bindsym $mod+Shift+0 move container to workspace number 10
+    # Note: workspaces can have any name you want, not just numbers.
+    # We just use 1-10 as the default.
+#
+# Layout stuff:
+#
+    # You can "split" the current object of your focus with
+    # $mod+b or $mod+v, for horizontal and vertical splits
+    # respectively.
+    bindsym $mod+b splith
+    bindsym $mod+shift+b splitv
+
+    # Switch the current container between different layout styles
+    # bindsym $mod+s layout stacking
+    bindsym $mod+w layout tabbed
+    bindsym $mod+x layout toggle split
+
+    # Make the current focus fullscreen
+    bindsym $mod+shift+m fullscreen
+
+    # Toggle the current focus between tiling and floating mode
+    bindsym $mod+Shift+space floating toggle
+
+    # Swap focus between the tiling area and the floating area
+    bindsym $mod+space focus mode_toggle
+
+    # Move focus to the parent container
+    bindsym $mod+a focus parent
+
+    bindsym $mod+e exec dolphin
+    bindsym $mod+shift+e exec kitty bash -c "yazi"
+    bindsym $mod+shift+w exec rofi -show window -icon-theme Papirus -show-icons
+    bindsym $mod+period exec rofi -show p -modi p:rofimoji | wl-copy
+    bindsym ctrl+alt+backspace exec rofi -show p -modi p:rofi-power-menu
+    # bindsym ctrl+alt+backspace 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'
+#
+# Scratchpad:
+#
+    # Sway has a "scratchpad", which is a bag of holding for windows.
+    # You can send windows there and get them back later.
+
+    # Move the currently focused window to the scratchpad
+    bindsym $mod+Shift+minus move scratchpad
+
+    # Show the next scratchpad window or hide the focused scratchpad window.
+    # If there are multiple scratchpad windows, this command cycles through them.
+    bindsym $mod+minus scratchpad show
+#
+# Resizing containers:
+#
+mode "resize" {
+    # left will shrink the containers width
+    # right will grow the containers width
+    # up will shrink the containers height
+    # down will grow the containers height
+    bindsym $left resize shrink width 10px
+    bindsym $down resize grow height 10px
+    bindsym $up resize shrink height 10px
+    bindsym $right resize grow width 10px
+
+    # Ditto, with arrow keys
+    bindsym Left resize shrink width 10px
+    bindsym Down resize grow height 10px
+    bindsym Up resize shrink height 10px
+    bindsym Right resize grow width 10px
+
+    # Return to default mode
+    bindsym Return mode "default"
+    bindsym Escape mode "default"
+}
+bindsym $mod+r mode "resize"
+#
+# Utilities:
+#
+    # Special keys to adjust volume via PulseAudio
+    bindsym --locked XF86AudioMute exec pactl set-sink-mute \@DEFAULT_SINK@ toggle
+    bindsym --locked XF86AudioLowerVolume exec pactl set-sink-volume \@DEFAULT_SINK@ -5%
+    bindsym --locked XF86AudioRaiseVolume exec pactl set-sink-volume \@DEFAULT_SINK@ +5%
+    bindsym --locked XF86AudioMicMute exec pactl set-source-mute \@DEFAULT_SOURCE@ toggle
+    # Special keys to adjust brightness via brightnessctl
+    bindsym --locked XF86MonBrightnessDown exec brightnessctl set 5%-
+    bindsym --locked XF86MonBrightnessUp exec brightnessctl set 5%+
+    # Special key to take a screenshot with grim
+    bindsym Print exec grimshot --notify savecopy area ~/Pictures/$(date "+%Y-%m-%d"T"%H:%M:%S").png
+    bindsym $mod+shift+s exec grimshot --notify savecopy area ~/Pictures/$(date "+%Y-%m-%d"T"%H:%M:%S").png
+
+#
+# Status Bar:
+exec waybar
+
+seat seat0 xcursor_theme Adwaita 30
+
+include /etc/sway/config.d/*
diff --git a/home/dot_config/waybar/config.jsonc b/home/dot_config/waybar/config.jsonc
index afc52ed..2c200ac 100644
--- a/home/dot_config/waybar/config.jsonc
+++ b/home/dot_config/waybar/config.jsonc
@@ -16,7 +16,7 @@
         // "~/.config/waybar/modules/niri.jsonc"
     ],
     // Choose the order of the modules
-    "modules-left": ["custom/osicon", "wlr/taskbar"],
+    "modules-left": ["custom/osicon", "sway/workspaces", "wlr/taskbar"],
     // "modules-center": ["clock"],
     "modules-right": ["tray", "pulseaudio", "cpu", "memory", "network", "battery", "clock"],
     // "modules-right": ["cpu", "memory", "battery", "network", "tray"],
diff --git a/home/dot_config/waybar/modules/misc.jsonc b/home/dot_config/waybar/modules/misc.jsonc
index 98c03d5..efc63e0 100644
--- a/home/dot_config/waybar/modules/misc.jsonc
+++ b/home/dot_config/waybar/modules/misc.jsonc
@@ -185,7 +185,7 @@
         }
     },
     "custom/osicon": {
-        "format": "<span size='x-large'></span>",
-        "on-click-right": "rofi -show drun"
+        "format": "<span size='x-large'></span>",
+        "on-click-right": "rofi -show drun -icon-theme Papirus -show-icons"
     }
 }
diff --git a/home/dot_config/waybar/style.css b/home/dot_config/waybar/style.css
index 100f4f8..5e045f7 100644
--- a/home/dot_config/waybar/style.css
+++ b/home/dot_config/waybar/style.css
@@ -1,6 +1,6 @@
 * {
     /* `otf-font-awesome` is required to be installed for icons */
-    font-family: Cantarell, 'Font Awesome 6 Free';
+    font-family: "Maple Mono NF";
     font-size: 14px;
     font-feature-settings: "tnum";
 }
diff --git a/home/dot_config/yazi/init.lua b/home/dot_config/yazi/init.lua
index 4836798..c29e977 100644
--- a/home/dot_config/yazi/init.lua
+++ b/home/dot_config/yazi/init.lua
@@ -1,18 +1,18 @@
 -- ~/.config/yazi/init.lua
-function Linemode:size_and_mtime()
-  local time = math.floor(self._file.cha.mtime or 0)
-  if time == 0 then
-    time = ""
-  elseif os.date("%Y", time) == os.date("%Y") then
-    time = os.date("%b %d %H:%M", time)
-  else
-    time = os.date("%b %d  %Y", time)
-  end
-
-  local size = self._file:size()
-  return string.format("%s %s", size and ya.readable_size(size) or "-", time)
-end
-
--- require("dual-pane"):setup({ enabled = true })
-require("starship"):setup()
--- require("yaziline"):setup()
+-- function Linemode:size_and_mtime()
+--   local time = math.floor(self._file.cha.mtime or 0)
+--   if time == 0 then
+--     time = ""
+--   elseif os.date("%Y", time) == os.date("%Y") then
+--     time = os.date("%b %d %H:%M", time)
+--   else
+--     time = os.date("%b %d  %Y", time)
+--   end
+--
+--   local size = self._file:size()
+--   return string.format("%s %s", size and ya.readable_size(size) or "-", time)
+-- end
+--
+-- -- require("dual-pane"):setup({ enabled = true })
+-- require("starship"):setup()
+-- -- require("yaziline"):setup()
diff --git a/nixcfgs/hosts/zephyrus/default.nix b/nixcfgs/hosts/zephyrus/default.nix
index 487c0de..f40e2db 100644
--- a/nixcfgs/hosts/zephyrus/default.nix
+++ b/nixcfgs/hosts/zephyrus/default.nix
@@ -20,9 +20,9 @@
     ../../modules/nixos/hardware/udev/basys3.nix
 
     # desktop environment and display manager
-    ../../modules/nixos/desktop/dm/gdm.nix
-    ../../modules/nixos/desktop/de/gnome.nix
-    ../../modules/nixos/desktop/de/niri.nix
+    ../../modules/nixos/desktop/dm/sddm.nix
+    ../../modules/nixos/desktop/de/kde.nix
+    ../../modules/nixos/desktop/de/sway.nix
 
     # desktop programs
     ../../modules/nixos/programs/chromium.nix
diff --git a/nixcfgs/modules/nixos/desktop/de/niri.nix b/nixcfgs/modules/nixos/desktop/de/niri.nix
index 5916b1c..7ceff18 100644
--- a/nixcfgs/modules/nixos/desktop/de/niri.nix
+++ b/nixcfgs/modules/nixos/desktop/de/niri.nix
@@ -4,5 +4,8 @@
     waybar
     mako
     rofi
+    rofimoji
+    rofi-power-menu
+    swaylock-effects
   ];
 }
diff --git a/nixcfgs/modules/nixos/desktop/de/sway.nix b/nixcfgs/modules/nixos/desktop/de/sway.nix
new file mode 100644
index 0000000..42541d7
--- /dev/null
+++ b/nixcfgs/modules/nixos/desktop/de/sway.nix
@@ -0,0 +1,15 @@
+{pkgs, ...}: {
+  programs.sway.enable = true;
+  programs.sway.xwayland.enable = true;
+  environment.systemPackages = with pkgs; [
+    swaybg
+    swayidle
+    mako
+    rofi
+    rofimoji
+    rofi-power-menu
+    swaylock-effects
+    sway-contrib.grimshot
+    waybar
+  ];
+}
diff --git a/nixcfgs/modules/nixos/desktop/dm/sddm.nix b/nixcfgs/modules/nixos/desktop/dm/sddm.nix
index 7c5c6ff..b6b17c5 100644
--- a/nixcfgs/modules/nixos/desktop/dm/sddm.nix
+++ b/nixcfgs/modules/nixos/desktop/dm/sddm.nix
@@ -9,10 +9,10 @@ let
     #};
   };
 in {
-  # Enable the KDE Plasma Desktop Environment.
   services.displayManager.sddm = {
     enable = true;
-    extraPackages = with pkgs; [
+    wayland.enable = true;
+    extraPackages = [
       custom-sddm-astronaut
     ];