diff --git a/hosts/desktop/default.nix b/hosts/desktop/default.nix
index 9a27aef..8bee2b9 100644
--- a/hosts/desktop/default.nix
+++ b/hosts/desktop/default.nix
@@ -26,11 +26,22 @@
       efiSysMountPoint = "/boot";
     };
     grub = {
+      enable = true;
       devices = [ "nodev" ];
       efiSupport = true;
-      enable = true;
-      useOSProber = true;
+      useOSProber = false;
       extraEntries = ''
+        menuentry 'Windows Boot Manager (on /dev/sda2)' --class windows --class os $menuentry_id_option 'osprober-efi-6877-BD74' {
+            insmod part_gpt
+            insmod fat
+            set root='hd0,gpt2'
+            if [ x$feature_platform_search_hint = xy ]; then
+              search --no-floppy --fs-uuid --set=root --hint-bios=hd0,gpt2 --hint-efi=hd0,gpt2 --hint-baremetal=ahci0,gpt2  6877-BD74
+            else
+              search --no-floppy --fs-uuid --set=root 6877-BD74
+            fi
+            chainloader /efi/Microsoft/Boot/bootmgfw.efi
+        }
     '';
     };
   };
diff --git a/modules/neovim.nix b/modules/neovim.nix
index 7ac54d4..06f019f 100644
--- a/modules/neovim.nix
+++ b/modules/neovim.nix
@@ -2,6 +2,12 @@
 let
 in
 {
+
+  home.packages = with pkgs; [
+    # Required clipboard provider
+    xclip
+  ];
+
   programs.nixvim = {
     enable = true;
     viAlias = true;
@@ -9,6 +15,7 @@ in
 
     globals = {
       mapleader = " ";
+      clipboard = "unnamedplus";
     };
 
     options = {
diff --git a/modules/emacs.nix b/modules/old/emacs.nix
similarity index 100%
rename from modules/emacs.nix
rename to modules/old/emacs.nix
diff --git a/modules/monad-module.nix b/modules/old/monad-module.nix
similarity index 100%
rename from modules/monad-module.nix
rename to modules/old/monad-module.nix
diff --git a/modules/old-neovim.nix b/modules/old/old-neovim.nix
similarity index 100%
rename from modules/old-neovim.nix
rename to modules/old/old-neovim.nix
diff --git a/modules/urxvt.nix b/modules/old/urxvt.nix
similarity index 100%
rename from modules/urxvt.nix
rename to modules/old/urxvt.nix
diff --git a/users/nixolas.nix b/users/nixolas.nix
index 56a8923..1bb8966 100644
--- a/users/nixolas.nix
+++ b/users/nixolas.nix
@@ -23,8 +23,8 @@ in
         #../modules/emacs.nix
         ../modules/fusuma.nix
         ../modules/git.nix
-        ../modules/rofi.nix
         ../modules/neovim.nix
+        ../modules/rofi.nix
         ../modules/wezterm.nix
         ../modules/xdg.nix
         ../modules/zsh.nix