diff --git a/home-manager/firefox.nix b/home-manager/firefox.nix
index 134d588..ff4d3df 100644
--- a/home-manager/firefox.nix
+++ b/home-manager/firefox.nix
@@ -25,7 +25,10 @@
         youtube-high-definition
         shinigami-eyes
       ];
-      search.force = "ddg"; # Set search engine to DuckDuckGo
+      search = {
+        default = "ddg"; # Set search engine to DuckDuckGo
+        force = true; # Prevents annoying error when rebuilding
+      };
       settings = {
         "browser.search.region" = "GB";
         "browser.search.isUS" = false;
diff --git a/home-manager/nvf.nix b/home-manager/nvf.nix
index 1f44fe0..ba5b52c 100644
--- a/home-manager/nvf.nix
+++ b/home-manager/nvf.nix
@@ -33,44 +33,23 @@
           markdown.enable = true;
           java.enable = true;
         };
-        autocomplete.nvim-cmp.enable = true;
+        autocomplete.blink-cmp.enable = true;
         startPlugins = with pkgs.vimPlugins; [
           vimwiki
         ];
-	# the following doesnt seem to work, i fear i may have to properly package vimwiki but i dont want to do that right now so i will come back later
-#        luaConfigRC = ''
-#
-#	  -- set vimwiki settings that I want
-#          set nocompatible
-#          filetype plugin on
-#          syntax on
-#
-#          let g:vimwiki_list = [{'path': '~/Notes/',
-#                                \ 'syntax': 'markdown', 'ext': 'md'}]
-#          let g:vimwiki_global_ext = 0
-#        ''; # Required settings for vimwiki
+        # the following doesnt seem to work, i fear i may have to properly package vimwiki but i dont want to do that right now so i will come back later
+        #        luaConfigRC = ''
+        #
+        #	  -- set vimwiki settings that I want
+        #          set nocompatible
+        #          filetype plugin on
+        #          syntax on
+        #
+        #          let g:vimwiki_list = [{'path': '~/Notes/',
+        #                                \ 'syntax': 'markdown', 'ext': 'md'}]
+        #          let g:vimwiki_global_ext = 0
+        #        ''; # Required settings for vimwiki
       };
     };
   };
-
-  # Pulls stylix base16 colours into nvf for use in the vim theme.
-  # This works for colours generated from the wallpaper, colours set manually and colours pulled from a base16Scheme yaml file.
-  programs.nvf.settings.vim.theme.base16-colors = {
-    base00 = "${config.lib.stylix.colors.base00}";
-    base01 = "${config.lib.stylix.colors.base01}";
-    base02 = "${config.lib.stylix.colors.base02}";
-    base03 = "${config.lib.stylix.colors.base03}";
-    base04 = "${config.lib.stylix.colors.base04}";
-    base05 = "${config.lib.stylix.colors.base05}";
-    base06 = "${config.lib.stylix.colors.base06}";
-    base07 = "${config.lib.stylix.colors.base07}";
-    base08 = "${config.lib.stylix.colors.base08}";
-    base09 = "${config.lib.stylix.colors.base09}";
-    base0A = "${config.lib.stylix.colors.base0A}";
-    base0B = "${config.lib.stylix.colors.base0B}";
-    base0C = "${config.lib.stylix.colors.base0C}";
-    base0D = "${config.lib.stylix.colors.base0D}";
-    base0E = "${config.lib.stylix.colors.base0E}";
-    base0F = "${config.lib.stylix.colors.base0F}";
-  };
 }
diff --git a/home-manager/stylix.nix b/home-manager/stylix.nix
index c55590b..117891c 100644
--- a/home-manager/stylix.nix
+++ b/home-manager/stylix.nix
@@ -11,7 +11,6 @@
     polarity = "dark";
     targets = {
       firefox.profileNames = ["blue"];
-      nvf.enable = false; # This was added after I had nvf already set up to pull theme from stylix, and the two don't work together so I am leaving this disabled for now
     };
   };
 }