diff --git a/.zshrc b/.zshrc
index a293d10..fccd5f3 100644
--- a/.zshrc
+++ b/.zshrc
@@ -9,7 +9,14 @@ export PATH=$HOME/.ghcup/bin:$PATH
 export PATH=$HOME/Documents/pasm/build:$PATH
 export PSPDEV=/usr/local/pspdev
 export PATH=$PATH:$PSPDEV/bin
+export XDG_CURRENT_DESKTOP=sway
+export XDG_SESSION_DESKTOP=sway
+export QT_QPA_PLATFORM=wayland
+export XDG_CURRENT_SESSION_TYPE=wayland
+export GDK_BACKEND="wayland,x11"
+export MOZ_ENABLE_WAYLAND=1
 export LD_LIBRARY_PATH=~/.local/share/Steam/steamapps/common/Counter-Strike\ Source/bin
+alias e="emacs . 2>/dev/null &"
 
 # Set name of the theme to load --- if set to "random", it will
 # load a random theme each time oh-my-zsh is loaded, in which case,
diff --git a/MANIFEST.linux b/MANIFEST.linux
index e9e2b15..e1b4c46 100755
--- a/MANIFEST.linux
+++ b/MANIFEST.linux
@@ -8,6 +8,7 @@ picom.conf|symlink|.config/picom
 neofetch/config.conf|symlink|.config
 .zshrc|symlink|
 i3|symlink|.config
+sway|symlink|.config
 .screenlayout|symlink|
 .ghci|symlink|
 .i3status.conf|symlink|
