Asahi
Soft reset of dotfiles specific to Asahi, Sway and Neovim.
This commit is contained in:
1 parent
8d688d1107
commit
0bd1501855
84 files changed
+3192
-1973
No files matched your search
@@ -30,7 +30,7 @@ vim.opt.splitright = true
|
||||
|
||||
vim.opt.encoding = "utf-8"
|
||||
|
||||
vim.opt.shell = "zsh"
|
||||
vim.opt.shell = "bash"
|
||||
|
||||
vim.opt.mouse = "a"
|
||||
|
||||
@@ -55,7 +55,7 @@ vim.wo.fillchars='eob: '
|
||||
vim.opt.conceallevel = 3
|
||||
|
||||
-- Window Borders
|
||||
vim.o.winborder = 'rounded'
|
||||
vim.o.winborder = 'single'
|
||||
|
||||
-- Remove Whitespaces on File Save
|
||||
vim.api.nvim_create_autocmd({ "BufWritePre" }, {
|
||||
@@ -105,6 +105,3 @@ vim.fn.sign_define("LineNrDiagnosticHint", { text = "", texthl = "LineNrDiagnos
|
||||
vim.api.nvim_create_autocmd({ "DiagnosticChanged", "BufEnter", "CursorHold" }, {
|
||||
callback = set_line_number_highlight,
|
||||
})
|
||||
|
||||
-- TODO: Put somewhere else (for llm.nvim)
|
||||
vim.fn.setenv("LLM_KEY", "NONE")
|
||||
@@ -21,6 +21,6 @@ require("lazy").setup({
|
||||
spec = {
|
||||
{ import = "plugins" },
|
||||
},
|
||||
install = { colorscheme = { "habamax" } },
|
||||
install = { colorscheme = { "modus" } },
|
||||
checker = { enabled = true, notify = false },
|
||||
})
|
||||
@@ -12,7 +12,10 @@ return {
|
||||
local cmp = require('cmp')
|
||||
local lspkind = require('lspkind')
|
||||
cmp.setup({
|
||||
preselect = 'none',
|
||||
-- preselect = cmp.PreselectMode.None,
|
||||
completion = {
|
||||
completeopt = "menu,menuone,noinsert",
|
||||
},
|
||||
window = {
|
||||
completion = cmp.config.window.bordered({}),
|
||||
documentation = cmp.config.window.bordered({}),
|
||||
@@ -23,11 +26,10 @@ return {
|
||||
end
|
||||
},
|
||||
mapping = cmp.mapping.preset.insert({
|
||||
-- ['<CR>'] = cmp.mapping.confirm({ select = true }),
|
||||
['<C-t>'] = cmp.mapping.complete(),
|
||||
['<CR>'] = cmp.mapping.confirm(),
|
||||
['<Tab>'] = cmp.mapping.select_next_item(),
|
||||
['<S-Tab>'] = cmp.mapping.select_prev_item(),
|
||||
['<Tab>'] = cmp.mapping.confirm({ select = true }),
|
||||
['<C-n>'] = cmp.mapping.select_next_item(),
|
||||
['<C-p>'] = cmp.mapping.select_prev_item(),
|
||||
['<C-g>'] = cmp.mapping.abort(),
|
||||
}),
|
||||
sources = cmp.config.sources(
|
||||
{
|
||||
@@ -53,8 +55,43 @@ return {
|
||||
|
||||
local capabilities = require('cmp_nvim_lsp').default_capabilities()
|
||||
vim.lsp.config('lua_ls', {
|
||||
capabilities = capabilities
|
||||
cmd = { '/home/venomade/.local/share/lua-language-server/bin/lua-language-server' },
|
||||
capabilities = capabilities,
|
||||
root_markers = {
|
||||
".luarc.json",
|
||||
".luarc.jsonc",
|
||||
".git",
|
||||
},
|
||||
settings = {
|
||||
Lua = {
|
||||
runtime = {
|
||||
version = 'Lua 5.4',
|
||||
-- luarocks path --lr-path | tr ';' '\n' | sed 's/?.*//' | sort -u
|
||||
path = {
|
||||
'?.lua',
|
||||
'?/init.lua',
|
||||
'/home/venomade/.luarocks/share/lua/5.4/?.lua',
|
||||
'/home/venomade/.luarocks/share/lua/5.4/?/init.lua',
|
||||
'/usr/share/lua/5.4/?.lua',
|
||||
'/usr/share/lua/5.4/?/init.lua',
|
||||
'./stubs/?.lua',
|
||||
'./stubs/?/init.lua'
|
||||
},
|
||||
},
|
||||
workspace = {
|
||||
library = {
|
||||
'/home/venomade/.luarocks/share/lua/5.4',
|
||||
'/usr/share/lua/5.4',
|
||||
'./stubs'
|
||||
},
|
||||
},
|
||||
diagnostics = {
|
||||
enable = true,
|
||||
},
|
||||
},
|
||||
},
|
||||
})
|
||||
|
||||
vim.lsp.enable('lua_ls')
|
||||
vim.lsp.config('clangd', {
|
||||
capabilities = capabilities
|
||||
|
||||
@@ -1,11 +0,0 @@
|
||||
return {
|
||||
'nvim-flutter/flutter-tools.nvim',
|
||||
lazy = false,
|
||||
dependencies = {
|
||||
'nvim-lua/plenary.nvim',
|
||||
-- 'stevearc/dressing.nvim', -- optional for vim.ui.select
|
||||
},
|
||||
config = function ()
|
||||
require('flutter-tools').setup({})
|
||||
end,
|
||||
}
|
||||
@@ -1,14 +0,0 @@
|
||||
return {
|
||||
"numToStr/FTerm.nvim",
|
||||
config = function()
|
||||
require("FTerm").setup({
|
||||
border = "bold",
|
||||
dimensions = {
|
||||
height = 0.9,
|
||||
width = 0.9,
|
||||
},
|
||||
})
|
||||
vim.keymap.set('n', '<A-i>', '<CMD>lua require("FTerm").toggle()<CR>')
|
||||
vim.keymap.set('t', '<A-i>', '<C-\\><C-n><CMD>lua require("FTerm").toggle()<CR>')
|
||||
end,
|
||||
}
|
||||
@@ -1,14 +0,0 @@
|
||||
return {
|
||||
require('plugins.theme'),
|
||||
require('plugins.autopairs'),
|
||||
require('plugins.treesitter'),
|
||||
require('plugins.rainbow-delimiters'),
|
||||
require('plugins.telescope'),
|
||||
require('plugins.lualine'),
|
||||
require('plugins.statuscol'),
|
||||
require('plugins.oil'),
|
||||
require('plugins.cmp'),
|
||||
require('plugins.lastplace'),
|
||||
require('plugins.orgmode'),
|
||||
require('plugins.which-key'),
|
||||
}
|
||||
@@ -4,3 +4,4 @@ return {
|
||||
require'nvim-lastplace'.setup({})
|
||||
end
|
||||
}
|
||||
|
||||
@@ -7,6 +7,18 @@ return {
|
||||
icons_enabled = true,
|
||||
component_separators = { left = '|', right = '|'},
|
||||
section_separators = { left = '', right = ''},
|
||||
theme = {
|
||||
normal = {
|
||||
a = { bg = '#000000' },
|
||||
b = { bg = '#000000' },
|
||||
c = { bg = '#000000' },
|
||||
},
|
||||
inactive = {
|
||||
a = { bg = '#000000' },
|
||||
b = { bg = '#000000' },
|
||||
c = { bg = '#000000' },
|
||||
}
|
||||
},
|
||||
},
|
||||
sections = {
|
||||
lualine_a = {"mode", {
|
||||
|
||||
@@ -0,0 +1,13 @@
|
||||
return {
|
||||
"miikanissi/modus-themes.nvim",
|
||||
priority = 1000,
|
||||
config = function ()
|
||||
require("modus-themes").setup({
|
||||
style = "modus_vivendi",
|
||||
sign_column_background = false,
|
||||
line_nr_column_background = false,
|
||||
})
|
||||
vim.cmd.colorscheme("modus")
|
||||
end
|
||||
}
|
||||
|
||||
@@ -1,31 +0,0 @@
|
||||
return {
|
||||
'nvim-orgmode/orgmode',
|
||||
event = 'VeryLazy',
|
||||
ft = { 'org' },
|
||||
config = function()
|
||||
-- Setup orgmode
|
||||
require('orgmode').setup({
|
||||
org_agenda_files = '~/orgfiles/**/*',
|
||||
org_default_notes_file = '~/orgfiles/refile.org',
|
||||
org_hide_emphasis_markers = true,
|
||||
})
|
||||
|
||||
-- Enable line wrapping and line breaking for Org files
|
||||
vim.api.nvim_create_augroup("OrgMode", { clear = true })
|
||||
vim.api.nvim_create_autocmd("FileType", {
|
||||
pattern = "org",
|
||||
callback = function()
|
||||
vim.opt_local.wrap = true
|
||||
vim.opt_local.linebreak = true
|
||||
vim.opt_local.textwidth = 80
|
||||
end,
|
||||
})
|
||||
|
||||
-- AUTHORS_NOTE: If you are using nvim-treesitter with ~ensure_installed = "all"~ option
|
||||
-- add ~org~ to ignore_install
|
||||
-- require('nvim-treesitter.configs').setup({
|
||||
-- ensure_installed = 'all',
|
||||
-- ignore_install = { 'org' },
|
||||
-- })
|
||||
end,
|
||||
}
|
||||
+1
-1
@@ -1,6 +1,6 @@
|
||||
return {
|
||||
'MeanderingProgrammer/render-markdown.nvim',
|
||||
dependencies = { 'nvim-treesitter/nvim-treesitter', 'nvim-tree/nvim-web-devicons' },
|
||||
dependencies = { 'nvim-treesitter/nvim-treesitter', 'nvim-tree/nvim-web-devicons' }, -- if you prefer nvim-web-devicons
|
||||
---@module 'render-markdown'
|
||||
---@type render.md.UserConfig
|
||||
opts = {},
|
||||
@@ -1,6 +0,0 @@
|
||||
return {
|
||||
"luukvbaal/statuscol.nvim",
|
||||
config = function()
|
||||
require("statuscol").setup({relculright = true})
|
||||
end,
|
||||
}
|
||||
@@ -2,13 +2,16 @@ return {
|
||||
"nvim-telescope/telescope.nvim",
|
||||
dependencies = { "nvim-lua/plenary.nvim" },
|
||||
config = function()
|
||||
require("telescope").setup({})
|
||||
require("telescope").setup({
|
||||
defaults = {
|
||||
borderchars = { "─", "│", "─", "│", "┌", "┐", "┘", "└" },
|
||||
},
|
||||
})
|
||||
|
||||
local tscope = require('telescope.builtin')
|
||||
vim.keymap.set("n", "<leader>ff", function()
|
||||
local cwd
|
||||
if vim.bo.filetype == "oil" then
|
||||
-- For Oil buffers
|
||||
cwd = require("oil").get_current_dir()
|
||||
else
|
||||
cwd = vim.fn.expand("%:p:h")
|
||||
@@ -25,11 +28,6 @@ return {
|
||||
{ desc = "Find Buffer" })
|
||||
vim.keymap.set('n', '<leader>fh', tscope.help_tags,
|
||||
{ desc = "Find Help" })
|
||||
-- vim.keymap.set('n', '<leader>fg', function()
|
||||
-- tscope.grep_string(
|
||||
-- { search = vim.fn.input("Grep > "),
|
||||
-- desc = "Find by Grep" });
|
||||
-- end)
|
||||
vim.keymap.set('n', '<leader>fg', tscope.live_grep,
|
||||
{ desc = "Find by Grep" })
|
||||
vim.keymap.set('n', '<leader>fr', tscope.oldfiles,
|
||||
|
||||
@@ -1,29 +0,0 @@
|
||||
-- return {
|
||||
-- "rose-pine/neovim",
|
||||
-- as = "rose-pine",
|
||||
-- config = function()
|
||||
-- require("rose-pine").setup({
|
||||
-- variant = "main",
|
||||
-- palette = {
|
||||
-- main = {
|
||||
-- base = "#000000",
|
||||
-- surface = "#000000",
|
||||
-- }
|
||||
-- }
|
||||
-- })
|
||||
-- vim.opt.termguicolors = true
|
||||
-- vim.cmd.colorscheme("rose-pine")
|
||||
-- end,
|
||||
-- }
|
||||
|
||||
return {
|
||||
"catppuccin/nvim",
|
||||
priority = 1000,
|
||||
config = function ()
|
||||
require("catppuccin").setup({
|
||||
flavour = "mocha"
|
||||
})
|
||||
vim.cmd.colorscheme("catppuccin")
|
||||
end,
|
||||
opts = {}
|
||||
}
|
||||
@@ -2,6 +2,13 @@ return {
|
||||
"folke/todo-comments.nvim",
|
||||
dependencies = { "nvim-lua/plenary.nvim" },
|
||||
opts = {
|
||||
}
|
||||
|
||||
},
|
||||
config = function()
|
||||
require('todo-comments').setup({})
|
||||
vim.keymap.set('n', '<leader>ft', function()
|
||||
vim.cmd('TodoTelescope')
|
||||
end,
|
||||
{ desc = "Find Buffer" })
|
||||
end,
|
||||
}
|
||||
-- TODO: Add a bind to :TodoTelescope at '<leader>ft'
|
||||
@@ -1,53 +0,0 @@
|
||||
-- return {
|
||||
-- "nvim-treesitter/nvim-treesitter",
|
||||
-- config = function()
|
||||
-- require("nvim-treesitter.configs").setup({
|
||||
-- ensure_installed = {"c", "vimdoc", "markdown", "jsonc", "lua"},
|
||||
-- sync_install = false,
|
||||
-- highlight = { enable = true },
|
||||
-- indent = { enable = true },
|
||||
-- })
|
||||
-- end,
|
||||
-- }
|
||||
|
||||
return {
|
||||
"nvim-treesitter/nvim-treesitter",
|
||||
opts = {
|
||||
highlight = { enable = true },
|
||||
indent = { enable = true },
|
||||
ensure_installed = {
|
||||
"bash",
|
||||
"c",
|
||||
"dart",
|
||||
"diff",
|
||||
"go",
|
||||
"html",
|
||||
"javascript",
|
||||
"jsdoc",
|
||||
"json",
|
||||
"jsonc",
|
||||
"lua",
|
||||
"luadoc",
|
||||
"luap",
|
||||
"make",
|
||||
"markdown",
|
||||
"markdown_inline",
|
||||
"printf",
|
||||
"python",
|
||||
"query",
|
||||
"regex",
|
||||
"rust",
|
||||
"toml",
|
||||
"tsx",
|
||||
"typescript",
|
||||
"vim",
|
||||
"vimdoc",
|
||||
"xml",
|
||||
"yaml",
|
||||
},
|
||||
},
|
||||
---@param opts TSConfig
|
||||
config = function(_, opts)
|
||||
require("nvim-treesitter.configs").setup(opts)
|
||||
end,
|
||||
}
|
||||
@@ -1,17 +0,0 @@
|
||||
return {
|
||||
"folke/which-key.nvim",
|
||||
event = "VeryLazy",
|
||||
opts = {
|
||||
icons = { mappings = false },
|
||||
delay = 1000
|
||||
},
|
||||
keys = {
|
||||
{
|
||||
"<leader>?",
|
||||
function()
|
||||
require("which-key").show({ global = false })
|
||||
end,
|
||||
desc = "Buffer Local Keymaps",
|
||||
},
|
||||
},
|
||||
}
|
||||
@@ -1,24 +0,0 @@
|
||||
return {
|
||||
"Pocco81/true-zen.nvim",
|
||||
config = function()
|
||||
require('true-zen').setup({
|
||||
modes = {
|
||||
ataraxis = {
|
||||
padding = {
|
||||
left = 100,
|
||||
right = 100,
|
||||
}
|
||||
},
|
||||
minimalist = {
|
||||
options = {
|
||||
-- Some weird bug fix :/
|
||||
cmdheight = 1
|
||||
}
|
||||
}
|
||||
}
|
||||
})
|
||||
|
||||
vim.keymap.set('n', '<leader>z', require('true-zen.ataraxis').toggle,
|
||||
{ desc = "Toggle Zen Mode" })
|
||||
end,
|
||||
}
|
||||
Reference in new issue
Block a user