From 436d28b6d2042514a9b193e8fd7032ce14dd53f2 Mon Sep 17 00:00:00 2001 From: Andrew Haynes Date: Wed, 25 Mar 2026 08:34:02 -0400 Subject: [PATCH] ? --- .DS_Store | Bin 10244 -> 0 bytes .config/nvim/init.lua | 31 ++++++++++++++++++++++++++----- .zshrc | 13 +++++++++---- macdock.sh | 8 -------- 4 files changed, 35 insertions(+), 17 deletions(-) delete mode 100644 .DS_Store delete mode 100755 macdock.sh diff --git a/.DS_Store b/.DS_Store deleted file mode 100644 index c9f1aa56bfae48b5a1de3047777693011b26f902..0000000000000000000000000000000000000000 GIT binary patch literal 0 HcmV?d00001 literal 10244 zcmeHM&uiR96n^7uV{L3Vva@zmnii401Z?V-z|0%XyiafD z(|!_f763@C?Op&d06@datv-xRpTg&PJyZtLkqNW}@c^3;fio8}#|{s9s{zG;Vn8vV z7*Gr-295#)_|4`;8)LQp%4)rafWaQQk7P-eBHs10d1%}us#CRWmpYgV+%ua+1K?QY+)uLs_CLoZ!rG_eBe zMFJ4G9=fdE2&l`pYphM(SYS;#p%t}aLqEN`oawS1wkjj1Mn;w7Xl> z#>?kFUToY6o0NSib_pbX(ZGnj-fzFcUXFvn*-Cdse(mn+PhIcst9W8)c;xMq`smoH z(bDMn`1r&-r{5iW?@U8KWn0c2KjQ1X%0d>^!nW7YPsX_GIfv1O$lJo*E+^i-#0(zb z)L0I%=()EJhL-NP(5G}TAa43uhbqCCaFWpanTou6~}nXfO%0V8R;Qg$_J|@8Em* z8GeJmU=N;?5i&u}l1VZ}X2@kyC9`CatdezNk=qhK(0$bJr}s+@iLsM=)S-XDbXc>+ zT?&tH@UKqJqsi*^^e3);Qri1x`kP;7`+2#q;MLm9MEh0*%|+WXBN{U5V+6j70*cc| zStdDIMmU$1<#F^2QN#|)KJ4{{8u~uT2)@VnH4$*no|JrFU-|Yt=&X1r&-jn=hu$-v zmG0BupAGLl6w=N490>PiK3UmLez1;VdgJ6o%kTf7|JN6OKx|fw!{FhUcMBRQ-vE1U zxQA%`a`zE&R`4hGaZQxG(-*^IWidrqglqU>t-}{+r=baMZxnJihrml!6a$I@#eiZ! zF`yVY(hMAvt26ld|FxI@|9_kZ z3J5mbg^!Elc)Z{TBjRue$0~e|7wlJ4+mRMWu>Ajj2K1zKD*spczc>hclk)!;zP9zh diff --git a/.config/nvim/init.lua b/.config/nvim/init.lua index ea4d7c5..bcc70f5 100644 --- a/.config/nvim/init.lua +++ b/.config/nvim/init.lua @@ -10,13 +10,15 @@ vim.pack.add({ { src = "git@moo:dmm/polydev.git", version = "main" }, { src = "https://github.com/nvim-treesitter/nvim-treesitter", build = ":TSUpdate" }, { src = "https://github.com/alexghergh/nvim-tmux-navigation" }, - + { src = "https://github.com/mason-org/mason.nvim" }, + { src = "https://github.com/stevearc/conform.nvim" }, }) -require'nvim-tmux-navigation'.setup { - disable_when_zoomed = true -- defaults to false +require("mason").setup() +require 'nvim-tmux-navigation'.setup { + disable_when_zoomed = true -- defaults to false } -require('nvim-treesitter').install { 'rust', 'c', 'cpp', 'lua' } +require('nvim-treesitter').install { 'rust', 'c', 'cpp', 'lua', 'nix' } vim.api.nvim_create_autocmd('FileType', { pattern = { 'c', 'cpp', 'rust', 'lua' }, callback = function() @@ -24,6 +26,24 @@ vim.api.nvim_create_autocmd('FileType', { vim.bo.indentexpr = "v:lua.require'nvim-treesitter'.indentexpr()" end, }) +require("conform").setup({ + formatters_by_ft = { + nix = { "alejandra" }, + -- Conform will run multiple formatters sequentially + -- You can customize some of the format options for the filetype (:help conform.format) + rust = { "rustfmt", lsp_format = "fallback" }, + -- Conform will run the first available formatter + -- javascript = { "prettierd", "prettier", stop_after_first = true }, + -- -- Use a "*" to run formatters on all filetypes + ["*"] = { "codespell" }, + -- Use "_" to run formatters on filetypes that don't have other formatters + ["_"] = { "trim_whitespace" }, + }, + format_on_save = { + timeout_ms = 500, + lsp_format = "fallback", + }, +}) require('colorizer').setup() require("Polydev").setup({ @@ -125,7 +145,7 @@ vim.lsp.config("lua_ls", { }, }, }) -vim.lsp.enable({ "lua_ls", "clangd", "rust-analyzer" }) +vim.lsp.enable({ "lua_ls", "clangd", "rust-analyzer", "nil_ls" }) 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' }) @@ -170,3 +190,4 @@ vim.keymap.set("n", "", ":NvimTmuxNavigateLeft", { silent = true }) vim.keymap.set("n", "", ":NvimTmuxNavigateDown", { silent = true }) vim.keymap.set("n", "", ":NvimTmuxNavigateUp", { silent = true }) vim.keymap.set("n", "", ":NvimTmuxNavigateRight", { silent = true }) + diff --git a/.zshrc b/.zshrc index 71a36ac..505da92 100644 --- a/.zshrc +++ b/.zshrc @@ -29,8 +29,14 @@ autoload -Uz _zinit export PATH="$HOME/.local/bin:$PATH" -alias ls="ls -a --color" -alias vim="nvim" +alias cat="bat" +alias rebuild="sudo darwin-rebuild switch --flake /etc/nix-darwin/#Andrews-MacBook-Air"; +alias enix="nvim /etc/nix-darwin/flake.nix" +alias v="nvim"; +alias ls="eza -la"; + + + # alias grep="rg" # if [[ $(uname) != "Darwin" ]]; then @@ -38,8 +44,6 @@ if [[ $(uname) != "Darwin" ]]; then alias env="sh /home/andrew/personal/dotfiles/env_linux.sh" else alias env='sh ~/personal/dotfiles/env_mac.sh' - export LIBRARY_PATH="$LIBRARY_PATH:$(brew --prefix)/lib" - export PATH="$(brew --prefix llvm)/bin:$PATH" export MANPAGER="sh -c 'col -bx | bat -l man -p'" export GOOGLE_CLOUD_PROJECT="development-477121" export HOMEBREW_NO_AUTO_UPDATE=1 @@ -48,3 +52,4 @@ else export HOMEBREW_CLEANUP_PERIODIC_FULL_DAYS=1 export HOMEBREW_NO_EMOJI=1 fi + diff --git a/macdock.sh b/macdock.sh deleted file mode 100755 index cba6cec..0000000 --- a/macdock.sh +++ /dev/null @@ -1,8 +0,0 @@ -#!/usr/bin/env bash -defaults write com.apple.dock autohide -bool true - -defaults write com.apple.dock autohide-delay -float 0 - -defaults write com.apple.dock autohide-time-modifier -float 0.4 - -killall Dock