diff --git a/.install/symlink.sh b/.install/symlink.sh
index 685248e..58b374c 100755
--- a/.install/symlink.sh
+++ b/.install/symlink.sh
@@ -27,7 +27,6 @@ directories=(
 	"mise"
 	"neofetch"
 	"nvim"
-	"quickshell"
 	"rofi"
 	"swappy"
 	"swaync"
diff --git a/hypr/config/environments/nvidia.conf b/hypr/config/environments/nvidia.conf
new file mode 100644
index 0000000..926b9e1
--- /dev/null
+++ b/hypr/config/environments/nvidia.conf
@@ -0,0 +1,24 @@
+# ----------------------------------------------------- 
+# Environment Variables
+# name: "Nvidia"
+# ----------------------------------------------------- 
+
+# https://wiki.hyprland.org/Nvidia/
+
+env = LIBVA_DRIVER_NAME,nvidia
+env = __GLX_VENDOR_LIBRARY_NAME,nvidia
+
+env = NVD_BACKEND,direct
+
+env = ELECTRON_OZONE_PLATFORM_HINT,auto
+
+env = XDG_SESSION_TYPE,wayland
+env = GBM_BACKEND,nvidia-drm
+cursor {
+    no_hardware_cursors = true
+}
+env = XCURSOR_SIZE,24
+env = QT_QPA_PLATFORM,wayland
+env = WLR_NO_HARDWARE_CURSORS,1
+env = __GL_VRR_ALLOWED,1
+env = WLR_DRM_NO_ATOMIC,1
diff --git a/hypr/config/keybinds.conf b/hypr/config/keybinds.conf
new file mode 100644
index 0000000..48fef57
--- /dev/null
+++ b/hypr/config/keybinds.conf
@@ -0,0 +1,80 @@
+
+# Example binds, see https://wiki.hyprland.org/Configuring/Binds/ for more
+bind = $mainMod, T, exec, $terminal
+bind = $mainMod, X, killactive, 
+bind = $mainMod, ESCAPE, exec, $powerMenu
+bind = $mainMod, E, exec, $fileManager
+bind = $mainMod, F, togglefloating, 
+bind = $mainMod, R, exec, $menu
+bind = $mainMod, P, pseudo, # dwindle
+bind = $mainMod, V, togglesplit, # dwindle
+bind = $mainMod, L, exec, $lockScreen # hyprlock
+bind = $mainMod, period, exec, emote
+bind = $mainMod, B, exec, zen-browser
+bind = $mainMod CTRL, F, fullscreen
+bind = , PRINT, exec, grim -g "$(slurp)" - | swappy -f -
+
+# Move focus with mainMod + arrow keys
+bind = $mainMod, left, movefocus, l
+bind = $mainMod, right, movefocus, r
+bind = $mainMod, up, movefocus, u
+bind = $mainMod, down, movefocus, d
+
+# Switch workspaces with mainMod + [0-9]
+bind = $mainMod, 1, workspace, 1
+bind = $mainMod, 2, workspace, 2
+bind = $mainMod, 3, workspace, 3
+bind = $mainMod, 4, workspace, 4
+bind = $mainMod, 5, workspace, 5
+bind = $mainMod, 6, workspace, 6
+bind = $mainMod, 7, workspace, 7
+bind = $mainMod, 8, workspace, 8
+bind = $mainMod, 9, workspace, 9
+bind = $mainMod, 0, workspace, 10
+
+# Move active window to a workspace with mainMod + SHIFT + [0-9]
+bind = $mainMod SHIFT, 1, movetoworkspace, 1
+bind = $mainMod SHIFT, 2, movetoworkspace, 2
+bind = $mainMod SHIFT, 3, movetoworkspace, 3
+bind = $mainMod SHIFT, 4, movetoworkspace, 4
+bind = $mainMod SHIFT, 5, movetoworkspace, 5
+bind = $mainMod SHIFT, 6, movetoworkspace, 6
+bind = $mainMod SHIFT, 7, movetoworkspace, 7
+bind = $mainMod SHIFT, 8, movetoworkspace, 8
+bind = $mainMod SHIFT, 9, movetoworkspace, 9
+bind = $mainMod SHIFT, 0, movetoworkspace, 10
+
+###############################################################################
+# Special workspaces
+###############################################################################
+# Scratchpad
+bind = CTRL SHIFT, S, togglespecialworkspace, magic
+bind = CTRL $mainMod, S, movetoworkspace, special:magic
+
+# Terminal
+bind = CTRL SHIFT, T, togglespecialworkspace, terminal
+
+# Music
+bind = CTRL SHIFT, M, togglespecialworkspace, music
+
+# Scroll through existing workspaces with mainMod + scroll
+bind = $mainMod, mouse_down, workspace, e+1
+bind = $mainMod, mouse_up, workspace, e-1
+
+# Switch workspaces
+bind = CTRL ALT, right, workspace, e+1
+bind = CTRL ALT, left, workspace, e-1
+
+# Move/resize windows with mainMod + LMB/RMB and dragging
+bindm = $mainMod, mouse:272, movewindow
+bindm = $mainMod, mouse:273, resizewindow
+
+# Audio keybinds
+bind = , XF86AudioRaiseVolume, exec, wpctl set-volume @DEFAULT_AUDIO_SINK@ 2%+
+bind = , XF86AudioLowerVolume, exec, wpctl set-volume @DEFAULT_AUDIO_SINK@ 2%-
+bind = , XF86AudioMute, exec, wpctl set-mute @DEFAULT_AUDIO_SINK@ toggle
+bind = , XF86AudioPlay, exec, playerctl play-pause
+bind = , XF86AudioStop, exec,
+bind = , XF86AudioPrev, exec, playerctl previous
+bind = , XF86AudioNext, exec, playerctl next
+
diff --git a/hypr/config/rules.conf b/hypr/config/rules.conf
new file mode 100644
index 0000000..a7c7c68
--- /dev/null
+++ b/hypr/config/rules.conf
@@ -0,0 +1,39 @@
+
+# Example windowrule v1
+# windowrule = float, ^(kitty)$
+# Example windowrule v2
+# windowrulev2 = float,class:^(kitty)$,title:^(kitty)$
+# See https://wiki.hyprland.org/Configuring/Window-Rules/ for more
+windowrulev2 = nomaxsize, class:.* # You'll probably like this.
+# windowrulev2 = opacity 1 0.6, class:.*
+
+
+# Apps
+
+windowrule = float, title:rofi
+
+# windowrule = workspace special:terminal, kitty
+windowrule = workspace special:music, initialClass:Spotify
+windowrule = opacity 0.85 0.8, initialClass:Spotify
+
+windowrule = workspace:1, class:thunderbird
+
+windowrule = workspace 2,class:(discord)
+
+windowrule = workspace 2,class:(signal)
+windowrule = opacity:0.999, class:signal
+
+windowrule = workspace:3, class:firefox
+windowrule = opacity:0.999, class:firefox
+
+windowrule = workspace 5,float,class:(steam)
+windowrule = workspace 5, class:^(steam_app_*)$
+
+windowrule = float, class:org.gnome.Calculator
+
+# Workspaces
+workspace = 1, persistent:true
+workspace = 2, persistent:true
+workspace = 3, persistent:true
+workspace = 4, persistent:true
+
diff --git a/hypr/config/startup.conf b/hypr/config/startup.conf
new file mode 100644
index 0000000..cf57e24
--- /dev/null
+++ b/hypr/config/startup.conf
@@ -0,0 +1,21 @@
+# Notification Daemon
+exec-once = bash ~/.config/hypr/scripts/start-swaync.sh
+# Idle Daemon
+exec-once = hypridle
+# Status-bar
+# exec-once = bash ~/.config/hypr/scripts/start-waybar.sh
+exec-once = bash ~/dotfiles/hypr/scripts/run-ags.sh
+# Emotes
+exec-once = emote
+# Wallpaper Daemon
+exec-once = swww-daemon
+
+exec-once = [workspace 1 silent] thunderbird
+exec-once = [workspace 1 silent] proton-mail --password-store="gnome-libsecret"
+exec-once = [workspace 2 silent] discord --enable-features=UseOzonePlatform --ozone-platform=wayland
+exec-once = [workspace 2 silent] signal-desktop --password-store="gnome-libsecret"
+exec-once = [workspace 3 silent] zen-browser
+exec-once = [workspace 4 silent] kitty
+exec-once = [workspace special:terminal silent] kitty
+exec-once = [workspace special:music silent] deezer --enable-features=UseOzonePlatform --ozone-platform=wayland
+
diff --git a/hypr/hyprland/scripts/run-ags.sh b/hypr/scripts/run-ags.sh
similarity index 100%
rename from hypr/hyprland/scripts/run-ags.sh
rename to hypr/scripts/run-ags.sh
diff --git a/hypr/hyprland/scripts/start-swaync.sh b/hypr/scripts/start-swaync.sh
similarity index 100%
rename from hypr/hyprland/scripts/start-swaync.sh
rename to hypr/scripts/start-swaync.sh
diff --git a/hypr/scripts/start-waybar.sh b/hypr/scripts/start-waybar.sh
new file mode 100755
index 0000000..da4e38b
--- /dev/null
+++ b/hypr/scripts/start-waybar.sh
@@ -0,0 +1,12 @@
+#!/bin/sh
+
+CONFIG_FILES="$HOME/.config/waybar/ $HOME/.cache/wal/"
+
+trap "killall waybar" EXIT
+
+while true; do
+	sleep 1.6
+	waybar &
+	inotifywait -e create,modify -r $CONFIG_FILES
+	killall waybar
+done