Compare commits
1 Commits
main
...
8cd07e48d5
| Author | SHA1 | Date | |
|---|---|---|---|
|
8cd07e48d5
|
@@ -1,6 +1,6 @@
|
||||
repos:
|
||||
- repo: https://github.com/JohnnyMorganz/StyLua
|
||||
rev: v2.5.2
|
||||
rev: v2.3.0
|
||||
hooks:
|
||||
- id: stylua-system
|
||||
args: [--check, --respect-ignores]
|
||||
|
||||
@@ -2,4 +2,4 @@ vim.keymap.set("n", "<leader><leader>x", "<cmd>source %<CR>")
|
||||
vim.keymap.set("n", "<leader>x", ":.lua<CR>")
|
||||
vim.keymap.set("v", "<leader>x", ":lua<CR>")
|
||||
|
||||
vim.opt_local.colorcolumn = "81"
|
||||
vim.opt_local.colorcolumn = { 81 }
|
||||
|
||||
@@ -1 +1 @@
|
||||
vim.opt_local.colorcolumn = "80,81,89"
|
||||
vim.opt_local.colorcolumn = { 80, 81, 89 }
|
||||
|
||||
@@ -1 +1 @@
|
||||
vim.opt_local.colorcolumn = "80,100"
|
||||
vim.opt_local.colorcolumn = { 80, 100 }
|
||||
|
||||
@@ -1,5 +1,7 @@
|
||||
return {
|
||||
init_options = {
|
||||
telemetry = "off",
|
||||
settings = {
|
||||
initializationOptions = {
|
||||
telemetry = "off",
|
||||
},
|
||||
},
|
||||
}
|
||||
|
||||
@@ -6,6 +6,7 @@ vim.g.loaded_netrw = 1
|
||||
vim.g.loaded_netrwPlugin = 1
|
||||
|
||||
-- general
|
||||
vim.o.backup = false
|
||||
vim.o.mouse = ""
|
||||
-- TODO:(janezicmatej) i think mouse scroll is binded to up/down and this
|
||||
-- deosn't always work
|
||||
@@ -13,6 +14,7 @@ vim.o.mousescroll = "ver:0,hor:0"
|
||||
vim.o.writebackup = false
|
||||
vim.o.undofile = true
|
||||
vim.o.updatetime = 250
|
||||
vim.o.timeout = true
|
||||
vim.o.timeoutlen = 300
|
||||
|
||||
-- ui
|
||||
@@ -28,6 +30,7 @@ vim.o.wrap = false
|
||||
vim.o.winborder = "double"
|
||||
|
||||
-- editing
|
||||
vim.o.autoindent = true
|
||||
vim.o.expandtab = true
|
||||
vim.o.ignorecase = true
|
||||
vim.o.smartcase = true
|
||||
@@ -60,14 +63,11 @@ vim.g.clipboard = {
|
||||
|
||||
vim.o.completeopt = "menuone,noselect,fuzzy,nosort"
|
||||
|
||||
-- default plus added dash
|
||||
vim.o.iskeyword = "@,48-57,_,192-255,-"
|
||||
|
||||
vim.api.nvim_create_autocmd("TextYankPost", {
|
||||
desc = "highlight when yanking text",
|
||||
group = vim.api.nvim_create_augroup("CustomHighlightYank", { clear = true }),
|
||||
callback = function() vim.hl.hl_op() end,
|
||||
})
|
||||
|
||||
-- filetype overrides
|
||||
vim.api.nvim_create_autocmd({ "BufRead", "BufNewFile" }, {
|
||||
pattern = vim.fn.expand("~") .. "/.config/sway/**/*.conf",
|
||||
callback = function() vim.bo.filetype = "swayconfig" end,
|
||||
callback = function() vim.highlight.on_yank() end,
|
||||
})
|
||||
|
||||
@@ -1,6 +1,6 @@
|
||||
-- bootstrap 'mini.nvim' manually in a way that it gets managed by 'mini.deps'
|
||||
local mini_path = vim.fn.stdpath("data") .. "/site/pack/deps/start/mini.nvim"
|
||||
if not vim.uv.fs_stat(mini_path) then
|
||||
if not vim.loop.fs_stat(mini_path) then
|
||||
vim.cmd('echo "Installing `mini.nvim`" | redraw')
|
||||
local clone_cmd = {
|
||||
"git",
|
||||
|
||||
@@ -16,6 +16,7 @@ now_if_args(function()
|
||||
nix = true,
|
||||
python = true,
|
||||
rust = true,
|
||||
sh = true,
|
||||
typescript = true,
|
||||
}
|
||||
|
||||
|
||||
@@ -1,11 +0,0 @@
|
||||
MiniDeps.now(function()
|
||||
MiniDeps.add("j-hui/fidget.nvim")
|
||||
|
||||
local opts = {
|
||||
notification = {
|
||||
override_vim_notify = true,
|
||||
},
|
||||
}
|
||||
|
||||
require("fidget").setup(opts)
|
||||
end)
|
||||
@@ -1,8 +1,6 @@
|
||||
MiniDeps.later(function()
|
||||
MiniDeps.add({
|
||||
source = "ruifm/gitlinker.nvim",
|
||||
depends = { "nvim-lua/plenary.nvim" },
|
||||
})
|
||||
MiniDeps.add("nvim-lua/plenary.nvim")
|
||||
MiniDeps.add("ruifm/gitlinker.nvim")
|
||||
require("gitlinker").setup({
|
||||
callbacks = {
|
||||
["git.aflabs.org"] = require("gitlinker.hosts").get_gitlab_type_url,
|
||||
|
||||
@@ -1,4 +1,5 @@
|
||||
MiniDeps.now(function()
|
||||
require("mini.icons").setup()
|
||||
MiniIcons.mock_nvim_web_devicons()
|
||||
MiniIcons.tweak_lsp_kind()
|
||||
end)
|
||||
|
||||
4
lua/plugins/mini_notify.lua
Normal file
4
lua/plugins/mini_notify.lua
Normal file
@@ -0,0 +1,4 @@
|
||||
MiniDeps.now(function()
|
||||
require("mini.notify").setup()
|
||||
vim.notify = MiniNotify.make_notify()
|
||||
end)
|
||||
@@ -1 +1,13 @@
|
||||
MiniDeps.later(function() require("mini.snippets").setup() end)
|
||||
MiniDeps.later(function()
|
||||
local gen_loader = require("mini.snippets").gen_loader
|
||||
require("mini.snippets").setup({
|
||||
snippets = {
|
||||
-- Load custom file with global snippets first (adjust for Windows)
|
||||
gen_loader.from_file("~/.config/nvim/snippets/global.json"),
|
||||
|
||||
-- Load snippets based on current language by reading files from
|
||||
-- "snippets/" subdirectories from 'runtimepath' directories.
|
||||
gen_loader.from_lang(),
|
||||
},
|
||||
})
|
||||
end)
|
||||
|
||||
@@ -2,7 +2,7 @@ local function default_header()
|
||||
local hour = tonumber(vim.fn.strftime("%H"))
|
||||
local part_id = math.floor((hour + 4) / 8) + 1
|
||||
local day_part = ({ "evening", "morning", "afternoon", "evening" })[part_id]
|
||||
local username = vim.uv.os_get_passwd()["username"] or "USERNAME"
|
||||
local username = vim.loop.os_get_passwd()["username"] or "USERNAME"
|
||||
|
||||
return ("good %s, %s"):format(day_part, username)
|
||||
end
|
||||
@@ -13,6 +13,9 @@ local function reinstall_treesitter()
|
||||
end
|
||||
|
||||
local function deps_section()
|
||||
-- get working dir
|
||||
-- get config dir
|
||||
|
||||
local mini_deps = require("mini.deps")
|
||||
local nr_deps = #vim.iter(mini_deps):enumerate():totable()
|
||||
|
||||
@@ -35,6 +38,10 @@ local function deps_section()
|
||||
mk_dep_item("clean dependencies", "DepsClean"),
|
||||
}
|
||||
|
||||
vim.notify(vim.fn.getcwd())
|
||||
vim.notify(vim.fn.stdpath("config"))
|
||||
vim.notify(tostring(vim.fn.stdpath("config") == vim.fn.getcwd()))
|
||||
|
||||
if vim.fn.getcwd() == vim.fn.stdpath("config") then
|
||||
for _, item in ipairs(deps_actions) do
|
||||
table.insert(items, item)
|
||||
|
||||
@@ -1,7 +1,5 @@
|
||||
MiniDeps.now(function()
|
||||
MiniDeps.add({
|
||||
source = "folke/todo-comments.nvim",
|
||||
depends = { "nvim-lua/plenary.nvim" },
|
||||
})
|
||||
MiniDeps.add("folke/todo-comments.nvim")
|
||||
MiniDeps.add("nvim-lua/plenary.nvim")
|
||||
require("todo-comments").setup()
|
||||
end)
|
||||
|
||||
@@ -3,6 +3,7 @@ local now_if_args = vim.fn.argc(-1) > 0 and MiniDeps.now or MiniDeps.later
|
||||
now_if_args(function()
|
||||
MiniDeps.add({
|
||||
source = "nvim-treesitter/nvim-treesitter",
|
||||
checkout = "main",
|
||||
hooks = { post_checkout = function() vim.cmd("TSUpdate") end },
|
||||
})
|
||||
|
||||
|
||||
@@ -1,17 +1,16 @@
|
||||
return {
|
||||
["copilot.vim"] = "a12fd5672110c8aa7e3c8419e28c96943ca179be",
|
||||
["fidget.nvim"] = "9e0201673e08e997e7cf52afca5565c70bd117f3",
|
||||
["fzf-lua"] = "13bb178a299f7493dd64427a58e61904c4b58ecb",
|
||||
["copilot.vim"] = "da369d90cfd6c396b1d0ec259836a1c7222fb2ea",
|
||||
["fzf-lua"] = "6bb2a266facf0d16e30371b6b433037d1828a674",
|
||||
["gitlinker.nvim"] = "cc59f732f3d043b626c8702cb725c82e54d35c25",
|
||||
["gitsigns.nvim"] = "8d79f2410c76e62b92e51c28c82e28c1c5a3daeb",
|
||||
["gruvbox-material"] = "11d779b26a9ab2b3db8c22c6ac9fb6e8ed4fea79",
|
||||
["gitsigns.nvim"] = "20ad4419564d6e22b189f6738116b38871082332",
|
||||
["gruvbox-material"] = "834dbf21836862300ced7444db4262b796330ab7",
|
||||
["guess-indent.nvim"] = "84a4987ff36798c2fc1169cbaff67960aed9776f",
|
||||
["mini.nvim"] = "4389a4f31f854ce066949ea89c72dc71564f5c20",
|
||||
["nvim-autopairs"] = "430522f95fe4fb7c511ec64f8c1a90cc6a66c05c",
|
||||
["nvim-lspconfig"] = "ffd261c09c3dabd0bf1a438f47a8ae3b22f3c3ff",
|
||||
["nvim-treesitter"] = "f603a2f4da48728f80257fb5fbb90145fd1dc173",
|
||||
["oil.nvim"] = "b73018b75affd13fa38e2fc94ef753b465f770d7",
|
||||
["plenary.nvim"] = "74b06c6c75e4eeb3108ec01852001636d85a932b",
|
||||
["rainbow-delimiters.nvim"] = "3a0fc08dd39e8bf034a4cfef3f2845bd5f565a2e",
|
||||
["todo-comments.nvim"] = "31e3c38ce9b29781e4422fc0322eb0a21f4e8668"
|
||||
["mini.nvim"] = "d1a91582bf2d16026ae84292874c70fb2d0ffe42",
|
||||
["nvim-autopairs"] = "7a2c97cccd60abc559344042fefb1d5a85b3e33b",
|
||||
["nvim-lspconfig"] = "a9b2fb560c4ab22c10728fd5149dbd7b62aa4f69",
|
||||
["nvim-treesitter"] = "738d9ced4ce5b4538c3a0e23ceca12c34c8d2e74",
|
||||
["oil.nvim"] = "7e1cd7703ff2924d7038476dcbc04b950203b902",
|
||||
["plenary.nvim"] = "b9fd5226c2f76c951fc8ed5923d85e4de065e509",
|
||||
["rainbow-delimiters.nvim"] = "b6b3c9e3f8db02a56416b8ee25d3dbd079ebf26b",
|
||||
["todo-comments.nvim"] = "19d461ddd543e938eb22505fb03fa878800270b6"
|
||||
}
|
||||
|
||||
Reference in New Issue
Block a user