diff --git a/flake.nix b/flake.nix
index 1f1a684..55e7ffa 100644
--- a/flake.nix
+++ b/flake.nix
@@ -83,11 +83,12 @@
       mercury = nixpkgs.lib.nixosSystem {
         specialArgs = {
           host = "mercury";
-          inherit self inputs username;
+          inherit self inputs scheme wallpaper username;
         };
         modules = [
           ./hosts/laptop
           stylix.nixosModules.stylix
+					nixvim.nixosModules.nixvim
           nur.nixosModules.nur
         ];
       };
@@ -99,6 +100,7 @@
         };
         modules = [
           ./hosts/installer
+					nixvim.nixosModules.nixvim
         ];
       };
     };
diff --git a/hosts/installer/default.nix b/hosts/installer/default.nix
index 6b633d3..d36d0c6 100644
--- a/hosts/installer/default.nix
+++ b/hosts/installer/default.nix
@@ -8,8 +8,8 @@
 	extraFigletFonts = pkgs.fetchFromGitHub {
       owner = "xero";
       repo = "figlet-fonts";
-      rev = "master"; 
-      sha256 = "sha256-dAs7N66D2Fpy4/UB5Za1r2qb1iSAJR6TMmau1asxgtY="; 
+      rev = "master";
+      sha256 = "sha256-dAs7N66D2Fpy4/UB5Za1r2qb1iSAJR6TMmau1asxgtY=";
 	};
 	toilet-extrafonts = pkgs.toilet.overrideAttrs (oldAttrs: {
 		buildInputs = oldAttrs.buildInputs or [] ++ [extraFigletFonts];
@@ -23,7 +23,6 @@
 in {
   imports = [
     "${modulesPath}/installer/cd-dvd/installation-cd-minimal.nix"
-		../../modules/sys/software/nixvim
   ];
   nixpkgs.hostPlatform = "x86_64-linux";
   system.stateVersion = "24.05";
diff --git a/modules/home/environment/waybar/settings.nix b/modules/home/environment/waybar/settings.nix
index 350aed4..a129c80 100644
--- a/modules/home/environment/waybar/settings.nix
+++ b/modules/home/environment/waybar/settings.nix
@@ -1,4 +1,5 @@
 {
+host,
 ...
 }:
 # Grocery list:
@@ -20,17 +21,25 @@ let
         "5" = "五";
         "6" = "六";
       };
-      persistent-workspaces = {
+      persistent-workspaces = if (host == "oganesson") then {
         "HDMI-A-1" = [ 1 2 3 ];
         "DP-1" = [ 4 5 6 ];
+      } else {
+        "eDP-1" = [ 1 2 3 4 ];
       };
   };
+  monitors = if (host == "oganesson") then [
+    "DP-1"
+    "HDMI-A-1"
+  ] else [
+    "eDP-1"
+  ];
 
 in
 {
   programs.waybar.settings.mainBar = {
     layer = "bottom";
-    output = "DP-1";
+    output = builtins.elemAt monitors 0;
     position = "top";
     name = "mainBar";
     margin-left = 8;
@@ -149,6 +158,7 @@ in
 
     clock = {
       format = "{:%I:%M %p}";
+      tooltip = false;
     };
 
 
@@ -158,7 +168,7 @@ in
 
   programs.waybar.settings.sideBar = {
     layer = "bottom";
-    output = "HDMI-A-1";
+    output = if (host == "oganesson") then builtins.elemAt monitors 1 else "";
     position = "right";
     margin-top = 8;
     margin-right = 5;
diff --git a/modules/sys/software/nixvim/plugins/extra_plugins.nix b/modules/sys/software/nixvim/plugins/extra_plugins.nix
index 225f5ee..534c717 100644
--- a/modules/sys/software/nixvim/plugins/extra_plugins.nix
+++ b/modules/sys/software/nixvim/plugins/extra_plugins.nix
@@ -11,15 +11,6 @@
           hash = "sha256-Upx29rIPwW/e7Lkmf0PNOpIACnAXIzlkfa6V1p2nYHM=";
         };
       })
-      (pkgs.vimUtils.buildVimPlugin {
-        name = "vim-markdown";
-        src = pkgs.fetchFromGitHub {
-          owner = "preservim";
-          repo = "vim-markdown";
-          rev = "8f6cb3a6ca4e3b6bcda0730145a0b700f3481b51";
-          hash = "sha256-ZCCSjZ5Xok4rnIwfa4VUEaz6d3oW9066l0EkoqiTppM=";
-        };
-      })
       (pkgs.vimUtils.buildVimPlugin {
         name = "vim-sneak";
         src = pkgs.fetchFromGitHub {