diff --git a/machines/desktop/default.nix b/machines/desktop/default.nix
index 28a6ea5..11196be 100644
--- a/machines/desktop/default.nix
+++ b/machines/desktop/default.nix
@@ -1,7 +1 @@
-{ pkgs, lib, config, ... }:
-
-{
-  import = [
-    ./.
-  ];
-}
+{ imports = ./.; }
diff --git a/modules/template.nix b/modules/default.nix
similarity index 100%
rename from modules/template.nix
rename to modules/default.nix
diff --git a/modules/nvim/default.nix b/modules/nvim/default.nix
new file mode 100644
index 0000000..bfe45d7
--- /dev/null
+++ b/modules/nvim/default.nix
@@ -0,0 +1,30 @@
+{ pkgs, lib, config, ... }:
+
+with lib;
+let cfg = config.modules.neovim;
+
+    github-theme = pkgs.vimUtils.buildVimPlugin {
+      name = "github-theme";
+      src = pkgs.fetchFromGithub {
+        owner = "projekt0n";
+        repo = "github-nvim-theme";
+        rev = "62b7b54a90c70c20cd1641f9facfced46bdd3561";
+        sha256 = "0cwr3b5r2ac7aizxmwb3mlhdc2sh0pw670vcwps79x9jp52yrj2y";
+      };
+    };
+in {
+    options.modules.neovim = { enable = mkEnableOption "neovim"; };
+    config = mkIf cfg.enable {
+      
+      home.file.".config/nvim" = {
+        source = ./nvim;
+        recursive = true;
+      };
+      
+      home.packages = with pkgs; [
+        nil nixfmt
+        sumneko-lua-language-server stylua
+        haskell-language-server hlint
+      ];
+    };
+}
diff --git a/modules/nvim/nvim.nix b/modules/nvim/nvim.nix
deleted file mode 100644
index e69de29..0000000