Compare commits
3 commits
4e1fba9299
...
2450f6b222
Author | SHA1 | Date | |
---|---|---|---|
2450f6b222 | |||
1fb71cfa08 | |||
8a30fffd64 |
7 changed files with 89 additions and 22 deletions
|
@ -23,4 +23,5 @@ A short list of what's included in here:
|
|||
- `emacs`, while I use Zed for a lot these days, Emacs remains the best Lisp interaction mode, hands down
|
||||
- A barebones `vim` config
|
||||
- `git` and `hg` configuration
|
||||
- `neovim` (gotta have it)
|
||||
- Configuration for things I use very rarely (`helix`, `nushell`, `nix`, `alacritty`)
|
||||
|
|
|
@ -61,7 +61,7 @@ alias cd.. "cd ../"
|
|||
alias rmrf "rm -rf"
|
||||
|
||||
# portage aliases
|
||||
alias eupgrade "doas emerge -aguDN @world"
|
||||
alias eupgrade "doas emerge -aguDN --with-bdeps=t @world"
|
||||
alias eclean "doas emerge -ac"
|
||||
|
||||
# chezmoi aliases
|
||||
|
|
|
@ -1 +1,2 @@
|
|||
require("settings")
|
||||
require("config.lazy")
|
||||
|
|
|
@ -11,9 +11,46 @@ return {
|
|||
dashboard = { enabled = true },
|
||||
indent = { enabled = true, animate = { enabled = false } },
|
||||
input = { enabled = true },
|
||||
lazygit = { enabled = true },
|
||||
lazygit = { enabled = true, configure = true },
|
||||
picker = { enabled = true },
|
||||
quickfile = { enabled = true },
|
||||
statuscolumn = { enabled = true }
|
||||
}
|
||||
}
|
||||
statuscolumn = { enabled = true },
|
||||
},
|
||||
keys = {
|
||||
{
|
||||
"<leader>gg",
|
||||
function()
|
||||
require("snacks").lazygit()
|
||||
end,
|
||||
desc = "Open LazyGit",
|
||||
},
|
||||
},
|
||||
},
|
||||
{
|
||||
"stevearc/conform.nvim",
|
||||
opts = {
|
||||
formatters_by_ft = {
|
||||
lua = { "stylua" },
|
||||
},
|
||||
format_on_save = {
|
||||
timeout_ms = 500,
|
||||
lsp_format = "fallback",
|
||||
},
|
||||
},
|
||||
},
|
||||
{
|
||||
"zapling/mason-conform.nvim",
|
||||
depends = {
|
||||
"williamboman/mason.nvim",
|
||||
"stevearc/conform.nvim",
|
||||
},
|
||||
opts = {},
|
||||
},
|
||||
{
|
||||
"mrjones2014/legendary.nvim",
|
||||
priority = 999,
|
||||
opts = {
|
||||
extensions = { lazy_nvim = true },
|
||||
},
|
||||
},
|
||||
}
|
||||
|
|
|
@ -1,30 +1,37 @@
|
|||
-- Telescope, and other file picker-related plugins
|
||||
|
||||
return {
|
||||
{
|
||||
{
|
||||
"nvim-telescope/telescope.nvim",
|
||||
config = function()
|
||||
local telescope = require("telescope")
|
||||
telescope.setup()
|
||||
telescope.setup({})
|
||||
telescope.load_extension("chezmoi")
|
||||
end
|
||||
end,
|
||||
keys = {
|
||||
{
|
||||
"<leader><space>",
|
||||
"<cmd>Telescope find_files<cr>",
|
||||
desc = "Find files",
|
||||
},
|
||||
},
|
||||
},
|
||||
{
|
||||
"xvzc/chezmoi.nvim",
|
||||
config = function()
|
||||
require("chezmoi").setup {
|
||||
-- Treat all files in my chezmoi source directory as source files
|
||||
vim.api.nvim_create_autocmd({ "BufRead", "BufNewFile" }, {
|
||||
pattern = { os.getenv("HOME") .. "/.local/share/chezmoi/*" },
|
||||
callback = function(evt)
|
||||
local bufnr = evt.buf
|
||||
local edit_watch = function()
|
||||
require("chezmoi.commands.__edit").watch(bufnr)
|
||||
end
|
||||
vim.schedule(edit_watch)
|
||||
end
|
||||
})
|
||||
}
|
||||
end
|
||||
require("chezmoi").setup({
|
||||
-- Treat all files in my chezmoi source directory as source files
|
||||
vim.api.nvim_create_autocmd({ "BufRead", "BufNewFile" }, {
|
||||
pattern = { os.getenv("HOME") .. "/.local/share/chezmoi/*" },
|
||||
callback = function(evt)
|
||||
local bufnr = evt.buf
|
||||
local edit_watch = function()
|
||||
require("chezmoi.commands.__edit").watch(bufnr)
|
||||
end
|
||||
vim.schedule(edit_watch)
|
||||
end,
|
||||
}),
|
||||
})
|
||||
end,
|
||||
},
|
||||
}
|
||||
|
|
18
dot_config/nvim/lua/settings.lua
Normal file
18
dot_config/nvim/lua/settings.lua
Normal file
|
@ -0,0 +1,18 @@
|
|||
local o = vim.opt
|
||||
|
||||
o.number = true -- line numbers
|
||||
o.clipboard = "unnamedplus" -- use the clipboard register
|
||||
o.syntax = "on" -- syntaxxxx
|
||||
o.autoindent = true -- keep indents from prev line
|
||||
o.cursorline = true -- highlight bg of current line
|
||||
o.expandtab = true -- in insert, handle <tab> correctly
|
||||
o.shiftwidth = 2 -- 2 spaces
|
||||
o.tabstop = 2 -- 2-wide tabs
|
||||
o.encoding = "UTF-8" -- obligatory
|
||||
o.ruler = true -- show location of cursor
|
||||
o.mouse = "a" -- enable mouse on all modes
|
||||
o.title = true -- update the window title
|
||||
o.wildmenu = true -- get wild
|
||||
o.showmatch = true -- jump to matching bracket
|
||||
o.splitright = true -- split right
|
||||
o.splitbelow = true -- split below
|
3
dot_config/nvim/stylua.toml
Normal file
3
dot_config/nvim/stylua.toml
Normal file
|
@ -0,0 +1,3 @@
|
|||
indent_type = "Spaces"
|
||||
indent_width = 2
|
||||
column_width = 120
|
Loading…
Add table
Reference in a new issue