Various fixes

common/fish/key-bindings.fish

@@ -1,5 +1,9 @@
 function fish_user_key_bindings
-	test -f $HOME/.fzf/shell/key-bindings.fish && source $HOME/.fzf/shell/key-bindings.fish
+	if command -v brew &>/dev/null && test -f (brew --prefix fzf)/shell/key-bindings.fish
+		source (brew --prefix fzf)/shell/key-bindings.fish
+	else if test -f $HOME/.fzf/shell/key-bindings.fish
+		source $HOME/.fzf/shell/key-bindings.fish
+	end
 
 	type -q fzf_key_bindings && fzf_key_bindings
 	fish_vi_key_bindings insert --no-erase

common/fish/paths.fish

@@ -26,6 +26,7 @@ set --export --universal GOPATH $HOME/.go
 set --export --universal GOBIN $GOPATH/bin
 
 set paths_candidates \
+	/Users/danielflanagan/.asdf/shims \
 	/opt/homebrew/bin \
 	/opt/homebrew/sbin \
 	$DOTFILES_PATH/common/bin \

common/helix/languages.toml

@@ -0,0 +1,3 @@
+[[language]]
+name = "typescript"
+language-server = { command = "deno", args = ["lsp"] }

common/neovim/lua/lsp.lua

@@ -86,13 +86,6 @@ for server, config in pairs(lsp_configs) do
 	lsp[server].setup(config)
 end
 
-local lsp_installer = require 'nvim-lsp-installer'
+require'nvim-lsp-installer'.setup{
-lsp_installer.on_server_ready(function(server)
+	automatic_installation = true,
-	local server_opts = {}
+}
-
-	-- if server.name == "elixirls" then
-	-- 	server_opts.cmd = { vim.fn.expand'~/.local/share/nvim/lsp_servers/elixir/elixir-ls/language_server.sh' }
-	-- end
-
-	server:setup(server_opts)
-end)

common/neovim/lua/plugins.lua

@@ -170,7 +170,7 @@ packer.startup(function()
 				require 'nvim-treesitter.configs'.setup {
 					ensure_installed = "all",
 					sync_install = false,
-					ignore_install = {},
+					ignore_install = { "phpdoc" },
 					indent = {
 						enable = true,
 					},

common/pgcli/.gitignore

@@ -0,0 +1,2 @@
+history
+log

os/macos/config.d.fish

@@ -1,4 +1,4 @@
 #!/usr/bin/env fish
 
-fish_add_path /opt/homebrew/sbin
+# fish_add_path /opt/homebrew/sbin
-fish_add_path /opt/homebrew/bin
+# fish_add_path /opt/homebrew/bin