diff --git a/hypr/.config/autostart.conf b/hypr/.config/autostart.conf
new file mode 100644
index 0000000..3b7c62d
--- /dev/null
+++ b/hypr/.config/autostart.conf
@@ -0,0 +1,2 @@
+# Extra autostart processes
+# exec-once = uwsm app -- my-service
diff --git a/hypr/.config/bindings.conf b/hypr/.config/bindings.conf
new file mode 100644
index 0000000..8b21632
--- /dev/null
+++ b/hypr/.config/bindings.conf
@@ -0,0 +1,15 @@
+# Application bindings
+$terminal = uwsm app -- $TERMINAL
+$browser = omarchy-launch-browser
+
+bindd = SUPER, RETURN, Terminal, exec, $terminal --dir="$(omarchy-cmd-terminal-cwd)"
+bindd = SUPER, F, File manager, exec, uwsm app -- nautilus --new-window
+bindd = SUPER , B, Browser, exec, $browser
+bindd = SUPER SHIFT, B, Browser (private), exec, $browser --private
+bindd = SUPER SHIFT, T, Activity, exec, $terminal -e btop
+bindd = SUPER, D, Discord, exec, discord
+
+# If your web app url contains #, type it as ## to prevent hyperland treat it as comments
+bindd = SUPER SHIFT, A, ChatGPT, exec, omarchy-launch-webapp "https://chatgpt.com"
+bindd = SUPER SHIFT, G, GitHub, exec, omarchy-launch-webapp "https://github.com"
+bindd = SUPER SHIFT, Y, YouTube, exec, omarchy-launch-or-focus-webapp YouTube "https://youtube.com/"
diff --git a/hypr/.config/bindings.conf.bak b/hypr/.config/bindings.conf.bak
new file mode 100644
index 0000000..a56aa8c
--- /dev/null
+++ b/hypr/.config/bindings.conf.bak
@@ -0,0 +1,15 @@
+# Application bindings
+$terminal = uwsm app -- $TERMINAL
+$browser = omarchy-launch-browser
+
+bindd = SUPER, return, Terminal, exec, $terminal --working-directory="$(omarchy-cmd-terminal-cwd)"
+bindd = SUPER, F, File manager, exec, uwsm app -- nautilus --new-window
+bindd = SUPER, B, Browser, exec, $browser
+bindd = SUPER SHIFT, B, Browser (private), exec, $browser --private
+bindd = SUPER, T, Activity, exec, $terminal -e btop
+bindd = SUPER, D, Discord, exec, discord
+
+# If your web app url contains #, type it as ## to prevent hyperland treat it as comments
+bindd = SUPER, A, ChatGPT, exec, omarchy-launch-webapp "https://chatgpt.com"
+bindd = SUPER, G, GitHub, exec, omarchy-launch-webapp "https://github.com"
+bindd = SUPER, Y, YouTube, exec, omarchy-launch-or-focus-webapp YouTube "https://youtube.com/"
diff --git a/hypr/.config/envs.conf b/hypr/.config/envs.conf
new file mode 100644
index 0000000..a2a3641
--- /dev/null
+++ b/hypr/.config/envs.conf
@@ -0,0 +1,2 @@
+# Extra env variables
+# env = MY_GLOBAL_ENV,setting
diff --git a/hypr/.config/hypridle.conf b/hypr/.config/hypridle.conf
new file mode 100644
index 0000000..f2245a7
--- /dev/null
+++ b/hypr/.config/hypridle.conf
@@ -0,0 +1,22 @@
+general {
+    lock_cmd = omarchy-lock-screen                         # lock screen and 1password
+    before_sleep_cmd = loginctl lock-session               # lock before suspend.
+    after_sleep_cmd = hyprctl dispatch dpms on             # to avoid having to press a key twice to turn on the display.
+    inhibit_sleep = 3                                      # wait until screen is locked
+}
+
+listener {
+    timeout = 150                                             # 2.5min
+    on-timeout = pidof hyprlock || omarchy-launch-screensaver # start screensaver (if we haven't locked already)
+}
+
+listener {
+    timeout = 300                      # 5min
+    on-timeout = loginctl lock-session # lock screen when timeout has passed
+}
+
+listener {
+    timeout = 330                                            # 5.5min
+    on-timeout = hyprctl dispatch dpms off                   # screen off when timeout has passed
+    on-resume = hyprctl dispatch dpms on && brightnessctl -r # screen on when activity is detected
+}
diff --git a/hypr/.config/hyprland.conf b/hypr/.config/hyprland.conf
new file mode 100644
index 0000000..f9c7221
--- /dev/null
+++ b/hypr/.config/hyprland.conf
@@ -0,0 +1,21 @@
+# Learn how to configure Hyprland: https://wiki.hyprland.org/Configuring/
+
+# Use defaults Omarchy defaults (but don't edit these directly!)
+source = ~/.local/share/omarchy/default/hypr/autostart.conf
+source = ~/.local/share/omarchy/default/hypr/bindings/media.conf
+source = ~/.local/share/omarchy/default/hypr/bindings/clipboard.conf
+source = ~/.local/share/omarchy/default/hypr/bindings/tiling-v2.conf
+source = ~/.local/share/omarchy/default/hypr/bindings/utilities.conf
+source = ~/.local/share/omarchy/default/hypr/envs.conf
+source = ~/.local/share/omarchy/default/hypr/looknfeel.conf
+source = ~/.local/share/omarchy/default/hypr/input.conf
+source = ~/.local/share/omarchy/default/hypr/windows.conf
+source = ~/.config/omarchy/current/theme/hyprland.conf
+
+# Change your own setup in these files (and overwrite any settings from defaults!)
+source = ~/.config/hypr/monitors.conf
+source = ~/.config/hypr/input.conf
+source = ~/.config/hypr/bindings.conf
+source = ~/.config/hypr/envs.conf
+source = ~/.config/hypr/looknfeel.conf
+source = ~/.config/hypr/autostart.conf
diff --git a/hypr/.config/hyprlock.conf b/hypr/.config/hyprlock.conf
new file mode 100644
index 0000000..063d793
--- /dev/null
+++ b/hypr/.config/hyprlock.conf
@@ -0,0 +1,39 @@
+source = ~/.config/omarchy/current/theme/hyprlock.conf
+
+background {
+    monitor =
+    color = $color
+    path = ~/.config/omarchy/current/background
+    blur_passes = 3
+}
+
+animations {
+    enabled = false
+}
+
+input-field {
+    monitor =
+    size = 650, 100
+    position = 0, 0
+    halign = center
+    valign = center
+
+    inner_color = $inner_color
+    outer_color = $outer_color
+    outline_thickness = 4
+
+    font_family = CaskaydiaMono Nerd Font Propo
+    font_color = $font_color
+
+    placeholder_text = Enter Password 󰈷
+    check_color = $check_color
+    fail_text = <i>$FAIL ($ATTEMPTS)</i>
+
+    rounding = 0
+    shadow_passes = 0
+    fade_on_empty = false
+}
+
+auth {
+    fingerprint:enabled = true
+}
diff --git a/hypr/.config/hyprsunset.conf b/hypr/.config/hyprsunset.conf
new file mode 100644
index 0000000..78bba7d
--- /dev/null
+++ b/hypr/.config/hyprsunset.conf
@@ -0,0 +1,6 @@
+# Makes hyprsunset do nothing to the screen by default
+# Without this, the default applies some tint to the monitor
+profile {
+    time = 07:00
+    identity = true
+}
\ No newline at end of file
diff --git a/hypr/.config/input.conf b/hypr/.config/input.conf
new file mode 100644
index 0000000..fcbe3c8
--- /dev/null
+++ b/hypr/.config/input.conf
@@ -0,0 +1,37 @@
+# Control your input devices
+# See https://wiki.hypr.land/Configuring/Variables/#input
+input {
+  # Use multiple keyboard layouts and switch between them with Left Alt + Right Alt
+  # kb_layout = us,dk,eu
+  kb_layout = us
+  kb_options = compose:caps # ,grp:alts_toggle
+
+  # Change speed of keyboard repeat
+  repeat_rate = 40
+  repeat_delay = 600
+
+  # Start with numlock on by default
+  numlock_by_default = true
+
+  # Increase sensitity for mouse/trackpack (default: 0)
+  # sensitivity = 0.35
+
+  touchpad {
+    # Use natural (inverse) scrolling
+    # natural_scroll = true
+
+    # Use two-finger clicks for right-click instead of lower-right corner
+    # clickfinger_behavior = true
+
+    # Control the speed of your scrolling
+    scroll_factor = 0.4
+  }
+}
+
+# Scroll nicely in the terminal
+windowrule = scrolltouchpad 1.5, class:(Alacritty|kitty)
+windowrule = scrolltouchpad 0.2, class:com.mitchellh.ghostty
+
+# Enable touchpad gestures for changing workspaces
+# See https://wiki.hyprland.org/Configuring/Gestures/
+# gesture = 3, horizontal, workspace
diff --git a/hypr/.config/looknfeel.conf b/hypr/.config/looknfeel.conf
new file mode 100644
index 0000000..39022b8
--- /dev/null
+++ b/hypr/.config/looknfeel.conf
@@ -0,0 +1,23 @@
+# Change the default Omarchy look'n'feel
+
+# https://wiki.hyprland.org/Configuring/Variables/#general
+general {
+    # No gaps between windows
+    # gaps_in = 0
+    # gaps_out = 0
+
+    # Use master layout instead of dwindle
+    # layout = master
+}
+
+# https://wiki.hyprland.org/Configuring/Variables/#decoration
+decoration {
+    # Use round window corners
+    # rounding = 8
+}
+
+# https://wiki.hypr.land/Configuring/Dwindle-Layout/
+dwindle {
+    # Avoid overly wide single-window layouts on wide screens
+    # single_window_aspect_ratio = 1 1
+}
diff --git a/hypr/.config/monitors.conf b/hypr/.config/monitors.conf
new file mode 100644
index 0000000..7a4b7c2
--- /dev/null
+++ b/hypr/.config/monitors.conf
@@ -0,0 +1,20 @@
+# See https://wiki.hyprland.org/Configuring/Monitors/
+# List current monitors and resolutions possible: hyprctl monitors
+# Format: monitor = [port], resolution, position, scale
+# You must relaunch Hyprland after changing any envs (use Super+Esc, then Relaunch)
+
+# Optimized for retina-class 2x displays, like 13" 2.8K, 27" 5K, 32" 6K.
+env = GDK_SCALE,1
+monitor=,preferred,auto,auto
+
+# Good compromise for 27" or 32" 4K monitors (but fractional!)
+# env = GDK_SCALE,1.75
+# monitor=,preferred,auto,1.666667
+
+# Straight 1x setup for low-resolution displays like 1080p or 1440p
+# env = GDK_SCALE,1
+# monitor=,preferred,auto,1
+
+# Example for Framework 13 w/ 6K XDR Apple display
+# monitor = DP-5, 6016x3384@60, auto, 2
+# monitor = eDP-1, 2880x1920@120, auto, 2
diff --git a/nvim/.config/nvim/init.lua b/nvim/.config/nvim/init.lua
index cdac2d4..a279c4e 100644
--- a/nvim/.config/nvim/init.lua
+++ b/nvim/.config/nvim/init.lua
@@ -147,7 +147,7 @@ require("lazy").setup({
 	local builtin = require("telescope.builtin")
       	require("telescope").setup {}
 	vim.keymap.set("n", "<leader>g", builtin.live_grep)
-	vim.keymap.set("n", "<leader>s", builtin.git_files)
+	vim.keymap.set("n", "<leader>s", builtin.find_files)
       end
     },
 })