diff --git a/modules/home/cli/default.nix b/modules/home/cli/default.nix
index fd325b1..36db5ab 100644
--- a/modules/home/cli/default.nix
+++ b/modules/home/cli/default.nix
@@ -11,6 +11,10 @@
     screensaver.timeout = lib.pantheon.mkStrOption;
     screensaver.command = lib.pantheon.mkStrOption;
     editor = lib.pantheon.mkStrOption;
+    nvf.snippets = lib.mkOption {
+      type = lib.types.listOf lib.types.attrs;
+      default = { };
+    };
     file-browser = lib.pantheon.mkStrOption;
     multiplexer = lib.pantheon.mkStrOption;
     fetch = lib.pantheon.mkStrOption;
diff --git a/modules/home/cli/editor/nvf/default.nix b/modules/home/cli/editor/nvf/default.nix
index c3cd7a7..408b1d1 100644
--- a/modules/home/cli/editor/nvf/default.nix
+++ b/modules/home/cli/editor/nvf/default.nix
@@ -9,6 +9,7 @@
       enable = true;
       settings.vim = {
         hideSearchHighlight = true;
+        searchCase = "ignore";
         undoFile.enable = true;
         fzf-lua.enable = true;
         git.enable = true;
@@ -20,9 +21,11 @@
         keymaps = import ./keymaps.nix;
         languages = import ./languages.nix;
         lsp = import ./lsp.nix;
-
+        navigation = import ./navigation.nix;
+        notes = import ./notes.nix;
         options = import ./options.nix;
         notify = import ./notify.nix;
+        snippets = import ./snippets.nix;
         utility = import ./utility.nix;
         visuals = import ./visuals.nix;
       };
diff --git a/modules/home/cli/editor/nvf/navigation.nix b/modules/home/cli/editor/nvf/navigation.nix
new file mode 100644
index 0000000..a664c27
--- /dev/null
+++ b/modules/home/cli/editor/nvf/navigation.nix
@@ -0,0 +1,5 @@
+{
+  harpoon = {
+    enable = true;
+  };
+}
diff --git a/modules/home/cli/editor/nvf/notes.nix b/modules/home/cli/editor/nvf/notes.nix
new file mode 100644
index 0000000..3f80024
--- /dev/null
+++ b/modules/home/cli/editor/nvf/notes.nix
@@ -0,0 +1,3 @@
+{
+  todo-comments.enable = true;
+}
diff --git a/modules/home/cli/editor/nvf/notify.nix b/modules/home/cli/editor/nvf/notify.nix
index 0db3279..2c63c08 100644
--- a/modules/home/cli/editor/nvf/notify.nix
+++ b/modules/home/cli/editor/nvf/notify.nix
@@ -1,3 +1,2 @@
 {
-
 }
diff --git a/modules/home/cli/editor/nvf/options.nix b/modules/home/cli/editor/nvf/options.nix
index bbeed6f..de49804 100644
--- a/modules/home/cli/editor/nvf/options.nix
+++ b/modules/home/cli/editor/nvf/options.nix
@@ -4,5 +4,6 @@
   expandtab = true;
   tabstop = 2;
   shiftwidth = 2;
+  updatetime = 0;
   backspace = "indent,eol,start";
 }
diff --git a/modules/home/cli/editor/nvf/snippets.nix b/modules/home/cli/editor/nvf/snippets.nix
new file mode 100644
index 0000000..d23871f
--- /dev/null
+++ b/modules/home/cli/editor/nvf/snippets.nix
@@ -0,0 +1,6 @@
+{
+  luasnip = {
+    enable = true;
+    setupOpts.enable_autosnippets = true;
+  };
+}
diff --git a/modules/home/cli/editor/nvf/visuals.nix b/modules/home/cli/editor/nvf/visuals.nix
index 3982421..65a8d5c 100644
--- a/modules/home/cli/editor/nvf/visuals.nix
+++ b/modules/home/cli/editor/nvf/visuals.nix
@@ -1,6 +1,7 @@
 {
   indent-blankline.enable = true;
   fidget-nvim.enable = true;
+  fidget-nvim.setupOpts.notification.override_vim_notify = true;
   nvim-cursorline.enable = true;
   nvim-web-devicons.enable = true;
   rainbow-delimiters.enable = true;
diff --git a/modules/nixos/hardware/nvidia.nix b/modules/nixos/hardware/nvidia.nix
index 327c0f2..ed9898a 100644
--- a/modules/nixos/hardware/nvidia.nix
+++ b/modules/nixos/hardware/nvidia.nix
@@ -6,7 +6,6 @@
 }:
 {
   config = lib.mkIf (config.hardware.gpu == "nvidia") {
-    #TODO: Setup CUDA
     hardware.graphics.enable = true;
     hardware.graphics.extraPackages = with pkgs; [
       nvidia-vaapi-driver