?

.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 {
+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", "<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 })
+

.zshrc

@@ -29,8 +29,14 @@ autoload -Uz _zinit
 
 export PATH="$HOME/.local/bin:$PATH"
 
-alias ls="ls -a --color"
+alias cat="bat"
-alias vim="nvim"
+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
+

macdock.sh

@@ -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