Skip to content
Closed
Show file tree
Hide file tree
Changes from all commits
Commits
File filter

Filter by extension

Filter by extension

Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
3 changes: 3 additions & 0 deletions ansible/vars/copr.yml
Original file line number Diff line number Diff line change
Expand Up @@ -2,3 +2,6 @@ copr:
atim/lazygit:
atim/starship:
sramanujam/atuin:
peterwu/iosevka:
che/nerd-fonts:

8 changes: 8 additions & 0 deletions ansible/vars/dnf.yml
Original file line number Diff line number Diff line change
Expand Up @@ -14,14 +14,20 @@ dnf:
zsh-syntax-highlighting:
zsh-autosuggestions:

iosevka-fonts:
nerd-fonts:

atuin:
bat:
difftastic:
dos2unix:
eza:
fd-find:
fzf:
gcc-g++:
gh:
git:
git-lfs:
jq:
lazygit:
mise:
Expand Down Expand Up @@ -52,3 +58,5 @@ dnf:
# GUI
chromium:
kitty:
thunderbird:
keepassxc:
5 changes: 5 additions & 0 deletions ghostty/config
Original file line number Diff line number Diff line change
@@ -0,0 +1,5 @@
theme = catppuccin-mocha
font-family = Iosevka Medium
font-family-bold = Iosevka Semibold
font-size = 13
window-decoration = false
5 changes: 5 additions & 0 deletions git/config
Original file line number Diff line number Diff line change
Expand Up @@ -14,3 +14,8 @@

[include]
path = ~/.config/git/config.local
[filter "lfs"]
smudge = git-lfs smudge -- %f
process = git-lfs filter-process
required = true
clean = git-lfs clean -- %f
2 changes: 2 additions & 0 deletions kitty/kitty.conf
Original file line number Diff line number Diff line change
Expand Up @@ -9,3 +9,5 @@ italic_font auto
bold_italic_font auto

font_size 13

hide_window_decorations yes
3 changes: 2 additions & 1 deletion mise/config.toml
Original file line number Diff line number Diff line change
@@ -1,7 +1,8 @@
[tools]
node = 'lts'
deno = '1.40.4'
python = ['3.12', '2.7']
python = "3.12.2"
go = '1.22.2'

[settings]
asdf_compat = true
163 changes: 88 additions & 75 deletions nvim/lazy-lock.json

Large diffs are not rendered by default.

