diff --git a/config/keymaps.nix b/config/keymaps.nix
index 636f5e76..29fec466 100644
--- a/config/keymaps.nix
+++ b/config/keymaps.nix
@@ -336,7 +336,27 @@
       action = "mzJ`z";
       options = {
         silent = true;
-        desc = "Allow cursor to stay in the same place after appending to current line ";
+        desc = "Allow cursor to stay in the same place after appeding to current line";
+      };
+    }
+
+    {
+      mode = "v";
+      key = "<";
+      action = "<gv";
+      options = {
+        silent = true;
+        desc = "Indent while remaining in visual mode.";
+      };
+    }
+
+    {
+      mode = "v";
+      key = ">";
+      action = ">gv";
+      options = {
+        silent = true;
+        desc = "Indent while remaining in visual mode.";
       };
     }
 
@@ -346,7 +366,7 @@
       action = "<C-d>zz";
       options = {
         silent = true;
-        desc = "Allow C-d and C-u to keep the cursor in the middle";
+        desc = "Allow <C-d> and <C-u> to keep the cursor in the middle";
       };
     }
 
@@ -359,6 +379,31 @@
       };
     }
 
+    # Remap for dealing with word wrap and adding jumps to the jumplist.
+    {
+      mode = "n";
+      key = "j";
+      action.__raw = "
+        [[(v:count > 1 ? 'm`' . v:count : 'g') . 'j']]
+      ";
+      options = {
+        expr = true;
+        desc = "Remap for dealing with word wrap and adding jumps to the jumplist.";
+      };
+    }
+
+    {
+      mode = "n";
+      key = "k";
+      action.__raw = "
+        [[(v:count > 1 ? 'm`' . v:count : 'g') . 'k']]
+      ";
+      options = {
+        expr = true;
+        desc = "Remap for dealing with word wrap and adding jumps to the jumplist.";
+      };
+    }
+
     {
       mode = "n";
       key = "n";
@@ -433,27 +478,44 @@
     }
   ];
   extraConfigLua = ''
+    local notify = require("notify")
+
+    local function show_notification(message, level)
+      notify(message, level, { title = "conform.nvim" })
+    end
+
     function ToggleLineNumber()
     if vim.wo.number then
       vim.wo.number = false
+      show_notification("Line numbers disabled", "info")
     else
       vim.wo.number = true
         vim.wo.relativenumber = false
+        show_notification("Line numbers enabled", "info")
         end
         end
 
         function ToggleRelativeLineNumber()
         if vim.wo.relativenumber then
           vim.wo.relativenumber = false
+          show_notification("Relative line numbers disabled", "info")
         else
           vim.wo.relativenumber = true
             vim.wo.number = false
-            end
-            end
+            show_notification("Relative line numbers enabled", "info")
+          end
+        end
 
-            function ToggleWrap()
-            vim.wo.wrap = not vim.wo.wrap
-            end
+        function ToggleWrap()
+          if vim.wo.wrap then
+            vim.wo.wrap = false
+            show_notification("Wrap disabled", "info")
+          else
+            vim.wo.wrap = true
+              vim.wo.number = false
+              show_notification("Wrap enabled", "info")
+          end
+        end
 
     if vim.lsp.inlay_hint then
       vim.keymap.set(
diff --git a/config/lsp/conform.nix b/config/lsp/conform.nix
index c5326eca..37cfd93d 100644
--- a/config/lsp/conform.nix
+++ b/config/lsp/conform.nix
@@ -18,6 +18,36 @@
     };
   };
 
+  keymaps = [
+    {
+      mode = "n";
+      key = "<leader>uf";
+      action = ":FormatToggle<CR>";
+      options = {
+        desc = "Toggle Format";
+        silent = true;
+      };
+    }
+    {
+      mode = [ "n" "v" ];
+      key = "<leader>cf";
+      action = "<cmd>lua require('conform').format()<cr>";
+      options = {
+        silent = true;
+        desc = "Format Buffer";
+      };
+    }
+    {
+      mode = "v";
+      key = "<leader>cF";
+      action = "<cmd>lua vim.lsp.buf.format()<cr>";
+      options = {
+        silent = true;
+        desc = "Format Lines";
+      };
+    }
+  ];
+
   extraConfigLua = ''
     local conform = require("conform")
     local notify = require("notify")
@@ -57,27 +87,5 @@
       desc = "Toggle autoformat-on-save",
       bang = true,
     })
-
   '';
-
-  keymaps = [
-    {
-      mode = "n";
-      key = "<leader>uf";
-      action = ":FormatToggle<CR>";
-      options = {
-        desc = "Toggle Format";
-        silent = true;
-      };
-    }
-    {
-      mode = [ "n" "v" ];
-      key = "<leader>cf";
-      action = "<cmd>lua require('conform').format()<cr>";
-      options = {
-        silent = true;
-        desc = "Format";
-      };
-    }
-  ];
 }
