diff --git a/dotfiles/hypr/config/animations.conf b/dotfiles/hypr/config/animations.conf
deleted file mode 100644
index 6e928f0..0000000
--- a/dotfiles/hypr/config/animations.conf
+++ /dev/null
@@ -1,20 +0,0 @@
-# ┏━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━┓
-# ┃                    Animations Configuration                 ┃
-# ┗━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━┛
-
-# https://wiki.hyprland.org/0.45.0/Configuring/Animations/ 
-
-animations {
-    enabled = yes, please :)
-    bezier = wind, 0.05, 0.9, 0.1, 1.05
-    bezier = winIn, 0.1, 1.1, 0.1, 1.1
-    bezier = winOut, 0.3, -0.3, 0, 1
-    bezier = liner, 1, 1, 1, 1
-    animation = windows, 1, 6, wind, slide
-    animation = windowsIn, 1, 6, winIn, slide
-    animation = windowsOut, 1, 5, winOut, slide
-    animation = windowsMove, 1, 5, wind, slide
-    animation = border, 1, 1, liner
-    animation = fade, 1, 10, default
-    animation = workspaces, 1, 5, wind
-}
diff --git a/dotfiles/hypr/config/autostart.conf b/dotfiles/hypr/config/autostart.conf
deleted file mode 100644
index 293a263..0000000
--- a/dotfiles/hypr/config/autostart.conf
+++ /dev/null
@@ -1,24 +0,0 @@
-# ┏━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━┓
-# ┃                    Autostart Configuration                  ┃
-# ┗━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━┛
-
-source = ~/.config/hypr/config/defaults.conf
-
-# Autostart wiki https://wiki.hyprland.org/0.45.0/Configuring/Keywords/#executing #
-exec-once = tailscale-systray &
-exec-once = slack &
-# exec-once = swaybg -o \* -i ~/.wallpaper.jpg -m fill
-exec-once = waybar &
-exec-once = fcitx5 -d &
-exec-once = mako &
-exec-once = nm-applet --indicator &
-exec-once = bash -c "mkfifo /tmp/$HYPRLAND_INSTANCE_SIGNATURE.wob && tail -f /tmp/$HYPRLAND_INSTANCE_SIGNATURE.wob | wob & disown" &
-exec-once = /usr/lib/polkit-kde-authentication-agent-1 &
-
-# ## Slow app launch fix
-exec-once = systemctl --user import-environment &
-exec-once = hash dbus-update-activation-environment 2>/dev/null &
-exec-once = dbus-update-activation-environment --systemd &
-
-# ## Idle configuration
-exec-once = $idlehandler
diff --git a/dotfiles/hypr/config/colors.conf b/dotfiles/hypr/config/colors.conf
deleted file mode 100644
index 5f3a3ef..0000000
--- a/dotfiles/hypr/config/colors.conf
+++ /dev/null
@@ -1,13 +0,0 @@
-# ┏━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━┓
-# ┃                      Colors Configuration                   ┃
-# ┗━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━┛
-
-$cachylgreen = rgba(82dcccff)
-$cachymgreen = rgba(00aa84ff)
-$cachydgreen = rgba(007d6fff)
-$cachylblue = rgba(01ccffff)
-$cachymblue = rgba(182545ff)
-$cachydblue = rgba(111826ff)
-$cachywhite = rgba(ffffffff)
-$cachygrey = rgba(ddddddff)
-$cachygray = rgba(798bb2ff)
diff --git a/dotfiles/hypr/config/decorations.conf b/dotfiles/hypr/config/decorations.conf
deleted file mode 100644
index 57bd6e4..0000000
--- a/dotfiles/hypr/config/decorations.conf
+++ /dev/null
@@ -1,33 +0,0 @@
-# ┏━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━┓
-# ┃                    Decorations Configuration                ┃
-# ┗━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━┛
-
-source = ~/.config/hypr/config/colors.conf
-
-# https://wiki.hyprland.org/0.45.0/Configuring/Variables/#decoration
-
-decoration {
-    active_opacity = 1
-    inactive_opacity = 0.9
-    rounding = 8
-
-    # https://wiki.hyprland.org/0.45.0/Configuring/Variables/#blur
-    blur {
-      enabled = true
-      size = 15
-      passes = 2 # more passes = more resource intensive.
-      xray = true
-      new_optimizations = on
-      ignore_opacity = off
-      vibrancy = 0.1696
-    }
-
-    # https://wiki.hyprland.org/0.45.0/Configuring/Variables/#shadow
-    shadow {
-      enabled = true
-      range = 4
-      render_power = 3
-      color = rgba(1a1a1aee)
-    }
-
-}
diff --git a/dotfiles/hypr/config/defaults.conf b/dotfiles/hypr/config/defaults.conf
deleted file mode 100644
index 01e81a5..0000000
--- a/dotfiles/hypr/config/defaults.conf
+++ /dev/null
@@ -1,11 +0,0 @@
-# ┏━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━┓
-# ┃                     Defaults Configuration                  ┃
-# ┗━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━┛
-
-$filemanager = thunar
-$applauncher = rofi -show combi -modi window,run,combi -combi-modi window,run
-$terminal = kitty
-$idlehandler = swayidle -w timeout 300 'swaylock -f -c 000000' before-sleep 'swaylock -f -c 000000'
-$capturing = grim -g "$(slurp)" - | swappy -f -
-
-
diff --git a/dotfiles/hypr/config/environment.conf b/dotfiles/hypr/config/environment.conf
deleted file mode 100644
index 4396885..0000000
--- a/dotfiles/hypr/config/environment.conf
+++ /dev/null
@@ -1,15 +0,0 @@
-# ┏━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━┓
-# ┃                    Enviroment Configuration                 ┃
-# ┗━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━┛
-
-envd = HYPRCURSOR_SIZE,24
-envd = XCURSOR_SIZE,24
-envd = QT_CURSOR_SIZE,24
-envd = XDG_CURRENT_DESKTOP, Hyprland
-envd = XDG_SESSION_TYPE, Hyprland
-envd = XDG_SESSION_DESKTOP, Hyprland
-envd = GDK_BACKEND, wayland, x11
-envd = CLUTTER_BACKEND, wayland
-envd = QT_QPA_PLATFORM=wayland;xcb
-envd = MOZ_ENABLE_WAYLAND, 1
-
diff --git a/dotfiles/hypr/config/input.conf b/dotfiles/hypr/config/input.conf
deleted file mode 100644
index 57946d5..0000000
--- a/dotfiles/hypr/config/input.conf
+++ /dev/null
@@ -1,16 +0,0 @@
-# ┏━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━┓
-# ┃                      Input Configuration                    ┃
-# ┗━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━┛
-
-# Input wiki https://wiki.hyprland.org/0.45.0/Configuring/Variables/#input
-
-input {
-  kb_layout = us,us_intl
-  kb_variant =
-  kb_model =
-  kb_options = grp:win_space_toggle
-  kb_rules =
-
-  follow_mouse = 2 # 0|1|2|3
-  float_switch_override_focus = 2
-}
diff --git a/dotfiles/hypr/config/keybinds.conf b/dotfiles/hypr/config/keybinds.conf
deleted file mode 100644
index 5d245c9..0000000
--- a/dotfiles/hypr/config/keybinds.conf
+++ /dev/null
@@ -1,156 +0,0 @@
-
-# ┏━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━┓
-# ┃                         Keybinds                            ┃
-# ┗━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━┛
-
-source = ~/.config/hypr/config/defaults.conf
-
-bindl = , switch:off:Lid Switch, exec, hyprctl keyword monitor "eDP-1, 1920x1200, 0x0, 1"
-bindl = , switch:on:Lid Switch,  exec, hyprctl keyword monitor "eDP-1, disable"
-
-# https://wiki.hyprland.org/Configuring/Binds/
-bindd = $mainMod, RETURN, Opens your preferred terminal emulator ($terminal), exec, $terminal
-bindd = $mainMod, E, Opens your preferred filemanager ($filemanager), exec, $filemanager
-bindd = $mainMod, A, Screen capture selection, exec, $capturing
-bindd = $mainMod, Q, Closes (not kill) current window, killactive,
-bindd = $mainMod SHIFT, M, Exits Hyprland by terminating the user sessions, exec, loginctl terminate-user ""
-bindd = $mainMod, V, Switches current window between floating and tiling mode, togglefloating,
-bindd = $mainMod, R, Runs your application launcher, exec, $applauncher
-bindd = $mainMod, F, Toggles current window fullscreen mode, fullscreen
-bindd = $mainMod, Y, Pin current window (shows on all workspaces),pin
-bindd = $mainMod, J, Toggles curren window split mode, togglesplit, # dwindle
-
-# ======= Grouping Windows =======
-bindd = $mainMod, K, Toggles current window group mode (ungroup all related), togglegroup,
-bindd = $mainMod, Tab, Switches to the next window in the group, changegroupactive, f
-
-# ======= Toggle Gaps =======
-
-bindd = $mainMod SHIFT, G, Set CachyOS default gaps, exec, hyprctl --batch "keyword general:gaps_out 5;keyword general:gaps_in 3"
-bindd = $mainMod, G, Remove gaps between window, exec, hyprctl --batch "keyword general:gaps_out 0;keyword general:gaps_in 0"
-
-# ======= Volume Control =======
-
-bindel = , XF86AudioRaiseVolume, exec, pactl set-sink-volume @DEFAULT_SINK@ +5% && pactl get-sink-volume @DEFAULT_SINK@ | grep -oP '\d+(?=%)' | awk '{if($1>100) system("pactl set-sink-volume @DEFAULT_SINK@ 100%")}' && pactl get-sink-volume @DEFAULT_SINK@ | grep -oP '\d+(?=%)' | awk '{print $1}' | head -1 > /tmp/$HYPRLAND_INSTANCE_SIGNATURE.wob # Raise Volume
-bindel = , XF86AudioLowerVolume, exec, pactl set-sink-volume @DEFAULT_SINK@ -5% && pactl get-sink-volume @DEFAULT_SINK@ | grep -oP '\d+(?=%)' | awk '{print $1}' | head -1 > /tmp/$HYPRLAND_INSTANCE_SIGNATURE.wob # Lower Volume
-bindel = , XF86AudioMute, exec, amixer sset Master toggle | sed -En '/\[on\]/ s/.*\[([0-9]+)%\].*/\1/ p; /\[off\]/ s/.*/0/p' | head -1 > /tmp/$HYPRLAND_INSTANCE_SIGNATURE.wob	#Mutes player audio
-
-# ======= Playback Control =======
-
-bindd = , XF86AudioPlay, Toggles play/pause, exec, playerctl play-pause
-bindd = , XF86AudioNext, Next track, exec, playerctl next
-bindd = , XF86AudioPrev, Previous track, exec, playerctl previous
-
-# ======= Screen Brightness =======
-
-bindel = , XF86MonBrightnessUp, exec, brightnessctl s +5% 	#Increases brightness 5%
-bindel = , XF86MonBrightnessDown, exec, brightnessctl s 5%- 	#Decreases brightness 5%
-bindd = $mainMod SHIFT, P, Runs the calculator application, exec, gnome-calculator
-bindd = $mainMod SHIFT, L, Lock the screen, exec, swaylock -e -K -p 10 -f Hack-Regular
-bindd = $mainMod, O, Reload/restarts Waybar, exec, killall -SIGUSR2 waybar
-
-# ======= Window Actions =======
-
-## Move window with mainMod + LMB/RMB and dragging
-bindd = $mainMod, mouse:272, Move the window towards a direction, movewindow
-## Move window towards a direction
-bindd = $mainMod SHIFT, left, Move active window to the left, movewindow, l
-bindd = $mainMod SHIFT, right, Move active window to the right, movewindow, r
-bindd = $mainMod SHIFT, up, Move active window upwards, movewindow, u
-bindd = $mainMod SHIFT, down, Move active window downwards, movewindow, d
-## Move focus with mainMod + arrow keys
-bindd = $mainMod, left, Move focus to the left, movefocus, l
-bindd = $mainMod, right,  Move focus to the right, movefocus, r
-bindd = $mainMod, up, Move focus upwards, movefocus, u
-bindd = $mainMod, down, Move focus downwards, movefocus, d
-## Resizing windows
-# Activate keyboard window resize mode
-# https://wiki.hyprland.org/Configuring/Binds/#submaps
-bindd = $mainMod SHIFT, R, Activates window resizing mode, submap, resize
-submap = resize
-bindd = , right, Resize to the right (resizing mode), resizeactive, 15 0
-bindd = , left, Resize to the left (resizing mode), resizeactive, -15 0
-bindd = , up, Resize upwards (resizing mode), resizeactive, 0 -15
-bindd = , down, Resize downwards (resizing mode), resizeactive, 0 15
-bindd = , l, Resize to the right (resizing mode), resizeactive, 15 0
-bindd = , h, Resize to the left (resizing mode), resizeactive, -15 0
-bindd = , k, Resize upwards (resizing mode), resizeactive, 0 -15
-bindd = , j, Resize downwards (resizing mode), resizeactive, 0 15
-bindd = , escape, Ends window resizing mode, submap, reset
-submap = reset
-# Quick resize window with keyboard
-# !!! added $mainMod here because CTRL + SHIFT is used for word selection in various text editors
-bindd = $mainMod CTRL SHIFT, right, Resize to the right, resizeactive, 15 0
-bindd = $mainMod CTRL SHIFT, left, Resize to the left, resizeactive, -15 0
-bindd = $mainMod CTRL SHIFT, up, Resize upwards, resizeactive, 0 -15
-bindd = $mainMod CTRL SHIFT, down, Resize downwards, resizeactive, 0 15
-bindd = $mainMod CTRL SHIFT, l, Resize to the right, resizeactive, 15 0
-bindd = $mainMod CTRL SHIFT, h, Resize to the left, resizeactive, -15 0
-bindd = $mainMod CTRL SHIFT, k, Resize upwards, resizeactive, 0 -15
-bindd = $mainMod CTRL SHIFT, j, Resize downwards, resizeactive, 0 15
-# Resize window with mainMod + LMB/RMB and dragging
-bindm = $mainMod, mouse:273, resizewindow	#Resize the window towards a direction
-bindm = $mainMod, mouse:272, movewindow		#Drag window  
-## Resizing Windows End #
-## Move active window to a workspace with $mainMod + CTRL + [0-9]
-bindd = $mainMod CTRL, 1, Move window and switch to workspace 1, movetoworkspace, 1
-bindd = $mainMod CTRL, 2, Move window and switch to workspace 2, movetoworkspace, 2
-bindd = $mainMod CTRL, 3, Move window and switch to workspace 3, movetoworkspace, 3
-bindd = $mainMod CTRL, 4, Move window and switch to workspace 4, movetoworkspace, 4
-bindd = $mainMod CTRL, 5, Move window and switch to workspace 5, movetoworkspace, 5
-bindd = $mainMod CTRL, 6, Move window and switch to workspace 6, movetoworkspace, 6
-bindd = $mainMod CTRL, 7, Move window and switch to workspace 7, movetoworkspace, 7
-bindd = $mainMod CTRL, 8, Move window and switch to workspace 8, movetoworkspace, 8
-bindd = $mainMod CTRL, 9, Move window and switch to workspace 9, movetoworkspace, 9
-bindd = $mainMod CTRL, 0, Move window and switch to workspace 10, movetoworkspace, 10
-bindd = $mainMod CTRL, left, Move window and switch to the next workspace, movetoworkspace, -1
-bindd = $mainMod CTRL, right, Move window and switch to the previous workspace, movetoworkspace, +1
-## Same as above, but doesn't switch to the workspace
-bindd = $mainMod SHIFT, 1, Move window silently to workspace 1, movetoworkspacesilent, 1
-bindd = $mainMod SHIFT, 2, Move window silently to workspace 2, movetoworkspacesilent, 2
-bindd = $mainMod SHIFT, 3, Move window silently to workspace 3, movetoworkspacesilent, 3
-bindd = $mainMod SHIFT, 4, Move window silently to workspace 4, movetoworkspacesilent, 4
-bindd = $mainMod SHIFT, 5, Move window silently to workspace 5, movetoworkspacesilent, 5
-bindd = $mainMod SHIFT, 6, Move window silently to workspace 6, movetoworkspacesilent, 6
-bindd = $mainMod SHIFT, 7, Move window silently to workspace 7, movetoworkspacesilent, 7
-bindd = $mainMod SHIFT, 8, Move window silently to workspace 8, movetoworkspacesilent, 8
-bindd = $mainMod SHIFT, 9, Move window silently to workspace 9, movetoworkspacesilent, 9
-bindd = $mainMod SHIFT, 0, Move window silently to workspace 10, movetoworkspacesilent, 10
-# Window actions End #
-
-# ======= Workspace Actions =======
-
-# Switch workspaces with mainMod + [0-9]
-bindd = $mainMod, 1, Switch to workspace 1, workspace, 1
-bindd = $mainMod, 2, Switch to workspace 2, workspace, 2
-bindd = $mainMod, 3, Switch to workspace 3, workspace, 3
-bindd = $mainMod, 4, Switch to workspace 4, workspace, 4
-bindd = $mainMod, 5, Switch to workspace 5, workspace, 5
-bindd = $mainMod, 6, Switch to workspace 6, workspace, 6
-bindd = $mainMod, 7, Switch to workspace 7, workspace, 7
-bindd = $mainMod, 8, Switch to workspace 8, workspace, 8
-bindd = $mainMod, 9, Switch to workspace 9, workspace, 9
-bindd = $mainMod, 0, Switch to workspace 10, workspace, 10
-# Scroll through existing workspaces with mainMod + , or .
-bindd = $mainMod, PERIOD, Scroll through workspaces incrementally, workspace, e+1
-bindd = $mainMod, COMMA, Scroll through workspaces decrementally, workspace, e-1
-# With $mainMod + scroll
-bindd = $mainMod, mouse_down, Scroll through workspaces incrementally, workspace, e+1
-bindd = $mainMod, mouse_up, Scroll through workspaces decrementally, workspace, e-1
-bindd = $mainMod, slash, Switch to the previous workspace, workspace, previous
-# Special workspaces (scratchpads)
-bindd = $mainMod, minus, Move active window to Special workspace, movetoworkspace,special
-bindd = $mainMod, equal, Toggles the Special workspace, togglespecialworkspace, special
-bindd = $mainMod, F1, Call special workspace scratchpad, togglespecialworkspace, scratchpad
-bindd = $mainMod ALT SHIFT, F1, Move active window to special workspace scratchpad, movetoworkspacesilent, special:scratchpad
-
-# ======= Additional Settings =======
-
-# https://wiki.hyprland.org/Configuring/Binds
-binds {
-    allow_workspace_cycles = 1
-    workspace_back_and_forth = 1
-    workspace_center_on = 1
-	movefocus_cycles_fullscreen = true
-	window_direction_monitor_fallback = true
-}
diff --git a/dotfiles/hypr/config/monitor.conf b/dotfiles/hypr/config/monitor.conf
deleted file mode 100644
index d1eff56..0000000
--- a/dotfiles/hypr/config/monitor.conf
+++ /dev/null
@@ -1,16 +0,0 @@
-# ┏━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━┓
-# ┃                     Monitor Configuration                   ┃
-# ┗━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━┛
-
-# Monitor wiki https://wiki.hyprland.org/0.45.0/Configuring/Monitors/
-
-monitor = , preferred, auto, 1
-
-
-# If you need to scale things like steam etc, please uncomment these lines.
-# Adjust GDK_SCALE accordingly to your liking.
-#xwayland {
-#  force_zero_scaling = true       # Unscale XWayland
-#}
-
-#env = GDK_SCALE, 1.25                   # GDK Scaling Factor
diff --git a/dotfiles/hypr/config/variables.conf b/dotfiles/hypr/config/variables.conf
deleted file mode 100644
index a93aeab..0000000
--- a/dotfiles/hypr/config/variables.conf
+++ /dev/null
@@ -1,81 +0,0 @@
-# ┏━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━┓
-# ┃                    Variables Configuration                  ┃
-# ┗━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━┛
-
-source = ~/.config/hypr/config/colors.conf
-
-# Variables wiki https://wiki.hyprland.org/0.45.0/Configuring/Variables/ #
-# https://wiki.hyprland.org/0.45.0/Configuring/Variables/#general
-general {
-
-    gaps_in = 6
-    gaps_out = 8
-    border_size = 2
-    col.active_border = $cachylgreen
-    col.inactive_border = $cachymblue
-    layout = dwindle # master|dwindle
-
-    # https://wiki.hyprland.org/0.45.0/Configuring/Variables/#snap
-    snap {
-    	enabled = true
-    }
-
-}
-
-# https://wiki.hyprland.org/0.45.0/Configuring/Variables/#gestures
-gestures {
-     workspace_swipe = true
-     workspace_swipe_fingers = 4
-     workspace_swipe_distance = 250
-     workspace_swipe_min_speed_to_force = 15
-     workspace_swipe_create_new = false
-}
-
-# https://wiki.hyprland.org/0.45.0/Configuring/Variables/#group
-group {
-	col.border_active = $cachydgreen
-	col.border_inactive = $cachylgreen
-	col.border_locked_active = $cachymgreen
-	col.border_locked_inactive = $cachydblue
-
-    # https://wiki.hyprland.org/0.45.0/Configuring/Variables/#groupbar
-	groupbar {
-		font_family = "Fira Sans"
-		text_color = $cachydblue
-		col.active = $cachydgreen
-		col.inactive = $cachylgreen
-		col.locked_active = $cachymgreen
-		col.locked_inactive = $cachydblue
-	}
-}
-# https://wiki.hyprland.org/0.45.0/Configuring/Variables/#misc
-misc {
-    font_family = "Fira Sans"
-    splash_font_family = "Fira Sans"
-    disable_hyprland_logo = true
-    col.splash = $cachylgreen
-    background_color = $cachydblue
-    enable_swallow = true
-    swallow_regex = ^(cachy-browser|firefox|nautilus|nemo|thunar|btrfs-assistant.)$
-    focus_on_activate = true
-    vrr = 2
-    enable_anr_dialog = false
-}
-
-# https://wiki.hyprland.org/0.45.0/Configuring/Variables/#render
-render {
-   direct_scanout = true
-}
-
-# See https://wiki.hyprland.org/0.45.0/Configuring/Dwindle-Layout/ for more
-dwindle {
-    special_scale_factor = 0.8
-    pseudotile = true # master switch for pseudotiling. Enabling is bound to mainMod + P in the keybinds section below
-    preserve_split = true
-}
-
-# See https://wiki.hyprland.org/0.45.0/Configuring/Master-Layout/ for more
-master {
-    new_status = master
-    special_scale_factor = 0.8
-}
diff --git a/dotfiles/hypr/config/windowrules.conf b/dotfiles/hypr/config/windowrules.conf
deleted file mode 100644
index d8f8973..0000000
--- a/dotfiles/hypr/config/windowrules.conf
+++ /dev/null
@@ -1,62 +0,0 @@
-# ┏━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━┓
-# ┃                    Windowrules Configuration                ┃
-# ┗━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━┛
-
-# Windows Rules https://wiki.hyprland.org/0.45.0/Configuring/Window-Rules/ #
-
-# Float Necessary Windows
-windowrule = float, class:^(org.pulseaudio.pavucontrol)
-windowrule = float, class:^()$,title:^(Picture in picture)$
-windowrule = float, class:^()$,title:^(Save File)$
-windowrule = float, class:^()$,title:^(Open File)$
-windowrule = float, class:^(LibreWolf)$,title:^(Picture-in-Picture)$
-windowrule = float, class:^(blueman-manager)$
-windowrule = float, class:^(xdg-desktop-portal-gtk|xdg-desktop-portal-kde|xdg-desktop-portal-hyprland)(.*)$
-windowrule = float, class:^(polkit-gnome-authentication-agent-1|hyprpolkitagent|org.org.kde.polkit-kde-authentication-agent-1)(.*)$
-windowrule = float, class:^(CachyOSHello)$
-windowrule = float, class:^(zenity)$
-windowrule = float, class:^()$,title:^(Steam - Self Updater)$
-# Increase the opacity
-windowrule = opacity 0.92, class:^(thunar|nemo)$
-windowrule = opacity 0.96, class:^(discord|armcord|webcord)$
-windowrule = opacity 0.95, title:^(QQ|Telegram)$
-windowrule = opacity 0.95, title:^(NetEase Cloud Music Gtk4)$
-# General window rules
-windowrule = float, title:^(Picture-in-Picture)$
-windowrule = size 960 540, title:^(Picture-in-Picture)$
-windowrule = move 25%-, title:^(Picture-in-Picture)$
-windowrule = float, title:^(imv|mpv|danmufloat|termfloat|nemo|ncmpcpp)$
-windowrule = move 25%-, title:^(imv|mpv|danmufloat|termfloat|nemo|ncmpcpp)$
-windowrule = size 960 540, title:^(imv|mpv|danmufloat|termfloat|nemo|ncmpcpp)$
-windowrule = pin, title:^(danmufloat)$
-windowrule = rounding 5, title:^(danmufloat|termfloat)$
-windowrule = animation slide right, class:^(kitty|Alacritty)$
-windowrule = noblur, class:^(org.mozilla.firefox)$
-# Decorations related to floating windows on workspaces 1 to 10
-windowrule = bordersize 2, floating:1, onworkspace:w[fv1-10]
-windowrule = bordercolor $cachylblue, floating:1, onworkspace:w[fv1-10]
-windowrule = rounding 8, floating:1, onworkspace:w[fv1-10]
-# Decorations related to tiling windows on workspaces 1 to 10
-windowrule = bordersize 3, floating:0, onworkspace:f[1-10]
-windowrule = rounding 4, floating:0, onworkspace:f[1-10]
-# Windows Rules End #
-
-# Workspaces Rules https://wiki.hyprland.org/0.45.0/Configuring/Workspace-Rules/ #
-# workspace = 1, default:true, monitor:$priMon
-# workspace = 6, default:true, monitor:$secMon
-# Workspace selectors https://wiki.hyprland.org/0.45.0/Configuring/Workspace-Rules/#workspace-selectors
-# workspace = r[1-5], monitor:$priMon
-# workspace = r[6-10], monitor:$secMon
-# workspace = special:scratchpad, on-created-empty:$applauncher
-# no_gaps_when_only deprecated instead workspaces rules with selectors can do the same
-# Smart gaps from 0.45.0 https://wiki.hyprland.org/0.45.0/Configuring/Workspace-Rules/#smart-gaps
-workspace = w[tv1-10], gapsout:5, gapsin:3
-workspace = f[1], gapsout:5, gapsin:3
-# Workspaces Rules End #
-
-# Layers Rules #
-layerrule = animation slide top, logout_dialog
-# layerrule = animation popin 50%, waybar
-layerrule = animation slide down, waybar
-layerrule = animation fade 50%, wallpaper
-# Layers Rules End #
diff --git a/dotfiles/hypr/hyprland.conf b/dotfiles/hypr/hyprland.conf
deleted file mode 100644
index 3a45025..0000000
--- a/dotfiles/hypr/hyprland.conf
+++ /dev/null
@@ -1,22 +0,0 @@
-# ┏━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━┓
-# ┃                 CachyOS Hyprland Configuration              ┃
-# ┗━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━┛
-
-$mainMod = SUPER
-
-# ┏━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━┓
-# ┃                         Source Files                        ┃
-# ┗━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━┛
-source = ~/.config/hypr/config/animations.conf
-source = ~/.config/hypr/config/autostart.conf
-source = ~/.config/hypr/config/decorations.conf
-source = ~/.config/hypr/config/environment.conf
-source = ~/.config/hypr/config/input.conf
-source = ~/.config/hypr/config/keybinds.conf
-source = ~/.config/hypr/config/monitor.conf
-source = ~/.config/hypr/config/variables.conf
-source = ~/.config/hypr/config/windowrules.conf
-
-# Modifying these configs can be done by creating a user defined config in the home directory, e.g.
-## ~/.config/hypr/config/user-config.conf
-# source = ~/.config/hypr/config/user-config.conf
diff --git a/dotfiles/hypr/scripts/screenshot b/dotfiles/hypr/scripts/screenshot
deleted file mode 100755
index ecc11b9..0000000
--- a/dotfiles/hypr/scripts/screenshot
+++ /dev/null
@@ -1,3 +0,0 @@
-#!/usr/bin/bash
-grim -g "$(slurp)" - | wl-copy -t image/png
-notify-send "Screenshot copied to clipboard"
diff --git a/dotfiles/hypr/scripts/screenshot_area b/dotfiles/hypr/scripts/screenshot_area
deleted file mode 100755
index 52218e2..0000000
--- a/dotfiles/hypr/scripts/screenshot_area
+++ /dev/null
@@ -1,3 +0,0 @@
-#!/usr/bin/bash
-grimblast copy area || exit
-notify-send "Screenshot copied to clipboard"
diff --git a/dotfiles/hypr/scripts/screenshot_full b/dotfiles/hypr/scripts/screenshot_full
deleted file mode 100755
index 0608891..0000000
--- a/dotfiles/hypr/scripts/screenshot_full
+++ /dev/null
@@ -1,3 +0,0 @@
-#!/usr/bin/bash
-grimblast copy output || exit
-notify-send "Screenshot copied to clipboard"
diff --git a/dotfiles/hyprland.conf b/dotfiles/hyprland.conf
deleted file mode 100644
index 236e6a1..0000000
--- a/dotfiles/hyprland.conf
+++ /dev/null
@@ -1,320 +0,0 @@
-################
-### MONITORS ###
-################
-
-# See https://wiki.hyprland.org/Configuring/Monitors/
-monitor=,preferred,auto,1
-
-###################
-### MY PROGRAMS ###
-###################
-
-# See https://wiki.hyprland.org/Configuring/Keywords/
-$terminal = kitty
-$fileManager = thunar
-$menu = rofi -show drun
-
-#################
-### AUTOSTART ###
-#################
-
-# exec-once = $terminal
-# exec-once = nm-applet &
-# exec-once = waybar & hyprpaper & firefox
-exec-once = dbus-update-activation-environment --systemd --all
-exec-once = systemctl --user import-environment QT_QPA_PLATFORMTHEME WAYLAND_DISPLAY XDG_CURRENT_DESKTOP
-exec-once = killall -q swww;sleep .5 && swww init
-exec-once = killall -q waybar;sleep .5 && waybar
-exec-once = killall -q swaync;sleep .5 && swaync
-exec-once = rainbow-border &
-
-#############################
-### ENVIRONMENT VARIABLES ###
-#############################
-
-# See https://wiki.hyprland.org/Configuring/Environment-variables/
-env = XCURSOR_SIZE,24
-env = HYPRCURSOR_SIZE,24
-env = NIXOS_OZONE_WL, 1
-env = XDG_CURRENT_DESKTOP, Hyprland
-env = XDG_SESSION_TYPE, Hyprland
-env = XDG_SESSION_DESKTOP, Hyprland
-env = GDK_BACKEND, wayland, x11
-env = CLUTTER_BACKEND, wayland
-env = QT_QPA_PLATFORM=wayland;xcb
-env = QT_WAYLAND_DISABLE_WINDOWDECORATION, 1
-env = QT_AUTO_SCREEN_SCALE_FACTOR, 1
-env = SDL_VIDEODRIVER, x11
-env = MOZ_ENABLE_WAYLAND, 1
-
-#####################
-### LOOK AND FEEL ###
-#####################
-# Refer to https://wiki.hyprland.org/Configuring/Variables/
-# https://wiki.hyprland.org/Configuring/Variables/#general
-general {
-    gaps_in = 6
-    gaps_out = 8
-    border_size = 2
-
-    # https://wiki.hyprland.org/Configuring/Variables/#variable-types for info about colors
-    col.active_border = rgba(33ccffee) rgba(00ff99ee) 45deg
-    col.inactive_border = rgba(595959aa)
-
-    # Set to true enable resizing windows by clicking and dragging on borders and gaps
-    resize_on_border = false
-
-    # Please see https://wiki.hyprland.org/Configuring/Tearing/ before you turn this on
-    allow_tearing = false
-
-    layout = dwindle
-}
-
-# https://wiki.hyprland.org/Configuring/Variables/#decoration
-decoration {
-    rounding = 10
-
-    # Change transparency of focused and unfocused windows
-    active_opacity = 1.0
-    inactive_opacity = 1.0
-
-    shadow {
-        enabled = true
-        range = 4
-        render_power = 3
-        color = rgba(1a1a1aee)
-    }
-
-    # https://wiki.hyprland.org/Configuring/Variables/#blur
-    blur {
-        enabled = true
-        size = 3
-        passes = 3
-        new_optimizations = on
-        ignore_opacity = off
-
-        vibrancy = 0.1696
-    }
-}
-
-# https://wiki.hyprland.org/Configuring/Variables/#animations
-animations {
-    enabled = yes, please :)
-
-    # Default animations, see https://wiki.hyprland.org/Configuring/Animations/ for more
-
-    # bezier = easeOutQuint,0.23,1,0.32,1
-    # bezier = easeInOutCubic,0.65,0.05,0.36,1
-    # bezier = linear,0,0,1,1
-    # bezier = almostLinear,0.5,0.5,0.75,1.0
-    # bezier = quick,0.15,0,0.1,1
-
-    # animation = global, 1, 10, default
-    # animation = border, 1, 5.39, easeOutQuint
-    # animation = windows, 1, 4.79, easeOutQuint
-    # animation = windowsIn, 1, 4.1, easeOutQuint, popin 87%
-    # animation = windowsOut, 1, 1.49, linear, popin 87%
-    # animation = fadeIn, 1, 1.73, almostLinear
-    # animation = fadeOut, 1, 1.46, almostLinear
-    # animation = fade, 1, 3.03, quick
-    # animation = layers, 1, 3.81, easeOutQuint
-    # animation = layersIn, 1, 4, easeOutQuint, fade
-    # animation = layersOut, 1, 1.5, linear, fade
-    # animation = fadeLayersIn, 1, 1.79, almostLinear
-    # animation = fadeLayersOut, 1, 1.39, almostLinear
-    # animation = workspaces, 1, 1.94, almostLinear, fade
-    # animation = workspacesIn, 1, 1.21, almostLinear, fade
-    # animation = workspacesOut, 1, 1.94, almostLinear, fade
-    bezier = wind, 0.05, 0.9, 0.1, 1.05
-    bezier = winIn, 0.1, 1.1, 0.1, 1.1
-    bezier = winOut, 0.3, -0.3, 0, 1
-    bezier = liner, 1, 1, 1, 1
-    animation = windows, 1, 6, wind, slide
-    animation = windowsIn, 1, 6, winIn, slide
-    animation = windowsOut, 1, 5, winOut, slide
-    animation = windowsMove, 1, 5, wind, slide
-    animation = border, 1, 1, liner
-    animation = fade, 1, 10, default
-    animation = workspaces, 1, 5, wind
-}
-
-plugin {
-    hyprtrails {
-            
-        }
-}
-
-
-# Ref https://wiki.hyprland.org/Configuring/Workspace-Rules/
-# "Smart gaps" / "No gaps when only"
-# uncomment all if you wish to use that.
-# workspace = w[tv1], gapsout:0, gapsin:0
-# workspace = f[1], gapsout:0, gapsin:0
-# windowrulev2 = bordersize 0, floating:0, onworkspace:w[tv1]
-# windowrulev2 = rounding 0, floating:0, onworkspace:w[tv1]
-# windowrulev2 = bordersize 0, floating:0, onworkspace:f[1]
-# windowrulev2 = rounding 0, floating:0, onworkspace:f[1]
-
-# See https://wiki.hyprland.org/Configuring/Dwindle-Layout/ for more
-dwindle {
-    pseudotile = true # Master switch for pseudotiling. Enabling is bound to mainMod + P in the keybinds section below
-    preserve_split = true # You probably want this
-}
-
-# See https://wiki.hyprland.org/Configuring/Master-Layout/ for more
-master {
-    new_status = master
-}
-
-# https://wiki.hyprland.org/Configuring/Variables/#misc
-misc {
-    force_default_wallpaper = -1 # Set to 0 or 1 to disable the anime mascot wallpapers
-    disable_hyprland_logo = false # If true disables the random hyprland logo / anime girl background. :(
-}
-
-binds {
-  workspace_back_and_forth = true
-  allow_workspace_cycles = true
-}
-
-#############
-### INPUT ###
-#############
-
-# https://wiki.hyprland.org/Configuring/Variables/#input
-input {
-    kb_layout = us,us_intl
-    kb_variant =
-    kb_model =
-    kb_options = grp:win_space_toggle
-    kb_rules =
-
-    follow_mouse = 1
-
-    sensitivity = 0 # -1.0 - 1.0, 0 means no modification
-    accel_profile = flat
-
-    touchpad {
-        natural_scroll = false
-    }
-}
-
-# https://wiki.hyprland.org/Configuring/Variables/#gestures
-gestures {
-    workspace_swipe = false
-}
-
-# Example per-device config
-# See https://wiki.hyprland.org/Configuring/Keywords/#per-device-input-configs for more
-device {
-    name = epic-mouse-v1
-    sensitivity = -0.5
-}
-
-###################
-### KEYBINDINGS ###
-###################
-
-# See https://wiki.hyprland.org/Configuring/Keywords/
-$mainMod = SUPER # Sets "Windows" key as main modifier
-
-# Example binds, see https://wiki.hyprland.org/Configuring/Binds/ for more
-bind = $mainMod, return, exec, $terminal
-bind = $mainMod, C, killactive,
-bind = $mainMod, M, exit,
-bind = $mainMod, E, exec, $fileManager
-bind = $mainMod, V, togglefloating,
-bind = $mainMod, R, exec, $menu
-bind = $mainMod, P, pseudo, # dwindle
-bind = $mainMod, J, togglesplit, # dwindle
-bind = $mainMod, L, exec, hyprlock
-
-bind = , Print, exec, "grim"
-# bind = $mainMod, Print, exec, "grim - | swappy -f -"
-# bind = SHIFT, Print, exec, "grim -g \"$(slurp)\""
-bind = $mainMod SHIFT, Print, exec, screenshot
-
-# 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
-
-# Example special workspace (scratchpad)
-bind = $mainMod, S, togglespecialworkspace, magic
-bind = $mainMod SHIFT, S, movetoworkspace, special:magic
-
-# Scroll through existing workspaces with mainMod + scroll
-bind = $mainMod, mouse_down, workspace, e+1
-bind = $mainMod, mouse_up, workspace, e-1
-
-# Move/resize windows with mainMod + LMB/RMB and dragging
-bindm = $mainMod, mouse:272, movewindow
-bindm = $mainMod, mouse:273, resizewindow
-
-# Laptop multimedia keys for volume and LCD brightness
-bindel = ,XF86AudioRaiseVolume, exec, wpctl set-volume @DEFAULT_AUDIO_SINK@ 5%+
-bindel = ,XF86AudioLowerVolume, exec, wpctl set-volume @DEFAULT_AUDIO_SINK@ 5%-
-bindel = ,XF86AudioMute, exec, wpctl set-mute @DEFAULT_AUDIO_SINK@ toggle
-bindel = ,XF86AudioMicMute, exec, wpctl set-mute @DEFAULT_AUDIO_SOURCE@ toggle
-bindel = ,XF86MonBrightnessUp, exec, brightnessctl s 10%+
-bindel = ,XF86MonBrightnessDown, exec, brightnessctl s 10%-
-
-# Requires playerctl
-bindl = , XF86AudioNext, exec, playerctl next
-bindl = , XF86AudioPause, exec, playerctl play-pause
-bindl = , XF86AudioPlay, exec, playerctl play-pause
-bindl = , XF86AudioPrev, exec, playerctl previous
-
-bind = ALT, Tab, cyclenext
-bind = ALT, Tab, bringactivetotop
-
-##############################
-### WINDOWS AND WORKSPACES ###
-##############################
-
-# See https://wiki.hyprland.org/Configuring/Window-Rules/ for more
-# See https://wiki.hyprland.org/Configuring/Workspace-Rules/ for workspace rules
-
-# Example windowrule v1
-# windowrule = float, ^(kitty)$
-
-# Example windowrule v2
-# windowrulev2 = float,class:^(kitty)$,title:^(kitty)$
-
-windowrulev2 = noborder,class:^(wofi)$,title:^(wofi)$
-windowrulev2 = center,class:^(wofi)$,title:^(wofi)$
-windowrulev2 = center,class:^(steam)$,title:^(steam)$
-windowrulev2 = float,class:swayimg|vlc|Viewnior|pavucontrol
-windowrulev2 = float,class:nwg-look|qt5ct|mpv
-windowrulev2 = float,class:zoom
-
-# Ignore maximize requests from apps. You'll probably like this.
-windowrulev2 = suppressevent maximize, class:.*
-
-# Fix some dragging issues with XWayland
-windowrulev2 = nofocus,class:^$,title:^$,xwayland:1,floating:1,fullscreen:0,pinned:0
diff --git a/hosts/work/configuration.nix b/hosts/work/configuration.nix
index d9a8855..15dd97c 100644
--- a/hosts/work/configuration.nix
+++ b/hosts/work/configuration.nix
@@ -57,6 +57,7 @@
   services.xserver.videoDrivers = [ "amdgpu" ];
 
   services.tailscale.enable = true;
