diff --git a/config/fastfetch/ProphecySymbol.png b/config/fastfetch/ProphecySymbol.png
deleted file mode 120000
index 1576411..0000000
--- a/config/fastfetch/ProphecySymbol.png
+++ /dev/null
@@ -1 +0,0 @@
-/nix/store/gf589vl2qg1qfciqy728pda0izimggdh-home-manager-files/.config/fastfetch/ProphecySymbol.png
\ No newline at end of file
diff --git a/config/fastfetch/ProphecySymbol.png.hmbackup b/config/fastfetch/ProphecySymbol.png.hmbackup
deleted file mode 100644
index 55aeff2..0000000
Binary files a/config/fastfetch/ProphecySymbol.png.hmbackup and /dev/null differ
diff --git a/config/fastfetch/config.jsonc b/config/fastfetch/config.jsonc
deleted file mode 120000
index 4c77aeb..0000000
--- a/config/fastfetch/config.jsonc
+++ /dev/null
@@ -1 +0,0 @@
-/nix/store/gf589vl2qg1qfciqy728pda0izimggdh-home-manager-files/.config/fastfetch/config.jsonc
\ No newline at end of file
diff --git a/config/fastfetch/config.jsonc.hmbackup b/config/fastfetch/config.jsonc.hmbackup
deleted file mode 100644
index 090edda..0000000
--- a/config/fastfetch/config.jsonc.hmbackup
+++ /dev/null
@@ -1,114 +0,0 @@
-{
-	"$schema": "https://github.com/fastfetch-cli/fastfetch/raw/dev/doc/json_schema.json",
-	"logo": {
-		"source": "~/.config/fastfetch/deltarune.png"
-	},
-	"display": {
-		"color": "magenta"
-	},
-	"modules": [
-		"break",
-
-		{
-			"type": "title",
-			"keyColor": "blue",
-			"outputColor": "magenta",
-			"format": "kris@darkworld" // "{user-name-colored}{at-symbol-colored}{host-name-colored}"
-		},
-
-		"break",
-
-		{
-			"type": "os",
-			"key": "OS",
-			"format": "DARKWORLD NIXOS"
-		},
-		{
-			"type": "kernel",
-			"format": "Linux 6.17.0-2-dark-fountain"
-		},
-		{
-			"type": "packages",
-			"format": "9999 (darkworld), 4 (deltarune), 1 (the-prophecy)"
-		},
-		//"packages",
-
-		"break",
-
-		//"host",
-		{
-			"type": "os",
-			"key": "Host",
-			"format": "Hopes and Dreams"
-		},
-		{
-			"type": "uptime",
-			"format": "a few minutes"
-		},
-		//"uptime",
-
-		"break",
-
-		{
-			"type": "cpu",
-			"format": "{cores-logical}x {name} @ {freq-base} {temperature}",
-			"temp": true
-		},
-		{
-			"type": "gpu",
-			"format": "{name} [{type}] {temperature}",
-			"temp": true
-		},
-
-		"break",
-
-		"memory",
-		"disk",
-
-		"break",
-
-		{
-			"type": "wm",
-			"key": "WM",
-			"format": "{pretty-name}"
-		},
-		{
-			"type": "shell",
-			"key": "Shell",
-			"format": "{pretty-name}"
-		},
-		"terminal",
-		"locale",
-
-		/*
-		"break",
-
-		{
-			"type": "weather",
-			"location": "Latvia",
-			"timeout": 1000,
-			"outputFormat": "%t+-+%C"
-		},
-		*/
-
-		"break",
-
-		{
-			"type": "media",
-			"key": "Song",
-			"format": "{artist} — {title}"
-		},
-		{
-			"type": "media",
-			"key": "Album",
-			"format": "{album}"
-		},
-
-		"break",
-
-		{
-			"type": "colors",
-			"symbol": "circle"
-		}
-	]
-}
diff --git a/config/fastfetch/deltarune.png b/config/fastfetch/deltarune.png
deleted file mode 120000
index 99b61fe..0000000
--- a/config/fastfetch/deltarune.png
+++ /dev/null
@@ -1 +0,0 @@
-/nix/store/gf589vl2qg1qfciqy728pda0izimggdh-home-manager-files/.config/fastfetch/deltarune.png
\ No newline at end of file
diff --git a/config/fastfetch/deltarune.png.hmbackup b/config/fastfetch/deltarune.png.hmbackup
deleted file mode 100644
index cba675b..0000000
Binary files a/config/fastfetch/deltarune.png.hmbackup and /dev/null differ
diff --git a/config/fastfetch/ralsei.png b/config/fastfetch/ralsei.png
deleted file mode 120000
index 0acd765..0000000
--- a/config/fastfetch/ralsei.png
+++ /dev/null
@@ -1 +0,0 @@
-/nix/store/gf589vl2qg1qfciqy728pda0izimggdh-home-manager-files/.config/fastfetch/ralsei.png
\ No newline at end of file
diff --git a/config/fastfetch/ralsei.png.hmbackup b/config/fastfetch/ralsei.png.hmbackup
deleted file mode 100755
index d83da62..0000000
Binary files a/config/fastfetch/ralsei.png.hmbackup and /dev/null differ
diff --git a/config/hypr/config/autoexec.conf b/config/hypr/config/autoexec.conf
deleted file mode 120000
index c2e35a8..0000000
--- a/config/hypr/config/autoexec.conf
+++ /dev/null
@@ -1 +0,0 @@
-/nix/store/gf589vl2qg1qfciqy728pda0izimggdh-home-manager-files/.config/hypr/config/autoexec.conf
\ No newline at end of file
diff --git a/config/hypr/config/autoexec.conf b/config/hypr/config/autoexec.conf
new file mode 100644
index 0000000..c41563a
--- /dev/null
+++ b/config/hypr/config/autoexec.conf
@@ -0,0 +1,35 @@
+# Polkit
+exec-once = systemctl --user start /nix/store/*-hyprpolkitagent-*/libexec/hyprpolkitagent
+exec-once = /usr/lib/hyprpolkitagent/hyprpolkitagent
+
+# Wallpaper
+exec-once = swww-daemon
+
+# Gentoo Stuff
+exec-once = bash /etc/nixos/scripts/gentoo-init.sh
+
+# Clipboard Manager
+exec-once = wl-paste --watch cliphist store
+
+# XDG Desktop Portal
+exec-once = bash /etc/nixos/scripts/xdg.sh
+
+# Start Hot Reload
+exec-once = bash /etc/nixos/scripts/hot-reload.sh
+
+# Hyprland polkit
+exec-once = /usr/lib/hyprpolkitagent/hyprpolkitagent
+
+exec-once = [workspace special:music silent] cider
+exec-once = [workspace special:quick silent] equibop
+
+# exec-once = arrpc
+
+# deltarune
+exec-once = qs
+
+# Hyprland Splash
+# exec-once = "sleep 5 && bun run scripts/bin/betterSplash.ts"
+exec-once = sleep 5 && notify-send -a dotfiles "Welcome to Hyprland!" "$(hyprctl splash)"
+
+# exec-once = nix-shell -p mpvpaper --command "mpvpaper -o \"no-audio loop loop-playlist\" HDMI-A-2 \"/home/ralsei/Documents/Boykisser Chipi Chipi Full Animation [3sP6ZvlqJeE].webm\""
diff --git a/config/hypr/config/autoexec.conf.hmbackup b/config/hypr/config/autoexec.conf.hmbackup
deleted file mode 100644
index c41563a..0000000
--- a/config/hypr/config/autoexec.conf.hmbackup
+++ /dev/null
@@ -1,35 +0,0 @@
-# Polkit
-exec-once = systemctl --user start /nix/store/*-hyprpolkitagent-*/libexec/hyprpolkitagent
-exec-once = /usr/lib/hyprpolkitagent/hyprpolkitagent
-
-# Wallpaper
-exec-once = swww-daemon
-
-# Gentoo Stuff
-exec-once = bash /etc/nixos/scripts/gentoo-init.sh
-
-# Clipboard Manager
-exec-once = wl-paste --watch cliphist store
-
-# XDG Desktop Portal
-exec-once = bash /etc/nixos/scripts/xdg.sh
-
-# Start Hot Reload
-exec-once = bash /etc/nixos/scripts/hot-reload.sh
-
-# Hyprland polkit
-exec-once = /usr/lib/hyprpolkitagent/hyprpolkitagent
-
-exec-once = [workspace special:music silent] cider
-exec-once = [workspace special:quick silent] equibop
-
-# exec-once = arrpc
-
-# deltarune
-exec-once = qs
-
-# Hyprland Splash
-# exec-once = "sleep 5 && bun run scripts/bin/betterSplash.ts"
-exec-once = sleep 5 && notify-send -a dotfiles "Welcome to Hyprland!" "$(hyprctl splash)"
-
-# exec-once = nix-shell -p mpvpaper --command "mpvpaper -o \"no-audio loop loop-playlist\" HDMI-A-2 \"/home/ralsei/Documents/Boykisser Chipi Chipi Full Animation [3sP6ZvlqJeE].webm\""
diff --git a/config/hypr/config/display.conf b/config/hypr/config/display.conf
deleted file mode 120000
index 17514ce..0000000
--- a/config/hypr/config/display.conf
+++ /dev/null
@@ -1 +0,0 @@
-/nix/store/gf589vl2qg1qfciqy728pda0izimggdh-home-manager-files/.config/hypr/config/display.conf
\ No newline at end of file
diff --git a/config/hypr/config/display.conf b/config/hypr/config/display.conf
new file mode 100644
index 0000000..e4f23a5
--- /dev/null
+++ b/config/hypr/config/display.conf
@@ -0,0 +1,234 @@
+#############################################
+# MONITORS
+#############################################
+
+monitor=,1920x1080@240,auto,1
+# monitor=Unknown-1,disabled
+
+
+#############################################
+# GENERAL
+#############################################
+
+general {
+	gaps_in = 5
+	gaps_out = 20
+	border_size = 0
+
+	# col.active_border = rgb(89b4fa)
+	# col.inactive_border = rgb(585b70)
+
+	resize_on_border = false
+	allow_tearing = true
+	layout = dwindle
+}
+
+
+#############################################
+# DECORATION
+#############################################
+
+decoration {
+	# rounding = 12
+
+	active_opacity = 1.0
+	inactive_opacity = 1.0
+	fullscreen_opacity = 1.0
+
+	shadow {
+		enabled = false
+		range = 8
+		render_power = 8
+		color = rgb(8aadf4)
+		color_inactive = rgb(585b70)
+		scale = 1.0
+		offset = 0 0
+	}
+
+	blur {
+		enabled = true
+		size = 3
+		passes = 1
+		xray = false
+		vibrancy = 0.1696
+	}
+}
+
+
+#############################################
+# ANIMATIONS
+#############################################
+
+animations {
+	enabled = true
+
+	bezier = myBezier, 0.05, 0.9, 0.1, 1.05
+	bezier = main,     0.445, 0.05, 0.55, 0.95
+	bezier = monitorBez, 0, 1, 1, 1
+
+	animation = windows,          1, 7, myBezier
+	animation = windowsOut,       1, 7, default
+	animation = border,           1, 10, default
+	animation = borderangle,      1, 8, default
+	animation = fade,             1, 7, default
+	animation = workspaces,       1, 6, default, slide
+	animation = specialWorkspace, 1, 6, myBezier, slide
+	animation = monitorAdded,     1, 30, monitorBez
+}
+
+
+#############################################
+# RENDER
+#############################################
+
+render {
+	# new_render_scheduling = true
+}
+
+
+#############################################
+# CURSOR
+#############################################
+
+cursor {
+	use_cpu_buffer = 2
+	enable_hyprcursor = true
+	invisible = false
+}
+
+
+#############################################
+# WINDOW RULES (TAGGING)
+#############################################
+
+windowrule {
+	name = games
+	match:class = org\.vinegarhq\.Sober|com\.mojang\.minecraft\.java-edition|deltarune\.exe|steam_app_1671210
+	tag = +game
+}
+
+windowrule {
+	name = discord
+	match:class = equibop
+	tag = +discord
+}
+
+
+windowrule {
+	name = roblox
+	match:class = org\.vinegarhq\.Sober
+	tag = +roblox
+}
+
+windowrule {
+	name = deltarune
+	match:class = deltarune\.exe|steam_app_1671210
+	tag = +deltarune
+}
+
+windowrule {
+	name = code
+	match:class = code|windsurf
+	tag = +code
+}
+
+windowrule {
+	name = music
+	match:class = cider|spotify
+	tag = +music
+}
+
+# Tag behavior rules
+windowrule {
+	name = render unfocused
+	match:tag = music|game|discord
+	render_unfocused = on
+}
+
+
+#############################################
+# LAYOUTS
+#############################################
+
+dwindle {
+	pseudotile = true
+	preserve_split = true
+}
+
+
+#############################################
+# MISC
+#############################################
+
+misc {
+	force_default_wallpaper = 2
+	enable_anr_dialog = true
+	disable_hyprland_logo = false
+	initial_workspace_tracking = 0
+	# new_window_takes_over_fullscreen = 1
+	disable_splash_rendering = false
+	font_family = "SF Pro Display"
+	render_unfocused_fps = 240
+	allow_session_lock_restore = 1
+}
+
+
+#############################################
+# LAYER RULES
+#############################################
+
+layerrule {
+	name = waybar
+	match:namespace = waybar
+	animation = slide top
+	above_lock = 2
+	order = -20
+	no_screen_share = off
+}
+
+layerrule {
+	name = notifications
+	match:namespace = notifications
+	animation = slide right
+	above_lock = 2
+}
+
+layerrule {
+	name = shimeji
+	match:namespace = wl_shimeji
+	order = -9999
+	above_lock = 2
+}
+
+layerrule {
+	name = gtk layer shell
+	match:namespace = gtk-layer-shell
+	order = -25
+}
+
+
+#############################################
+# FLOATING UTILITY WINDOWS
+#############################################
+
+windowrule {
+	name = utility windows
+	match:class = org\.kde\.systemsettings|systemsettings
+	float = true
+	size = 900 500
+	center = true
+}
+
+#############################################
+# OTHER
+#############################################
+
+windowrule = match:class steam_proton|org\.vinegarhq\.Sober, allows_input on
+
+env = QT_QPA_PLATFORMTHEME,qt6ct
+env = QT_STYLE_OVERRIDE,kvantum
+env = QT_WAYLAND_DISABLE_WINDOWDECORATION,1
+
+
+# windowrulev2 = immediate, class:^(sober)$
+# windowrulev2 = fullscreen,title:^(Sober)$
diff --git a/config/hypr/config/display.conf.hmbackup b/config/hypr/config/display.conf.hmbackup
deleted file mode 100644
index e4f23a5..0000000
--- a/config/hypr/config/display.conf.hmbackup
+++ /dev/null
@@ -1,234 +0,0 @@
-#############################################
-# MONITORS
-#############################################
-
-monitor=,1920x1080@240,auto,1
-# monitor=Unknown-1,disabled
-
-
-#############################################
-# GENERAL
-#############################################
-
-general {
-	gaps_in = 5
-	gaps_out = 20
-	border_size = 0
-
-	# col.active_border = rgb(89b4fa)
-	# col.inactive_border = rgb(585b70)
-
-	resize_on_border = false
-	allow_tearing = true
-	layout = dwindle
-}
-
-
-#############################################
-# DECORATION
-#############################################
-
-decoration {
-	# rounding = 12
-
-	active_opacity = 1.0
-	inactive_opacity = 1.0
-	fullscreen_opacity = 1.0
-
-	shadow {
-		enabled = false
-		range = 8
-		render_power = 8
-		color = rgb(8aadf4)
-		color_inactive = rgb(585b70)
-		scale = 1.0
-		offset = 0 0
-	}
-
-	blur {
-		enabled = true
-		size = 3
-		passes = 1
-		xray = false
-		vibrancy = 0.1696
-	}
-}
-
-
-#############################################
-# ANIMATIONS
-#############################################
-
-animations {
-	enabled = true
-
-	bezier = myBezier, 0.05, 0.9, 0.1, 1.05
-	bezier = main,     0.445, 0.05, 0.55, 0.95
-	bezier = monitorBez, 0, 1, 1, 1
-
-	animation = windows,          1, 7, myBezier
-	animation = windowsOut,       1, 7, default
-	animation = border,           1, 10, default
-	animation = borderangle,      1, 8, default
-	animation = fade,             1, 7, default
-	animation = workspaces,       1, 6, default, slide
-	animation = specialWorkspace, 1, 6, myBezier, slide
-	animation = monitorAdded,     1, 30, monitorBez
-}
-
-
-#############################################
-# RENDER
-#############################################
-
-render {
-	# new_render_scheduling = true
-}
-
-
-#############################################
-# CURSOR
-#############################################
-
-cursor {
-	use_cpu_buffer = 2
-	enable_hyprcursor = true
-	invisible = false
-}
-
-
-#############################################
-# WINDOW RULES (TAGGING)
-#############################################
-
-windowrule {
-	name = games
-	match:class = org\.vinegarhq\.Sober|com\.mojang\.minecraft\.java-edition|deltarune\.exe|steam_app_1671210
-	tag = +game
-}
-
-windowrule {
-	name = discord
-	match:class = equibop
-	tag = +discord
-}
-
-
-windowrule {
-	name = roblox
-	match:class = org\.vinegarhq\.Sober
-	tag = +roblox
-}
-
-windowrule {
-	name = deltarune
-	match:class = deltarune\.exe|steam_app_1671210
-	tag = +deltarune
-}
-
-windowrule {
-	name = code
-	match:class = code|windsurf
-	tag = +code
-}
-
-windowrule {
-	name = music
-	match:class = cider|spotify
-	tag = +music
-}
-
-# Tag behavior rules
-windowrule {
-	name = render unfocused
-	match:tag = music|game|discord
-	render_unfocused = on
-}
-
-
-#############################################
-# LAYOUTS
-#############################################
-
-dwindle {
-	pseudotile = true
-	preserve_split = true
-}
-
-
-#############################################
-# MISC
-#############################################
-
-misc {
-	force_default_wallpaper = 2
-	enable_anr_dialog = true
-	disable_hyprland_logo = false
-	initial_workspace_tracking = 0
-	# new_window_takes_over_fullscreen = 1
-	disable_splash_rendering = false
-	font_family = "SF Pro Display"
-	render_unfocused_fps = 240
-	allow_session_lock_restore = 1
-}
-
-
-#############################################
-# LAYER RULES
-#############################################
-
-layerrule {
-	name = waybar
-	match:namespace = waybar
-	animation = slide top
-	above_lock = 2
-	order = -20
-	no_screen_share = off
-}
-
-layerrule {
-	name = notifications
-	match:namespace = notifications
-	animation = slide right
-	above_lock = 2
-}
-
-layerrule {
-	name = shimeji
-	match:namespace = wl_shimeji
-	order = -9999
-	above_lock = 2
-}
-
-layerrule {
-	name = gtk layer shell
-	match:namespace = gtk-layer-shell
-	order = -25
-}
-
-
-#############################################
-# FLOATING UTILITY WINDOWS
-#############################################
-
-windowrule {
-	name = utility windows
-	match:class = org\.kde\.systemsettings|systemsettings
-	float = true
-	size = 900 500
-	center = true
-}
-
-#############################################
-# OTHER
-#############################################
-
-windowrule = match:class steam_proton|org\.vinegarhq\.Sober, allows_input on
-
-env = QT_QPA_PLATFORMTHEME,qt6ct
-env = QT_STYLE_OVERRIDE,kvantum
-env = QT_WAYLAND_DISABLE_WINDOWDECORATION,1
-
-
-# windowrulev2 = immediate, class:^(sober)$
-# windowrulev2 = fullscreen,title:^(Sober)$
diff --git a/config/hypr/config/input.conf b/config/hypr/config/input.conf
deleted file mode 120000
index 1a0ef82..0000000
--- a/config/hypr/config/input.conf
+++ /dev/null
@@ -1 +0,0 @@
-/nix/store/gf589vl2qg1qfciqy728pda0izimggdh-home-manager-files/.config/hypr/config/input.conf
\ No newline at end of file
diff --git a/config/hypr/config/input.conf b/config/hypr/config/input.conf
new file mode 100644
index 0000000..67a4738
--- /dev/null
+++ b/config/hypr/config/input.conf
@@ -0,0 +1,10 @@
+
+cursor {
+    no_hardware_cursors = false
+    zoom_rigid = true
+}
+
+$KBLANG = english
+
+# Keyboard
+source = ./input_configs/english.conf
diff --git a/config/hypr/config/input.conf.hmbackup b/config/hypr/config/input.conf.hmbackup
deleted file mode 100644
index 67a4738..0000000
--- a/config/hypr/config/input.conf.hmbackup
+++ /dev/null
@@ -1,10 +0,0 @@
-
-cursor {
-    no_hardware_cursors = false
-    zoom_rigid = true
-}
-
-$KBLANG = english
-
-# Keyboard
-source = ./input_configs/english.conf
diff --git a/config/hypr/config/input_configs/english.conf b/config/hypr/config/input_configs/english.conf
deleted file mode 120000
index 7aa88d2..0000000
--- a/config/hypr/config/input_configs/english.conf
+++ /dev/null
@@ -1 +0,0 @@
-/nix/store/gf589vl2qg1qfciqy728pda0izimggdh-home-manager-files/.config/hypr/config/input_configs/english.conf
\ No newline at end of file
diff --git a/config/hypr/config/input_configs/english.conf b/config/hypr/config/input_configs/english.conf
new file mode 100644
index 0000000..5f72e87
--- /dev/null
+++ b/config/hypr/config/input_configs/english.conf
@@ -0,0 +1,17 @@
+# Input Config ( https://wiki.hyprland.org/Configuring/Variables/#input )
+
+input {
+	kb_layout = us,lv
+	kb_variant = ,apostrophe
+	kb_model =
+	kb_options =
+	kb_rules =
+
+	follow_mouse = 1
+
+	sensitivity = 0 # -1.0 - 1.0, 0 means no modification.
+
+	touchpad {
+		natural_scroll = false
+	}
+}
diff --git a/config/hypr/config/input_configs/english.conf.hmbackup b/config/hypr/config/input_configs/english.conf.hmbackup
deleted file mode 100644
index 5f72e87..0000000
--- a/config/hypr/config/input_configs/english.conf.hmbackup
+++ /dev/null
@@ -1,17 +0,0 @@
-# Input Config ( https://wiki.hyprland.org/Configuring/Variables/#input )
-
-input {
-	kb_layout = us,lv
-	kb_variant = ,apostrophe
-	kb_model =
-	kb_options =
-	kb_rules =
-
-	follow_mouse = 1
-
-	sensitivity = 0 # -1.0 - 1.0, 0 means no modification.
-
-	touchpad {
-		natural_scroll = false
-	}
-}
diff --git a/config/hypr/config/input_configs/latvian.conf b/config/hypr/config/input_configs/latvian.conf
deleted file mode 120000
index 51b1958..0000000
--- a/config/hypr/config/input_configs/latvian.conf
+++ /dev/null
@@ -1 +0,0 @@
-/nix/store/gf589vl2qg1qfciqy728pda0izimggdh-home-manager-files/.config/hypr/config/input_configs/latvian.conf
\ No newline at end of file
diff --git a/config/hypr/config/input_configs/latvian.conf b/config/hypr/config/input_configs/latvian.conf
new file mode 100644
index 0000000..ec17a2d
--- /dev/null
+++ b/config/hypr/config/input_configs/latvian.conf
@@ -0,0 +1,23 @@
+# Input Config ( https://wiki.hyprland.org/Configuring/Variables/#input )
+
+# How to get Latvian Keyboard on Hyprland:
+# uncomment "lv_lv.UTF-8 UTF-8" in /etc/locale.gen
+# add first line "LANG=lv_LV.UTF-8" in /etc/locale.conf
+# locale-gen
+# setxkbmap lv
+
+input {
+	kb_layout = lv
+	kb_variant = apostrophe
+	kb_model =
+	kb_options = compose:apostrophe
+	kb_rules = #grp:alt_shift_toggle
+
+	follow_mouse = 1
+
+	sensitivity = 0 # -1.0 - 1.0, 0 means no modification.
+
+	touchpad {
+		natural_scroll = false
+	}
+}
\ No newline at end of file
diff --git a/config/hypr/config/input_configs/latvian.conf.hmbackup b/config/hypr/config/input_configs/latvian.conf.hmbackup
deleted file mode 100644
index ec17a2d..0000000
--- a/config/hypr/config/input_configs/latvian.conf.hmbackup
+++ /dev/null
@@ -1,23 +0,0 @@
-# Input Config ( https://wiki.hyprland.org/Configuring/Variables/#input )
-
-# How to get Latvian Keyboard on Hyprland:
-# uncomment "lv_lv.UTF-8 UTF-8" in /etc/locale.gen
-# add first line "LANG=lv_LV.UTF-8" in /etc/locale.conf
-# locale-gen
-# setxkbmap lv
-
-input {
-	kb_layout = lv
-	kb_variant = apostrophe
-	kb_model =
-	kb_options = compose:apostrophe
-	kb_rules = #grp:alt_shift_toggle
-
-	follow_mouse = 1
-
-	sensitivity = 0 # -1.0 - 1.0, 0 means no modification.
-
-	touchpad {
-		natural_scroll = false
-	}
-}
\ No newline at end of file
diff --git a/config/hypr/config/keybindings/default.conf b/config/hypr/config/keybindings/default.conf
deleted file mode 120000
index 6d3ed55..0000000
--- a/config/hypr/config/keybindings/default.conf
+++ /dev/null
@@ -1 +0,0 @@
-/nix/store/gf589vl2qg1qfciqy728pda0izimggdh-home-manager-files/.config/hypr/config/keybindings/default.conf
\ No newline at end of file
diff --git a/config/hypr/config/keybindings/default.conf b/config/hypr/config/keybindings/default.conf
new file mode 100644
index 0000000..0a7fbe8
--- /dev/null
+++ b/config/hypr/config/keybindings/default.conf
@@ -0,0 +1,76 @@
+# $mainMod was defined in variables.conf
+
+# Default keybinds
+bind = $mainMod, Q, exec, $terminal
+bind = $mainMod, C, killactive,
+bind = $mainMod, E, exec, $fileManager
+bind = $mainMod, V, togglefloating,
+bind = $mainMod, T, exec, $menu
+bind = $mainMod, A, exec, qs ipc call deltarune.shell toggleQuickSettings
+bind = $mainMod, Y, exec, $browser
+bind = $mainMod, P, pseudo, # dwindle
+bind = $mainMod, J, layoutmsg, togglesplit, # dwindle
+bind = $mainMod, F, fullscreen
+
+# Window focus keybinds
+bind = $mainMod, left, movefocus, l
+bind = $mainMod, right, movefocus, r
+bind = $mainMod, up, movefocus, u
+bind = $mainMod, down, movefocus, d
+
+# Window size controls
+bind = $mainMod SHIFT, right, resizeactive, 100 0 # Increase window width with keyboard
+bind = $mainMod SHIFT, left, resizeactive, -100 0 # Reduce window width with keyboard
+bind = $mainMod SHIFT, down, resizeactive, 0 100 # Increase window height with keyboard
+bind = $mainMod SHIFT, up, resizeactive, 0 -100 # Reduce window height with keyboard
+
+# Window swapping controls
+bind = $mainMod CTRL, left, swapwindow, l
+bind = $mainMod CTRL, right, swapwindow, r
+bind = $mainMod CTRL, up, swapwindow, u
+bind = $mainMod CTRL, down, swapwindow, d
+
+# Window movement and size
+bindm = $mainMod, mouse:272, movewindow
+bindm = $mainMod, mouse:273, resizewindow
+
+# Workspace mouse keybinds
+bind = $mainMod, mouse_down, workspace, e+1
+bind = $mainMod, mouse_up, workspace, e-1
+
+# Workspace keybinds ($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
+
+# Workspace keybinds ($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
+
+# Function keys ( FN + F[1-12] )
+bindlu = , XF86MonBrightnessUp, exec, brightnessctl -q s +10%
+bindlu = , XF86MonBrightnessDown, exec, brightnessctl -q s 10%-
+bindlu = , XF86AudioRaiseVolume, exec, wpctl set-volume @DEFAULT_AUDIO_SINK@ 5%+
+bindlu = , XF86AudioLowerVolume, exec, wpctl set-volume @DEFAULT_AUDIO_SINK@ 5%-
+bindlu = , XF86AudioMute, exec, wpctl set-mute @DEFAULT_AUDIO_SINK@ toggle
+bindlu = , XF86AudioPlay, exec, playerctl -p cider,chromium,Kris___s_iPhone,OCbwoy3__s_iPhone,OCbwoy3___s_iPhone,cmus play-pause
+bindlu = , XF86AudioPause, exec, playerctl -p cider,chromium,Kris___s_iPhone,OCbwoy3__s_iPhone,OCbwoy3___s_iPhone,cmus pause
+bindlu = , XF86AudioNext, exec, playerctl -p cider,chromium,Kris___s_iPhone,OCbwoy3__s_iPhone,OCbwoy3___s_iPhone,cmus next
+bindlu = , XF86AudioPrev, exec, playerctl -p cider,chromium,Kris___s_iPhone,OCbwoy3__s_iPhone,OCbwoy3___s_iPhone,cmus previous
+bindlu = , XF86AudioMicMute, exec, pactl set-source-mute @DEFAULT_SOURCE@ toggle
+bindl = , XF86Lock, exec, pkill -USR1 hyprlock || hyprlock
diff --git a/config/hypr/config/keybindings/default.conf.hmbackup b/config/hypr/config/keybindings/default.conf.hmbackup
deleted file mode 100644
index 5fce6b8..0000000
--- a/config/hypr/config/keybindings/default.conf.hmbackup
+++ /dev/null
@@ -1,76 +0,0 @@
-# $mainMod was defined in variables.conf
-
-# Default keybinds
-bind = $mainMod, Q, exec, $terminal
-bind = $mainMod, C, killactive,
-bind = $mainMod, E, exec, $fileManager
-bind = $mainMod, V, togglefloating,
-bind = $mainMod, T, exec, $menu
-bind = $mainMod, A, exec, qs ipc call deltarune.shell toggleQuickSettings
-bind = $mainMod, Y, exec, $browser
-bind = $mainMod, P, pseudo, # dwindle
-bind = $mainMod, J, togglesplit, # dwindle
-bind = $mainMod, F, fullscreen
-
-# Window focus keybinds
-bind = $mainMod, left, movefocus, l
-bind = $mainMod, right, movefocus, r
-bind = $mainMod, up, movefocus, u
-bind = $mainMod, down, movefocus, d
-
-# Window size controls
-bind = $mainMod SHIFT, right, resizeactive, 100 0 # Increase window width with keyboard
-bind = $mainMod SHIFT, left, resizeactive, -100 0 # Reduce window width with keyboard
-bind = $mainMod SHIFT, down, resizeactive, 0 100 # Increase window height with keyboard
-bind = $mainMod SHIFT, up, resizeactive, 0 -100 # Reduce window height with keyboard
-
-# Window swapping controls
-bind = $mainMod CTRL, left, swapwindow, l
-bind = $mainMod CTRL, right, swapwindow, r
-bind = $mainMod CTRL, up, swapwindow, u
-bind = $mainMod CTRL, down, swapwindow, d
-
-# Window movement and size
-bindm = $mainMod, mouse:272, movewindow
-bindm = $mainMod, mouse:273, resizewindow
-
-# Workspace mouse keybinds
-bind = $mainMod, mouse_down, workspace, e+1
-bind = $mainMod, mouse_up, workspace, e-1
-
-# Workspace keybinds ($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
-
-# Workspace keybinds ($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
-
-# Function keys ( FN + F[1-12] )
-bindlu = , XF86MonBrightnessUp, exec, brightnessctl -q s +10%
-bindlu = , XF86MonBrightnessDown, exec, brightnessctl -q s 10%-
-bindlu = , XF86AudioRaiseVolume, exec, wpctl set-volume @DEFAULT_AUDIO_SINK@ 5%+
-bindlu = , XF86AudioLowerVolume, exec, wpctl set-volume @DEFAULT_AUDIO_SINK@ 5%-
-bindlu = , XF86AudioMute, exec, wpctl set-mute @DEFAULT_AUDIO_SINK@ toggle
-bindlu = , XF86AudioPlay, exec, playerctl -p cider,chromium,Kris___s_iPhone,OCbwoy3__s_iPhone,OCbwoy3___s_iPhone,cmus play-pause
-bindlu = , XF86AudioPause, exec, playerctl -p cider,chromium,Kris___s_iPhone,OCbwoy3__s_iPhone,OCbwoy3___s_iPhone,cmus pause
-bindlu = , XF86AudioNext, exec, playerctl -p cider,chromium,Kris___s_iPhone,OCbwoy3__s_iPhone,OCbwoy3___s_iPhone,cmus next
-bindlu = , XF86AudioPrev, exec, playerctl -p cider,chromium,Kris___s_iPhone,OCbwoy3__s_iPhone,OCbwoy3___s_iPhone,cmus previous
-bindlu = , XF86AudioMicMute, exec, pactl set-source-mute @DEFAULT_SOURCE@ toggle
-bindl = , XF86Lock, exec, pkill -USR1 hyprlock || hyprlock
diff --git a/config/hypr/config/keybindings/other.conf b/config/hypr/config/keybindings/other.conf
deleted file mode 120000
index 9b13bac..0000000
--- a/config/hypr/config/keybindings/other.conf
+++ /dev/null
@@ -1 +0,0 @@
-/nix/store/gf589vl2qg1qfciqy728pda0izimggdh-home-manager-files/.config/hypr/config/keybindings/other.conf
\ No newline at end of file
diff --git a/config/hypr/config/keybindings/other.conf b/config/hypr/config/keybindings/other.conf
new file mode 100644
index 0000000..e26f529
--- /dev/null
+++ b/config/hypr/config/keybindings/other.conf
@@ -0,0 +1,65 @@
+# Special workspace keybinds
+bind = $mainMod, Z, togglespecialworkspace, quick
+bind = $mainMod SHIFT, Z, movetoworkspace, special:quick
+
+bind = $mainMod, GRAVE, togglespecialworkspace, music
+bind = $mainMod SHIFT, GRAVE, movetoworkspace, special:music
+
+# Hot reload
+bind = $mainMod SHIFT, B, exec, bash /etc/nixos/scripts/hot-reload.sh
+
+# Wallpaper
+bind = $mainMod SHIFT, RETURN, exec, bash /etc/nixos/scripts/select-wallpaper.sh
+
+# Screenshot keybinds
+bindu = $mainMod SHIFT, PRINT, exec, bash /etc/nixos/scripts/screenshot-fullscreen.sh
+bind = $mainMod CTRL SHIFT, PRINT, exec, bash /etc/nixos/scripts/edit-last-screenshot.sh
+
+# Music Get Keybind
+
+# input:repeat_delay = 10
+bindelu = $mainMod, BACKSLASH, exec, bash /etc/nixos/scripts/whatsplaying.sh
+# bindrl = $mainMod, BACKSLASH, exec, bash ~/config/scripts/whatsplaying.sh rel
+
+# Global shit
+bind = ALT, F9, pass, class:^(com\.obsproject\.Studio)$
+
+# Music volume control
+bindl = $mainMod, XF86AudioRaiseVolume, exec, playerctl -p chromium,cmus,elisa,cider,spotify,Kris___s_iPhone,OCbwoy3__s_iPhone,OCbwoy3___s_iPhone volume 0.02+
+bindl = $mainMod, XF86AudioLowerVolume, exec, playerctl -p chromium,cmus,elisa,cider,spotify,Kris___s_iPhone,OCbwoy3__s_iPhone,OCbwoy3___s_iPhone volume 0.02-
+
+# Screen locker and logout keybinds
+bind = CTRL ALT, DELETE, exec, qs ipc call deltarune.shell togglePowerMenu
+bindl = SUPER SHIFT, L, exec, pkill -9 hyprlock || hyprlock
+
+# Group Stuff, complicated stuff. Enable if you dare!
+# bind = SUPER, M, togglegroup
+# bind = SUPER ALT, M, lockactivegroup, toggle
+# bind = $mainMod ALT, right, changegroupactive, f
+# bind = $mainMod ALT, down, changegroupactive, b
+# bind = $mainMod ALT, up, moveoutofgroup
+# bind = $mainMod CTRL ALT, left, moveintogroup, l
+# bind = $mainMod CTRL ALT, right, moveintogroup, r
+# bind = $mainMod CTRL ALT, up, moveintogroup, u
+# bind = $mainMod CTRL ALT, down, moveintogroup, d
+
+# zoom
+bindu = $mainMod SHIFT CTRL, mouse_down, exec, hyprctl keyword cursor:zoom_factor "$(hyprctl getoption cursor:zoom_factor | awk 'NR==1 {factor = $2; if (factor < 1) {factor = 1}; print factor * 1.25}')"
+bindu = $mainMod SHIFT CTRL, mouse_up, exec, hyprctl keyword cursor:zoom_factor "$(hyprctl getoption cursor:zoom_factor | awk 'NR==1 {factor = $2; if (factor < 1) {factor = 1}; print factor / 1.25}')"
+
+bind = $mainMod SHIFT, M, exec, bun run $HOME/config/scripts/bin/r2Upload.ts
+bind = $mainMod, F1, exec, bash $HOME/config/scripts/roblox-fullscreen.sh
+bind = $mainMod, F2, exec, bash -c "xdg-open roblox://"
+bind = $mainMod, F5, exec, notify-send -u critical "Hyprland" "Enabled debug overlay" && hyprctl keyword debug:overlay 1
+# bind = $mainMod SHIFT, F3, exec, bash -c "NIXPKGS_ALLOW_UNFREE=1 nix-shell -p osu-lazer-bin --command osu\!"
+
+bind = $mainMod CTRL SHIFT, F9, exec, bash $HOME/config/scripts/open-game.sh
+
+bind = $mainMod SHIFT, F, fullscreen, 1
+bind = $mainMod, SPACE, exec, bash $HOME/config/scripts/toggle-language.sh
+
+# VM Passtrough
+bind = $mainMod, Insert, submap, passthru
+submap = passthru
+bind = $mainMod, Escape, submap, reset
+submap = reset
diff --git a/config/hypr/config/keybindings/other.conf.hmbackup b/config/hypr/config/keybindings/other.conf.hmbackup
deleted file mode 100644
index 455fa24..0000000
--- a/config/hypr/config/keybindings/other.conf.hmbackup
+++ /dev/null
@@ -1,66 +0,0 @@
-# Special workspace keybinds
-bind = $mainMod, Z, togglespecialworkspace, quick
-bind = $mainMod SHIFT, Z, movetoworkspace, special:quick
-
-bind = $mainMod, GRAVE, togglespecialworkspace, music
-bind = $mainMod SHIFT, GRAVE, movetoworkspace, special:music
-
-# Hot reload
-bind = $mainMod SHIFT, B, exec, bash /etc/nixos/scripts/hot-reload.sh
-
-# Wallpaper
-bind = $mainMod SHIFT, RETURN, exec, bash /etc/nixos/scripts/select-wallpaper.sh
-
-# Screenshot keybinds
-bindu = $mainMod, PRINT, exec, bash /etc/nixos/scripts/screenshot-selection.sh
-bindu = $mainMod SHIFT, PRINT, exec, bash /etc/nixos/scripts/screenshot-fullscreen.sh
-bind = $mainMod CTRL SHIFT, PRINT, exec, bash /etc/nixos/scripts/edit-last-screenshot.sh
-
-# Music Get Keybind
-
-# input:repeat_delay = 10
-bindelu = $mainMod, BACKSLASH, exec, bash /etc/nixos/scripts/whatsplaying.sh
-# bindrl = $mainMod, BACKSLASH, exec, bash ~/config/scripts/whatsplaying.sh rel
-
-# Global shit
-bind = ALT, F9, pass, class:^(com\.obsproject\.Studio)$
-
-# Music volume control
-bindl = $mainMod, XF86AudioRaiseVolume, exec, playerctl -p chromium,cmus,elisa,cider,spotify,Kris___s_iPhone,OCbwoy3__s_iPhone,OCbwoy3___s_iPhone volume 0.02+
-bindl = $mainMod, XF86AudioLowerVolume, exec, playerctl -p chromium,cmus,elisa,cider,spotify,Kris___s_iPhone,OCbwoy3__s_iPhone,OCbwoy3___s_iPhone volume 0.02-
-
-# Screen locker and logout keybinds
-bind = CTRL ALT, DELETE, exec, qs ipc call deltarune.shell togglePowerMenu
-bindl = SUPER SHIFT, L, exec, pkill -9 hyprlock || hyprlock
-
-# Group Stuff, complicated stuff. Enable if you dare!
-# bind = SUPER, M, togglegroup
-# bind = SUPER ALT, M, lockactivegroup, toggle
-# bind = $mainMod ALT, right, changegroupactive, f
-# bind = $mainMod ALT, down, changegroupactive, b
-# bind = $mainMod ALT, up, moveoutofgroup
-# bind = $mainMod CTRL ALT, left, moveintogroup, l
-# bind = $mainMod CTRL ALT, right, moveintogroup, r
-# bind = $mainMod CTRL ALT, up, moveintogroup, u
-# bind = $mainMod CTRL ALT, down, moveintogroup, d
-
-# zoom
-bindu = $mainMod SHIFT CTRL, mouse_down, exec, hyprctl keyword cursor:zoom_factor "$(hyprctl getoption cursor:zoom_factor | awk 'NR==1 {factor = $2; if (factor < 1) {factor = 1}; print factor * 1.25}')"
-bindu = $mainMod SHIFT CTRL, mouse_up, exec, hyprctl keyword cursor:zoom_factor "$(hyprctl getoption cursor:zoom_factor | awk 'NR==1 {factor = $2; if (factor < 1) {factor = 1}; print factor / 1.25}')"
-
-bind = $mainMod SHIFT, M, exec, bun run $HOME/config/scripts/bin/r2Upload.ts
-bind = $mainMod, F1, exec, bash $HOME/config/scripts/roblox-fullscreen.sh
-bind = $mainMod, F2, exec, bash -c "xdg-open roblox://"
-bind = $mainMod, F5, exec, notify-send -u critical "Hyprland" "Enabled debug overlay" && hyprctl keyword debug:overlay 1
-# bind = $mainMod SHIFT, F3, exec, bash -c "NIXPKGS_ALLOW_UNFREE=1 nix-shell -p osu-lazer-bin --command osu\!"
-
-bind = $mainMod CTRL SHIFT, F9, exec, bash $HOME/config/scripts/open-game.sh
-
-bind = $mainMod SHIFT, F, fullscreen, 1
-bind = $mainMod, SPACE, exec, bash $HOME/config/scripts/toggle-language.sh
-
-# VM Passtrough
-bind = $mainMod, Insert, submap, passthru
-submap = passthru
-bind = $mainMod, Escape, submap, reset
-submap = reset
diff --git a/config/hypr/config/permissions.conf b/config/hypr/config/permissions.conf
deleted file mode 120000
index 47de36d..0000000
--- a/config/hypr/config/permissions.conf
+++ /dev/null
@@ -1 +0,0 @@
-/nix/store/gf589vl2qg1qfciqy728pda0izimggdh-home-manager-files/.config/hypr/config/permissions.conf
\ No newline at end of file
diff --git a/config/hypr/config/permissions.conf b/config/hypr/config/permissions.conf
new file mode 100644
index 0000000..2187be7
--- /dev/null
+++ b/config/hypr/config/permissions.conf
@@ -0,0 +1,29 @@
+ecosystem {
+	enforce_permissions = true
+}
+
+permission = /nix/store/[A-Za-z0-9]+\-(wrapped-)?(grim|hyprlock|xdg-desktop-portal-hyprland|obs-studio|hyprpicker)\-.*, screencopy, allow
+permission = /(usr/)?bin/(grim|hyprlock|xdg-desktop-portal-hyprland|obs-studio|hyprpicker), screencopy, allow
+permission = /run/current-system/sw/bin/(grim|hyprlock|xdg-desktop-portal-hyprland|obs-studio|hyprpicker), screencopy, allow
+permission = /usr/lib(exec)?/xdg-desktop-portal-hyprland, screencopy, allow
+
+permission = /usr/(bin|local/bin)/hyprpm, plugin, allow
+
+# hyprlang noerror true
+
+source = ~/config/.hyprfail.conf
+
+# hyprland noerror false
+
+
+# windowrulev2 = noscreenshare, class:^(equibop)$
+
+# /swedbank|checkout|billing/i
+# windowrulev2 = noscreenshare,title:.*([S|s]wedbank|[Cc]heckout|[Bb]illing).*
+
+windowrule = supressevent fullscreen,class:steam_proton,title:(Wine Desktop)
+windowrule = supressevent maximize,class:steam_proton,title:(Wine Desktop)
+windowrule = supressevent activate,class:steam_proton,title:(Wine Desktop)
+windowrule = supressevent activatefocus,class:steam_proton,title:(Wine Desktop)
+windowrule = supressevent fullscreenoutput,class:steam_proton,title:(Wine Desktop)
+# windowrule = pin,class:steam_proton
diff --git a/config/hypr/config/permissions.conf.hmbackup b/config/hypr/config/permissions.conf.hmbackup
deleted file mode 100644
index 2187be7..0000000
--- a/config/hypr/config/permissions.conf.hmbackup
+++ /dev/null
@@ -1,29 +0,0 @@
-ecosystem {
-	enforce_permissions = true
-}
-
-permission = /nix/store/[A-Za-z0-9]+\-(wrapped-)?(grim|hyprlock|xdg-desktop-portal-hyprland|obs-studio|hyprpicker)\-.*, screencopy, allow
-permission = /(usr/)?bin/(grim|hyprlock|xdg-desktop-portal-hyprland|obs-studio|hyprpicker), screencopy, allow
-permission = /run/current-system/sw/bin/(grim|hyprlock|xdg-desktop-portal-hyprland|obs-studio|hyprpicker), screencopy, allow
-permission = /usr/lib(exec)?/xdg-desktop-portal-hyprland, screencopy, allow
-
-permission = /usr/(bin|local/bin)/hyprpm, plugin, allow
-
-# hyprlang noerror true
-
-source = ~/config/.hyprfail.conf
-
-# hyprland noerror false
-
-
-# windowrulev2 = noscreenshare, class:^(equibop)$
-
-# /swedbank|checkout|billing/i
-# windowrulev2 = noscreenshare,title:.*([S|s]wedbank|[Cc]heckout|[Bb]illing).*
-
-windowrule = supressevent fullscreen,class:steam_proton,title:(Wine Desktop)
-windowrule = supressevent maximize,class:steam_proton,title:(Wine Desktop)
-windowrule = supressevent activate,class:steam_proton,title:(Wine Desktop)
-windowrule = supressevent activatefocus,class:steam_proton,title:(Wine Desktop)
-windowrule = supressevent fullscreenoutput,class:steam_proton,title:(Wine Desktop)
-# windowrule = pin,class:steam_proton
diff --git a/config/hypr/config/plugin.conf b/config/hypr/config/plugin.conf
deleted file mode 120000
index c0ae5fe..0000000
--- a/config/hypr/config/plugin.conf
+++ /dev/null
@@ -1 +0,0 @@
-/nix/store/gf589vl2qg1qfciqy728pda0izimggdh-home-manager-files/.config/hypr/config/plugin.conf
\ No newline at end of file
diff --git a/config/hypr/config/plugin.conf b/config/hypr/config/plugin.conf
new file mode 100644
index 0000000..aff08a9
--- /dev/null
+++ b/config/hypr/config/plugin.conf
@@ -0,0 +1,25 @@
+plugin:imgborders {
+    enabled = true
+    image = /etc/nixos/asset/thirdparty/deltarune/border.png
+    sizes = 52,52,52,52 # left, right, top, bottom
+    insets = 20,20,20,20 # left, right, top, bottom
+    # 16 16+8=24 16+4=20
+	# 1 = the same scale in deltarune
+	scale = 0.5
+    smooth = true
+    blur = false
+	noimgborders = true
+}
+
+plugin:dynamic-cursors {
+	enabled = false
+	mode = tilt
+	shake {
+		enabled = false
+	}
+	hyprcursor {
+		nearest = true
+		enabled = true
+		resolution = -12
+	}
+}
diff --git a/config/hypr/config/plugin.conf.hmbackup b/config/hypr/config/plugin.conf.hmbackup
deleted file mode 100644
index aff08a9..0000000
--- a/config/hypr/config/plugin.conf.hmbackup
+++ /dev/null
@@ -1,25 +0,0 @@
-plugin:imgborders {
-    enabled = true
-    image = /etc/nixos/asset/thirdparty/deltarune/border.png
-    sizes = 52,52,52,52 # left, right, top, bottom
-    insets = 20,20,20,20 # left, right, top, bottom
-    # 16 16+8=24 16+4=20
-	# 1 = the same scale in deltarune
-	scale = 0.5
-    smooth = true
-    blur = false
-	noimgborders = true
-}
-
-plugin:dynamic-cursors {
-	enabled = false
-	mode = tilt
-	shake {
-		enabled = false
-	}
-	hyprcursor {
-		nearest = true
-		enabled = true
-		resolution = -12
-	}
-}
diff --git a/config/hypr/config/rice/deltarune.conf b/config/hypr/config/rice/deltarune.conf
deleted file mode 120000
index 3caf6e8..0000000
--- a/config/hypr/config/rice/deltarune.conf
+++ /dev/null
@@ -1 +0,0 @@
-/nix/store/gf589vl2qg1qfciqy728pda0izimggdh-home-manager-files/.config/hypr/config/rice/deltarune.conf
\ No newline at end of file
diff --git a/config/hypr/config/rice/deltarune.conf b/config/hypr/config/rice/deltarune.conf
new file mode 100644
index 0000000..ddb509e
--- /dev/null
+++ b/config/hypr/config/rice/deltarune.conf
@@ -0,0 +1,51 @@
+exec-once = qs -p /etc/nixos/Shell/Startup
+
+layerrule {
+	name = deltarune qs
+	match:namespace = deltarune-quickshell
+	animation = slide top
+	above_lock = 2
+	order = -20
+	no_screen_share = off
+}
+
+layerrule {
+	name = deltarune qs dn
+	match:namespace = deltarune-quickshell-bottom
+	animation = slide bottom
+	above_lock = 2
+	order = -20
+	no_screen_share = off
+}
+
+layerrule {
+	name = deltarune qs db
+	match:namespace = deltarune-quickshell-dialogbox
+	animation = slide bottom
+	order = 100
+	above_lock = 2
+	order = -20
+	no_screen_share = off
+}
+
+bind = SUPER, A, global, deltarune:shell_open
+
+submap = deltarune
+
+bind = SUPER, A, global, deltarune:shell_close
+
+bind = , ESCAPE, global, deltarune:input_back
+bind = , Shift_L, global, deltarune:input_back
+bind = , Shift_R, global, deltarune:input_back
+bind = , X, global, deltarune:input_back
+
+bind = , Z, global, deltarune:input_enter
+bind = , ENTER, global, deltarune:input_enter
+bind = , RETURN, global, deltarune:input_enter
+
+bind = , UP, global, deltarune:input_up
+bind = , DOWN, global, deltarune:input_down
+bind = , LEFT, global, deltarune:input_left
+bind = , RIGHT, global, deltarune:input_right
+
+submap = reset
diff --git a/config/hypr/config/rice/deltarune.conf.hmbackup b/config/hypr/config/rice/deltarune.conf.hmbackup
deleted file mode 100644
index ddb509e..0000000
--- a/config/hypr/config/rice/deltarune.conf.hmbackup
+++ /dev/null
@@ -1,51 +0,0 @@
-exec-once = qs -p /etc/nixos/Shell/Startup
-
-layerrule {
-	name = deltarune qs
-	match:namespace = deltarune-quickshell
-	animation = slide top
-	above_lock = 2
-	order = -20
-	no_screen_share = off
-}
-
-layerrule {
-	name = deltarune qs dn
-	match:namespace = deltarune-quickshell-bottom
-	animation = slide bottom
-	above_lock = 2
-	order = -20
-	no_screen_share = off
-}
-
-layerrule {
-	name = deltarune qs db
-	match:namespace = deltarune-quickshell-dialogbox
-	animation = slide bottom
-	order = 100
-	above_lock = 2
-	order = -20
-	no_screen_share = off
-}
-
-bind = SUPER, A, global, deltarune:shell_open
-
-submap = deltarune
-
-bind = SUPER, A, global, deltarune:shell_close
-
-bind = , ESCAPE, global, deltarune:input_back
-bind = , Shift_L, global, deltarune:input_back
-bind = , Shift_R, global, deltarune:input_back
-bind = , X, global, deltarune:input_back
-
-bind = , Z, global, deltarune:input_enter
-bind = , ENTER, global, deltarune:input_enter
-bind = , RETURN, global, deltarune:input_enter
-
-bind = , UP, global, deltarune:input_up
-bind = , DOWN, global, deltarune:input_down
-bind = , LEFT, global, deltarune:input_left
-bind = , RIGHT, global, deltarune:input_right
-
-submap = reset
diff --git a/config/hypr/config/variables.conf b/config/hypr/config/variables.conf
deleted file mode 120000
index 7aad01d..0000000
--- a/config/hypr/config/variables.conf
+++ /dev/null
@@ -1 +0,0 @@
-/nix/store/gf589vl2qg1qfciqy728pda0izimggdh-home-manager-files/.config/hypr/config/variables.conf
\ No newline at end of file
diff --git a/config/hypr/config/variables.conf b/config/hypr/config/variables.conf
new file mode 100644
index 0000000..2035e87
--- /dev/null
+++ b/config/hypr/config/variables.conf
@@ -0,0 +1,47 @@
+# Keywords: https://wiki.hyprland.org/Configuring/Keywords
+
+# Default
+$mainMod = SUPER
+
+# Programs
+
+$terminal = kitty
+$fileManager = dolphin
+$menu = qs ipc call deltarune.shell toggleAppLauncher
+$browser = zen-beta
+
+# Cursor
+
+# RalseiCursors 24
+
+env = HYPRCURSOR_SIZE,24
+env = XCURSOR_THEME,RalseiCursors
+env = XCURSOR_SIZE,24
+
+# Toolkit Env
+
+env = GDK_BACKEND,wayland,x11,*
+env = QT_QPA_PLATFORM,wayland;xcb
+env = SDL_VIDEODRIVER,wayland
+env = CLUTTER_BACKEND,wayland
+
+# XDG Env
+
+env = XDG_CURRENT_DESKTOP,Hyprland
+env = XDG_SESSION_TYPE,wayland
+env = XDG_SESSION_DESKTOP,Hyprland
+
+# Qt Env
+
+env = QT_AUTO_SCREEN_SCALE_FACTOR,1
+env = QT_QPA_PLATFORM,wayland;xcb
+env = QT_WAYLAND_DISABLE_WINDOWDECORATION,1
+
+# NVIDIA Env
+
+env = LIBVA_DRIVER_NAME,nvidia
+env = XDG_SESSION_TYPE,wayland
+env = GBM_BACKEND,nvidia-drm
+env = __GLX_VENDOR_LIBRARY_NAME,nvidia
+
+env = NVD_BACKEND,direct
diff --git a/config/hypr/config/variables.conf.hmbackup b/config/hypr/config/variables.conf.hmbackup
deleted file mode 100644
index 2035e87..0000000
--- a/config/hypr/config/variables.conf.hmbackup
+++ /dev/null
@@ -1,47 +0,0 @@
-# Keywords: https://wiki.hyprland.org/Configuring/Keywords
-
-# Default
-$mainMod = SUPER
-
-# Programs
-
-$terminal = kitty
-$fileManager = dolphin
-$menu = qs ipc call deltarune.shell toggleAppLauncher
-$browser = zen-beta
-
-# Cursor
-
-# RalseiCursors 24
-
-env = HYPRCURSOR_SIZE,24
-env = XCURSOR_THEME,RalseiCursors
-env = XCURSOR_SIZE,24
-
-# Toolkit Env
-
-env = GDK_BACKEND,wayland,x11,*
-env = QT_QPA_PLATFORM,wayland;xcb
-env = SDL_VIDEODRIVER,wayland
-env = CLUTTER_BACKEND,wayland
-
-# XDG Env
-
-env = XDG_CURRENT_DESKTOP,Hyprland
-env = XDG_SESSION_TYPE,wayland
-env = XDG_SESSION_DESKTOP,Hyprland
-
-# Qt Env
-
-env = QT_AUTO_SCREEN_SCALE_FACTOR,1
-env = QT_QPA_PLATFORM,wayland;xcb
-env = QT_WAYLAND_DISABLE_WINDOWDECORATION,1
-
-# NVIDIA Env
-
-env = LIBVA_DRIVER_NAME,nvidia
-env = XDG_SESSION_TYPE,wayland
-env = GBM_BACKEND,nvidia-drm
-env = __GLX_VENDOR_LIBRARY_NAME,nvidia
-
-env = NVD_BACKEND,direct
diff --git a/config/hypr/hyprland.conf b/config/hypr/hyprland.conf
deleted file mode 120000
index bef0e03..0000000
--- a/config/hypr/hyprland.conf
+++ /dev/null
@@ -1 +0,0 @@
-/nix/store/gf589vl2qg1qfciqy728pda0izimggdh-home-manager-files/.config/hypr/hyprland.conf
\ No newline at end of file
diff --git a/config/hypr/hyprland.conf b/config/hypr/hyprland.conf
new file mode 100644
index 0000000..b29a4f9
--- /dev/null
+++ b/config/hypr/hyprland.conf
@@ -0,0 +1,26 @@
+exec-once = /nix/store/5gln2rkcjx93cr5x0rr3wqrxjdmshd2f-dbus-1.16.2/bin/dbus-update-activation-environment --systemd DISPLAY HYPRLAND_INSTANCE_SIGNATURE WAYLAND_DISPLAY XDG_CURRENT_DESKTOP XDG_SESSION_TYPE && systemctl --user stop hyprland-session.target && systemctl --user start hyprland-session.target
+source=/nix/store/mjbgcv2gizslspivcnr7bpqi7igrs75z-catppuccin-hyprland-0-unstable-2024-06-19/mocha.conf
+source=/nix/store/24vli1vbac3n0lrf5bz3dh4m57zg9dls-hyprland-blue-accent.conf
+# https://wiki.hyprland.org/Configuring/Configuring-Hyprland/
+
+exec-once = hyprctl notify 1 5000 0 " Hyprland!!"
+
+exec-once = systemctl --user import-environment WAYLAND_DISPLAY XDG_CURRENT_DESKTOP
+exec-once = dbus-update-activation-environment --systemd WAYLAND_DISPLAY XDG_CURRENT_DESKTOP
+exec-once = dbus-update-activation-environment DISPLAY WAYLAND_DISPLAY
+
+source = ~/.config/hypr/config/variables.conf
+source = ~/.config/hypr/config/display.conf
+source = ~/.config/hypr/config/input.conf
+source = ~/.config/hypr/config/keybindings/default.conf
+source = ~/.config/hypr/config/keybindings/other.conf
+source = ~/.config/hypr/config/autoexec.conf
+source = ~/.config/hypr/config/permissions.conf
+
+source = ~/.config/hypr/config/rice/deltarune.conf
+
+# hyprlang noerror true
+
+source = ~/.config/hypr/config/plugin.conf
+
+# hyprlang noerror false
diff --git a/config/hypr/hyprland.conf.hmbackup b/config/hypr/hyprland.conf.hmbackup
deleted file mode 100644
index b29a4f9..0000000
--- a/config/hypr/hyprland.conf.hmbackup
+++ /dev/null
@@ -1,26 +0,0 @@
-exec-once = /nix/store/5gln2rkcjx93cr5x0rr3wqrxjdmshd2f-dbus-1.16.2/bin/dbus-update-activation-environment --systemd DISPLAY HYPRLAND_INSTANCE_SIGNATURE WAYLAND_DISPLAY XDG_CURRENT_DESKTOP XDG_SESSION_TYPE && systemctl --user stop hyprland-session.target && systemctl --user start hyprland-session.target
-source=/nix/store/mjbgcv2gizslspivcnr7bpqi7igrs75z-catppuccin-hyprland-0-unstable-2024-06-19/mocha.conf
-source=/nix/store/24vli1vbac3n0lrf5bz3dh4m57zg9dls-hyprland-blue-accent.conf
-# https://wiki.hyprland.org/Configuring/Configuring-Hyprland/
-
-exec-once = hyprctl notify 1 5000 0 " Hyprland!!"
-
-exec-once = systemctl --user import-environment WAYLAND_DISPLAY XDG_CURRENT_DESKTOP
-exec-once = dbus-update-activation-environment --systemd WAYLAND_DISPLAY XDG_CURRENT_DESKTOP
-exec-once = dbus-update-activation-environment DISPLAY WAYLAND_DISPLAY
-
-source = ~/.config/hypr/config/variables.conf
-source = ~/.config/hypr/config/display.conf
-source = ~/.config/hypr/config/input.conf
-source = ~/.config/hypr/config/keybindings/default.conf
-source = ~/.config/hypr/config/keybindings/other.conf
-source = ~/.config/hypr/config/autoexec.conf
-source = ~/.config/hypr/config/permissions.conf
-
-source = ~/.config/hypr/config/rice/deltarune.conf
-
-# hyprlang noerror true
-
-source = ~/.config/hypr/config/plugin.conf
-
-# hyprlang noerror false
diff --git a/config/hypr/hyprlock.conf b/config/hypr/hyprlock.conf
deleted file mode 120000
index 84e2a10..0000000
--- a/config/hypr/hyprlock.conf
+++ /dev/null
@@ -1 +0,0 @@
-/nix/store/gf589vl2qg1qfciqy728pda0izimggdh-home-manager-files/.config/hypr/hyprlock.conf
\ No newline at end of file
diff --git a/config/hypr/hyprlock.conf b/config/hypr/hyprlock.conf
new file mode 100644
index 0000000..c76e5f8
--- /dev/null
+++ b/config/hypr/hyprlock.conf
@@ -0,0 +1,40 @@
+# GENERAL
+general {
+  no_fade_in = true
+  no_fade_out = true
+  disable_loading_bar = false
+  hide_cursor = false
+  ignore_empty_input = true
+  immediate_render = false
+  text_trim = true
+}
+
+#BACKGROUND
+background {
+    monitor =
+    color = rgba(0,0,0,0) 
+    # path = ~/Pictures/Wallpapers/israel.png # definetly not a picture of kris and ralsei kissing!!
+}
+
+input-field {
+    monitor =
+    size = 250, 60
+    outline_thickness = 0
+    dots_size = 0.1 # Scale of input-field height, 0.2 - 0.8
+    dots_spacing = 1 # Scale of dots' absolute size, 0.0 - 1.0
+    dots_center = true
+    inner_color = rgba(0, 0, 0, 0)
+	check_color = rgba(0, 0, 0, 0)
+    fail_color = rgba(0, 0, 0, 0)
+    font_color = rgb(255, 0, 255)
+    fade_on_empty = false
+    font_family = Symbols Nerd Font, SF Pro Display
+    placeholder_text = Session locked, enter password to unlock!
+    hide_input = false
+    fail_text = wrong password mf
+    position = 0, -30
+    halign = center
+    valign = top
+    zindex = 10
+}
+
diff --git a/config/hypr/hyprlock.conf.hmbackup b/config/hypr/hyprlock.conf.hmbackup
deleted file mode 100644
index c76e5f8..0000000
--- a/config/hypr/hyprlock.conf.hmbackup
+++ /dev/null
@@ -1,40 +0,0 @@
-# GENERAL
-general {
-  no_fade_in = true
-  no_fade_out = true
-  disable_loading_bar = false
-  hide_cursor = false
-  ignore_empty_input = true
-  immediate_render = false
-  text_trim = true
-}
-
-#BACKGROUND
-background {
-    monitor =
-    color = rgba(0,0,0,0) 
-    # path = ~/Pictures/Wallpapers/israel.png # definetly not a picture of kris and ralsei kissing!!
-}
-
-input-field {
-    monitor =
-    size = 250, 60
-    outline_thickness = 0
-    dots_size = 0.1 # Scale of input-field height, 0.2 - 0.8
-    dots_spacing = 1 # Scale of dots' absolute size, 0.0 - 1.0
-    dots_center = true
-    inner_color = rgba(0, 0, 0, 0)
-	check_color = rgba(0, 0, 0, 0)
-    fail_color = rgba(0, 0, 0, 0)
-    font_color = rgb(255, 0, 255)
-    fade_on_empty = false
-    font_family = Symbols Nerd Font, SF Pro Display
-    placeholder_text = Session locked, enter password to unlock!
-    hide_input = false
-    fail_text = wrong password mf
-    position = 0, -30
-    halign = center
-    valign = top
-    zindex = 10
-}
-
diff --git a/config/hypr/hyprpaper.conf b/config/hypr/hyprpaper.conf
deleted file mode 120000
index f1c03ce..0000000
--- a/config/hypr/hyprpaper.conf
+++ /dev/null
@@ -1 +0,0 @@
-/nix/store/gf589vl2qg1qfciqy728pda0izimggdh-home-manager-files/.config/hypr/hyprpaper.conf
\ No newline at end of file
diff --git a/config/hypr/hyprpaper.conf b/config/hypr/hyprpaper.conf
new file mode 100644
index 0000000..883d33f
--- /dev/null
+++ b/config/hypr/hyprpaper.conf
@@ -0,0 +1,5 @@
+preload = ~/.config/hypr/wallpaper.png
+wallpaper = ,~/.config/hypr/wallpaper.png
+
+# preload = ~/.cache/.wallpaper
+# wallpaper = ,~/.cache/.wallpaper
diff --git a/config/hypr/hyprpaper.conf.hmbackup b/config/hypr/hyprpaper.conf.hmbackup
deleted file mode 100644
index 883d33f..0000000
--- a/config/hypr/hyprpaper.conf.hmbackup
+++ /dev/null
@@ -1,5 +0,0 @@
-preload = ~/.config/hypr/wallpaper.png
-wallpaper = ,~/.config/hypr/wallpaper.png
-
-# preload = ~/.cache/.wallpaper
-# wallpaper = ,~/.cache/.wallpaper
diff --git a/config/hypr/wallpaper.png b/config/hypr/wallpaper.png
deleted file mode 120000
index 9175115..0000000
--- a/config/hypr/wallpaper.png
+++ /dev/null
@@ -1 +0,0 @@
-/nix/store/gf589vl2qg1qfciqy728pda0izimggdh-home-manager-files/.config/hypr/wallpaper.png
\ No newline at end of file
diff --git a/config/hypr/wallpaper.png b/config/hypr/wallpaper.png
new file mode 100644
index 0000000..43444e5
Binary files /dev/null and b/config/hypr/wallpaper.png differ
diff --git a/config/hypr/wallpaper.png.hmbackup b/config/hypr/wallpaper.png.hmbackup
deleted file mode 100644
index 43444e5..0000000
Binary files a/config/hypr/wallpaper.png.hmbackup and /dev/null differ
diff --git a/config/hypr/xdph.conf b/config/hypr/xdph.conf
deleted file mode 120000
index 484dc1d..0000000
--- a/config/hypr/xdph.conf
+++ /dev/null
@@ -1 +0,0 @@
-/nix/store/gf589vl2qg1qfciqy728pda0izimggdh-home-manager-files/.config/hypr/xdph.conf
\ No newline at end of file
diff --git a/config/hypr/xdph.conf b/config/hypr/xdph.conf
new file mode 100644
index 0000000..16b6f97
--- /dev/null
+++ b/config/hypr/xdph.conf
@@ -0,0 +1,4 @@
+screencopy {
+    max_fps = 240
+	allow_token_by_default = true
+}
diff --git a/config/hypr/xdph.conf.hmbackup b/config/hypr/xdph.conf.hmbackup
deleted file mode 100644
index 16b6f97..0000000
--- a/config/hypr/xdph.conf.hmbackup
+++ /dev/null
@@ -1,4 +0,0 @@
-screencopy {
-    max_fps = 240
-	allow_token_by_default = true
-}
diff --git a/config/xdg-desktop-portal/hyprland-portals.conf b/config/xdg-desktop-portal/hyprland-portals.conf
deleted file mode 120000
index e239a3b..0000000
--- a/config/xdg-desktop-portal/hyprland-portals.conf
+++ /dev/null
@@ -1 +0,0 @@
-/nix/store/gf589vl2qg1qfciqy728pda0izimggdh-home-manager-files/.config/xdg-desktop-portal/hyprland-portals.conf
\ No newline at end of file
diff --git a/config/xdg-desktop-portal/hyprland-portals.conf.hmbackup b/config/xdg-desktop-portal/hyprland-portals.conf.hmbackup
deleted file mode 100644
index 24fec34..0000000
--- a/config/xdg-desktop-portal/hyprland-portals.conf.hmbackup
+++ /dev/null
@@ -1,2 +0,0 @@
-[preferred]
-default = hyprland
diff --git a/hosts/default/configuration.nix b/hosts/default/configuration.nix
index e9cda04..9802fda 100644
--- a/hosts/default/configuration.nix
+++ b/hosts/default/configuration.nix
@@ -217,6 +217,36 @@ in {
 			};
 		};
 
