diff --git a/env/.config/hypr/autostart.conf b/env/.config/hypr/hyprautostart.conf
similarity index 100%
rename from env/.config/hypr/autostart.conf
rename to env/.config/hypr/hyprautostart.conf
diff --git a/env/.config/hypr/env.conf b/env/.config/hypr/hyprenv.conf
similarity index 100%
rename from env/.config/hypr/env.conf
rename to env/.config/hypr/hyprenv.conf
diff --git a/env/.config/hypr/input.conf b/env/.config/hypr/hyprinput.conf
similarity index 100%
rename from env/.config/hypr/input.conf
rename to env/.config/hypr/hyprinput.conf
diff --git a/env/.config/hypr/keybinds.conf b/env/.config/hypr/hyprkeybinds.conf
similarity index 100%
rename from env/.config/hypr/keybinds.conf
rename to env/.config/hypr/hyprkeybinds.conf
diff --git a/env/.config/hypr/hyprland.conf b/env/.config/hypr/hyprland.conf
index 6666576..df632e9 100644
--- a/env/.config/hypr/hyprland.conf
+++ b/env/.config/hypr/hyprland.conf
@@ -6,12 +6,12 @@
 # Refer to the wiki for more information.
 # https://wiki.hyprland.org/Configuring/
 
-source = ~/.config/hypr/env.conf
-source = ~/.config/hypr/monitors.conf
-source = ~/.config/hypr/windows.conf
-source = ~/.config/hypr/keybinds.conf
-source = ~/.config/hypr/input.conf
-source = ~/.config/hypr/autostart.conf
+source = ~/.config/hypr/hyprenv.conf
+source = ~/.config/hypr/hyprmonitors.conf
+source = ~/.config/hypr/hyprwindows.conf
+source = ~/.config/hypr/hyprkeybinds.conf
+source = ~/.config/hypr/hyprinput.conf
+source = ~/.config/hypr/hyprautostart.conf
 
 #####################
 ### LOOK AND FEEL ###
diff --git a/env/.config/hypr/monitors.conf b/env/.config/hypr/hyprmonitors.conf
similarity index 100%
rename from env/.config/hypr/monitors.conf
rename to env/.config/hypr/hyprmonitors.conf
diff --git a/env/.config/hypr/windows.conf b/env/.config/hypr/hyprwindows.conf
similarity index 100%
rename from env/.config/hypr/windows.conf
rename to env/.config/hypr/hyprwindows.conf
diff --git a/env/.config/hypr/workspaces.conf b/env/.config/hypr/hyprworkspaces.conf
similarity index 100%
rename from env/.config/hypr/workspaces.conf
rename to env/.config/hypr/hyprworkspaces.conf
diff --git a/env/.config/nvim/init.lua b/env/.config/nvim/init.lua
index 6a6941f..09d4654 100644
--- a/env/.config/nvim/init.lua
+++ b/env/.config/nvim/init.lua
@@ -30,11 +30,17 @@ require("oil").setup()
 
 -- Set color scheme
 vim.cmd([[colorscheme catppuccin-mocha]])
+vim.cmd(":hi statusline guibg=NONE")
 vim.cmd [[set completeopt+=menuone,noselect,popup]]
 
 -- LSP
 vim.lsp.enable({
-	"lua_ls", "tinymist", "marksman"
+	"lua_ls", "tinymist", "marksman", "bashls", "hyprls",
+})
+
+vim.lsp.config('bashls', {
+	filetypes = { "bash", "sh", "zsh" },
+	cmd = { 'bash-language-server', 'start' },
 })
 
 -- Fix warnings for 'vim' global keyword.
@@ -42,7 +48,9 @@ vim.lsp.config("lua_ls", {
 	settings = {
 		Lua = {
 			workspace = {
-				library = vim.api.nvim_get_runtime_file("", true),
+				library = {
+					vim.api.nvim_get_runtime_file("", true),
+				},
 			},
 		},
 	},
@@ -53,8 +61,11 @@ local map = vim.keymap.set
 
 map('n', '<leader>e', ':Oil<CR>')
 map('n', '<leader>f', ':Pick files tool="git"<CR>')
+map('n', '<leader>h', ':Pick help<CR>')
 map('n', '<leader>lf', vim.lsp.buf.format)
 map('n', '<leader>o', ':update<CR> :source<CR>')
+map('n', '<leader>q', ':quit<CR>')
+map('n', '<leader>w', ':write<CR>')
 
 -- Auto commands.
 local defaultopts = { clear = true }
@@ -118,3 +129,15 @@ vim.api.nvim_create_autocmd('LspAttach', {
 		end
 	end,
 })
+
+-- Hyprlang LSP
+vim.api.nvim_create_autocmd({ 'BufEnter', 'BufWinEnter' }, {
+	pattern = { "*.hl", "hypr*.conf" },
+	callback = function(event)
+		vim.lsp.start {
+			name = "hyprlang",
+			cmd = { "hyprls" },
+			root_dir = vim.fn.getcwd(),
+		}
+	end
+})