10 changes: 7 additions & 3 deletions nvim/lua/community.lua
Original file line number Diff line number Diff line change
Expand Up @@ -5,27 +5,31 @@
---@type LazySpec
return {
-- TODO: Remove branch v4 on release
{ "AstroNvim/astrocommunity", branch = "v4" },
{ "AstroNvim/astrocommunity" },
{ import = "astrocommunity.colorscheme.catppuccin" },
{ import = "astrocommunity.completion.copilot-lua-cmp" },
{ import = "astrocommunity.motion.nvim-surround" },
{ import = "astrocommunity.note-taking.obsidian-nvim" },
{ import = "astrocommunity.recipes.heirline-mode-text-statusline" },
{ import = "astrocommunity.recipes.telescope-lsp-mappings" },
{ import = "astrocommunity.test.neotest" },
{ import = "astrocommunity.test.nvim-coverage" },

{ import = "astrocommunity.git.neogit" },
{ import = "astrocommunity.git.diffview-nvim" },

-- language packs: https://github.com/AstroNvim/astrocommunity/tree/main/lua/astrocommunity/pack
{ import = "astrocommunity.pack.go" },
{ import = "astrocommunity.pack.rust" },
{ import = "astrocommunity.pack.lua" },
{ import = "astrocommunity.pack.python-ruff" },
{ import = "astrocommunity.pack.bash" },
{ import = "astrocommunity.pack.docker" },
{ import = "astrocommunity.pack.typescript-all-in-one" },
{ import = "astrocommunity.pack.typescript" },
{ import = "astrocommunity.pack.html-css" },
{ import = "astrocommunity.pack.tailwindcss" },
{ import = "astrocommunity.pack.markdown" },
{ import = "astrocommunity.pack.yaml" },
{ import = "astrocommunity.pack.json" },
{ import = "astrocommunity.pack.toml" },
{ import = "astrocommunity.pack.cpp" },
}
2 changes: 1 addition & 1 deletion nvim/lua/lazy_setup.lua
Original file line number Diff line number Diff line change
@@ -1,7 +1,7 @@
require("lazy").setup({
{
"AstroNvim/AstroNvim",
branch = "v4", -- TODO: change `branch="v4"` to `version="^4"` on release
version = "^4",
import = "astronvim.plugins",
opts = { -- AstroNvim options must be set here with the `import` key
mapleader = " ", -- This ensures the leader key must be configured before Lazy is set up
Expand Down
57 changes: 29 additions & 28 deletions nvim/lua/plugins/auto_restore_sessions.lua
Original file line number Diff line number Diff line change
@@ -1,30 +1,31 @@
-- See: https://deploy-preview-120--peaceful-platypus-6db452.netlify.app/recipes/sessions/

return {
"AstroNvim/astrocore",
---@type AstroCoreOpts
opts = {
autocmds = {
-- disable alpha autostart
alpha_autostart = false,
restore_session = {
{
event = "VimEnter",
desc = "Restore previous directory session if neovim opened with no arguments",
callback = function()
-- Only load the session if nvim was started with no args
if vim.fn.argc(-1) == 0 then
-- try to load a directory session using the current working directory
require("resession").load(
vim.fn.getcwd(),
{ dir = "dirsession", silence_errors = true }
)
-- trigger buffer read auto commands on each opened buffer after load
vim.tbl_map(vim.cmd.doautoall, { "BufReadPre", "BufReadPost" })
end
end,
},
},
},
},
}
return {}
-- return {
-- "AstroNvim/astrocore",
-- ---@type AstroCoreOpts
-- opts = {
-- autocmds = {
-- -- disable alpha autostart
-- alpha_autostart = false,
-- restore_session = {
-- {
-- event = "VimEnter",
-- desc = "Restore previous directory session if neovim opened with no arguments",
-- callback = function()
-- -- Only load the session if nvim was started with no args
-- if vim.fn.argc(-1) == 0 then
-- -- try to load a directory session using the current working directory
-- require("resession").load(
-- vim.fn.getcwd(),
-- { dir = "dirsession", silence_errors = true }
-- )
-- -- trigger buffer read auto commands on each opened buffer after load
-- vim.tbl_map(vim.cmd.doautoall, { "BufReadPre", "BufReadPost" })
-- end
-- end,
-- },
-- },
-- },
-- },
-- }
20 changes: 20 additions & 0 deletions nvim/lua/plugins/colorizer.lua
Original file line number Diff line number Diff line change
@@ -0,0 +1,20 @@
---@type LazySpec
return {
{
"NvChad/nvim-colorizer.lua",
enabled = false,
},
{
"brenoprata10/nvim-highlight-colors",
event = { "User AstroFile", "InsertEnter" },
cmd = "HighlightColors",
specs = {
"AstroNvim/astrocore",
opts = function(_, opts)
local maps = opts.mappings
maps.n["<Leader>uz"] = { function() vim.cmd.HighlightColors "Toggle" end, desc = "Toggle color highlight" }
end,
},
opts = { enabled_named_colors = false, virtual_symbol = "", enable_tailwind = true },
},
}
29 changes: 15 additions & 14 deletions nvim/lua/plugins/copilot.lua
Original file line number Diff line number Diff line change
@@ -1,17 +1,18 @@
---@type LazySpec
return {
"zbirenbaum/copilot.lua",
---@type copilot_config
opts = {
suggestion = {
debounce= 75
},
filetypes = {
yaml = true,
markdown = true,
gitcommit = true,
gitrebase = true,
hgcommit = true,
},
"zbirenbaum/copilot.lua",
enabled = false,
---@type copilot_config
opts = {
suggestion = {
debounce = 75,
},
}
filetypes = {
yaml = true,
markdown = true,
gitcommit = true,
gitrebase = true,
hgcommit = true,
},
},
}
28 changes: 28 additions & 0 deletions nvim/lua/plugins/devcontainer.lua
Original file line number Diff line number Diff line change
@@ -0,0 +1,28 @@
return {
"https://codeberg.org/esensar/nvim-dev-container",
dependencies = { "nvim-treesitter/nvim-treesitter" },
opts = {
attach_mounts = {
neovim_config = {
-- enables mounting local config to /root/.config/nvim in container
enabled = true,
-- makes mount readonly in container
options = { "readonly" },
},
neovim_data = {
-- enables mounting local data to /root/.local/share/nvim in container
enabled = true,
-- no options by default
options = {},
},
-- Only useful if using neovim 0.8.0+
neovim_state = {
-- enables mounting local state to /root/.local/state/nvim in container
enabled = true,
-- no options by default
options = {},
},
},
},
-- config = function(opts) require("devcontainer").setup {} end,
}
33 changes: 33 additions & 0 deletions nvim/lua/plugins/tailwind.lua
Original file line number Diff line number Diff line change
@@ -0,0 +1,33 @@
return {
{ import = "astrocommunity.pack.tailwindcss" },
{
"williamboman/mason-lspconfig.nvim",
optional = true,
opts = function(_, opts)
opts.ensure_installed = require("astrocore").list_insert_unique(opts.ensure_installed, { "tailwindcss" })
end,
dependencies = {
{
"AstroNvim/astrolsp",
optional = true,
---@type AstroLSPOpts
opts = {
config = {
tailwindcss = {
settings = {
tailwindCSS = {
experimental = {
classRegex = {
{ "cva\\(([^)]*)\\)", "[\"'`]([^\"'`]*).*?[\"'`]" },
{ "cx\\(([^)]*)\\)", "(?:'|\"|`)([^']*)(?:'|\"|`)" },
},
},
},
},
},
},
},
},
},
},
}
14 changes: 14 additions & 0 deletions nvim/lua/plugins/test.lua
Original file line number Diff line number Diff line change
@@ -0,0 +1,14 @@
---@type LazySpec
return {
"nvim-neotest/neotest",
dependencies = {
"marilari88/neotest-vitest",
},
config = function()
require("neotest").setup {
adapters = {
require "neotest-vitest",
},
}
end,
}
17 changes: 17 additions & 0 deletions nvim/lua/plugins/yamlls.lua
Original file line number Diff line number Diff line change
@@ -0,0 +1,17 @@
return {
"AstroNvim/astrolsp",
optional = true,
---@type AstroLSPOpts
opts = {
---@diagnostic disable: missing-fields
config = {
yamlls = {
settings = { yaml = {
customTags = {
"!reference sequence",
},
} },
},
},
},
}
8 changes: 4 additions & 4 deletions tmux/tmux.conf
Original file line number Diff line number Diff line change
Expand Up @@ -67,7 +67,7 @@ set -g @catppuccin_window_current_text "#W"
set -g @plugin 'tmux-plugins/tmux-resurrect'
set -g @plugin 'tmux-plugins/tmux-continuum'
set -g @continuum-restore 'on'
set -g @resurrect-capture-pane-contents 'on'
set -g @resurrect-capture-pane-contents 'off'

set -g @plugin 'omerxx/tmux-sessionx'
set -g @sessionx-bind 'C-j'
Expand All @@ -78,9 +78,9 @@ set -g @sessionx-preview-enabled 'true'
# TODO: this is not working, it only prints the command and runs the prompt afterwards
# Its also not a neovim problem, it behaves the same with any other command
# This is a wsl problem, it worked fine on a mac
# set -g @resurrect-processes 'nvim'
# set -g @resurrect-strategy-vim 'session'
# set -g @resurrect-strategy-nvim 'session'
set -g @resurrect-processes 'nvim'
set -g @resurrect-strategy-vim 'session'
set -g @resurrect-strategy-nvim 'session'

# Initialize TMUX plugin manager (keep this line at the very bottom of tmux.conf)
run '/usr/share/tmux-plugin-manager/tpm'
Expand Down
7 changes: 7 additions & 0 deletions zsh/aliases
Original file line number Diff line number Diff line change
Expand Up @@ -17,6 +17,10 @@ alias notes='$HOME/notes'
alias ev='nvim $DOTFILES/nvim'
alias et='nvim $DOTFILES/tmux'

# NPX aliases
alias bru='pnpm dlx @usebruno/cli'
alias gcl='pnpm dlx gitlab-ci-local --shell-isolation --no-artifacts-to-source --mount-cache'

# Eza
alias ls="eza --icons --git"
alias l="eza -l --icons --git -a"
Expand All @@ -30,3 +34,6 @@ alias cat='bat --paging=never --style=plain'
# colorize help pages
alias -g -- -h='-h 2>&1 | bat --language=help --style=plain'
alias -g -- --help='--help 2>&1 | bat --language=help --style=plain'

# Timetrace
alias timetrace='docker container run -v ~/.local/share/timetrace:/data:z dominikbraun/timetrace'
Loading
Loading