+		wayland.windowManager.hyprland = {
+			enable = true;
+			package = null;
+			portalPackage = null;
+			systemd.enable = true;
+			plugins = [];
+			extraConfig = builtins.readFile ../../config/hypr/hyprland.conf;
+		};
+
+		home.file.".config/hypr/config" = {
+			source = ../../config/hypr/config;
+			recursive = true;
+		};
+
+		home.file.".config/hypr/hyprlock.conf" = {
+			source = ../../config/hypr/hyprlock.conf;
+		};
+
+		home.file.".config/hypr/hyprpaper.conf" = {
+			source = ../../config/hypr/hyprpaper.conf;
+		};
+
+		home.file.".config/hypr/wallpaper.png" = {
+			source = ../../config/hypr/wallpaper.png;
+		};
+
+		home.file.".config/hypr/xdph.conf" = {
+			source = ../../config/hypr/xdph.conf;
+		};
+
 		home.file.".local/share/fonts/DotfilesFont.otf" = {
 			source = ../../config/dotfile_deps/DotfilesFont.otf;
 		};
diff --git a/hosts/default/other/activate.nix b/hosts/default/other/activate.nix
index ad7f228..221d0a0 100644
--- a/hosts/default/other/activate.nix
+++ b/hosts/default/other/activate.nix
@@ -24,21 +24,4 @@
 		'';
 	};
 
-	system.activationScripts.linkDotConfigChildren = {
-		text = ''
-			config_root=/etc/nixos/config
-			target_root=/home/kris/.config
-
-			mkdir -p "$target_root"
-
-			for src in "$config_root"/*; do
-				name=$(basename "$src")
-				dst="$target_root/$name"
-				rm -rf "$dst"
-				ln -s "$src" "$dst"
-				chown -h kris:users "$dst"
-			done
-		'';
-	};
-
 }