9 Commits 43c3451aeb ... f4afce80c4

Author SHA1 Message Date
  Thomas Dy f4afce80c4 nixpkgs/neovim: add typescript compiler 2 months ago
  Thomas Dy 0668e432fd nixpkgs/neovim: open quickfix window after Make 2 months ago
  Thomas Dy ad0f930cd7 git: sort branches by last committed 2 months ago
  Thomas Dy bbb6a81292 git: use newer diff options 2 months ago
  Thomas Dy 66e4010624 nixpkgs/neovim: use treesitter for indentation 2 months ago
  Thomas Dy 43c3451aeb nixpkgs/neovim: open quickfix window after Make 2 months ago
  Thomas Dy ef1a97b4c4 git: sort branches by last committed 2 months ago
  Thomas Dy b50be72152 git: use newer diff options 2 months ago
  Thomas Dy dac86cf1e7 nixpkgs/neovim: use treesitter for indentation 2 months ago

+ 6 - 2
.config/nixpkgs/neovim/neovim.nix

@@ -88,8 +88,8 @@ let
       let g:loaded_node_provider = 0
       let g:loaded_perl_provider = 0
 
-      set runtimepath^=${placeholder "out"}/lib
-      set packpath^=${placeholder "out"}/lib
+      set runtimepath=${placeholder "out"}/lib,$VIMRUNTIME
+      set packpath=${placeholder "out"}/lib
 
       ${initText}
     '';
@@ -107,6 +107,10 @@ let
         ln -s "${p}" "lib/pack/nixpkgs/start/${lib.getName p}"
       '') enabledPlugins}
 
+      # copy in overrides
+      mkdir -p lib/pack/nixpkgs/start
+      cp -r ${./overrides} lib/pack/nixpkgs/start/overrides
+
       # create config file
       mkdir etc
       cp "$initVimPath" etc/init.vim

+ 2 - 0
.config/nixpkgs/neovim/overrides/after/compiler/typescript.lua

@@ -0,0 +1,2 @@
+vim.bo.makeprg = "tsc --noEmit --incremental $*"
+vim.bo.errorformat = "%+A %#%f %#(%l\\,%c): %m,%C%m"

+ 1 - 0
.config/nixpkgs/neovim/overrides/after/ftplugin/javascript.vim

@@ -0,0 +1 @@
+compiler typescript

+ 1 - 0
.config/nixpkgs/neovim/overrides/after/ftplugin/typescript.vim

@@ -0,0 +1 @@
+compiler typescript

+ 1 - 0
.config/nixpkgs/neovim/overrides/after/ftplugin/typescriptreact.vim

@@ -0,0 +1 @@
+compiler typescript

+ 0 - 4
.config/nixpkgs/neovim/plugins/sources.json

@@ -63,10 +63,6 @@
     "rev": "1e8d3cc4d74f40fb384cd1739739543fe117ff61",
     "sha256": "06sdplgw76xnpdb89yd4arpphsn24nn327mhp3siyvc5qlsddby7"
   },
-  "leafgarland/typescript-vim": {
-    "rev": "eafdcf5e9ee73b43d92372d69dd84458bf98c5e3",
-    "sha256": "1ybc0ppr6xqx5ahg56xfcrs2v0h9dnsblqmgvx5xbz41lirh51h0"
-  },
   "rest-nvim/rest.nvim": {
     "rev": "84e81a19ab24ccf05c9233d34d4dfce61c233abe",
     "sha256": "1z6wkszd84xnqfhb1s59rggcipl9dmyxw21yrksg1q7hhcgq1abb"