Readd vim

6 files changed, 94 insertions, 4 deletions

diff --git a/home-manager/modules/apps/default.nix b/home-manager/modules/apps/default.nix
index b4ba1f0..ac45032 100644
--- a/home-manager/modules/apps/default.nix
+++ b/home-manager/modules/apps/default.nix
@@ -18,6 +18,7 @@ with lib;
 	unzip 
 	unrar
 	xdg-user-dirs
+	zsh
 
 	# Do i need this? 
 	php 
diff --git a/home-manager/modules/apps/desktop/default.nix b/home-manager/modules/apps/desktop/default.nix
index b070444..82f8d27 100644
--- a/home-manager/modules/apps/desktop/default.nix
+++ b/home-manager/modules/apps/desktop/default.nix
@@ -25,6 +25,7 @@
     mpv
     openttd
     anki-bin
+    vesktop
 
     #Theme  
     qt6Packages.qt6ct
diff --git a/home-manager/modules/apps/nvim/default.nix b/home-manager/modules/apps/nvim/default.nix
index 0505f78..366cdf0 100644
--- a/home-manager/modules/apps/nvim/default.nix
+++ b/home-manager/modules/apps/nvim/default.nix
@@ -1,4 +1,92 @@
-{pkgs, ...}:
+{ pkgs, config, ...}:
+let 
+  treesitterWithGrammars = (pkgs.vimPlugins.nvim-treesitter.withPlugins (p : [
+    p.bash 
+    p.comment
+    p.css 
+    p.dockerfile
+    p.gitattributes 
+    p.gitignore
+    p.go
+    p.gomod
+    p.gowork
+    p.rust 
+    p.javascript 
+    p.typescript
+    p.json5
+    p.json
+    p.lua
+    p.markdown
+    p.nix
+    p.python 
+    p.java 
+    p.rust
+    p.toml 
+    p.vue 
+    p.yaml
+    p.php
+    p.latex 
+  ]));
+  treesitter-parsers = pkgs.symlinkJoin {
+    name = "treesitter-parsers";
+    paths = treesitterWithGrammars.dependencies;
+  };
+
+in 
 {
-  # TODO 
+  programs.neovim = {
+    enable = true; 
+     defaultEditor = true;
+     viAlias = true; 
+     vimAlias = true; 
+  #   vimdiffAlias = true;
+  #   # withPython3 = false; 
+  #   # withNodeJs = false; 
+  #   # withRuby = false; 
+  #
+     coc.enable = false; 
+  # 
+     plugins = [
+      treesitterWithGrammars
+     ];
+  };
+
+  home.file."./.config/nvim/lua/wilkuu/init.lua".text = ''
+    require("wilkuu.set")
+    require("wilkuu.remap")
+  '';
+  #vim.opt.runtimepath:append("${treesitter-parsers}")
+
+  home.file."./.config/nvim/lua/wilkuu/nix.lua".text = ''
+    return {
+      vue_ts_plugin = "/home/wilkuu/.npm/@vue/typescript-plugin",
+    } 
+  '';
+
+
+  # home.file."./.local/share/nvim/nix/nvim-treesitter/" = {
+  #   source = treesitterWithGrammars; 
+  #   recursive = true; 
+  # };
+
+  home.sessionPath = [
+    "/home/wilkuu/.npm/bin/"
+  ]; 
+
+  home.packages = with pkgs; [
+    lua
+    lua-language-server
+    gopls 
+    go
+    typescript
+    nodejs_22 
+    rustup
+    nixd 
+    nixfmt-rfc-style 
+    pyright
+    nodePackages.intelephense
+    texlive.combined.scheme-full
+    texlab
+  ];
+
 }
diff --git a/home-manager/modules/default.nix b/home-manager/modules/default.nix
index 040dee8..9ea5563 100644
--- a/home-manager/modules/default.nix
+++ b/home-manager/modules/default.nix
@@ -3,6 +3,6 @@ with lib;
 {
   imports = [
     ./apps
-    #./service
+    ./services
   ]; 
 }
diff --git a/home-manager/modules/services/default.nix b/home-manager/modules/services/default.nix
index a0f8310..5ac3f6a 100644
--- a/home-manager/modules/services/default.nix
+++ b/home-manager/modules/services/default.nix
@@ -1,3 +1,3 @@
 {lib, ...}: {
-   imports = [ ./syncthing.nix]; 
+   imports = [ ./syncthing.nix ];
 } 
diff --git a/home-manager/modules/services/syncthing.nix  b/home-manager/modules/services/syncthing.nix
index f917d86..f917d86 100644
--- a/home-manager/modules/services/syncthing.nix 
+++ b/home-manager/modules/services/syncthing.nix