DarthMooMancer/dotfiles
1
1
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

Updated cleaned up dotfiles

Browse Source
This commit is contained in:
Andrew Haynes
2026-07-16 04:16:34 -04:00
parent 2dc0392bf9
commit bc3f6d4a06
17 changed files with 173 additions and 154 deletions
Download Patch File Download Diff File Expand all files Collapse all files
.DS_Store
Vendored
BIN
View File
Binary file not shown.
brew/.Brewfile
+2 -20
View File
@@ -1,17 +1,8 @@
cask "ghostty"
# cask "localsend"
cask "tailscale-app"
# cask "zen"
cask "autodesk-fusion"
cask "logi-options+"
cask "font-jetbrains-mono-nerd-font"
# cask "utm"
cask "bitwarden"
# cask "modrinth"
# cask "vlc"
cask "prismlauncher"
cask "flutter"
cask "TheBoredTeam/boring-notch/boring-notch"
cask "modrinth"
cask "google-chrome"
brew "ripgrep"
brew "neovim"
@@ -27,16 +18,7 @@ brew "fzf"
brew "git"
brew "zoxide"
brew "stow"
brew "mosh"
brew "go"
# brew "jpeg-turbo"
brew "npm"
brew "wget"
brew "opencode"
brew "xcp"
brew "xcbeautify"
brew "pipx"
brew "jq"
brew "coreutils"
brew "ruby"
# brew "podman"
ghostty/.config/ghostty/config
+5 -3
View File
@@ -1,13 +1,15 @@
font-size = 14
theme = "rose-pine-default"
# theme = Kanagawa Wave
theme = Kanagawa Dragon
macos-titlebar-style = tabs
font-family = "JetBrainsMono Nerd Font Medium"
font-thicken = true
font-thicken-strength = 10
background = 000000
# background-opacity = 0.85
# background-blur = true
# .92 on most wallpapers
background-opacity = 0.65
background-blur = true
confirm-close-surface = false
window-padding-x = 6
window-padding-y = 6
macutil.sh
+4 -4
View File
@@ -13,10 +13,10 @@ if ! command -v brew &> /dev/null; then
fi
fi
if ! command -v cargo &> /dev/null; then
echo "Installing Cargo"
curl https://sh.rustup.rs -sSf | sh
fi
# if ! command -v cargo &> /dev/null; then
# echo "Installing Cargo"
# curl https://sh.rustup.rs -sSf | sh
# fi
if ! command -v zinit &> /dev/null; then
echo "Installing zinit"
bash -c "$(curl --fail --show-error --silent --location https://raw.githubusercontent.com/zdharma-continuum/zinit/HEAD/scripts/install.sh)"
nvim/.DS_Store
Vendored
BIN
View File
Binary file not shown.
nvim/.config/nvim/init.lua
-1
View File
@@ -19,7 +19,6 @@ vim.api.nvim_create_autocmd('FileType', {
'html',
'python',
'go',
'dart',
'yaml',
},
callback = function()
nvim/.config/nvim/lua/DarthMooMancer/colors.lua
+19
View File
@@ -1,4 +1,23 @@
-- require('bamboo').load()
-- vim.cmd.colorscheme('bamboo')
-- vim.cmd.colorscheme('melange')
-- vim.cmd.colorscheme('rose-pine')
-- vim.cmd.colorscheme('bamboo-multiplex')
-- require('kanagawa').setup({
-- overrides = function(colors)
-- local theme = colors.theme
-- return {
-- Pmenu = { fg = theme.ui.shade0, bg = theme.ui.bg_p1 }, -- add `blend = vim.o.pumblend` to enable transparency
-- PmenuSel = { fg = 'NONE', bg = theme.ui.bg_p2 },
-- PmenuSbar = { bg = theme.ui.bg_m1 },
-- PmenuThumb = { bg = theme.ui.bg_p2 },
-- }
-- end,
-- })
--
-- vim.cmd.colorscheme('kanagawa-dragon')
vim.cmd.colorscheme('rose-pine')
vim.api.nvim_set_hl(0, 'Normal', { bg = 'none' })
vim.api.nvim_set_hl(0, 'NormalFloat', { link = 'Normal' })
vim.api.nvim_set_hl(0, 'StatusLine', { link = 'Normal' })
nvim/.config/nvim/lua/DarthMooMancer/keymaps.lua
+11 -10
View File
@@ -37,12 +37,12 @@ vim.keymap.set(
builtin.man_pages,
{ desc = 'Telescope man_pages' }
)
vim.keymap.set(
'n',
'<leader>xx',
builtin.diagnostics,
{ desc = 'Telescope diagnostics' }
)
-- vim.keymap.set(
-- 'n',
-- '<leader>xx',
-- builtin.diagnostics,
-- { desc = 'Telescope diagnostics' }
-- )
vim.keymap.set(
'n',
'<leader>xn',
@@ -67,7 +67,8 @@ vim.keymap.set('n', '<C-h>', ':NvimTmuxNavigateLeft<CR>', { silent = true })
vim.keymap.set('n', '<C-j>', ':NvimTmuxNavigateDown<CR>', { silent = true })
vim.keymap.set('n', '<C-k>', ':NvimTmuxNavigateUp<CR>', { silent = true })
vim.keymap.set('n', '<C-l>', ':NvimTmuxNavigateRight<CR>', { silent = true })
vim.keymap.set('n', '<leader>fr', ':FlutterRun<CR>')
vim.keymap.set('n', '<leader>fq', ':FlutterQuit<CR>')
vim.keymap.set('n', '<leader>fR', ':FlutterReload<CR>')
vim.keymap.set('n', '<leader>frr', ':FlutterRestart<CR>')
-- vim.keymap.set('n', '<leader>fr', ':FlutterRun<CR>')
-- vim.keymap.set('n', '<leader>fq', ':FlutterQuit<CR>')
-- vim.keymap.set('n', '<leader>fR', ':FlutterReload<CR>')
-- vim.keymap.set('n', '<leader>frr', ':FlutterRestart<CR>')
vim.keymap.set('n', '<leader>xx', ':Trouble diagnostics toggle<cr>')
nvim/.config/nvim/lua/DarthMooMancer/lsp.lua
-1
View File
@@ -23,7 +23,6 @@ require('nvim-treesitter').install({
'css',
'html',
'python',
'dart',
'yaml',
})
nvim/.config/nvim/lua/DarthMooMancer/plugins.lua
+21 -2
View File
@@ -1,8 +1,26 @@
vim.pack.add({
-- Themes
{
src = 'https://github.com/rose-pine/neovim',
name = 'rose-pine',
},
{
src = 'https://github.com/ribru17/bamboo.nvim',
},
{
src = 'https://github.com/savq/melange-nvim',
},
{
src = 'https://github.com/mountain-theme/Mountain',
},
{
src = 'https://github.com/sainnhe/everforest',
},
{
src = 'https://github.com/rebelot/kanagawa.nvim',
},
-- The rest
{ src = 'https://github.com/mbbill/undotree' },
{
src = 'https://github.com/nvim-mini/mini.pairs',
@@ -34,8 +52,9 @@ vim.pack.add({
-- { src = 'https://github.com/nvim-lualine/lualine.nvim' },
{ src = 'https://github.com/nvim-lua/plenary.nvim' },
{ src = 'https://github.com/folke/noice.nvim' },
{ src = 'https://github.com/akinsho/flutter-tools.nvim' },
{ src = 'https://github.com/mfussenegger/nvim-dap' },
-- { src = 'https://github.com/akinsho/flutter-tools.nvim' },
-- { src = 'https://github.com/mfussenegger/nvim-dap' },
{ src = 'https://github.com/stevearc/dressing.nvim' },
{ src = 'https://github.com/rcarriga/nvim-notify' },
{ src = 'https://github.com/folke/trouble.nvim' },
})
nvim/.config/nvim/lua/DarthMooMancer/tools.lua
+2 -62
View File
@@ -19,50 +19,15 @@ hipatterns.setup({
group = 'MiniHipatternsNote',
},
-- Highlight hex color strings (`#rrggbb`) using that color
hex_color = hipatterns.gen_highlighter.hex_color(),
},
})
---
--- Functionality
---
-- require('flutter-tools').setup({})
require('flutter-tools').setup({
decorations = {
statusline = {
app_version = true,
device = true,
},
},
widget_guides = {
enabled = true,
},
closing_tags = {
highlight = 'Comment',
prefix = '//',
enabled = true,
},
lsp = {
-- color = {
-- enabled = true,
-- background = true,
-- foreground = false,
-- virtual_text = true,
-- virtual_text_str = '■',
-- },
settings = {
showTodos = true,
completeFunctionCalls = true,
enableSnippets = true,
},
},
})
require('mini.pairs').setup()
require('nvim-tmux-navigation').setup({
disable_when_zoomed = true, -- defaults to false
})
require('blink.cmp').setup({
completion = {
menu = {
@@ -76,9 +41,6 @@ require('blink.cmp').setup({
},
})
---
--- Project Management
---
require('Polydev').setup()
require('nvim-ts-autotag').setup({
opts = {
@@ -87,27 +49,5 @@ require('nvim-ts-autotag').setup({
enable_close_on_slash = false, -- Auto close on trailing </
},
})
-- require('fzf-lua').setup({
-- winopts = {
-- height = 0.50,
-- width = 0.45,
-- border = 'rounded',
-- preview = {
-- hidden = true,
-- },
-- },
-- grep = {
-- rg_glob = true,
-- rg_glob_fn = function(query)
-- local regex, flags = query:match('^(.-)%s%-%-(.*)$')
-- return (regex or query), flags
-- end,
-- },
-- defaults = {
-- formatter = 'path.filename_first',
-- },
-- })
---
--- LSP
---
require('trouble').setup({})
nvim/.config/nvim/lua/DarthMooMancer/ui.lua
+51 -4
View File
@@ -38,11 +38,13 @@ local function setup_statusline_highlights()
derive_hl('StatusDiagWarn', { base = 'StatusLine', fg = 'DiagnosticWarn' })
derive_hl('StatusDiagHint', { base = 'StatusLine', fg = 'DiagnosticHint' })
derive_hl('StatusCursor', { base = 'CursorLine', fg = 'Normal' })
derive_hl('StatusGitAdded', { base = 'StatusLine', fg = 'OkMsg' })
-- derive_hl('StatusGitAdded', { base = 'StatusLine', fg = 'OkMsg' })
derive_hl('StatusGitAdded', { base = 'StatusLine', fg = 'MoreMsg' })
derive_hl(
'StatusGitRemoved',
{ base = 'StatusLine', fg = 'DiagnosticError' }
)
derive_hl('StatusRecording', { base = 'StatusLine', fg = 'WarningMsg' })
end
vim.api.nvim_create_autocmd('ColorScheme', {
callback = setup_statusline_highlights,
@@ -53,8 +55,8 @@ local mode_map = {
['n'] = ' NORM ',
['i'] = ' INS ',
['v'] = ' VIS ',
['V'] = 'V-LINE',
[''] = 'V-BLK ',
['V'] = ' V-LINE ',
[''] = ' V-BLK ',
['R'] = ' REPL ',
['c'] = ' CMD ',
['t'] = ' TERM ',
@@ -273,6 +275,13 @@ function _G.__statusline()
end
table.insert(parts, lsp_section())
table.insert(parts, '%=')
local recording = vim.fn.reg_recording()
if recording ~= '' then
table.insert(
parts,
'%#StatusRecording# ● Rec @' .. recording .. ' %*'
)
end
table.insert(
parts,
diag_cache[cur_buf] or build_diag_string(vim.diagnostic.count(cur_buf))
@@ -288,6 +297,10 @@ require('incline').setup({
window = {
padding = 0,
margin = { horizontal = 0 },
options = {
-- Reset winhl so it doesn't force total transparency
winhl = 'Normal:InclineNormal',
},
},
render = function(props)
local filename =
@@ -298,6 +311,7 @@ require('incline').setup({
local ft_icon, ft_color =
require('nvim-web-devicons').get_icon_color(filename)
local modified = vim.bo[props.buf].modified
return {
ft_icon and {
' ',
@@ -306,13 +320,46 @@ require('incline').setup({
guibg = ft_color,
guifg = require('incline.helpers').contrast_color(ft_color),
} or '',
-- Wrap the text and padding inside a structural block linked to 'CursorLine'
{
' ',
{ filename, gui = modified and 'bold,italic' or 'bold' },
' ',
guibg = '#44406e',
group = 'CursorLine',
},
}
end,
})
-- require('incline').setup({
-- window = {
-- padding = 0,
-- margin = { horizontal = 0 },
-- },
-- render = function(props)
-- local filename =
-- vim.fn.fnamemodify(vim.api.nvim_buf_get_name(props.buf), ':t')
-- if filename == '' then
-- filename = '[No Name]'
-- end
-- local ft_icon, ft_color =
-- require('nvim-web-devicons').get_icon_color(filename)
-- local modified = vim.bo[props.buf].modified
-- -- Query 'StatusLine' since your custom highlights derive from it
-- return {
-- ft_icon and {
-- ' ',
-- ft_icon,
-- ' ',
-- guibg = ft_color,
-- guifg = require('incline.helpers').contrast_color(ft_color),
-- } or '',
-- ' ',
-- { filename, gui = modified and 'bold,italic' or 'bold' },
-- ' ',
-- guibg = '#363646',
-- }
-- end,
-- })
require('noice').setup({
lsp = {
nvim/.config/nvim/nvim-pack-lock.json
+36 -16
View File
@@ -1,32 +1,44 @@
{
"plugins": {
"Mountain": {
"rev": "27db65fef4654095bf7e46a8930f411b6545fbe5",
"src": "https://github.com/mountain-theme/Mountain"
},
"bamboo.nvim": {
"rev": "1309bc88bffcf1bedc3e84e7fa9004de93da774a",
"src": "https://github.com/ribru17/bamboo.nvim"
},
"blink.cmp": {
"rev": "78336bc89ee5365633bcf754d93df01678b5c08f",
"src": "https://github.com/saghen/blink.cmp",
"version": ">=0.0.0"
},
"catppuccin": {
"rev": "426dbebe06b5c69fd846ceb17b42e12f890aedf1",
"rev": "05e8787020dcfdb937bf2ff23855ea2415b4e072",
"src": "https://github.com/catppuccin/nvim"
},
"conform.nvim": {
"rev": "dca1a190aa85f9065979ef35802fb77131911106",
"rev": "619363c30309d29ffa631e67c8183f2a72caa373",
"src": "https://github.com/stevearc/conform.nvim"
},
"dart-vim-plugin": {
"rev": "dd74e59c50e29896483a87373743136f2cbd24e7",
"rev": "13fa42674f1685a1c5a095c1dac74d94e43a9849",
"src": "https://github.com/dart-lang/dart-vim-plugin"
},
"dressing.nvim": {
"rev": "2d7c2db2507fa3c4956142ee607431ddb2828639",
"src": "https://github.com/stevearc/dressing.nvim"
},
"everforest": {
"rev": "85a86eb62409e3ec88713bff3d1b9d7374e112e4",
"src": "https://github.com/sainnhe/everforest"
},
"flutter-tools.nvim": {
"rev": "7d1acfd139215e02d2784733af69a61aaebe06e8",
"src": "https://github.com/akinsho/flutter-tools.nvim"
},
"fzf-lua": {
"rev": "33fe4b6f0c817c4d99a7baeea82c4d17e57efd64",
"rev": "532d463f5c83595192fe740572d8fd6902b2217a",
"src": "https://github.com/ibhagwan/fzf-lua"
},
"incline.nvim": {
@@ -34,7 +46,7 @@
"src": "https://github.com/b0o/incline.nvim"
},
"kanagawa.nvim": {
"rev": "8ad3b4cdcc804b332c32db8f9743667e1bb82b99",
"rev": "bb85e4bfc8d89b0e62c8fa53ccdd13d12e2f77b3",
"src": "https://github.com/rebelot/kanagawa.nvim"
},
"lsp-status.nvim": {
@@ -42,29 +54,33 @@
"src": "https://github.com/nvim-lua/lsp-status.nvim"
},
"lualine.nvim": {
"rev": "131a558e13f9f28b15cd235557150ccb23f89286",
"rev": "221ce6b2d999187044529f49da6554a92f740a96",
"src": "https://github.com/nvim-lualine/lualine.nvim"
},
"mason-lspconfig.nvim": {
"rev": "1423254f58a3407a5afd5ade0ccd901f3eecc6ba",
"rev": "a4068c3ebd4cb335b25239e5ea35c22ee6007962",
"src": "https://github.com/mason-org/mason-lspconfig.nvim"
},
"mason.nvim": {
"rev": "e54f5bf5f12c560da31c17eee5b3e1bd369f3ff9",
"rev": "2a6940af80375532e5e9e7c1f2fc6319a1b7a69d",
"src": "https://github.com/mason-org/mason.nvim"
},
"melange-nvim": {
"rev": "ce42f6b629beeaa00591ba73a77d3eeac4cf28ce",
"src": "https://github.com/savq/melange-nvim"
},
"mini.hipatterns": {
"rev": "add8d8abad602787377ec5d81f6b248605828e0f",
"rev": "607d604e650cdf21d71f863d040c496a1d0cb320",
"src": "https://github.com/nvim-mini/mini.hipatterns",
"version": ">=0.0.0"
},
"mini.pairs": {
"rev": "d5a29b6254dad07757832db505ea5aeab9aad43a",
"rev": "4a014143fcb4e9df26198ccb3ecff3b9e77a048c",
"src": "https://github.com/nvim-mini/mini.pairs",
"version": ">=0.0.0"
},
"mini.statusline": {
"rev": "b456bfe845e475e9cec065b7a9a1ef657ad2f41b",
"rev": "127997ebef7ef632161203b960c5ef9d158f4810",
"src": "https://github.com/nvim-mini/mini.statusline"
},
"noice.nvim": {
@@ -76,11 +92,11 @@
"src": "https://github.com/MunifTanjim/nui.nvim"
},
"nvim-dap": {
"rev": "45a69eba683a2c448dd9ecfc4de89511f0646b5f",
"rev": "9e848e09a697ee95302a3ef2dd43fd6eb709e570",
"src": "https://github.com/mfussenegger/nvim-dap"
},
"nvim-lspconfig": {
"rev": "cd576dd72d31ddffcbfa6d064c0dd697ca218758",
"rev": "d5b6e3db4c17b0146f63a2fc47e2027a754b2cb1",
"src": "https://github.com/neovim/nvim-lspconfig"
},
"nvim-notify": {
@@ -100,7 +116,7 @@
"src": "https://github.com/windwp/nvim-ts-autotag"
},
"nvim-web-devicons": {
"rev": "4fc505ac7bd7692824a142e96e5f529c133862f8",
"rev": "0ca28b61a04fe7426cefbdd52c2647ef0e335b5f",
"src": "https://github.com/nvim-tree/nvim-web-devicons"
},
"plenary.nvim": {
@@ -112,7 +128,7 @@
"src": "git@moo:dmm/polydev.git"
},
"rose-pine": {
"rev": "6a961effd67f6130d36df6d1c05c48c739796dd2",
"rev": "ff483051a47e27d84bdef47703538df1ed9f4a47",
"src": "https://github.com/rose-pine/neovim"
},
"statusline.lua": {
@@ -120,9 +136,13 @@
"src": "https://github.com/beauwilliams/statusline.lua"
},
"telescope.nvim": {
"rev": "f04ab730b8f9c6bf3f54a206d0dcddfd70c52d59",
"rev": "427b576c16792edad01a92b89721d923c19ad60f",
"src": "https://github.com/nvim-telescope/telescope.nvim"
},
"trouble.nvim": {
"rev": "bd67efe408d4816e25e8491cc5ad4088e708a69a",
"src": "https://github.com/folke/trouble.nvim"
},
"undotree": {
"rev": "6fa6b57cda8459e1e4b2ca34df702f55242f4e4d",
"src": "https://github.com/mbbill/undotree"
ssh/.DS_Store
Vendored
BIN
View File
Binary file not shown.
ssh/.ssh/config
+8 -4
View File
@@ -4,13 +4,17 @@ Host *
IdentityFile ~/.ssh/id_ed25519
Host moo
HostName git.local.moomancer.xyz
HostName 192.168.5.16
User git
IdentityFile ~/.ssh/id_ed25519 # Path to your private key
Host oasis
HostName 100.111.101.97
User oasis
HostName 192.168.5.16
User andrew
Port 2222
IdentityFile ~/.ssh/id_ed25519
Ciphers aes128-gcm@openssh.com
Compression no
IPQoS throughput
ServerAliveInterval 15
ServerAliveCountMax 3
tmux/.config/tmux/tmux.conf
+7 -21
View File
@@ -6,34 +6,21 @@ set -g focus-events on
set -ga terminal-features ',xterm-ghostty:RGB'
set -as terminal-overrides ',xterm-ghostty:Tc'
set-option -g default-shell $SHELL
# --- Visual Flair Enhancements ---
set -g status-position top
set -g status-justify left
set -g status-style 'bg=default' # Makes the bar transparent/seamless
set -g status-style 'bg=default' # Completely transparent container
# Left Side: Minimal Session Name with a pill-style look
set -g status-left-length 100
set -g status-left "#[fg=#31748f,bg=default,bold]  #S #[fg=#444444,nobold]│ "
set -g status-left "#[fg=colour4,bg=default,bold]  #S #[fg=colour8,nobold]│ "
# Right Side: Clean icons with no unnecessary labels
set -g status-right-length 150
set -g status-right "#[fg=#c4a7e7]󰃭 %m-%d #[fg=#444444]│ #[fg=#eb6f92]󱑒 %H:%M "
set -g status-right "#[fg=colour5]󰃭 %m-%d #[fg=colour8]│ #[fg=colour1]󱑒 %H:%M "
# Window Status: The "Flare"
# Using a dot or a subtle block to indicate the active window
# set -g window-status-current-format "#[fg=#9ccfd8,bg=default,bold] ● #W"
# set -g window-status-format "#[fg=#6e6a86,bg=default] ○ #W"
set -g window-status-current-format "#[fg=#9ccfd8,bg=default,bold] #F#I:#W"
set -g window-status-format "#[fg=#6e6a86,bg=default] #I:#W"
set -g window-status-current-format "#[fg=colour6,bg=default,bold] #F#I:#W"
set -g window-status-format "#[fg=colour7,bg=default] #I:#W"
# Message styling (Command mode)
set -g message-style 'fg=#ebbcba bg=default bold'
# ---------------------------------
# set -g status-style 'fg=#9ccfd8 bg=#000000'
# set -g status-left-length 100
# set -g status-right-length 30
# set -g status-left "#[fg=#31748f, bold][#S]#[fg=#908caa,nobold] | "
# set -g status-right "#[fg=#c4a7e7]  %m-%d-%Y #[fg=#eb6f92]  %H:%M"
set -g message-style 'fg=colour3 bg=default bold'
set -g base-index 1
set -g pane-base-index 1
@@ -45,7 +32,6 @@ set -g status-position top
bind-key h previous-window
bind-key l next-window
bind -r f run-shell "tmux neww ~/.local/bin/tmux-windowizer"
bind -r v run-shell "tmux neww ~/.local/bin/tmux-sessionizer"
bind-key z resize-pane -Z
bind -n C-h select-pane -L
zshrc/.zshrc
+1
View File
@@ -35,6 +35,7 @@ alias enix="nvim /etc/nix-darwin/flake.nix"
alias v="nvim"
alias ls="eza -a"
alias brew-update="brew update && brew upgrade && brew bundle --cleanup --zap --file=~/.Brewfile"
alias cmake-update="sudo rm -rd build && cmake -S . -B build && cmake --build build"