diff --git a/modules/home/nvim.nix b/modules/home/nvim.nix
index e0b493f..9289483 100644
--- a/modules/home/nvim.nix
+++ b/modules/home/nvim.nix
@@ -1,7 +1,28 @@
-{ 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 fa19aea..316be83 100644
--- a/modules/home/packages.nix
+++ b/modules/home/packages.nix
@@ -1,10 +1,4 @@
-{
-  inputs,
-  lib,
-  pkgs,
-  config,
-  ...
-}:
+{ pkgs, ... }:
 {
   home.packages = with pkgs; [
     # Environment shit
@@ -80,11 +74,6 @@
     #   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 4aa8f2e..0fb401b 100644
--- a/modules/home/packages.server.nix
+++ b/modules/home/packages.server.nix
@@ -1,4 +1,4 @@
-{ inputs, pkgs, ... }:
+{ pkgs, ... }:
 {
   home.packages = with pkgs; [
     vimv
@@ -27,7 +27,5 @@
     wget
     xxd
     borgbackup
-    inputs.alejandra.defaultPackage.${pkgs.stdenv.hostPlatform.system}
-    inputs.nixvim.packages.${pkgs.stdenv.hostPlatform.system}.default
   ];
 }