diff --git a/sway/config b/sway/config
new file mode 100755
index 0000000..db1be44
--- /dev/null
+++ b/sway/config
@@ -0,0 +1,245 @@
+# This file has been auto-generated by i3-config-wizard(1).
+# It will not be overwritten, so edit it as you like.
+#
+# Should you change your keyboard layout some time, delete
+# this file and re-run i3-config-wizard(1).
+#
+
+# i3 config file (v4)
+#
+# Please see http://i3wm.org/docs/userguide.html for a complete reference!
+include ~/.config/sway/outputs
+
+exec systemctl --user import-environment WAYLAND_DISPLAY XDG_CURRENT_DESKTOP
+exec --no-startup-id dbus-update-activation-environment WAYLAND_DISPLAY XDG_CURRENT_DESKTOP=sway
+set $mod Mod4
+
+exec xinput set-prop "Elan Touchpad" "libinput Tapping Enabled" 1
+
+input "type:keyboard" {
+    xkb_layout fr
+    xkb_options caps:swayescape 
+    xkb_numlock enabled
+}
+
+input "type:touchpad" {
+    dwt enabled
+    tap enabled
+    middle_emulation enabled
+}
+
+exec_always swaybg -i ~/dotfiles/bg.png
+exec_always feh --bg-scale ~/dotfiles/bg.png
+exec --no-startup-id dunst
+exec --no-startup-id blueman-applet 
+
+exec --no-startup-id picom --config ~/.config/picom/picom.conf -b
+
+# Font for window titles. Will also be used by the bar unless a different font
+# is used in the bar {} block below.
+# font pango:monospace 8
+
+# This font is widely installed, provides lots of unicode glyphs, right-to-left
+# text rendering and scalability on retina/hidpi displays (thanks to pango).
+#font pango:DejaVu Sans Mono 8
+
+font pango:Iosevka 9
+
+# Before i3 v4.8, we used to recommend this one as the default:
+# font -misc-fixed-medium-r-normal--13-120-75-75-C-70-iso10646-1
+# The font above is very space-efficient, that is, it looks good, sharp and
+# clear in small sizes. However, its unicode glyph coverage is limited, the old
+# X core fonts rendering does not support right-to-left and this being a bitmap
+# font, it doesn’t scale on retina/hidpi displays.
+
+# Use Mouse+$mod to drag floating windows to their wanted position
+floating_modifier $mod
+
+# start a terminal
+exec xrdb ~/dotfiles/.Xresources
+bindsym $mod+Return exec kitty 
+
+# Pulse Audio controls
+#alsa_output.pci-0000_00_1f.3-platform-skl_hda_dsp_generic.HiFi__hw_sofhdadsp__sink
+
+# Pulse Audio controls
+bindsym XF86AudioRaiseVolume exec --no-startup-id pactl set-sink-volume 0 +5% #increase sound volume
+bindsym XF86AudioLowerVolume exec --no-startup-id pactl set-sink-volume 0 -5% #decrease sound volume
+bindsym XF86AudioMute exec --no-startup-id pactl set-sink-mute 0 toggle # mute sound
+
+# Sreen brightness controls
+bindsym XF86MonBrightnessUp exec brightnessctl set 5%+ # increase screen brightness
+bindsym XF86MonBrightnessDown exec brightnessctl set 5%- # decrease screen brightness
+
+# Screen capture
+bindsym $mod+Print exec sway-screenshot -m region --clipboard-only
+
+# kill focused window
+bindsym $mod+Shift+q kill
+
+# There also is the (new) i3-dmenu-desktop which only displays applications
+# shipping a .desktop file. It is a wrapper around dmenu, so you need that
+# installed.
+# bindsym $mod+d exec --no-startup-id i3-dmenu-desktop
+
+# change focus
+bindsym $mod+l focus left
+bindsym $mod+semicolon focus down
+bindsym $mod+k focus up
+bindsym $mod+m focus right
+
+# alternatively, you can use the cursor keys:
+bindsym $mod+Left focus left
+bindsym $mod+Down focus down
+bindsym $mod+Up focus up
+bindsym $mod+Right focus right
+
+# move focused window
+bindsym $mod+Shift+l move left
+bindsym $mod+Shift+m move right
+bindsym $mod+Shift+semicolon move down
+
+# alternatively, you can use the cursor 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
+
+# split in horizontal orientation
+bindsym $mod+h split h
+
+# split in vertical orientation
+bindsym $mod+v split v
+
+# enter fullscreen mode for the focused container
+bindsym $mod+f fullscreen toggle
+
+# change container layout (stacked, tabbed, toggle split)
+bindsym $mod+s layout stacking
+bindsym $mod+w layout tabbed
+bindsym $mod+e layout toggle split
+
+# toggle tiling / floating
+bindsym $mod+Shift+space floating toggle
+
+# change focus between tiling / floating windows
+bindsym $mod+space focus mode_toggle
+
+# focus the parent container
+bindsym $mod+a focus parent
+
+# focus the child container
+#bindsym $mod+d focus child
+
+# switch to workspace
+bindcode $mod+10 workspace 1
+bindcode $mod+11 workspace 2
+bindcode $mod+12 workspace 3
+bindcode $mod+13 workspace 4
+bindcode $mod+14 workspace 5
+bindcode $mod+15 workspace 6
+bindcode $mod+16 workspace 7
+bindcode $mod+17 workspace 8
+bindcode $mod+18 workspace 9
+bindcode $mod+19 workspace 10
+
+# move focused container to workspace
+bindcode $mod+Shift+10 move container to workspace 1
+bindcode $mod+Shift+11 move container to workspace 2
+bindcode $mod+Shift+12 move container to workspace 3
+bindcode $mod+Shift+13 move container to workspace 4
+bindcode $mod+Shift+14 move container to workspace 5
+bindcode $mod+Shift+15 move container to workspace 6
+bindcode $mod+Shift+16 move container to workspace 7
+bindcode $mod+Shift+17 move container to workspace 8
+bindcode $mod+Shift+18 move container to workspace 9
+bindcode $mod+Shift+19 move container to workspace 10
+
+# reload the configuration file
+bindsym $mod+Shift+c reload
+# restart i3 inplace (preserves your layout/session, can be used to upgrade i3)
+bindsym $mod+Shift+r restart
+# exit i3 (logs you out of your X session)
+
+# resize window (you can also use the mouse for that)
+mode "resize" {
+        # These bindings trigger as soon as you enter the resize mode
+
+        # Pressing left will shrink the window’s width.
+        # Pressing right will grow the window’s width.
+        # Pressing up will shrink the window’s height.
+        # Pressing down will grow the window’s height.
+        bindsym j resize shrink width 10 px or 10 ppt
+        bindsym k resize grow height 10 px or 10 ppt
+        bindsym l resize shrink height 10 px or 10 ppt
+        bindsym semicolon resize grow width 10 px or 10 ppt
+
+        # same bindings, but for the arrow keys
+        bindsym Left resize shrink width 10 px or 10 ppt
+        bindsym Down resize grow height 10 px or 10 ppt
+        bindsym Up resize shrink height 10 px or 10 ppt
+        bindsym Right resize grow width 10 px or 10 ppt
+
+        # back to normal: Enter or Escape
+        bindsym Return mode "default"
+        bindsym Escape mode "default"
+}
+
+bindsym $mod+r mode "resize"
+
+bindsym Mod1+F1 exec "~/bin/hhkb-i3"
+bindsym $mod+Shift+n exec "swaylock -i ~/dotfiles/bg.png -e"
+bindsym $mod+Shift+b exec "quentin_saver"
+bindsym --release $mod+Shift+l exec "slock"
+
+focus_follows_mouse no
+
+hide_edge_borders both
+
+#######
+#THEME#
+#######
+
+# set primary gruvbox colorscheme colors
+set $bg #282828
+set $red #cc241d
+set $green #98971a
+set $yellow #ffffff
+set $white #ffffff
+set $blue #458588
+set $purple #b16286
+set $aqua #689d68
+set $gray #a89984
+set $darkgray #1d2021
+
+# start dmenu (a program launcher)
+bindsym $mod+d exec dmenu_run -nb '#222222' -sf '#eeeeee' -sb '#689d68' -nf '#a89984'
+
+#start of bar section
+bar {
+    status_command i3status
+    colors {
+        # bar background color
+        background $bg
+        # text color used for blocks that do not have a color specified.
+        statusline #ded6ca
+        # workspaces section            
+        #                    border  backgr. text
+        focused_workspace    $aqua $aqua $darkgray
+        inactive_workspace   $darkgray $darkgray $yellow
+        active_workspace     $darkgray $darkgray $yellow
+        urgent_workspace     $red $red $bg
+    }
+}
+#end of bar section
+
+#start of window title bars & borders section
+
+# green gruvbox
+# class                 border|backgr|text|indicator|child_border
+client.focused_inactive $darkgray $darkgray $yellow $purple $darkgray
+client.urgent           $red $red $white $red $red
+client.focused          $aqua $aqua $darkgray $purple $darkgray
+client.unfocused          $darkgray $darkgray $gray $aqua $darkgray  
+
+titlebar_padding 2
\ No newline at end of file
diff --git a/sway/outputs b/sway/outputs
new file mode 100644
index 0000000..6d69f4e
--- /dev/null
+++ b/sway/outputs
@@ -0,0 +1,11 @@
+# Generated by nwg-displays on 2025-01-28 at 14:33:26. Do not edit manually.
+
+output "AU Optronics 0xE48D Unknown" {
+    mode  1920x1080@60.03Hz
+    pos 0 0
+    transform normal
+    scale 1.0
+    scale_filter nearest
+    adaptive_sync off
+    dpms on
+}
diff --git a/sway/workspaces b/sway/workspaces
new file mode 100644
index 0000000..e69de29