diff --git a/config/sets.nix b/config/sets.nix
index e64ac12e..23777191 100644
--- a/config/sets.nix
+++ b/config/sets.nix
@@ -9,7 +9,7 @@
       number = true;
       relativenumber = true;
 
-      # Set tabs to 2 spaces 
+      # Set tabs to 2 spaces
       tabstop = 2;
       softtabstop = 2;
       showtabline = 2;
@@ -53,7 +53,7 @@
       backup = false;
       undofile = true;
 
-      # Enable 24-bit colors 
+      # Enable 24-bit colors
       termguicolors = true;
 
       # Enable the sign column to prevent the screen from jumping
@@ -106,6 +106,8 @@
       # Maximum number of items to show in the popup menu (0 means "use available screen space")
       pumheight = 0;
 
+      # Use conform-nvim for gq formatting. ('formatexpr' is set to vim.lsp.formatexpr(), so you can format lines via gq if the language server supports it)
+      formatexpr = "v:lua.require'conform'.formatexpr()";
     };
 
     extraConfigLua = ''
diff --git a/flake.lock b/flake.lock
index d4cb3180..c67ff637 100644
--- a/flake.lock
+++ b/flake.lock
@@ -103,11 +103,11 @@
         ]
       },
       "locked": {
-        "lastModified": 1706955260,
-        "narHash": "sha256-W3y0j77IDVbmbajudHoUr46RpswujUCl+D5Vru53UsI=",
+        "lastModified": 1707467182,
+        "narHash": "sha256-/Bw/xgCXfj4nXDd8Xq+r1kaorfsYkkomMf5w5MpsDyA=",
         "owner": "nix-community",
         "repo": "home-manager",
-        "rev": "880d9bc2110f7cae59698f715b8ca42cdc53670c",
+        "rev": "5b9156fa9a8b8beba917b8f9adbfd27bf63e16af",
         "type": "github"
       },
       "original": {
@@ -139,11 +139,11 @@
     },
     "nixpkgs": {
       "locked": {
-        "lastModified": 1707588924,
-        "narHash": "sha256-0e1ce6X5ghapv6cAF9rxLZKeNyFHHXsLbGxN2cQQE8U=",
+        "lastModified": 1707619277,
+        "narHash": "sha256-vKnYD5GMQbNQyyQm4wRlqi+5n0/F1hnvqSQgaBy4BqY=",
         "owner": "NixOS",
         "repo": "nixpkgs",
-        "rev": "10b813040df67c4039086db0f6eaf65c536886c6",
+        "rev": "f3a93440fbfff8a74350f4791332a19282cc6dc8",
         "type": "github"
       },
       "original": {
@@ -153,11 +153,11 @@
     },
     "nixpkgs_2": {
       "locked": {
-        "lastModified": 1706732774,
-        "narHash": "sha256-hqJlyJk4MRpcItGYMF+3uHe8HvxNETWvlGtLuVpqLU0=",
+        "lastModified": 1707268954,
+        "narHash": "sha256-2en1kvde3cJVc3ZnTy8QeD2oKcseLFjYPLKhIGDanQ0=",
         "owner": "NixOS",
         "repo": "nixpkgs",
-        "rev": "b8b232ae7b8b144397fdb12d20f592e5e7c1a64d",
+        "rev": "f8e2ebd66d097614d51a56a755450d4ae1632df1",
         "type": "github"
       },
       "original": {
@@ -176,11 +176,11 @@
         "pre-commit-hooks": "pre-commit-hooks"
       },
       "locked": {
-        "lastModified": 1707677596,
-        "narHash": "sha256-+xMTYbWXBu0Sek8rjKuXAL3mBLgTp1Bcwp4i1XRBJwo=",
+        "lastModified": 1707691286,
+        "narHash": "sha256-yZ8KzUBAo0xMk683krioF/YPr0StrN32kkDYArfrrOs=",
         "owner": "nix-community",
         "repo": "nixvim",
-        "rev": "30bc345dee03d933af184f63056ab2ee9864d37f",
+        "rev": "f44d117d59117e55c4ddf1837e5eb65eeda2f135",
         "type": "github"
       },
       "original": {
@@ -204,11 +204,11 @@
         ]
       },
       "locked": {
-        "lastModified": 1706424699,
-        "narHash": "sha256-Q3RBuOpZNH2eFA1e+IHgZLAOqDD9SKhJ/sszrL8bQD4=",
+        "lastModified": 1707297608,
+        "narHash": "sha256-ADjo/5VySGlvtCW3qR+vdFF4xM9kJFlRDqcC9ZGI8EA=",
         "owner": "cachix",
         "repo": "pre-commit-hooks.nix",
-        "rev": "7c54e08a689b53c8a1e5d70169f2ec9e2a68ffaf",
+        "rev": "0db2e67ee49910adfa13010e7f012149660af7f0",
         "type": "github"
       },
       "original": {