diff --git a/.gitignore b/.gitignore
index ae639be..fbac185 100644
--- a/.gitignore
+++ b/.gitignore
@@ -4,3 +4,4 @@ config/nvim/undodir
 config/qtile/__pycache__
 etc/nixos/hardware-configuration.nix
 nixos/hardware-configuration.nix
+config/nvim/nvim
diff --git a/config/niri/config.kdl b/config/niri/config.kdl
index d71cd0e..3c55536 100644
--- a/config/niri/config.kdl
+++ b/config/niri/config.kdl
@@ -209,7 +209,7 @@ binds {
     Mod+Shift+R { switch-preset-window-height; }
     Mod+Ctrl+R { reset-window-height; }
     Mod+W { maximize-column; }
-    Mod+Q { fullscreen-window; }
+    Mod+Shift+W { fullscreen-window; }
 
     Mod+Ctrl+F { expand-column-to-available-width; }
     Mod+C { center-column; }
diff --git a/config/nvim/init.lua b/config/nvim/init.lua
index 6407906..e4d01e0 100644
--- a/config/nvim/init.lua
+++ b/config/nvim/init.lua
@@ -1,7 +1,6 @@
 require("plugins/lazy")
 require("plugins/lsp")
 require("plugins/lualine")
-require("plugins/nvim-cursorline")
 require("plugins/nvim-tree")
 require("plugins/telescope")
 require("plugins/treesitter")
diff --git a/config/nvim/lazy-lock.json b/config/nvim/lazy-lock.json
index de9d811..6409153 100644
--- a/config/nvim/lazy-lock.json
+++ b/config/nvim/lazy-lock.json
@@ -6,8 +6,9 @@
   "cmp-path": { "branch": "main", "commit": "c6635aae33a50d6010bf1aa756ac2398a2d54c32" },
   "cmp-spell": { "branch": "master", "commit": "694a4e50809d6d645c1ea29015dad0c293f019d6" },
   "cmp-vsnip": { "branch": "main", "commit": "989a8a73c44e926199bfd05fa7a516d51f2d2752" },
+  "comfy-line-numbers.nvim": { "branch": "main", "commit": "31e2f9287b4491ad72defb9e0185eb2739983799" },
   "gruvbox.nvim": { "branch": "main", "commit": "5e0a460d8e0f7f669c158dedd5f9ae2bcac31437" },
-  "lazy.nvim": { "branch": "main", "commit": "db067881fff0fd4be8c00e5bde7492e0e1c77a2f" },
+  "lazy.nvim": { "branch": "main", "commit": "202d8e92b3a74ac88eb3a7f1e40fb59b4c2a6535" },
   "lsp_signature.nvim": { "branch": "master", "commit": "d50e40b3bf9324128e71b0b7e589765ce89466d2" },
   "lualine.nvim": { "branch": "master", "commit": "a94fc68960665e54408fe37dcf573193c4ce82c9" },
   "mason.nvim": { "branch": "main", "commit": "8024d64e1330b86044fed4c8494ef3dcd483a67c" },
@@ -16,8 +17,8 @@
   "none-ls.nvim": { "branch": "main", "commit": "db2a48b79cfcdab8baa5d3f37f21c78b6705c62e" },
   "nvim-autopairs": { "branch": "master", "commit": "4d74e75913832866aa7de35e4202463ddf6efd1b" },
   "nvim-cmp": { "branch": "main", "commit": "b5311ab3ed9c846b585c0c15b7559be131ec4be9" },
-  "nvim-cursorline": { "branch": "main", "commit": "804f0023692653b2b2368462d67d2a87056947f9" },
   "nvim-lspconfig": { "branch": "master", "commit": "77d3fdfb3554632c7a3b101ded643d422de7626f" },
+  "nvim-numbertoggle": { "branch": "main", "commit": "923f9709989605fe2bc4b9de8a3625fa808f5cd6" },
   "nvim-tree.lua": { "branch": "master", "commit": "1c733e8c1957dc67f47580fe9c458a13b5612d5b" },
   "nvim-treesitter": { "branch": "master", "commit": "42fc28ba918343ebfd5565147a42a26580579482" },
   "nvim-web-devicons": { "branch": "master", "commit": "1fb58cca9aebbc4fd32b086cb413548ce132c127" },
diff --git a/config/nvim/lua/config.lua b/config/nvim/lua/config.lua
index a3f813f..4a6e620 100644
--- a/config/nvim/lua/config.lua
+++ b/config/nvim/lua/config.lua
@@ -13,8 +13,6 @@ cfg.smartindent = true
 cfg.number = true
 cfg.relativenumber = true
 
-cfg.conceallevel = 2
-
 cfg.fillchars = "eob: "
 
 g.loaded_netrw = 1
diff --git a/config/nvim/lua/plugins/lazy/plugins.lua b/config/nvim/lua/plugins/lazy/plugins.lua
index 822a6c2..408b7a5 100644
--- a/config/nvim/lua/plugins/lazy/plugins.lua
+++ b/config/nvim/lua/plugins/lazy/plugins.lua
@@ -17,7 +17,6 @@ return {
 			"nvim-lualine/lualine.nvim",
 			dependencies = { "nvim-tree/nvim-web-devicons" },
 		},
-		"yamatsum/nvim-cursorline",
 		{
 			"folke/todo-comments.nvim",
 			dependencies = { "nvim-lua/plenary.nvim" },
@@ -75,5 +74,7 @@ return {
 			},
 			opts = {},
 		},
+		"sitiom/nvim-numbertoggle",
+		"mluders/comfy-line-numbers.nvim",
 	},
 }
