update stuffz

This commit is contained in:
LordMZTE 2021-11-05 17:44:11 +01:00
parent c4eeb91e62
commit b0732cae2e
13 changed files with 433 additions and 519 deletions

View file

@ -1,3 +1,3 @@
require("plugins") require "plugins"
require("settings") require "settings"
require("maps") require "maps"

View file

@ -1,32 +1,32 @@
map = vim.api.nvim_set_keymap map = vim.api.nvim_set_keymap
function escape_keycode(keycode) function escape_keycode(keycode)
return vim.api.nvim_replace_termcodes(keycode, true, true, true) return vim.api.nvim_replace_termcodes(keycode, true, true, true)
end end
local function check_back_space() local function check_back_space()
local col = vim.fn.col(".") - 1 local col = vim.fn.col "." - 1
return col <= 0 or vim.fn.getline("."):sub(col, col):match("%s") return col <= 0 or vim.fn.getline("."):sub(col, col):match "%s"
end end
function tab_completion() function tab_completion()
if vim.fn.pumvisible() > 0 then if vim.fn.pumvisible() > 0 then
return escape_keycode("<C-n>") return escape_keycode "<C-n>"
end end
if check_back_space() then if check_back_space() then
return escape_keycode("<TAB>") return escape_keycode "<TAB>"
end end
return vim.fn["coc#refresh"]() return vim.fn["coc#refresh"]()
end end
function shift_tab_completion() function shift_tab_completion()
if vim.fn.pumvisible() > 0 then if vim.fn.pumvisible() > 0 then
return escape_keycode("<C-p>") return escape_keycode "<C-p>"
else else
return escape_keycode("<C-h>") return escape_keycode "<C-h>"
end end
end end
-- Getting stuck in ~~vim~~ terminal -- Getting stuck in ~~vim~~ terminal

View file

