diff --git a/stowers/nvim/dot-config/nvim/lazy-lock.json b/stowers/nvim/dot-config/nvim/lazy-lock.json index e42274e..ac6ed74 100644 --- a/stowers/nvim/dot-config/nvim/lazy-lock.json +++ b/stowers/nvim/dot-config/nvim/lazy-lock.json @@ -1,21 +1,22 @@ { "blamer.nvim": { "branch": "master", "commit": "920eee3913091bd929d83e7bf52a815351a0559c" }, - "cmp-nvim-lsp": { "branch": "main", "commit": "a8912b88ce488f411177fc8aed358b04dc246d7b" }, + "cmp-nvim-lsp": { "branch": "main", "commit": "bd5a7d6db125d4654b50eeae9f5217f24bb22fd3" }, "indent-o-matic": { "branch": "master", "commit": "4d11e98f523d3c4500b1dc33f0d1a248a4f69719" }, - "lualine.nvim": { "branch": "master", "commit": "a94fc68960665e54408fe37dcf573193c4ce82c9" }, - "mason-lspconfig.nvim": { "branch": "main", "commit": "c4c84f4521d62de595c0d0f718a9a40c1890c8ce" }, - "mason.nvim": { "branch": "main", "commit": "8024d64e1330b86044fed4c8494ef3dcd483a67c" }, + "lazy.nvim": { "branch": "main", "commit": "6c3bda4aca61a13a9c63f1c1d1b16b9d3be90d7a" }, + "lualine.nvim": { "branch": "master", "commit": "b8c23159c0161f4b89196f74ee3a6d02cdc3a955" }, + "mason-lspconfig.nvim": { "branch": "main", "commit": "155eac5d8609a2f110041f8ac3491664cc126354" }, + "mason.nvim": { "branch": "main", "commit": "ad7146aa61dcaeb54fa900144d768f040090bff0" }, "neovim": { "branch": "main", "commit": "e62a61166ebfa2e5fdad4993310b290ac9b905c1" }, - "nvim-autopairs": { "branch": "master", "commit": "2647cce4cb64fb35c212146663384e05ae126bdf" }, + "nvim-autopairs": { "branch": "master", "commit": "23320e75953ac82e559c610bec5a90d9c6dfa743" }, "nvim-cmp": { "branch": "main", "commit": "b5311ab3ed9c846b585c0c15b7559be131ec4be9" }, - "nvim-lspconfig": { "branch": "master", "commit": "69a1624aff5dc30dddd0c59d99a947b63c80bf2a" }, + "nvim-lspconfig": { "branch": "master", "commit": "db8fef885009fdec0daeff3e5dda92e1f539611e" }, "nvim-tree.lua": { "branch": "master", "commit": "c7639482a1598f4756798df1b2d72f79fe5bb34f" }, "nvim-treesitter": { "branch": "master", "commit": "cfc6f2c117aaaa82f19bcce44deec2c194d900ab" }, - "nvim-web-devicons": { "branch": "master", "commit": "19d6211c78169e78bab372b585b6fb17ad974e82" }, - "plenary.nvim": { "branch": "master", "commit": "857c5ac632080dba10aae49dba902ce3abf91b35" }, - "schemastore.nvim": { "branch": "main", "commit": "eeacd3cb53a1991a3ef18fb0456c9b9bda047c70" }, + "nvim-web-devicons": { "branch": "master", "commit": "b8221e42cf7287c4dcde81f232f58d7b947c210d" }, + "plenary.nvim": { "branch": "master", "commit": "b9fd5226c2f76c951fc8ed5923d85e4de065e509" }, + "schemastore.nvim": { "branch": "main", "commit": "c8af3f44c68757344b4dcb82e2ac48892b1be765" }, "telescope.nvim": { "branch": "master", "commit": "a0bbec21143c7bc5f8bb02e0005fa0b982edc026" }, "trouble.nvim": { "branch": "main", "commit": "40c5317a6e90fe3393f07b0fee580d9e93a216b4" }, - "undotree": { "branch": "master", "commit": "b951b87b46c34356d44aa71886aecf9dd7f5788a" }, - "vim-gitgutter": { "branch": "main", "commit": "85ca3a087204e3a32cb2faa5d9d0451524e08720" } + "undotree": { "branch": "master", "commit": "0f1c9816975b5d7f87d5003a19c53c6fd2ff6f7f" }, + "vim-gitgutter": { "branch": "main", "commit": "488c0555e47e2aabe273c635f7dd233e985311a6" } } diff --git a/stowers/nvim/dot-config/nvim/lua/eyedevelop/pm.lua b/stowers/nvim/dot-config/nvim/lua/eyedevelop/pm.lua index 8433d8b..ad03730 100644 --- a/stowers/nvim/dot-config/nvim/lua/eyedevelop/pm.lua +++ b/stowers/nvim/dot-config/nvim/lua/eyedevelop/pm.lua @@ -1,5 +1,5 @@ -- Bootstrap lazy.nvim -local pm_path = vim.fn.stdpath("data") .. "lazy/lazy.nvim" +local pm_path = vim.fn.stdpath("data") .. "/lazy/lazy.nvim" if not (vim.uv or vim.loop).fs_stat(pm_path) then local pm_repo = "https://github.com/folke/lazy.nvim.git" local out = vim.fn.system({ "git", "clone", "--filter=blob:none", "--branch=stable", pm_repo, pm_path }) diff --git a/stowers/zsh/dot-zshrc.d/02-ssh-agent.sh b/stowers/zsh/dot-zshrc.d/02-ssh-agent.sh index a5cbf09..d5640c0 100644 --- a/stowers/zsh/dot-zshrc.d/02-ssh-agent.sh +++ b/stowers/zsh/dot-zshrc.d/02-ssh-agent.sh @@ -2,6 +2,10 @@ TMPDIR="${TMPDIR:-${XDG_RUNTIME_DIR}}" +if pgrep -u "${USER}" gcr-ssh-agent >/dev/null; then + return +fi + if [[ -z "${SSH_CONNECTION}" ]]; then if ! pgrep -u "${USER}" ssh-agent >/dev/null; then ssh-agent > "${TMPDIR}/ssh-agent.env" diff --git a/tools/nvim.mk b/tools/nvim.mk index c2d255c..4f6a06f 100644 --- a/tools/nvim.mk +++ b/tools/nvim.mk @@ -15,4 +15,4 @@ $(LOCAL_TOOLS_BIN)/nvim: $(NVIM_DOWNLOAD_LOCATION) $(LOCAL_TOOLS) $(LOCAL_TOOLS_ @echo Installing neovim 0.11.2 mkdir -p $(LOCAL_TOOLS)/nvim tar -C $(LOCAL_TOOLS)/nvim --strip-components=1 -xzf $(NVIM_DOWNLOAD_LOCATION) - cp $(LOCAL_TOOLS)/nvim/bin/nvim $@ + ln -s $(realpath -- $(LOCAL_TOOLS)/nvim/bin/nvim) $@