diff --git a/config/nvim/lua/plugins/nvim-cursorline/init.lua b/config/nvim/lua/plugins/nvim-cursorline/init.lua
deleted file mode 100644
index cb3b797..0000000
--- a/config/nvim/lua/plugins/nvim-cursorline/init.lua
+++ /dev/null
@@ -1,14 +0,0 @@
-local curline = require('nvim-cursorline')
-
-curline.setup{
-    cursorline = {
-        enable = true,
-        timeout = 1000,
-        number = false,
-      },
-      cursorword = {
-        enable = true,
-        min_length = 3,
-        hl = { underline = true },
-      }
-}
\ No newline at end of file
diff --git a/config/nvim/lua/plugins/render-markdown/init.lua b/config/nvim/lua/plugins/render-markdown/init.lua
index 1b69c14..ab078ce 100644
--- a/config/nvim/lua/plugins/render-markdown/init.lua
+++ b/config/nvim/lua/plugins/render-markdown/init.lua
@@ -1,5 +1,3 @@
--- Credits to https://raw.githubusercontent.com/BreadOnPenguins/nvim/refs/heads/master/lua/plugins/render-markdown.lua
-
 require("render-markdown").setup({
 	link = {
 		-- Turn on / off inline link icon rendering.
diff --git a/config/rofi/gruvbox.rasi b/config/rofi/gruvbox.rasi
index 68a20b5..c4dbc39 100644
--- a/config/rofi/gruvbox.rasi
+++ b/config/rofi/gruvbox.rasi
@@ -49,7 +49,7 @@
 }
 
 configuration {
-    font: "MapleMono 13";
+    font: "JetBrainsMono Nerd Font 13";
     show-icons: true;
 }
 
diff --git a/config/waybar/config.jsonc b/config/waybar/config.jsonc
index 79767e9..b0d7b01 100644
--- a/config/waybar/config.jsonc
+++ b/config/waybar/config.jsonc
@@ -1,6 +1,6 @@
 {
-    "position": "top",
-    "layer": "top",
+    "position": "bottom",
+    "layer": "bottom",
     "modules-left": [
         "niri/workspaces",
         "niri/mode",
diff --git a/config/waybar/style.css b/config/waybar/style.css
index 1f8c4ca..20a3430 100644
--- a/config/waybar/style.css
+++ b/config/waybar/style.css
@@ -23,7 +23,7 @@
 
 window#waybar {
     background: @background;
-    border-bottom: 2px solid @surface0;
+    border-top: 2px solid @surface0;
 }
 
 #disk,