Skip to content
Merged
Show file tree
Hide file tree
Changes from all commits
Commits
File filter

Filter by extension

Filter by extension

Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
3 changes: 2 additions & 1 deletion .config/nvim/lua/plugins/conform.lua
Original file line number Diff line number Diff line change
Expand Up @@ -20,7 +20,8 @@ return {
python = { "ruff", "black" },
bash = { "shfmt" },
sh = { "shfmt" },
snakemake = { "snakefmt" },
["yaml.ansible"] = { "ansible-lint" },
snakemake = { "snakemfmt" },
markdown = { "markdownlint" },
},
formatters = {
Expand Down
6 changes: 5 additions & 1 deletion .config/nvim/lua/plugins/nvim-lspconfig.lua
Original file line number Diff line number Diff line change
Expand Up @@ -9,7 +9,6 @@ if post_v011 then
"neovim/nvim-lspconfig",
version = "v2.5",
config = function()

-- Python language server
vim.lsp.config.pyright = {
cmd = { "pyright-langserver", "--stdio" },
Expand Down Expand Up @@ -50,6 +49,11 @@ if post_v011 then
root_markers = { ".git", "DESCRIPTION" },
}

vim.lsp.config.ansible = {
cmd = { "ansible-language-server", "--stdio" },
filetypes = { "yaml.ansible" },
}

-- Lua language server
vim.lsp.config.lua_ls = {
cmd = { "lua-language-server" },
Expand Down
3 changes: 2 additions & 1 deletion setup.sh
Original file line number Diff line number Diff line change
Expand Up @@ -32,6 +32,7 @@ FD_VERSION=8.5.3
BLACK_VERSION=22.6.0
PYP_VERSION=1.1.0
FZF_VERSION=0.48.1
TMUX_VERSION=3.5

function showHelp() {

Expand Down Expand Up @@ -625,7 +626,7 @@ elif [ $task == "--install-fd" ]; then

elif [ $task == "--install-tmux" ]; then
ok "Install tmux into a new conda env and symlink to ~/opt/bin/tmux"
install_env_and_symlink tmux tmux tmux
install_env_and_symlink tmux tmux=${TMUX_VERSION} tmux
printf "${YELLOW}Installed to ~/opt/bin/tmux${UNSET}\n"
check_opt_bin_in_path

Expand Down