.config/git/config

@@ -2,7 +2,7 @@
 	name = Thomas Dy
 	email = thatsmydoing@gmail.com
 [merge]
-	conflictstyle = diff3
+	conflictstyle = zdiff3
 [core]
 	autocrlf = input
 	hooksPath = ~/.config/git/hooks
@@ -17,7 +17,7 @@
 [color]
 	ui = true
 [diff]
-	algorithm = patience
+	algorithm = histogram
 [difftool]
 	prompt = false
 [difftool "difft"]
@@ -27,6 +27,7 @@
 [branch]
 	# we use a hook to set this up instead
 	autoSetupMerge = false
+	sort = -committerdate
 [remote]
 	pushDefault = origin
 [alias]

.config/nixpkgs/elvish/lib/config.elv

@@ -1,12 +1,16 @@
 use str
 use prompt
 use nix-shell
-use direlv
 use title
 use eval-export
 use completion
 use pushd
 
+# don't use direlv if we're in a nix-shell to avoid nesting direlvs
+if (not (has-env IN_NIX_SHELL)) {
+  use direlv
+}
+
 edit:add-var ls~ { |@a|
   e:ls --color=auto --group-directories-first -F --quoting-style literal $@a
 }

.config/nixpkgs/elvish/lib/direlv.elv

@@ -37,34 +37,55 @@ fn state-type {|@a|
 
 var state-dir = (get-env XDG_STATE_HOME &default=~/.local/state)/direlv
 var dir-stack = []
-var ignore = [
+var quiet = [
   AR
+  AR_FOR_TARGET
   AS
+  AS_FOR_TARGET
   CC
-  CONFIG_SHELL
+  CC_FOR_TARGET
   CXX
-  HOME
-  HOST_PATH
+  CXX_FOR_TARGET
   LD
-  LD_DYLD_PATH
-  MACOSX_DEPLOYMENT_TARGET
+  LD_FOR_TARGET
   NM
-  OBJCOPY
-  OBJDUMP
-  OLDPWD
+  NM_FOR_TARGET
   RANLIB
-  READELF
-  SHELL
+  RANLIB_FOR_TARGET
   SIZE
-  SOURCE_DATE_EPOCH
+  SIZE_FOR_TARGET
   STRINGS
+  STRINGS_FOR_TARGET
   STRIP
+  STRIP_FOR_TARGET
+
+  READELF
+  OBJCOPY
+  OBJDUMP
+
+  MACOSX_DEPLOYMENT_TARGET
+
+  CONFIG_SHELL
+  HOST_PATH
+]
+var ignore = [
+  # keep user variables
+  HOME
+  OLDPWD
+  SHELL
   TEMP
   TEMPDIR
   TERM
   TMP
   TMPDIR
   TZ
+
+  # purity-related envs
+  NIX_ENFORCE_PURITY
+  SOURCE_DATE_EPOCH
+  ZERO_AR_DATE
+
+  # nix build variables
   buildInputs
   buildPhase
   builder
@@ -88,6 +109,7 @@ var ignore = [
   outputs
   patches
   phases
+  preferLocalBuild
   propagatedBuildInputs
   propagatedNativeBuildInputs
   shell
@@ -109,17 +131,33 @@ fn diff-env {|env|
   } $env
 }
 
+fn print-change {|key new|
+  if (has-value $quiet $key) {
+    return
+  }
+
+  if (str:has-prefix $key "NIX_") {
+    return
+  }
+
+  if $new {
+    put +$key
+  } else {
+    put -$key
+  }
+}
+
 fn apply-env {|env|
   each {|row|
     var key value = (all $row)
     if (eq $value $nil) {
-      put -$key
+      print-change $key $false
       unset-env $key
     } else {
-      put +$key
+      print-change $key $true
       set-env $key $value
     }
-  } $env
+  } $env | compact
 }
 
 fn env-from-nix-flake {|state-file|
@@ -127,15 +165,16 @@ fn env-from-nix-flake {|state-file|
   keys $data[variables] | each {|key|
     var v = $data[variables][$key]
     if (eq $v[type] "exported") {
-      if (str:has-prefix $key "NIX_") {
-        continue
-      } elif (str:has-prefix $key "__") {
+      if (str:has-prefix $key "__") {
         continue
       } elif (has-value $ignore $key) {
         continue
       } elif (has-value $extend $key) {
-        var existing = (get-env $key)
         var extended = $v[value]
+        if (eq $extended "") {
+          continue
+        }
+        var existing = (get-env $key)
         if (not-eq $existing $nil) {
           set extended = $extended":"$existing
         }

.config/nixpkgs/neovim/make.lua

@@ -30,6 +30,10 @@ function make(opts)
       efm = errorformat,
     })
     vim.api.nvim_exec_autocmds('QuickFixCmdPost', {})
+
+    if #result > 0 then
+      vim.cmd('copen')
+    end
   end
 
   Job:new({

.config/nixpkgs/neovim/plugins.lua

@@ -206,6 +206,9 @@ require('nvim-treesitter.configs').setup({
   highlight = {
     enable = true,
   },
+  indent = {
+    enable = true,
+  },
   incremental_selection = {
     enable = true,
     keymaps = {

.config/nixpkgs/neovim/plugins/default.nix

@@ -3,13 +3,6 @@ let
   plugins = builtins.fromJSON (builtins.readFile ./sources.json);
 
   overrides = {
-    "leafgarland/typescript-vim" = {
-      patches = [
-        # make compiler build entire project
-        ./typescript-vim-compiler.patch
-      ];
-    };
-
     "nvim-telescope/telescope-fzf-native.nvim" = {
       dontBuild = false;
     };

.config/nixpkgs/neovim/plugins/typescript-vim-compiler.patch

@@ -1,13 +0,0 @@
-diff --git a/compiler/typescript.vim b/compiler/typescript.vim
-index 77121eb..203af9b 100644
---- a/compiler/typescript.vim
-+++ b/compiler/typescript.vim
-@@ -22,7 +22,7 @@ execute 'CompilerSet makeprg='
-       \ . escape(g:typescript_compiler_binary, ' ')
-       \ . '\ '
-       \ . escape(g:typescript_compiler_options, ' ')
--      \ . '\ $*\ %'
-+      \ . '\ $*'
- 
- CompilerSet errorformat=%+A\ %#%f\ %#(%l\\\,%c):\ %m,%C%m
-