diff --git a/modules/core/default-server.nix b/modules/core/default-server.nix
index 29b1e15..25b122a 100644
--- a/modules/core/default-server.nix
+++ b/modules/core/default-server.nix
@@ -1,14 +1,13 @@
 { ... }:
 {
   imports =
-    [ (import ./bootloader.nix) ]
+       [ (import ./bootloader.nix) ]
     ++ [ (import ./hardware.nix) ]
     ++ [ (import ./network.nix) ]
-    ++ [ (import ./nvim.nix) ]
     ++ [ (import ./program.nix) ]
     ++ [ (import ./security.nix) ]
     ++ [ (import ./services.nix) ]
     ++ [ (import ./system.nix) ]
     ++ [ (import ./user.nix) ];
-  # ++ [ (import ./virtualization.nix) ];
+    # ++ [ (import ./virtualization.nix) ];
 }
diff --git a/modules/home/nvim.nix b/modules/home/nvim.nix
index 9289483..e0b493f 100644
--- a/modules/home/nvim.nix
+++ b/modules/home/nvim.nix
@@ -1,28 +1,7 @@
+{ pkgs, ... }:
 {
-  lib,
-  config,
-  pkgs,
-  inputs,
-  ...
-}:
-{
-  # Nixvim is being used for this
   programs.neovim = {
     enable = false;
     vimAlias = false;
   };
-  xdg.mimeApps.defaultApplications = lib.mkIf config.xdg.mimeApps.enable {
-    "text/markdown" = "nvim.desktop";
-    "text/html" = "nvim.desktop";
-    "text/xml" = "nvim.desktop";
-    "text/plain" = "nvim.desktop";
-    "text/x-shellscript" = "nvim.desktop";
-  };
-
-  home.packages = with pkgs; [
-    inputs.alejandra.defaultPackage.${pkgs.stdenv.hostPlatform.system}
-    inputs.nixvim.packages.${pkgs.stdenv.hostPlatform.system}.default # import config from github:ahwxorg/nixvim-config
-    mermaid-cli
-    gnuplot
-  ];
 }
diff --git a/modules/home/packages.nix b/modules/home/packages.nix
index 316be83..fa19aea 100644
--- a/modules/home/packages.nix
+++ b/modules/home/packages.nix
@@ -1,4 +1,10 @@
-{ pkgs, ... }:
+{
+  inputs,
+  lib,
+  pkgs,
+  config,
+  ...
+}:
 {
   home.packages = with pkgs; [
     # Environment shit
@@ -74,6 +80,11 @@
     #   pip install --user --break-system-packages <package>
     # '')
 
+    inputs.alejandra.defaultPackage.${pkgs.stdenv.hostPlatform.system}
+    inputs.nixvim.packages.${pkgs.stdenv.hostPlatform.system}.default
+    mermaid-cli
+    gnuplot
+
     # Email/calendar/etc
     neomutt
     w3m
diff --git a/modules/home/packages.server.nix b/modules/home/packages.server.nix
index 0fb401b..4aa8f2e 100644
--- a/modules/home/packages.server.nix
+++ b/modules/home/packages.server.nix
@@ -1,4 +1,4 @@
-{ pkgs, ... }:
+{ inputs, pkgs, ... }:
 {
   home.packages = with pkgs; [
     vimv
@@ -27,5 +27,7 @@
     wget
     xxd
     borgbackup
+    inputs.alejandra.defaultPackage.${pkgs.stdenv.hostPlatform.system}
+    inputs.nixvim.packages.${pkgs.stdenv.hostPlatform.system}.default
   ];
 }