+  services.tailscale.useRoutingFeatures = "client";
 
   system.stateVersion = "24.05";
 }
diff --git a/modules/home-manager/services/hyprland.nix b/modules/home-manager/services/hyprland.nix
index 648d77e..395617d 100644
--- a/modules/home-manager/services/hyprland.nix
+++ b/modules/home-manager/services/hyprland.nix
@@ -4,16 +4,187 @@
   config,
   ...
 }:
+let
+  active_gradient = "rgb(${config.stylix.base16Scheme.base08}) rgb(${config.stylix.base16Scheme.base0D}) 45deg";
+in
 {
   options.myHome.services.hyprland.enable = lib.mkEnableOption "enables hyprland";
 
   config = lib.mkIf config.myHome.services.hyprland.enable {
-    home.file.".config/hypr" = {
-      source = ../../../dotfiles/hypr;
-      recursive = true;
-    };
+    wayland.windowManager.hyprland = {
+      enable = true;
+      settings = {
+        # hyprland.conf
+        "$mainMod" = "SUPER";
 
-    wayland.windowManager.hyprland.enable = true;
+        # defaults.conf
+        "$filemanager" = "thunar";
+        "$applauncher" = "rofi -show combi -modi window,run,combi -combi-modi window,run";
+        "$terminal" = "kitty";
+        "$idlehandler" =
+          "swayidle -w timeout 300 'swaylock -f -c 000000' before-sleep 'swaylock -f -c 000000'";
+        "$capturing" = "grim -g \"$(slurp)\" - | swappy -f -";
+
+        # autostart.conf
+        exec-once = [
+          "tailscale-systray &"
+          "slack &"
+          "waybar &"
+          "fcitx5 -d &"
+          "mako &"
+          "nm-applet --indicator &"
+          "$idlehandler"
+        ];
+
+        # decorations.conf
+        decoration = {
+          active_opacity = 1;
+          inactive_opacity = 0.9;
+          rounding = 8;
+          blur = {
+            enabled = true;
+            size = 15;
+            passes = 2;
+            xray = true;
+            new_optimizations = "on";
+            ignore_opacity = "off";
+            vibrancy = 0.1696;
+          };
+          shadow = {
+            enabled = true;
+            range = 4;
+            render_power = 3;
+            # color = "rgba(1a1a1aee)";
+          };
+        };
+
+        # environment.conf
+        envd = [
+          "HYPRCURSOR_SIZE,24"
+          "XCURSOR_SIZE,24"
+          "QT_CURSOR_SIZE,24"
+          "XDG_CURRENT_DESKTOP, Hyprland"
+          "XDG_SESSION_TYPE, Hyprland"
+          "XDG_SESSION_DESKTOP, Hyprland"
+          "GDK_BACKEND, wayland, x11"
+          "CLUTTER_BACKEND, wayland"
+          "QT_QPA_PLATFORM=wayland;xcb"
+          "MOZ_ENABLE_WAYLAND, 1"
+        ];
+
+        # input.conf
+        input = {
+          kb_layout = "us,us_intl";
+          kb_variant = "";
+          kb_model = "";
+          kb_options = "grp:win_space_toggle";
+          kb_rules = "";
+          follow_mouse = 2;
+          float_switch_override_focus = 2;
+        };
+
+        # keybinds.conf
+        bindl = [
+          ", switch:off:Lid Switch, exec, hyprctl keyword monitor \"eDP-1, 1920x1200, 0x0, 1\""
+          ", switch:on:Lid Switch,  exec, hyprctl keyword monitor \"eDP-1, disable\""
+        ];
+
+        bindd = [
+          "$mainMod, RETURN, Opens your preferred terminal emulator ($terminal), exec, $terminal"
+          "$mainMod, E, Opens your preferred filemanager ($filemanager), exec, $filemanager"
+          "$mainMod, A, Screen capture selection, exec, $capturing"
+          "$mainMod, Q, Closes (not kill) current window, killactive,"
+          "$mainMod SHIFT, M, Exits Hyprland by terminating the user sessions, exec, loginctl terminate-user \"\" "
+          "$mainMod, V, Switches current window between floating and tiling mode, togglefloating,"
+          "$mainMod, R, Runs your application launcher, exec, $applauncher"
+          "$mainMod, F, Toggles current window fullscreen mode, fullscreen"
+          "$mainMod, Y, Pin current window (shows on all workspaces),pin"
+          "$mainMod, J, Toggles curren window split mode, togglesplit, # dwindle"
+          "$mainMod, K, Toggles current window group mode (ungroup all related), togglegroup,"
+          "$mainMod, Tab, Switches to the next window in the group, changegroupactive, f"
+          "$mainMod SHIFT, L, Lock the screen, exec, swaylock -e -K -p 10"
+          "$mainMod, mouse:272, Move the window towards a direction, movewindow"
+          "$mainMod CTRL, 1, Move window and switch to workspace 1, movetoworkspace, 1"
+          "$mainMod CTRL, 2, Move window and switch to workspace 2, movetoworkspace, 2"
+          "$mainMod CTRL, 3, Move window and switch to workspace 3, movetoworkspace, 3"
+          "$mainMod CTRL, 4, Move window and switch to workspace 4, movetoworkspace, 4"
+          "$mainMod CTRL, 5, Move window and switch to workspace 5, movetoworkspace, 5"
+          "$mainMod CTRL, 6, Move window and switch to workspace 6, movetoworkspace, 6"
+          "$mainMod CTRL, 7, Move window and switch to workspace 7, movetoworkspace, 7"
+          "$mainMod CTRL, 8, Move window and switch to workspace 8, movetoworkspace, 8"
+          "$mainMod CTRL, 9, Move window and switch to workspace 9, movetoworkspace, 9"
+          "$mainMod CTRL, 0, Move window and switch to workspace 10, movetoworkspace, 10"
+          "$mainMod CTRL, left, Move window and switch to the next workspace, movetoworkspace, -1"
+          "$mainMod CTRL, right, Move window and switch to the previous workspace, movetoworkspace, +1"
+          "$mainMod SHIFT, 1, Move window silently to workspace 1, movetoworkspacesilent, 1"
+          "$mainMod SHIFT, 2, Move window silently to workspace 2, movetoworkspacesilent, 2"
+          "$mainMod SHIFT, 3, Move window silently to workspace 3, movetoworkspacesilent, 3"
+          "$mainMod SHIFT, 4, Move window silently to workspace 4, movetoworkspacesilent, 4"
+          "$mainMod SHIFT, 5, Move window silently to workspace 5, movetoworkspacesilent, 5"
+          "$mainMod SHIFT, 6, Move window silently to workspace 6, movetoworkspacesilent, 6"
+          "$mainMod SHIFT, 7, Move window silently to workspace 7, movetoworkspacesilent, 7"
+          "$mainMod SHIFT, 8, Move window silently to workspace 8, movetoworkspacesilent, 8"
+          "$mainMod SHIFT, 9, Move window silently to workspace 9, movetoworkspacesilent, 9"
+          "$mainMod SHIFT, 0, Move window silently to workspace 10, movetoworkspacesilent, 10"
+          "$mainMod, 1, Switch to workspace 1, workspace, 1"
+          "$mainMod, 2, Switch to workspace 2, workspace, 2"
+          "$mainMod, 3, Switch to workspace 3, workspace, 3"
+          "$mainMod, 4, Switch to workspace 4, workspace, 4"
+          "$mainMod, 5, Switch to workspace 5, workspace, 5"
+          "$mainMod, 6, Switch to workspace 6, workspace, 6"
+          "$mainMod, 7, Switch to workspace 7, workspace, 7"
+          "$mainMod, 8, Switch to workspace 8, workspace, 8"
+          "$mainMod, 9, Switch to workspace 9, workspace, 9"
+          "$mainMod, 0, Switch to workspace 10, workspace, 10"
+          "$mainMod, PERIOD, Scroll through workspaces incrementally, workspace, e+1"
+          "$mainMod, COMMA, Scroll through workspaces decrementally, workspace, e-1"
+          "$mainMod, minus, Move active window to Special workspace, movetoworkspace,special"
+          "$mainMod, slash, Toggles the Special workspace, togglespecialworkspace, special"
+        ];
+        bindm = [
+          "$mainMod, mouse:273, resizewindow	#Resize the window towards a direction"
+          "$mainMod, mouse:272, movewindow		#Drag window"
+        ];
+
+        binds = {
+          allow_workspace_cycles = 1;
+          workspace_back_and_forth = 1;
+          workspace_center_on = 1;
+          movefocus_cycles_fullscreen = true;
+          window_direction_monitor_fallback = true;
+        };
+
+        # variables.conf
+        general = {
+          gaps_in = 5;
+          gaps_out = 5;
+          border_size = 2;
+          layout = "dwindle";
+          snap.enabled = true;
+          "col.active_border" = lib.mkForce active_gradient;
+        };
+        group = {
+          "col.border_active" = lib.mkForce active_gradient;
+        };
+        render.direct_scanout = true;
+        dwindle = {
+          special_scale_factor = 0.8;
+          pseudotile = true;
+          preserve_split = true;
+        };
+        master = {
+          new_status = "master";
+          special_scale_factor = 0.8;
+        };
+        misc = {
+          focus_on_activate = true;
+          vrr = 2;
+          enable_anr_dialog = false; # "application not responding"
+        };
+        # windowrules.conf
+        # ...
+      };
+    };
 
     home.packages = with pkgs; [
       libnotify
diff --git a/modules/nixos/archetypes/general.nix b/modules/nixos/archetypes/general.nix
index a8ecc34..f0090d8 100644
--- a/modules/nixos/archetypes/general.nix
+++ b/modules/nixos/archetypes/general.nix
@@ -2,7 +2,6 @@
   pkgs,
   lib,
   config,
-  inputs,
   ...
 }:
 {
diff --git a/modules/nixos/default.nix b/modules/nixos/default.nix
index e790e05..fb789fa 100644
--- a/modules/nixos/default.nix
+++ b/modules/nixos/default.nix
@@ -16,10 +16,11 @@
   config = {
     programs.dconf.enable = true;
     programs.hyprland.enable = true;
-    services.xserver = {
-      displayManager = {
-        defaultSession = "hyprland";
-      };
+    services.displayManager.defaultSession = "hyprland";
+    services.chrony = {
+      enable = true;
+      enableNTS = true;
+      servers = [ "time.cloudflare.com" ];
     };
     xdg.portal.enable = true;
 
diff --git a/scripts/rainbow-border.nix b/scripts/rainbow-border.nix
deleted file mode 100644
index 5214d3d..0000000
--- a/scripts/rainbow-border.nix
+++ /dev/null
@@ -1,15 +0,0 @@
-{ pkgs }:
-
-pkgs.writeShellScriptBin "rainbow-border" ''
-  #!/bin/bash
-  # /* ---- 💫 https://github.com/JaKooLit 💫 ---- */  ##
-  # for rainbow borders animation
-
-  function random_hex() {
-      random_hex=("0xff$(openssl rand -hex 3)")
-      echo $random_hex
-  }
-
-  # rainbow colors only for active window
-  hyprctl keyword general:col.active_border $(random_hex)  $(random_hex) $(random_hex) $(random_hex) $(random_hex) $(random_hex) $(random_hex) $(random_hex) $(random_hex) $(random_hex)  270deg
-''
diff --git a/scripts/screenshot.nix b/scripts/screenshot.nix
deleted file mode 100644
index 463ca3d..0000000
--- a/scripts/screenshot.nix
+++ /dev/null
@@ -1,5 +0,0 @@
-{ pkgs }:
-
-pkgs.writeShellScriptBin "screenshot" ''
-  grim -g "$(slurp)" - | swappy -f -
-''
diff --git a/wall.jpg b/wall.jpg
index b1399e3..7017cf7 100644
Binary files a/wall.jpg and b/wall.jpg differ
diff --git a/wallpapers/wall-gits.jpg b/wallpapers/wall-gits.jpg
new file mode 100644
index 0000000..fbab58d
Binary files /dev/null and b/wallpapers/wall-gits.jpg differ
diff --git a/wallpapers/wall-gits2.jpg b/wallpapers/wall-gits2.jpg
new file mode 100644
index 0000000..7017cf7
Binary files /dev/null and b/wallpapers/wall-gits2.jpg differ
diff --git a/wallpapers/wall-gits3.jpg b/wallpapers/wall-gits3.jpg
new file mode 100644
index 0000000..4cfbf39
Binary files /dev/null and b/wallpapers/wall-gits3.jpg differ