@ -1,48 +1,48 @@
coc = {} coc = {}
vim.g.coc_global_extensions = { vim.g.coc_global_extensions = {
"coc-clangd", "coc-clangd",
"coc-fish", "coc-fish",
"coc-go", "coc-go",
"coc-haxe", "coc-haxe",
"coc-java", "coc-java",
"coc-json", "coc-json",
"coc-kotlin", "coc-kotlin",
"coc-rust-analyzer", "coc-rust-analyzer",
"coc-snippets", "coc-snippets",
"coc-sumneko-lua", "coc-sumneko-lua",
"coc-toml", "coc-toml",
} }
local function check_back_space() local function check_back_space()
local col = vim.fn.col(".") - 1 local col = vim.fn.col "." - 1
return col <= 0 or vim.fn.getline("."):sub(col, col):match("%s") return col <= 0 or vim.fn.getline("."):sub(col, col):match "%s"
end end
function coc.tab_completion() function coc.tab_completion()
if vim.fn.pumvisible() > 0 then if vim.fn.pumvisible() > 0 then
return escape_keycode("<C-n>") return escape_keycode "<C-n>"
end end
if check_back_space() then if check_back_space() then
return escape_keycode("<TAB>") return escape_keycode "<TAB>"
end end
return vim.fn["coc#refresh"]() return vim.fn["coc#refresh"]()
end end
function coc.shift_tab_completion() function coc.shift_tab_completion()
if vim.fn.pumvisible() > 0 then if vim.fn.pumvisible() > 0 then
return escape_keycode("<C-p>") return escape_keycode "<C-p>"
else else
return escape_keycode("<C-h>") return escape_keycode "<C-h>"
end end
end end
function coc.cr_completion() function coc.cr_completion()
if vim.fn.pumvisible() > 0 then if vim.fn.pumvisible() > 0 then
return vim.fn["coc#_select_confirm"]() return vim.fn["coc#_select_confirm"]()
else else
return escape_keycode([[\<C-g>u\<CR>\<c-r>=coc#on_enter()\<CR>]]) return escape_keycode [[\<C-g>u\<CR>\<c-r>=coc#on_enter()\<CR>]]
end end
end end

View file

@ -1,14 +1,14 @@
local blacklistedSites = { ".*twitch\\.tv.*", ".*twitter\\.com.*" } local blacklistedSites = { ".*twitch\\.tv.*", ".*twitter\\.com.*" }
local localSettings = { local localSettings = {
[".*"] = { [".*"] = {
cmdline = "neovim", cmdline = "neovim",
}, },
} }
for _, site in pairs(blacklistedSites) do for _, site in pairs(blacklistedSites) do
localSettings[site] = { takeover = "never" } localSettings[site] = { takeover = "never" }
end end
vim.g.firenvim_config = { vim.g.firenvim_config = {
localSettings = localSettings, localSettings = localSettings,
} }

View file

@ -1,116 +1,116 @@
-- BASED OFF https://github.com/LoydAndrew/nvim/blob/main/evilline.lua -- BASED OFF https://github.com/LoydAndrew/nvim/blob/main/evilline.lua
local gl = require("galaxyline") local gl = require "galaxyline"
local gls = gl.section local gls = gl.section
local extension = require("galaxyline.provider_extensions") local extension = require "galaxyline.provider_extensions"
gl.short_line_list = { gl.short_line_list = {
"LuaTree", "LuaTree",
"vista", "vista",
"dbui", "dbui",
"startify", "startify",
"term", "term",
"nerdtree", "nerdtree",
"fugitive", "fugitive",
"fugitiveblame", "fugitiveblame",
"plug", "plug",
} }
-- VistaPlugin = extension.vista_nearest -- VistaPlugin = extension.vista_nearest
local colors = { local colors = {
bg = "#44475a", bg = "#44475a",
line_bg = "#282c34", line_bg = "#282c34",
fg = "#f8f8f2", fg = "#f8f8f2",
fg_green = "#65a380", fg_green = "#65a380",
yellow = "#f1fa8c", yellow = "#f1fa8c",
cyan = "#8be9fd", cyan = "#8be9fd",
darkblue = "#081633", darkblue = "#081633",
green = "#50fa7b", green = "#50fa7b",
orange = "#ffb86c", orange = "#ffb86c",
purple = "#bd93f9", purple = "#bd93f9",
magenta = "#ff79c6", magenta = "#ff79c6",
blue = "#51afef", blue = "#51afef",
red = "#ff5555", red = "#ff5555",
} }
local mode_color = { local mode_color = {
n = colors.green, n = colors.green,
i = colors.blue, i = colors.blue,
v = colors.magenta, v = colors.magenta,
[""] = colors.blue, [""] = colors.blue,
V = colors.blue, V = colors.blue,
c = colors.red, c = colors.red,
no = colors.magenta, no = colors.magenta,
s = colors.orange, s = colors.orange,
S = colors.orange, S = colors.orange,
[""] = colors.orange, [""] = colors.orange,
ic = colors.yellow, ic = colors.yellow,
R = colors.purple, R = colors.purple,
Rv = colors.purple, Rv = colors.purple,
cv = colors.red, cv = colors.red,
ce = colors.red, ce = colors.red,
r = colors.cyan, r = colors.cyan,
rm = colors.cyan, rm = colors.cyan,
["r?"] = colors.cyan, ["r?"] = colors.cyan,
["!"] = colors.green, ["!"] = colors.green,
t = colors.green, t = colors.green,
c = colors.purple, c = colors.purple,
["r?"] = colors.red, ["r?"] = colors.red,
["r"] = colors.red, ["r"] = colors.red,
rm = colors.red, rm = colors.red,
R = colors.yellow, R = colors.yellow,
Rv = colors.magenta, Rv = colors.magenta,
} }
local function lsp_status(status) local function lsp_status(status)
shorter_stat = "" shorter_stat = ""
for match in string.gmatch(status, "[^%s]+") do for match in string.gmatch(status, "[^%s]+") do
err_warn = string.find(match, "^[WE]%d+", 0) err_warn = string.find(match, "^[WE]%d+", 0)
if not err_warn then if not err_warn then
shorter_stat = shorter_stat .. " " .. match shorter_stat = shorter_stat .. " " .. match
end end
end end
return shorter_stat return shorter_stat
end end
local function get_coc_lsp() local function get_coc_lsp()
local status = vim.fn["coc#status"]() local status = vim.fn["coc#status"]()
if not status or status == "" then if not status or status == "" then
return "" return ""
end end
return lsp_status(status) return lsp_status(status)
end end
function get_diagnostic_info() function get_diagnostic_info()
if vim.fn.exists("*coc#rpc#start_server") == 1 then if vim.fn.exists "*coc#rpc#start_server" == 1 then
return get_coc_lsp() return get_coc_lsp()
end end
return "" return ""
end end
local function get_current_func() local function get_current_func()
local has_func, func_name = pcall(vim.fn.nvim_buf_get_var, 0, "coc_current_function") local has_func, func_name = pcall(vim.fn.nvim_buf_get_var, 0, "coc_current_function")
if not has_func then if not has_func then
return return
end end
return func_name return func_name
end end
function get_function_info() function get_function_info()
if vim.fn.exists("*coc#rpc#start_server") == 1 then if vim.fn.exists "*coc#rpc#start_server" == 1 then
return get_current_func() return get_current_func()
end end
return "" return ""
end end
local function trailing_whitespace() local function trailing_whitespace()
local trail = vim.fn.search("\\s$", "nw") local trail = vim.fn.search("\\s$", "nw")
if trail ~= 0 then if trail ~= 0 then
return " " return " "
else else
return nil return nil
end end
end end
CocStatus = get_diagnostic_info CocStatus = get_diagnostic_info
@ -118,255 +118,255 @@ CocFunc = get_current_func
TrailingWhiteSpace = trailing_whitespace TrailingWhiteSpace = trailing_whitespace
function has_file_type() function has_file_type()
local f_type = vim.bo.filetype local f_type = vim.bo.filetype
if not f_type or f_type == "" then if not f_type or f_type == "" then
return false return false
end end
return true return true
end end
local buffer_not_empty = function() local buffer_not_empty = function()
if vim.fn.empty(vim.fn.expand("%:t")) ~= 1 then if vim.fn.empty(vim.fn.expand "%:t") ~= 1 then
return true return true
end end
return false return false
end end
gls.left[1] = { gls.left[1] = {
FirstElement = { FirstElement = {
provider = function() provider = function()
return " " return " "
end, end,
highlight = { colors.blue, colors.line_bg }, highlight = { colors.blue, colors.line_bg },
}, },
} }
gls.left[2] = { gls.left[2] = {
ViMode = { ViMode = {
provider = function() provider = function()
-- auto change color according the vim mode -- auto change color according the vim mode
local alias = { local alias = {
n = "NORMAL", n = "NORMAL",
i = "INSERT", i = "INSERT",
c = "COMMAND", c = "COMMAND",
V = "VISUAL", V = "VISUAL",
[""] = "VISUAL", [""] = "VISUAL",
v = "VISUAL", v = "VISUAL",
c = "COMMAND-LINE", c = "COMMAND-LINE",
["r?"] = ":CONFIRM", ["r?"] = ":CONFIRM",
rm = "--MORE", rm = "--MORE",
R = "REPLACE", R = "REPLACE",
Rv = "VIRTUAL", Rv = "VIRTUAL",
s = "SELECT", s = "SELECT",
S = "SELECT", S = "SELECT",
["r"] = "HIT-ENTER", ["r"] = "HIT-ENTER",
[""] = "SELECT", [""] = "SELECT",
t = "TERMINAL", t = "TERMINAL",
["!"] = "SHELL", ["!"] = "SHELL",
} }
local vim_mode = vim.fn.mode() local vim_mode = vim.fn.mode()
vim.api.nvim_command("hi GalaxyViMode guibg=" .. mode_color[vim_mode]) vim.api.nvim_command("hi GalaxyViMode guibg=" .. mode_color[vim_mode])
return alias[vim_mode] .. "" return alias[vim_mode] .. ""
end, end,
highlight = { colors.line_bg, colors.line_bg, "bold" }, highlight = { colors.line_bg, colors.line_bg, "bold" },
}, },
} }
gls.left[3] = { gls.left[3] = {
ModeSep = { ModeSep = {
provider = function() provider = function()
vim.api.nvim_command("hi GalaxyModeSep guifg=" .. mode_color[vim.fn.mode()] .. " guibg=" .. colors.bg) vim.api.nvim_command("hi GalaxyModeSep guifg=" .. mode_color[vim.fn.mode()] .. " guibg=" .. colors.bg)
return "" return ""
end, end,
highlight = { colors.line_bg, colors.line_bg }, highlight = { colors.line_bg, colors.line_bg },
separator = "", separator = "",
separator_highlight = { colors.bg, colors.line_bg }, separator_highlight = { colors.bg, colors.line_bg },
}, },
} }
gls.left[4] = { gls.left[4] = {
FileIcon = { FileIcon = {
provider = "FileIcon", provider = "FileIcon",
condition = buffer_not_empty, condition = buffer_not_empty,
highlight = { require("galaxyline.provider_fileinfo").get_file_icon_color, colors.line_bg }, highlight = { require("galaxyline.provider_fileinfo").get_file_icon_color, colors.line_bg },
}, },
} }
gls.left[5] = { gls.left[5] = {
FileName = { FileName = {
provider = { "FileName", "FileSize" }, provider = { "FileName", "FileSize" },
condition = buffer_not_empty, condition = buffer_not_empty,
highlight = { colors.fg, colors.line_bg, "bold" }, highlight = { colors.fg, colors.line_bg, "bold" },
}, },
} }
gls.left[6] = { gls.left[6] = {
GitIcon = { GitIcon = {
provider = function() provider = function()
return "" return ""
end, end,
condition = require("galaxyline.provider_vcs").check_git_workspace, condition = require("galaxyline.provider_vcs").check_git_workspace,
highlight = { colors.orange, colors.line_bg }, highlight = { colors.orange, colors.line_bg },
}, },
} }
gls.left[7] = { gls.left[7] = {
GitBranch = { GitBranch = {
provider = "GitBranch", provider = "GitBranch",
condition = require("galaxyline.provider_vcs").check_git_workspace, condition = require("galaxyline.provider_vcs").check_git_workspace,
highlight = { "#8FBCBB", colors.line_bg, "bold" }, highlight = { "#8FBCBB", colors.line_bg, "bold" },
}, },
} }
local checkwidth = function() local checkwidth = function()
local squeeze_width = vim.fn.winwidth(0) / 2 local squeeze_width = vim.fn.winwidth(0) / 2
if squeeze_width > 40 then if squeeze_width > 40 then
return true return true
end end
return false return false
end end
gls.left[8] = { gls.left[8] = {
DiffAdd = { DiffAdd = {
provider = "DiffAdd", provider = "DiffAdd",
condition = checkwidth, condition = checkwidth,
icon = "", icon = "",
highlight = { colors.green, colors.line_bg }, highlight = { colors.green, colors.line_bg },
}, },
} }
gls.left[9] = { gls.left[9] = {
DiffModified = { DiffModified = {
provider = "DiffModified", provider = "DiffModified",
condition = checkwidth, condition = checkwidth,
icon = "", icon = "",
highlight = { colors.orange, colors.line_bg }, highlight = { colors.orange, colors.line_bg },
}, },
} }
gls.left[10] = { gls.left[10] = {
DiffRemove = { DiffRemove = {
provider = "DiffRemove", provider = "DiffRemove",
condition = checkwidth, condition = checkwidth,
icon = "", icon = "",
highlight = { colors.red, colors.line_bg }, highlight = { colors.red, colors.line_bg },
}, },
} }
gls.left[11] = { gls.left[11] = {
LeftEnd = { LeftEnd = {
provider = function() provider = function()
return "" return ""
end, end,
highlight = { colors.line_bg, colors.bg }, highlight = { colors.line_bg, colors.bg },
}, },
} }
gls.left[12] = { gls.left[12] = {
TrailingWhiteSpace = { TrailingWhiteSpace = {
provider = TrailingWhiteSpace, provider = TrailingWhiteSpace,
icon = "", icon = "",
highlight = { colors.yellow, colors.bg }, highlight = { colors.yellow, colors.bg },
}, },
} }
gls.left[13] = { gls.left[13] = {
DiagnosticError = { DiagnosticError = {
provider = "DiagnosticError", provider = "DiagnosticError",
icon = "", icon = "",
highlight = { colors.red, colors.bg }, highlight = { colors.red, colors.bg },
}, },
} }
gls.left[14] = { gls.left[14] = {
Space = { Space = {
provider = function() provider = function()
return " " return " "
end, end,
highlight = { colors.bg, colors.bg }, highlight = { colors.bg, colors.bg },
}, },
} }
gls.left[15] = { gls.left[15] = {
DiagnosticWarn = { DiagnosticWarn = {
provider = "DiagnosticWarn", provider = "DiagnosticWarn",
icon = "", icon = "",
highlight = { colors.yellow, colors.bg }, highlight = { colors.yellow, colors.bg },
}, },
} }
gls.left[16] = { gls.left[16] = {
CocStatus = { CocStatus = {
provider = CocStatus, provider = CocStatus,
highlight = { colors.green, colors.bg }, highlight = { colors.green, colors.bg },
icon = " 🗱", icon = " 🗱",
}, },
} }
gls.left[17] = { gls.left[17] = {
CocFunc = { CocFunc = {
provider = CocFunc, provider = CocFunc,
icon = " λ ", icon = " λ ",
highlight = { colors.yellow, colors.bg }, highlight = { colors.yellow, colors.bg },
}, },
} }
gls.right[1] = { gls.right[1] = {
BufferType = { BufferType = {
provider = "FileTypeName", provider = "FileTypeName",
separator = "", separator = "",
condition = has_file_type, condition = has_file_type,
separator_highlight = { colors.line_bg, colors.bg }, separator_highlight = { colors.line_bg, colors.bg },
highlight = { colors.fg, colors.line_bg }, highlight = { colors.fg, colors.line_bg },
}, },
} }
gls.right[2] = { gls.right[2] = {
TypeSep = { TypeSep = {
provider = function() provider = function()
return "" return ""
end, end,
highlight = { colors.bg, colors.line_bg }, highlight = { colors.bg, colors.line_bg },
}, },
} }
gls.right[3] = { gls.right[3] = {
FileFormat = { FileFormat = {
provider = "FileFormat", provider = "FileFormat",
separator = "", separator = "",
separator_highlight = { colors.line_bg, colors.bg }, separator_highlight = { colors.line_bg, colors.bg },
highlight = { colors.fg, colors.line_bg, "bold" }, highlight = { colors.fg, colors.line_bg, "bold" },
}, },
} }
gls.right[4] = { gls.right[4] = {
LineInfo = { LineInfo = {
provider = "LineColumn", provider = "LineColumn",
separator = " |", separator = " |",
separator_highlight = { colors.blue, colors.line_bg }, separator_highlight = { colors.blue, colors.line_bg },
highlight = { colors.fg, colors.line_bg }, highlight = { colors.fg, colors.line_bg },
}, },
} }
gls.right[5] = { gls.right[5] = {
PerCent = { PerCent = {
provider = "LinePercent", provider = "LinePercent",
highlight = { colors.cyan, colors.darkblue, "bold" }, highlight = { colors.cyan, colors.darkblue, "bold" },
}, },
} }
gls.right[6] = { gls.right[6] = {
ScrollBar = { ScrollBar = {
provider = "ScrollBar", provider = "ScrollBar",
highlight = { colors.blue, colors.purple }, highlight = { colors.blue, colors.purple },
}, },
} }
gls.short_line_left[1] = { gls.short_line_left[1] = {
BufferType = { BufferType = {
provider = "FileTypeName", provider = "FileTypeName",
separator = "", separator = "",
condition = has_file_type, condition = has_file_type,
separator_highlight = { colors.purple, colors.bg }, separator_highlight = { colors.purple, colors.bg },
highlight = { colors.fg, colors.purple }, highlight = { colors.fg, colors.purple },
}, },
} }
gls.short_line_right[1] = { gls.short_line_right[1] = {
BufferIcon = { BufferIcon = {
provider = "BufferIcon", provider = "BufferIcon",
separator = "", separator = "",
condition = has_file_type, condition = has_file_type,
separator_highlight = { colors.purple, colors.bg }, separator_highlight = { colors.purple, colors.bg },
highlight = { colors.fg, colors.purple }, highlight = { colors.fg, colors.purple },
}, },
} }

View file

@ -1,13 +1,13 @@
local pears = require("pears") local pears = require "pears"
pears.setup(function(conf) pears.setup(function(conf)
conf.preset("tag_matching") conf.preset "tag_matching"
conf.on_enter(function(pears_handle) conf.on_enter(function(pears_handle)
if vim.fn.pumvisible() == 1 then if vim.fn.pumvisible() == 1 then
return vim.fn["coc#_select_confirm"]() return vim.fn["coc#_select_confirm"]()
else else
pears_handle() pears_handle()
end end
end) end)
end) end)

View file

@ -1,11 +1,11 @@
require("nvim-tree").setup({ require("nvim-tree").setup {
-- don't open tree when using firenvim -- don't open tree when using firenvim
open_on_setup = not vim.g.started_by_firenvim, open_on_setup = not vim.g.started_by_firenvim,
auto_close = true, auto_close = true,
diagnostics = { diagnostics = {
enable = true, enable = true,
}, },
view = { view = {
auto_resize = true, auto_resize = true,
}, },
}) }

View file

@ -1,13 +1,13 @@
require("telescope").setup({ require("telescope").setup {
defaults = { defaults = {
vimgrep_arguments = { vimgrep_arguments = {
"rg", "rg",
"--color=never", "--color=never",
"--no-heading", "--no-heading",
"--with-filename", "--with-filename",
"--line-number", "--line-number",
"--column", "--column",
"--smart-case", "--smart-case",
}, },
}, },
}) }

View file

@ -1,20 +1,20 @@
local configs = require("nvim-treesitter.configs") local configs = require "nvim-treesitter.configs"
local parsers = require("nvim-treesitter.parsers") local parsers = require "nvim-treesitter.parsers"
local parser_config = parsers.get_parser_configs() local parser_config = parsers.get_parser_configs()
parser_config.haxe = { parser_config.haxe = {
install_info = { install_info = {
url = "https://github.com/vantreeseba/tree-sitter-haxe", url = "https://github.com/vantreeseba/tree-sitter-haxe",
files = { "src/parser.c" }, files = { "src/parser.c" },
branch = "main", branch = "main",
}, },
filetype = "haxe", filetype = "haxe",
} }
configs.setup({ configs.setup {
ensure_installed = { "haxe" }, ensure_installed = { "haxe" },
highlight = { highlight = {
enable = true, enable = true,
}, },
}) }

View file

@ -1,80 +1,76 @@
vim.cmd([[packadd packer.nvim]]) vim.cmd [[packadd packer.nvim]]
local function pconf(plugin) local function pconf(plugin)
return 'require("pluginconf.' .. plugin .. '")' return 'require("pluginconf.' .. plugin .. '")'
end end
return require("packer").startup(function(use) return require("packer").startup(function(use)
use("wbthomason/packer.nvim") use "wbthomason/packer.nvim"
use({ use {
"neoclide/coc.nvim", "neoclide/coc.nvim",
branch = "release", branch = "release",
config = pconf("coc"), config = pconf "coc",
}) }
use("ryanoasis/vim-devicons") use "ryanoasis/vim-devicons"
use({ use {
"cespare/vim-toml", "dracula/vim",
branch = "main", as = "dracula",
}) }
use({ use "vimwiki/vimwiki"
"dracula/vim", use {
as = "dracula", "glacambre/firenvim",
}) run = function()
use("vimwiki/vimwiki") vim.fn["firenvim#install"](0)
use({ end,
"glacambre/firenvim", config = pconf "firenvim",
run = function() }
vim.fn["firenvim#install"](0) use "airblade/vim-gitgutter"
end, use "dag/vim-fish"
config = pconf("firenvim"), use "uiiaoo/java-syntax.vim"
}) use "honza/vim-snippets"
use("airblade/vim-gitgutter") use "sheerun/vim-polyglot"
use("dag/vim-fish") use {
use("uiiaoo/java-syntax.vim") "glepnir/galaxyline.nvim",
use("honza/vim-snippets") branch = "main",
use("sheerun/vim-polyglot") config = pconf "galaxyline",
use({ }
"glepnir/galaxyline.nvim", use {
branch = "main", "nvim-treesitter/nvim-treesitter",
config = pconf("galaxyline"), run = ":TSUpdate",
}) config = pconf "treesitter",
use({ }
"nvim-treesitter/nvim-treesitter", use {
run = ":TSUpdate", "euclio/vim-markdown-composer",
config = pconf("treesitter"), run = "cargo build --release",
}) config = pconf "markdowncomposer",
use({ }
"euclio/vim-markdown-composer",
run = "cargo build --release",
config = pconf("markdowncomposer"),
})
use("kassio/neoterm") use "kassio/neoterm"
use("kyazdani42/nvim-web-devicons") use "kyazdani42/nvim-web-devicons"
use({ use {
"kyazdani42/nvim-tree.lua", "kyazdani42/nvim-tree.lua",
requires = "kyazdani42/nvim-web-devicons", requires = "kyazdani42/nvim-web-devicons",
config = pconf("nvimtree"), config = pconf "nvimtree",
}) }
use({ use {
"TimUntersberger/neogit", "TimUntersberger/neogit",
requires = "nvim-lua/plenary.nvim", requires = "nvim-lua/plenary.nvim",
}) }
use("ron-rs/ron.vim") use "ron-rs/ron.vim"
use({ use {
"nvim-telescope/telescope.nvim", "nvim-telescope/telescope.nvim",
requires = "nvim-lua/plenary.nvim", requires = "nvim-lua/plenary.nvim",
config = pconf("telescope"), config = pconf "telescope",
}) }
use("gluon-lang/vim-gluon") use "gluon-lang/vim-gluon"
use({ use {
"steelsojka/pears.nvim", "steelsojka/pears.nvim",
config = pconf("nvim_pears"), config = pconf "nvim_pears",
}) }
end) end)

View file

@ -4,7 +4,7 @@ local o = vim.o
local wo = vim.wo local wo = vim.wo
local g = vim.g local g = vim.g
cmd("syntax on") cmd "syntax on"
o.tabstop = 4 o.tabstop = 4
o.shiftwidth = 4 o.shiftwidth = 4
o.expandtab = true o.expandtab = true
@ -19,11 +19,11 @@ g.airline_powerline_fonts = 1
g.neoterm_default_mod = "tab" g.neoterm_default_mod = "tab"
g.neovide_iso_layout = true g.neovide_iso_layout = true
cmd("colorscheme dracula") cmd "colorscheme dracula"
-- Highlight the symbol and its references when holding the cursor. -- Highlight the symbol and its references when holding the cursor.
cmd("autocmd CursorHold * silent call CocActionAsync('highlight')") cmd "autocmd CursorHold * silent call CocActionAsync('highlight')"
cmd("autocmd StdinReadPre * let s:std_in=1") cmd "autocmd StdinReadPre * let s:std_in=1"
cmd("filetype plugin on") cmd "filetype plugin on"

View file

@ -1,84 +0,0 @@
local wezterm = require "wezterm"
local gitbash = {"C:\\Program Files\\Git\\bin\\bash.exe", "-i", "-l"}
return {
color_scheme = "Dracula",
default_prog = gitbash,
keys = {
{
key = "F3",
action = "ShowLauncher",
},
{
key = "Y",
mods = "CTRL",
action = "Copy",
},
{
key = "C",
mods = "CTRL",
action = "DisableDefaultAssignment",
},
{
key = " ",
mods = "CTRL|SHIFT",
action = "ActivateCopyMode",
},
{
key = "9",
mods = "ALT",
action = "DisableDefaultAssignment",
},
},
ssh_domains = {
{
name = "RPI",
remote_address = "192.168.2.5",
username = "pi",
}
},
font_dirs = {"C:\\Windows\\Fonts"},
font_rules = {
{
italic = false,
bold = false,
font = wezterm.font("Iosevka Nerd Font Complete"),
},
{
italic = true,
bold = false,
font = wezterm.font("Iosevka Italic Nerd Font Complete"),
},
{
italic = false,
bold = true,
font = wezterm.font("Iosevka Bold Nerd Font Complete"),
},
{
italic = true,
bold = true,
font = wezterm.font("Iosevka Bold Italic Nerd Font Complete"),
},
},
launch_menu = {
{
label = "Arch WSL",
args = {"wsl", "-d", "Arch"},
},
{
label = "Ubuntu WSL",
args = {"wsl", "-d", "Ubuntu-20.04"},
},
{
label = "Powershell",
args = {"powershell"},
},
{
label = "Git Bash",
args = gitbash,
},
},
}

2
stylua.toml Normal file
View file

@ -0,0 +1,2 @@
indent_type = "Spaces"
no_call_parentheses = true