From 464ad8b0035cbcaf4864d14da598b77a939026d8 Mon Sep 17 00:00:00 2001 From: yangbinji <1139040653@qq.com> Date: Thu, 15 Sep 2022 20:41:51 +0800 Subject: fix(example config): fix config for treesitter (#3016) --- utils/installer/config.example.lua | 2 +- utils/installer/config_win.example.lua | 2 +- 2 files changed, 2 insertions(+), 2 deletions(-) (limited to 'utils/installer') diff --git a/utils/installer/config.example.lua b/utils/installer/config.example.lua index 26a50edc..f5d50709 100644 --- a/utils/installer/config.example.lua +++ b/utils/installer/config.example.lua @@ -82,7 +82,7 @@ lvim.builtin.treesitter.ensure_installed = { } lvim.builtin.treesitter.ignore_install = { "haskell" } -lvim.builtin.treesitter.highlight.enabled = true +lvim.builtin.treesitter.highlight.enable = true -- generic LSP settings diff --git a/utils/installer/config_win.example.lua b/utils/installer/config_win.example.lua index 872e6270..8fe03d69 100644 --- a/utils/installer/config_win.example.lua +++ b/utils/installer/config_win.example.lua @@ -97,7 +97,7 @@ lvim.builtin.treesitter.ensure_installed = { } lvim.builtin.treesitter.ignore_install = { "haskell" } -lvim.builtin.treesitter.highlight.enabled = true +lvim.builtin.treesitter.highlight.enable = true -- generic LSP settings -- cgit v1.2.3 From 518b1d4167162a54a6e76784038d30191613b76d Mon Sep 17 00:00:00 2001 From: Abouzar Parvan Date: Tue, 20 Sep 2022 14:11:58 +0430 Subject: Fix: make sure latest plugins are customizable (#3044) * fix: make navim-navic configurable * fix: make sure vim-illuminate is configurable * fix: make sure theme is configurable * fix(ci): don't verify uninstalled plugins * refactor(lsp): add setup_document_symbols util * revert: keep onedarker on freeze branch * refactor(lsp): avoid duplicate hl autocmds Co-authored-by: kylo252 <59826753+kylo252@users.noreply.github.com> --- utils/installer/config.example.lua | 7 +++++-- utils/installer/config_win.example.lua | 7 +++++-- 2 files changed, 10 insertions(+), 4 deletions(-) (limited to 'utils/installer') diff --git a/utils/installer/config.example.lua b/utils/installer/config.example.lua index f5d50709..8f490f77 100644 --- a/utils/installer/config.example.lua +++ b/utils/installer/config.example.lua @@ -11,7 +11,7 @@ an executable -- general lvim.log.level = "warn" lvim.format_on_save = true -lvim.colorscheme = "onedarker" +lvim.colorscheme = "tokyonight" -- to disable icons and use a minimalist setup, uncomment the following -- lvim.use_icons = false @@ -44,6 +44,10 @@ lvim.keys.normal_mode[""] = ":w" -- }, -- } +-- Change theme settings +-- lvim.builtin.theme.options.dim_inactive = true +-- lvim.builtin.theme.options.style = "storm" + -- Use which-key to add extra bindings with the leader-key prefix -- lvim.builtin.which_key.mappings["P"] = { "Telescope projects", "Projects" } -- lvim.builtin.which_key.mappings["t"] = { @@ -161,7 +165,6 @@ lvim.builtin.treesitter.highlight.enable = true -- Additional Plugins -- lvim.plugins = { --- {"folke/tokyonight.nvim"}, -- { -- "folke/trouble.nvim", -- cmd = "TroubleToggle", diff --git a/utils/installer/config_win.example.lua b/utils/installer/config_win.example.lua index 8fe03d69..bc83aab7 100644 --- a/utils/installer/config_win.example.lua +++ b/utils/installer/config_win.example.lua @@ -28,7 +28,7 @@ vim.g.clipboard = { -- general lvim.log.level = "warn" lvim.format_on_save = true -lvim.colorscheme = "onedarker" +lvim.colorscheme = "tokyonight" -- to disable icons and use a minimalist setup, uncomment the following -- lvim.use_icons = false @@ -61,6 +61,10 @@ lvim.keys.normal_mode[""] = ":w" -- }, -- } +-- Change theme settings +-- lvim.builtin.theme.options.dim_inactive = true +-- lvim.builtin.theme.options.style = "storm" + -- Use which-key to add extra bindings with the leader-key prefix -- lvim.builtin.which_key.mappings["P"] = { "Telescope projects", "Projects" } -- lvim.builtin.which_key.mappings["t"] = { @@ -176,7 +180,6 @@ lvim.builtin.treesitter.highlight.enable = true -- Additional Plugins -- lvim.plugins = { --- {"folke/tokyonight.nvim"}, -- { -- "folke/trouble.nvim", -- cmd = "TroubleToggle", -- cgit v1.2.3 From 975d1ffcd3660c970d5bb8e4644b88daee17ac5e Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?D=C3=A1niel=20Vank=C3=B3?= Date: Tue, 20 Sep 2022 12:07:45 +0200 Subject: fix(installer): small fix in help message of install.sh (#3032) --- utils/installer/install.sh | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) (limited to 'utils/installer') diff --git a/utils/installer/install.sh b/utils/installer/install.sh index 620d46f5..98faa6f0 100755 --- a/utils/installer/install.sh +++ b/utils/installer/install.sh @@ -51,7 +51,7 @@ function usage() { echo " -l, --local Install local copy of LunarVim" echo " -y, --yes Disable confirmation prompts (answer yes to all questions)" echo " --overwrite Overwrite previous LunarVim configuration (a backup is always performed first)" - echo " --[no]-install-dependencies Whether to automatically install external dependencies (will prompt by default)" + echo " --[no-]install-dependencies Whether to automatically install external dependencies (will prompt by default)" } function parse_arguments() { -- cgit v1.2.3 From 31af25f6a19006cad1c38ffd2c63e73d914aded7 Mon Sep 17 00:00:00 2001 From: kylo252 <59826753+kylo252@users.noreply.github.com> Date: Tue, 20 Sep 2022 17:26:57 +0200 Subject: revert: fix Packer instead of hard-coding config (#3049) --- utils/installer/install.sh | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) (limited to 'utils/installer') diff --git a/utils/installer/install.sh b/utils/installer/install.sh index 98faa6f0..0fc17ab2 100755 --- a/utils/installer/install.sh +++ b/utils/installer/install.sh @@ -395,7 +395,7 @@ function backup_old_config() { function clone_lvim() { msg "Cloning LunarVim configuration" if ! git clone --branch "$LV_BRANCH" \ - --depth 1 "https://github.com/${LV_REMOTE}" "$LUNARVIM_BASE_DIR"; then + "https://github.com/${LV_REMOTE}" "$LUNARVIM_BASE_DIR"; then echo "Failed to clone repository. Installation failed." exit 1 fi -- cgit v1.2.3 From 58b0684f7edc91503bc774af840a9a5021214781 Mon Sep 17 00:00:00 2001 From: ChristianChiarulli Date: Tue, 27 Sep 2022 13:18:26 -0400 Subject: chore: format on save false by default in default config --- utils/installer/config.example.lua | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) (limited to 'utils/installer') diff --git a/utils/installer/config.example.lua b/utils/installer/config.example.lua index 8f490f77..9f54c2a4 100644 --- a/utils/installer/config.example.lua +++ b/utils/installer/config.example.lua @@ -10,7 +10,7 @@ an executable -- general lvim.log.level = "warn" -lvim.format_on_save = true +lvim.format_on_save = false lvim.colorscheme = "tokyonight" -- to disable icons and use a minimalist setup, uncomment the following -- lvim.use_icons = false -- cgit v1.2.3 From 0d578ab152708019ad10cb7b21fc4a1cb0105a1a Mon Sep 17 00:00:00 2001 From: Mattherix Date: Thu, 6 Oct 2022 07:21:34 +0200 Subject: fix(installer): don't overwrite previous config (#3154) --- utils/installer/install.sh | 3 ++- 1 file changed, 2 insertions(+), 1 deletion(-) (limited to 'utils/installer') diff --git a/utils/installer/install.sh b/utils/installer/install.sh index 0fc17ab2..4f0988be 100755 --- a/utils/installer/install.sh +++ b/utils/installer/install.sh @@ -439,7 +439,8 @@ function setup_lvim() { setup_shim - cp "$LUNARVIM_BASE_DIR/utils/installer/config.example.lua" "$LUNARVIM_CONFIG_DIR/config.lua" + [ ! -f "$LUNARVIM_CONFIG_DIR/config.lua" ] \ + && cp "$LUNARVIM_BASE_DIR/utils/installer/config.example.lua" "$LUNARVIM_CONFIG_DIR/config.lua" echo "Preparing Packer setup" -- cgit v1.2.3 From 9def60f1dd09ac2244672b8570092229977b43b4 Mon Sep 17 00:00:00 2001 From: kylo252 <59826753+kylo252@users.noreply.github.com> Date: Thu, 6 Oct 2022 08:55:06 +0200 Subject: feat: lock new installations to nvim 0.8+ (#3111) --- utils/installer/install.sh | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) (limited to 'utils/installer') diff --git a/utils/installer/install.sh b/utils/installer/install.sh index 4f0988be..fee0e420 100755 --- a/utils/installer/install.sh +++ b/utils/installer/install.sh @@ -201,11 +201,11 @@ function print_missing_dep_msg() { } function check_neovim_min_version() { - local verify_version_cmd='if !has("nvim-0.7") | cquit | else | quit | endif' + local verify_version_cmd='if !has("nvim-0.8") | cquit | else | quit | endif' # exit with an error if min_version not found if ! nvim --headless -u NONE -c "$verify_version_cmd"; then - echo "[ERROR]: LunarVim requires at least Neovim v0.7 or higher" + echo "[ERROR]: LunarVim requires at least Neovim v0.8 or higher" exit 1 fi } -- cgit v1.2.3 From f6402563abb3ace148168a27e7889c961dd94bfd Mon Sep 17 00:00:00 2001 From: kylo252 <59826753+kylo252@users.noreply.github.com> Date: Fri, 7 Oct 2022 04:51:09 +0200 Subject: feat: enable global installation (#3161) --- utils/installer/install.sh | 22 +++++++++++----------- utils/installer/install_bin.sh | 3 ++- 2 files changed, 13 insertions(+), 12 deletions(-) (limited to 'utils/installer') diff --git a/utils/installer/install.sh b/utils/installer/install.sh index fee0e420..cafd92ad 100755 --- a/utils/installer/install.sh +++ b/utils/installer/install.sh @@ -2,20 +2,20 @@ set -eo pipefail #Set branch to master unless specified by the user -declare LV_BRANCH="${LV_BRANCH:-"master"}" -declare -r LV_REMOTE="${LV_REMOTE:-lunarvim/lunarvim.git}" -declare -r INSTALL_PREFIX="${INSTALL_PREFIX:-"$HOME/.local"}" +declare -x LV_BRANCH="${LV_BRANCH:-"master"}" +declare -xr LV_REMOTE="${LV_REMOTE:-lunarvim/lunarvim.git}" +declare -xr INSTALL_PREFIX="${INSTALL_PREFIX:-"$HOME/.local"}" -declare -r XDG_DATA_HOME="${XDG_DATA_HOME:-"$HOME/.local/share"}" -declare -r XDG_CACHE_HOME="${XDG_CACHE_HOME:-"$HOME/.cache"}" -declare -r XDG_CONFIG_HOME="${XDG_CONFIG_HOME:-"$HOME/.config"}" +declare -xr XDG_DATA_HOME="${XDG_DATA_HOME:-"$HOME/.local/share"}" +declare -xr XDG_CACHE_HOME="${XDG_CACHE_HOME:-"$HOME/.cache"}" +declare -xr XDG_CONFIG_HOME="${XDG_CONFIG_HOME:-"$HOME/.config"}" -declare -r LUNARVIM_RUNTIME_DIR="${LUNARVIM_RUNTIME_DIR:-"$XDG_DATA_HOME/lunarvim"}" -declare -r LUNARVIM_CONFIG_DIR="${LUNARVIM_CONFIG_DIR:-"$XDG_CONFIG_HOME/lvim"}" -declare -r LUNARVIM_CACHE_DIR="${LUNARVIM_CACHE_DIR:-"$XDG_CACHE_HOME/lvim"}" -declare -r LUNARVIM_BASE_DIR="${LUNARVIM_BASE_DIR:-"$LUNARVIM_RUNTIME_DIR/lvim"}" +declare -xr LUNARVIM_RUNTIME_DIR="${LUNARVIM_RUNTIME_DIR:-"$XDG_DATA_HOME/lunarvim"}" +declare -xr LUNARVIM_CONFIG_DIR="${LUNARVIM_CONFIG_DIR:-"$XDG_CONFIG_HOME/lvim"}" +declare -xr LUNARVIM_CACHE_DIR="${LUNARVIM_CACHE_DIR:-"$XDG_CACHE_HOME/lvim"}" +declare -xr LUNARVIM_BASE_DIR="${LUNARVIM_BASE_DIR:-"$LUNARVIM_RUNTIME_DIR/lvim"}" -declare -r LUNARVIM_LOG_LEVEL="${LUNARVIM_LOG_LEVEL:-warn}" +declare -xr LUNARVIM_LOG_LEVEL="${LUNARVIM_LOG_LEVEL:-warn}" declare BASEDIR BASEDIR="$(cd -- "$(dirname -- "${BASH_SOURCE[0]}")" &>/dev/null && pwd)" diff --git a/utils/installer/install_bin.sh b/utils/installer/install_bin.sh index c6ad5181..920f2fd5 100755 --- a/utils/installer/install_bin.sh +++ b/utils/installer/install_bin.sh @@ -26,7 +26,8 @@ function setup_shim() { sed -e s"#RUNTIME_DIR_VAR#\"${LUNARVIM_RUNTIME_DIR}\"#"g \ -e s"#CONFIG_DIR_VAR#\"${LUNARVIM_CONFIG_DIR}\"#"g \ - -e s"#CACHE_DIR_VAR#\"${LUNARVIM_CACHE_DIR}\"#"g "$src" \ + -e s"#CACHE_DIR_VAR#\"${LUNARVIM_CACHE_DIR}\"#"g \ + -e s"#BASE_DIR_VAR#\"${LUNARVIM_BASE_DIR}\"#"g "$src" \ | tee "$dst" >/dev/null chmod u+x "$dst" -- cgit v1.2.3 From 86dd1f113246d06859db600b08d05d807d29b5bb Mon Sep 17 00:00:00 2001 From: Leung Yau Ming Date: Fri, 7 Oct 2022 22:41:10 +0800 Subject: fix(typo): fix language server name typo in config example (#3176) --- utils/installer/config.example.lua | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) (limited to 'utils/installer') diff --git a/utils/installer/config.example.lua b/utils/installer/config.example.lua index 9f54c2a4..ee599d1b 100644 --- a/utils/installer/config.example.lua +++ b/utils/installer/config.example.lua @@ -92,7 +92,7 @@ lvim.builtin.treesitter.highlight.enable = true -- -- make sure server will always be installed even if the server is in skipped_servers list -- lvim.lsp.installer.setup.ensure_installed = { --- "sumeko_lua", +-- "sumneko_lua", -- "jsonls", -- } -- -- change UI setting of `LspInstallInfo` -- cgit v1.2.3 From 5699a5e5573b0766a37b7f115bc49efd52a00822 Mon Sep 17 00:00:00 2001 From: Christian Chiarulli Date: Sat, 8 Oct 2022 18:31:02 -0400 Subject: fix(installer): don't set log level --- utils/installer/install.sh | 1 - 1 file changed, 1 deletion(-) (limited to 'utils/installer') diff --git a/utils/installer/install.sh b/utils/installer/install.sh index cafd92ad..aefc52c2 100755 --- a/utils/installer/install.sh +++ b/utils/installer/install.sh @@ -445,7 +445,6 @@ function setup_lvim() { echo "Preparing Packer setup" "$INSTALL_PREFIX/bin/lvim" --headless \ - -c "lua require('lvim.core.log'):set_level([[$LUNARVIM_LOG_LEVEL]])" \ -c 'autocmd User PackerComplete quitall' \ -c 'PackerSync' -- cgit v1.2.3 From e6f50af1de686ba33b794f50957352b40ccb4bd2 Mon Sep 17 00:00:00 2001 From: Leung Yau Ming Date: Sun, 9 Oct 2022 07:08:15 +0800 Subject: fix(typo): fix language server name typo in config example #3176 (#3183) --- utils/installer/config_win.example.lua | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) (limited to 'utils/installer') diff --git a/utils/installer/config_win.example.lua b/utils/installer/config_win.example.lua index bc83aab7..40cc34e8 100644 --- a/utils/installer/config_win.example.lua +++ b/utils/installer/config_win.example.lua @@ -107,7 +107,7 @@ lvim.builtin.treesitter.highlight.enable = true -- -- make sure server will always be installed even if the server is in skipped_servers list -- lvim.lsp.installer.setup.ensure_installed = { --- "sumeko_lua", +-- "sumneko_lua", -- "jsonls", -- } -- -- change UI setting of `LspInstallInfo` -- cgit v1.2.3 From 523bafacb67708d56d0c05eadd6968eb58957c0e Mon Sep 17 00:00:00 2001 From: opalmay <65673442+opalmay@users.noreply.github.com> Date: Sun, 9 Oct 2022 22:55:47 +0300 Subject: Feat(installer): desktop entry (#3187) Co-authored-by: Opal Mizrahi --- utils/installer/install.sh | 18 ++++++++++++++++++ 1 file changed, 18 insertions(+) (limited to 'utils/installer') diff --git a/utils/installer/install.sh b/utils/installer/install.sh index aefc52c2..bd751abe 100755 --- a/utils/installer/install.sh +++ b/utils/installer/install.sh @@ -439,6 +439,8 @@ function setup_lvim() { setup_shim + create_desktop_file + [ ! -f "$LUNARVIM_CONFIG_DIR/config.lua" ] \ && cp "$LUNARVIM_BASE_DIR/utils/installer/config.example.lua" "$LUNARVIM_CONFIG_DIR/config.lua" @@ -453,6 +455,22 @@ function setup_lvim() { verify_core_plugins } +function create_desktop_file() { + OS="$(uname -s)" + # TODO: Any other OSes that use desktop files? + [ "$OS" != "Linux" ] && return + echo "Creating desktop file" + + for d in "$LUNARVIM_BASE_DIR"/utils/desktop/*/; do + size_folder=$(basename "$d") + mkdir -p "$XDG_DATA_HOME/icons/hicolor/$size_folder/apps/" + cp "$LUNARVIM_BASE_DIR/utils/desktop/$size_folder/lvim.svg" "$XDG_DATA_HOME/icons/hicolor/$size_folder/apps" + done + + cp "$LUNARVIM_BASE_DIR/utils/desktop/lvim.desktop" "$XDG_DATA_HOME/applications/lvim.desktop" + xdg-desktop-menu forceupdate +} + function print_logo() { cat <<'EOF' -- cgit v1.2.3 From 4fa96e8e791a54c7d474e6f6cc6735bb5694765b Mon Sep 17 00:00:00 2001 From: opalmay <65673442+opalmay@users.noreply.github.com> Date: Mon, 10 Oct 2022 02:23:29 +0300 Subject: feat(uninstaller): desktop entry feat(uninstaller): desktop entry --- utils/installer/uninstall.sh | 11 +++++++++++ 1 file changed, 11 insertions(+) (limited to 'utils/installer') diff --git a/utils/installer/uninstall.sh b/utils/installer/uninstall.sh index 8fc8e693..16d3c365 100755 --- a/utils/installer/uninstall.sh +++ b/utils/installer/uninstall.sh @@ -60,12 +60,23 @@ function remove_lvim_bin() { rm -f "$lvim_bin" } +function remove_desktop_file() { + OS="$(uname -s)" + # TODO: Any other OSes that use desktop files? + [ "$OS" != "Linux" ] && return + echo "Removing desktop file..." + + find "$XDG_DATA_HOME/icons/hicolor" -name "lvim.svg" -type f -delete + rm "$XDG_DATA_HOME/applications/lvim.desktop" +} + function main() { parse_arguments "$@" echo "Removing LunarVim binary..." remove_lvim_bin echo "Removing LunarVim directories..." remove_lvim_dirs + remove_desktop_file echo "Uninstalled LunarVim!" } -- cgit v1.2.3 From 1fbdcabf1915b35599c7912a45ef92888417ea65 Mon Sep 17 00:00:00 2001 From: opalmay <65673442+opalmay@users.noreply.github.com> Date: Fri, 14 Oct 2022 19:33:08 +0300 Subject: fix: don't install desktop file w/o xdg-desktop-menu (#3229) --- utils/installer/install.sh | 5 ++--- utils/installer/uninstall.sh | 4 ++-- 2 files changed, 4 insertions(+), 5 deletions(-) (limited to 'utils/installer') diff --git a/utils/installer/install.sh b/utils/installer/install.sh index bd751abe..87f60fd4 100755 --- a/utils/installer/install.sh +++ b/utils/installer/install.sh @@ -458,7 +458,7 @@ function setup_lvim() { function create_desktop_file() { OS="$(uname -s)" # TODO: Any other OSes that use desktop files? - [ "$OS" != "Linux" ] && return + ([ "$OS" != "Linux" ] || ! command -v xdg-desktop-menu &>/dev/null) && return echo "Creating desktop file" for d in "$LUNARVIM_BASE_DIR"/utils/desktop/*/; do @@ -467,8 +467,7 @@ function create_desktop_file() { cp "$LUNARVIM_BASE_DIR/utils/desktop/$size_folder/lvim.svg" "$XDG_DATA_HOME/icons/hicolor/$size_folder/apps" done - cp "$LUNARVIM_BASE_DIR/utils/desktop/lvim.desktop" "$XDG_DATA_HOME/applications/lvim.desktop" - xdg-desktop-menu forceupdate + xdg-desktop-menu install --novendor "$LUNARVIM_BASE_DIR/utils/desktop/lvim.desktop" } function print_logo() { diff --git a/utils/installer/uninstall.sh b/utils/installer/uninstall.sh index 16d3c365..597bbf85 100755 --- a/utils/installer/uninstall.sh +++ b/utils/installer/uninstall.sh @@ -63,11 +63,11 @@ function remove_lvim_bin() { function remove_desktop_file() { OS="$(uname -s)" # TODO: Any other OSes that use desktop files? - [ "$OS" != "Linux" ] && return + ([ "$OS" != "Linux" ] || ! command -v xdg-desktop-menu &>/dev/null) && return echo "Removing desktop file..." find "$XDG_DATA_HOME/icons/hicolor" -name "lvim.svg" -type f -delete - rm "$XDG_DATA_HOME/applications/lvim.desktop" + xdg-desktop-menu uninstall lvim.desktop } function main() { -- cgit v1.2.3