From 3c5a6d06b966eedac74a01d0fcc3a6a06631128e Mon Sep 17 00:00:00 2001 From: Nikolay Belov Date: Sun, 17 Oct 2021 00:07:55 +1300 Subject: Rollback default branch name to master (#1589) --- utils/installer/install.sh | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) (limited to 'utils') diff --git a/utils/installer/install.sh b/utils/installer/install.sh index aaee515d..b290fec7 100755 --- a/utils/installer/install.sh +++ b/utils/installer/install.sh @@ -2,7 +2,7 @@ set -eo pipefail #Set branch to master unless specified by the user -declare LV_BRANCH="${LV_BRANCH:-"rolling"}" +declare LV_BRANCH="${LV_BRANCH:-"master"}" declare -r LV_REMOTE="${LV_REMOTE:-lunarvim/lunarvim.git}" declare -r INSTALL_PREFIX="${INSTALL_PREFIX:-"$HOME/.local"}" -- cgit v1.2.3 From 0444c28379d48d904386348e24d4c5213113b96d Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Goran=20Meki=C4=87?= Date: Wed, 20 Oct 2021 17:44:37 +0200 Subject: [Feature] Add BSD support (#1801) --- utils/installer/install.sh | 11 ++++++++++- 1 file changed, 10 insertions(+), 1 deletion(-) (limited to 'utils') diff --git a/utils/installer/install.sh b/utils/installer/install.sh index b290fec7..8438ad8b 100755 --- a/utils/installer/install.sh +++ b/utils/installer/install.sh @@ -146,6 +146,15 @@ function detect_platform() { RECOMMEND_INSTALL="sudo apt install -y" fi ;; + FreeBSD) + RECOMMEND_INSTALL="sudo pkg install -y" + ;; + NetBSD) + RECOMMEND_INSTALL="sudo pkgin install" + ;; + OpenBSD) + RECOMMEND_INSTALL="doas pkg_add" + ;; Darwin) RECOMMEND_INSTALL="brew install" ;; @@ -256,7 +265,7 @@ function backup_old_config() { else OS="$(uname -s)" case "$OS" in - Linux) + Linux | *BSD) cp -r "$dir/"* "$dir.bak/." ;; Darwin) -- cgit v1.2.3 From 9be8ea6aab5f6f4618cdcdbeafd9eec6bc049d24 Mon Sep 17 00:00:00 2001 From: Antyos <17516195+Antyos@users.noreply.github.com> Date: Wed, 20 Oct 2021 11:04:42 -0500 Subject: [Bugfix] Fix Windows environment variables in .ps1 scripts (#1802) --- utils/bin/lvim.ps1 | 4 ++-- utils/installer/install.ps1 | 5 ++--- 2 files changed, 4 insertions(+), 5 deletions(-) (limited to 'utils') diff --git a/utils/bin/lvim.ps1 b/utils/bin/lvim.ps1 index e220e8ec..79950365 100644 --- a/utils/bin/lvim.ps1 +++ b/utils/bin/lvim.ps1 @@ -1,6 +1,6 @@ $env:XDG_DATA_HOME = ($env:XDG_DATA_HOME, "$env:APPDATA", 1 -ne $null)[0] -$env:XDG_CONFIG_HOME = ($env:XDG_CONFIG_HOME, "$LOCALAPPDATA", 1 -ne $null)[0] -$env:XDG_CACHE_HOME = ($env:XDG_CACHE_HOME, "$TEMP", 1 -ne $null)[0] +$env:XDG_CONFIG_HOME = ($env:XDG_CONFIG_HOME, "$env:LOCALAPPDATA", 1 -ne $null)[0] +$env:XDG_CACHE_HOME = ($env:XDG_CACHE_HOME, "$env:TEMP", 1 -ne $null)[0] $env:LUNARVIM_RUNTIME_DIR = ($env:LUNARVIM_RUNTIME_DIR, "$env:XDG_DATA_HOME\lunarvim", 1 -ne $null)[0] $env:LUNARVIM_CONFIG_DIR = ($env:LUNARVIM_CONFIG_DIR, "$env:XDG_CONFIG_HOME\lvim", 1 -ne $null)[0] diff --git a/utils/installer/install.ps1 b/utils/installer/install.ps1 index 9f861125..4ec499c6 100644 --- a/utils/installer/install.ps1 +++ b/utils/installer/install.ps1 @@ -6,8 +6,8 @@ $LV_REMOTE = ($LV_REMOTE, "lunarvim/lunarvim.git", 1 -ne $null)[0] $INSTALL_PREFIX = ($INSTALL_PREFIX, "$HOME\.local", 1 -ne $null)[0] $env:XDG_DATA_HOME = ($env:XDG_DATA_HOME, "$env:APPDATA", 1 -ne $null)[0] -$env:XDG_CONFIG_HOME = ($env:XDG_CONFIG_HOME, "$LOCALAPPDATA", 1 -ne $null)[0] -$env:XDG_CACHE_HOME = ($env:XDG_CACHE_HOME, "$TEMP", 1 -ne $null)[0] +$env:XDG_CONFIG_HOME = ($env:XDG_CONFIG_HOME, "$env:LOCALAPPDATA", 1 -ne $null)[0] +$env:XDG_CACHE_HOME = ($env:XDG_CACHE_HOME, "$env:TEMP", 1 -ne $null)[0] $env:LUNARVIM_RUNTIME_DIR = ($env:LUNARVIM_RUNTIME_DIR, "$env:XDG_DATA_HOME\lunarvim", 1 -ne $null)[0] $env:LUNARVIM_CONFIG_DIR = ($env:LUNARVIM_CONFIG_DIR, "$env:XDG_CONFIG_HOME\lvim", 1 -ne $null)[0] $env:LUNARVIM_CACHE_DIR = ($env:LUNARVIM_CACHE_DIR, "$env:XDG_CACHE_HOME\lvim", 1 -ne $null)[0] @@ -276,4 +276,3 @@ function create_alias { } main "$args" - -- cgit v1.2.3 From cfdd5e61f9d92763994b41fa5b5e1daac2f2ab95 Mon Sep 17 00:00:00 2001 From: kylo252 <59826753+kylo252@users.noreply.github.com> Date: Wed, 20 Oct 2021 18:35:07 +0200 Subject: fix(docs): update telescope's example config (#1814) --- utils/installer/config.example-no-ts.lua | 23 ++++++++++++++--------- utils/installer/config.example.lua | 23 ++++++++++++++--------- 2 files changed, 28 insertions(+), 18 deletions(-) (limited to 'utils') diff --git a/utils/installer/config.example-no-ts.lua b/utils/installer/config.example-no-ts.lua index 17bb0217..ddae7e82 100644 --- a/utils/installer/config.example-no-ts.lua +++ b/utils/installer/config.example-no-ts.lua @@ -15,17 +15,22 @@ lvim.keys.normal_mode[""] = ":w" -- lvim.keys.normal_mode[""] = ":q" -- Change Telescope navigation to use j and k for navigation and n and p for history in both input and normal mode. --- lvim.builtin.telescope.on_config_done = function() --- local actions = require "telescope.actions" +-- we use protected-mode (pcall) just in case the plugin wasn't loaded yet. +-- local _, actions = pcall(require, "telescope.actions") +-- lvim.builtin.telescope.defaults.mappings = { -- -- for input mode --- lvim.builtin.telescope.defaults.mappings.i[""] = actions.move_selection_next --- lvim.builtin.telescope.defaults.mappings.i[""] = actions.move_selection_previous --- lvim.builtin.telescope.defaults.mappings.i[""] = actions.cycle_history_next --- lvim.builtin.telescope.defaults.mappings.i[""] = actions.cycle_history_prev +-- i = { +-- [""] = actions.move_selection_next, +-- [""] = actions.move_selection_previous, +-- [""] = actions.cycle_history_next, +-- [""] = actions.cycle_history_prev, +-- }, -- -- for normal mode --- lvim.builtin.telescope.defaults.mappings.n[""] = actions.move_selection_next --- lvim.builtin.telescope.defaults.mappings.n[""] = actions.move_selection_previous --- end +-- n = { +-- [""] = actions.move_selection_next, +-- [""] = actions.move_selection_previous, +-- }, +-- } -- Use which-key to add extra bindings with the leader-key prefix -- lvim.builtin.which_key.mappings["P"] = { "Telescope projects", "Projects" } diff --git a/utils/installer/config.example.lua b/utils/installer/config.example.lua index 346fac98..897b2cf0 100644 --- a/utils/installer/config.example.lua +++ b/utils/installer/config.example.lua @@ -23,17 +23,22 @@ lvim.keys.normal_mode[""] = ":w" -- lvim.keys.normal_mode[""] = ":q" -- Change Telescope navigation to use j and k for navigation and n and p for history in both input and normal mode. --- lvim.builtin.telescope.on_config_done = function() --- local actions = require "telescope.actions" +-- we use protected-mode (pcall) just in case the plugin wasn't loaded yet. +-- local _, actions = pcall(require, "telescope.actions") +-- lvim.builtin.telescope.defaults.mappings = { -- -- for input mode --- lvim.builtin.telescope.defaults.mappings.i[""] = actions.move_selection_next --- lvim.builtin.telescope.defaults.mappings.i[""] = actions.move_selection_previous --- lvim.builtin.telescope.defaults.mappings.i[""] = actions.cycle_history_next --- lvim.builtin.telescope.defaults.mappings.i[""] = actions.cycle_history_prev +-- i = { +-- [""] = actions.move_selection_next, +-- [""] = actions.move_selection_previous, +-- [""] = actions.cycle_history_next, +-- [""] = actions.cycle_history_prev, +-- }, -- -- for normal mode --- lvim.builtin.telescope.defaults.mappings.n[""] = actions.move_selection_next --- lvim.builtin.telescope.defaults.mappings.n[""] = actions.move_selection_previous --- end +-- n = { +-- [""] = actions.move_selection_next, +-- [""] = actions.move_selection_previous, +-- }, +-- } -- Use which-key to add extra bindings with the leader-key prefix -- lvim.builtin.which_key.mappings["P"] = { "Telescope projects", "Projects" } -- cgit v1.2.3