Compare commits

..

No commits in common. "630160e1e925b10a57f76d520fde01ffb06b6f2c" and "27d202b0c26c0d490d2fa8c9356ed27275f42ee7" have entirely different histories.

5 changed files with 3 additions and 25 deletions

3
.gitmodules vendored
View File

@ -58,6 +58,3 @@
[submodule "vim/.vim/bundle/vim-gitgutter"] [submodule "vim/.vim/bundle/vim-gitgutter"]
path = vim/.vim/bundle/vim-gitgutter path = vim/.vim/bundle/vim-gitgutter
url = https://github.com/airblade/vim-gitgutter.git url = https://github.com/airblade/vim-gitgutter.git
[submodule "vim/.vim/nvim-bundle/zk-nvim"]
path = vim/.vim/nvim-bundle/zk-nvim
url = https://github.com/zk-org/zk-nvim.git

View File

@ -24,24 +24,10 @@ fi
export PS1="${green}"'\$'"${no_color} " export PS1="${green}"'\$'"${no_color} "
export DIRENV_PS1="${red}"'\$'"${no_color} " export DIRENV_PS1="${red}"'\$'"${no_color} "
export NIX_SHELL_PS1="${blue}"'λ'"${no_color} " export NIX_SHELL_PS1="${blue}"'λ'"${no_color} "
if [ "${HOSTNAME}" != "crypt" ] && [ "${HOSTNAME}" != "tomb" ] || [ "${CONTAINER_ID}" != "" ] || [ "${SSH_TTY}" != "" ]; then if [ "${HOSTNAME}" != "crypt" ] && [ "${HOSTNAME}" != "tomb" ] || [ "${SSH_TTY}" != "" ]; then
if [ "${CONTAINER_ID}" ]; then
OLD_HOSTNAME="${HOSTNAME}"
HOSTNAME="${CONTAINER_ID}"
fi
DIRENV_PS1="${DIRENV_PS1}${blue}${HOSTNAME} ${DIRENV_PS1}" DIRENV_PS1="${DIRENV_PS1}${blue}${HOSTNAME} ${DIRENV_PS1}"
NIX_SHELL_PS1="${NIX_SHELL_PS1}${green}${HOSTNAME} ${NIX_SHELL_PS1}" NIX_SHELL_PS1="${NIX_SHELL_PS1}${green}${HOSTNAME} ${NIX_SHELL_PS1}"
PS1="${PS1}${blue}${HOSTNAME} ${PS1}"
if [ "${CONTAINER_ID}" ]; then
PS1="${PS1}${magenta}${HOSTNAME} ${PS1}"
else
PS1="${PS1}${blue}${HOSTNAME} ${PS1}"
fi
if [ "${CONTAINER_ID}" ]; then
HOSTNAME="${OLD_HOSTNAME}"
fi
fi fi
export ORIG_PS1=${PS1} export ORIG_PS1=${PS1}

View File

@ -18,7 +18,7 @@ end
require('user.lspconfig') require('user.lspconfig')
require('user.indentblanklines') require('user.indentblanklines')
require('user.luasnip') require('user.luasnip')
require('user.zk')
EOF EOF
nnoremap <leader>ib <cmd>IBLToggle<cr> nnoremap <leader>ib <cmd>IBLToggle<cr>

View File

@ -1,4 +0,0 @@
-- Configure the zk neovim plugin
require("zk").setup({
picker = "fzf"
})

@ -1 +0,0 @@
Subproject commit 10089c398df925b8db51fd659501d2cb044003b9