diff --git a/.config/nix/modules/darwin.nix b/.config/nix/modules/darwin.nix index e940674..dbe188b 100644 --- a/.config/nix/modules/darwin.nix +++ b/.config/nix/modules/darwin.nix @@ -22,7 +22,6 @@ "betterdisplay" "cleanshot" "contexts" - "cron" "daisydisk" "dropbox" "firefox" diff --git a/.config/nix/modules/ghostty.nix b/.config/nix/modules/ghostty.nix index 7f6f58d..929327d 100644 --- a/.config/nix/modules/ghostty.nix +++ b/.config/nix/modules/ghostty.nix @@ -8,7 +8,7 @@ in # https://github.com/mitchellh/ghostty/issues/601 xdg.configFile."ghostty/config".text = '' copy-on-select = "clipboard" - font-family = JetBrains Mono + font-family = JetBrains Nerd Font Mono font-feature = -calt font-size = 14 macos-non-native-fullscreen = true diff --git a/.config/nix/modules/home-manager.nix b/.config/nix/modules/home-manager.nix index eee7aab..77f4e5a 100644 --- a/.config/nix/modules/home-manager.nix +++ b/.config/nix/modules/home-manager.nix @@ -7,6 +7,8 @@ diff-so-fancy direnv dockutil + elixir + erlang eza fd fnm diff --git a/.config/nvim/TODO.md b/.config/nvim/TODO.md index 6f19afc..703c4ad 100644 --- a/.config/nvim/TODO.md +++ b/.config/nvim/TODO.md @@ -5,17 +5,28 @@ nix ## Plugins - :checkhealth -- toggle copilot + ```bash + which-key: require("which-key.health").check() + + WhichKey: checking conflicting keymaps ~ + - WARNING conflicting keymap exists for mode **"n"**, lhs: **"gc"** + - rhs: ` ` + - WARNING conflicting keymap exists for mode **"n"**, lhs: **"yS"** + - rhs: `YSurround` + - WARNING conflicting keymap exists for mode **"n"**, lhs: **"ys"** + - rhs: `Ysurround` + ``` - https://github.com/echasnovski/mini.surround +- inc_rename x noice (https://github.com/folke/noice.nvim) + +- toggle copilot +- https://github.com/folke/persistence.nvim +- https://github.com/goolord/alpha-nvim +- https://github.com/andymass/vim-matchup +- https://github.com/folke/edgy.nvim + - LSP set up https://github.com/LazyVim/LazyVim/blob/8c0e39c826f697d668aae336ea26a83be806a543/lua/lazyvim/plugins/lsp/init.lua#L90 - trouble quickfix https://github.com/LazyVim/LazyVim/blob/0801e52118ef5f48d4ae389d0cefd79814d28a42/lua/lazyvim/plugins/editor.lua#L415 -- https://github.com/andymass/vim-matchup -- https://github.com/goolord/alpha-nvim -- https://github.com/folke/persistence.nvim -- https://github.com/folke/edgy.nvim lazyterm -- https://github.com/folke/noice.nvim -- https://github.com/b0o/incline.nvim -- https://github.com/lewis6991/satellite.nvim ## Misc @@ -27,44 +38,8 @@ nix - https://www.lazyvim.org - https://github.com/folke/dot - https://gist.github.com/rsms/fb463396c95ad8d9efa338a8050a01dc -- https://speakerdeck.com/cocopon/creating-your-lovely-color-scheme?slide=63 -- https://dotfiles.substack.com/p/16-elijah-manor?post_id=135441075 - https://nix-community.github.io/home-manager/options.html - https://daiderd.com/nix-darwin/manual/index.html - https://search.nixos.org/packages ---- - -``` -NSGlobalDomain.AppleHighlightColor = "0.764700 0.976500 0.568600"; - -defaults write com.apple.driver.AppleBluetoothMultitouch.trackpad Clicking -bool true -defaults write com.apple.dock showLaunchpadGestureEnabled -int 0 -defaults write com.apple.BluetoothAudioAgent "Apple Bitpool Min (editable)" -int 40 -defaults write com.apple.finder WarnOnEmptyTrash -bool false - -chflags nohidden ~/Library - -# Finder > Preferences -# Enable snap-to-grid for icons on the desktop and in other icon views -/usr/libexec/PlistBuddy -c "Set :DesktopViewSettings:IconViewSettings:arrangeBy grid" ~/Library/Preferences/com.apple.finder.plist -/usr/libexec/PlistBuddy -c "Set :FK_StandardViewSettings:IconViewSettings:arrangeBy grid" ~/Library/Preferences/com.apple.finder.plist -/usr/libexec/PlistBuddy -c "Set :StandardViewSettings:IconViewSettings:arrangeBy grid" ~/Library/Preferences/com.apple.finder.plist - -dockutil --no-restart --remove all -dockutil --no-restart --add "/Applications/Firefox.app" -dockutil --no-restart --add "/Applications/iTerm.app" -dockutil --no-restart --add "~/Downloads" --section others --sort name --view list - -# Remove All Unavailable Simulators -xcrun simctl delete unavailable - -brew 'gpg' -brew 'tmux' -brew 'mas' # App Store CLI (https://github.com/mas-cli/mas) - - -system.activationScripts -https://github.com/leonbreedt/nix-config/blob/15765e5aea9cce38fd1e342cf6df6799a11ef73e/macos/lib/dock.nix#L7 -``` diff --git a/.config/nvim/init.lua b/.config/nvim/init.lua index 59bc3ce..e7c443a 100644 --- a/.config/nvim/init.lua +++ b/.config/nvim/init.lua @@ -340,17 +340,6 @@ require("lazy").setup({ end, }, - { - "edgedb/edgedb-vim", - ft = "edgeql", - config = function() - vim.api.nvim_create_autocmd( - { "BufRead", "BufNewFile" }, - { pattern = { "*.esdl", "*.edgeql" }, command = "setf edgeql" } - ) - end, - }, - -- gitsigns.nvim (https://github.com/lewis6991/gitsigns.nvim) { "lewis6991/gitsigns.nvim", @@ -483,9 +472,6 @@ require("lazy").setup({ "L3MON4D3/LuaSnip", dependencies = { "rafamadriz/friendly-snippets", - config = function() - require("luasnip.loaders.from_vscode").lazy_load() - end, }, opts = { history = true, @@ -516,6 +502,9 @@ require("lazy").setup({ mode = { "i", "s" }, }, }, + config = function() + require("luasnip.loaders.from_vscode").lazy_load() + end, }, -- lualine.nvim (https://github.com/nvim-lualine/lualine.nvim) @@ -606,9 +595,9 @@ require("lazy").setup({ }, config = function() require("mini.comment").setup({ - hooks = { - pre = function() - require("ts_context_commentstring.internal").update_commentstring({}) + options = { + custom_commentstring = function() + return require("ts_context_commentstring").calculate_commentstring() or vim.bo.commentstring end, }, }) @@ -627,6 +616,16 @@ require("lazy").setup({ end, desc = "Delete Buffer", }, + { + "bD", + "%bd", + desc = "Delete All Buffers", + }, + { + "bc", + "%bd|edit#|bd#", + desc = "Delete All Buffers (except current)", + }, }, }, @@ -683,7 +682,7 @@ require("lazy").setup({ hijack_netrw_behavior = "open_current", }, window = { - position = "right", + position = "left", width = 30, }, }, @@ -842,6 +841,7 @@ require("lazy").setup({ require("mason-lspconfig").setup({ ensure_installed = { "biome", + "elixirls", "lua_ls", "rnix", "tsserver", @@ -850,6 +850,13 @@ require("lazy").setup({ }) local servers = { + elixirls = { + settings = { + elixirLS = { + fetchDeps = false, + }, + }, + }, lua_ls = { settings = { Lua = { @@ -982,13 +989,10 @@ require("lazy").setup({ autotag = { enable = true, }, - context_commentstring = { - enable = true, - enable_autocmd = false, - }, ensure_installed = { "bash", "css", + "elixir", "fish", "gitignore", "html", @@ -1180,20 +1184,6 @@ require("lazy").setup({ end, }, - -- rasmus.nvim (https://github.com/kvrohit/rasmus.nvim) - -- { - -- "kvrohit/rasmus.nvim", - -- lazy = false, - -- config = function() - -- vim.g.rasmus_italic_comments = false - -- vim.g.rasmus_italic_keywords = false - -- vim.g.rasmus_italic_booleans = false - -- vim.g.rasmus_italic_functions = false - -- vim.g.rasmus_italic_variables = false - -- vim.cmd([[colorscheme rasmus]]) - -- end, - -- }, - -- trouble.nvim (https://github.com/folke/trouble.nvim) { "folke/trouble.nvim", @@ -1230,18 +1220,6 @@ require("lazy").setup({ end, }, - -- vim-tmux-navigator (https://github.com/christoomey/vim-tmux-navigator) - { - "christoomey/vim-tmux-navigator", - event = "VeryLazy", - config = function() - vim.g.tmux_navigator_disable_when_zoomed = 1 - vim.g.tmux_navigator_save_on_switch = 2 - vim.g.VtrOrientation = "v" - vim.g.VtrPercentage = 20 - end, - }, - -- vim-illuminate (https://github.com/RRethy/vim-illuminate) { "RRethy/vim-illuminate", @@ -1402,6 +1380,7 @@ require("lazy").setup({ }, }, + -- lush.nvim (https://github.com/rktjmp/lush.nvim) { "rktjmp/lush.nvim", }, @@ -1489,6 +1468,12 @@ vim.api.nvim_create_autocmd("User", { vim.keymap.set("", "", "", opts) vim.keymap.set("", "", "", opts) + -- Navigate between splits + vim.keymap.set("n", "", "h", opts) + vim.keymap.set("n", "", "j", opts) + vim.keymap.set("n", "", "k", opts) + vim.keymap.set("n", "", "l", opts) + -- https://github.com/mhinz/vim-galore#saner-behavior-of-n-and-n vim.keymap.set("n", "n", "'Nn'[v:searchforward]", { expr = true, desc = "Next search result" }) vim.keymap.set("x", "n", "'Nn'[v:searchforward]", { expr = true, desc = "Next search result" }) diff --git a/.config/nvim/lazy-lock.json b/.config/nvim/lazy-lock.json index ec71ea5..60918ed 100644 --- a/.config/nvim/lazy-lock.json +++ b/.config/nvim/lazy-lock.json @@ -1,46 +1,45 @@ { - "LuaSnip": { "branch": "master", "commit": "a4de64570b9620875c8ea04175cd07ed8e32ac99" }, + "LuaSnip": { "branch": "master", "commit": "2dbef19461198630b3d7c39f414d09fb07d1fdd2" }, "cmp-buffer": { "branch": "main", "commit": "3022dbc9166796b644a841a02de8dd1cc1d311fa" }, - "cmp-nvim-lsp": { "branch": "main", "commit": "44b16d11215dce86f253ce0c30949813c0a90765" }, + "cmp-nvim-lsp": { "branch": "main", "commit": "5af77f54de1b16c34b23cba810150689a3a90312" }, "cmp-path": { "branch": "main", "commit": "91ff86cd9c29299a64f968ebb45846c485725f23" }, "cmp_luasnip": { "branch": "master", "commit": "05a9ab28b53f71d1aece421ef32fee2cb857a843" }, "copilot-cmp": { "branch": "master", "commit": "72fbaa03695779f8349be3ac54fa8bd77eed3ee3" }, - "copilot.lua": { "branch": "master", "commit": "73047082d72fcfdde1f73b7f17ad495cffcbafaa" }, - "dressing.nvim": { "branch": "master", "commit": "fe3071330a0720ce3695ac915820c8134b22d1b0" }, - "edgedb-vim": { "branch": "master", "commit": "7f2516bec3a5ad137347fb703d0b2c88f1478f5b" }, + "copilot.lua": { "branch": "master", "commit": "b03617a6dc4bc88b65ab5deac1631da9a9c2dcaf" }, + "dressing.nvim": { "branch": "master", "commit": "c1179336aaeca82a785cade27e9b7b276af3222e" }, "flash.nvim": { "branch": "main", "commit": "48817af25f51c0590653bbc290866e4890fe1cbe" }, - "friendly-snippets": { "branch": "main", "commit": "43727c2ff84240e55d4069ec3e6158d74cb534b6" }, - "gitsigns.nvim": { "branch": "main", "commit": "af0f583cd35286dd6f0e3ed52622728703237e50" }, - "inc-rename.nvim": { "branch": "main", "commit": "ed0f6f2b917cac4eb3259f907da0a481b27a3b7e" }, - "indent-blankline.nvim": { "branch": "master", "commit": "29be0919b91fb59eca9e90690d76014233392bef" }, - "lazy.nvim": { "branch": "main", "commit": "96584866b9c5e998cbae300594d0ccfd0c464627" }, - "lsp": { "branch": "master", "commit": "37457f268af5cd6765e589b0dcd7cbd192d8da00" }, - "lualine.nvim": { "branch": "master", "commit": "2248ef254d0a1488a72041cfb45ca9caada6d994" }, - "lush.nvim": { "branch": "main", "commit": "966aad1accd47fa11fbe2539234f81f678fef2de" }, - "mason-lspconfig.nvim": { "branch": "main", "commit": "40301e1c74bc0946eece13edf2b1c561cc497491" }, - "mason.nvim": { "branch": "main", "commit": "eabf6d347fdb75be360d4c0ced1145670a171453" }, - "mini.bufremove": { "branch": "main", "commit": "f53c7f27e36009fe61563c11cde154b94a0e5b94" }, - "mini.nvim": { "branch": "main", "commit": "8e18eb9ba849d737acac1873cd78fc8058c1700a" }, + "friendly-snippets": { "branch": "main", "commit": "69a2c1675b66e002799f5eef803b87a12f593049" }, + "gitsigns.nvim": { "branch": "main", "commit": "4aaacbf5e5e2218fd05eb75703fe9e0f85335803" }, + "inc-rename.nvim": { "branch": "main", "commit": "6f9b5f9cb237e12935144cdc535322b8c93c1b25" }, + "indent-blankline.nvim": { "branch": "master", "commit": "12e92044d313c54c438bd786d11684c88f6f78cd" }, + "lazy.nvim": { "branch": "main", "commit": "747bb955c5bfb2dc5d51280132f00a56a53f9f6d" }, + "lsp": { "branch": "master", "commit": "042aa6b27b8b8d4f4e1bd42de2037c83d676a8a0" }, + "lualine.nvim": { "branch": "master", "commit": "566b7036f717f3d676362742630518a47f132fff" }, + "lush.nvim": { "branch": "main", "commit": "e8a58f36c256af65cda36878f6f2024a612154c3" }, + "mason-lspconfig.nvim": { "branch": "main", "commit": "3ba1b92b771f33256b4969d696b82c8ae7075364" }, + "mason.nvim": { "branch": "main", "commit": "e110bc3be1a7309617cecd77bfe4bf86ba1b8134" }, + "mini.bufremove": { "branch": "main", "commit": "020243bfed8c8b941f2c20626faf3ea39c0c0e1b" }, + "mini.nvim": { "branch": "main", "commit": "910e49d2d45e9d32c815d16cce6cea7c3b43cecf" }, "neo-tree.nvim": { "branch": "v2.x", "commit": "80dc74d081823649809f78370fa5b204aa9a853a" }, - "none-ls.nvim": { "branch": "main", "commit": "b8fd44ee1616e6a9c995ed5f94ad9f1721d303ef" }, - "nui.nvim": { "branch": "main", "commit": "c0c8e347ceac53030f5c1ece1c5a5b6a17a25b32" }, - "nvim-cmp": { "branch": "main", "commit": "0b751f6beef40fd47375eaf53d3057e0bfa317e4" }, + "none-ls.nvim": { "branch": "main", "commit": "e64f03f3f77bd6854c3b3c5cfffcc806a0c0f66a" }, + "nui.nvim": { "branch": "main", "commit": "35da9ca1de0fc4dda96c2e214d93d363c145f418" }, + "nvim-cmp": { "branch": "main", "commit": "538e37ba87284942c1d76ed38dd497e54e65b891" }, "nvim-lastplace": { "branch": "main", "commit": "0bb6103c506315044872e0f84b1f736c4172bb20" }, - "nvim-treesitter": { "branch": "master", "commit": "96f55f304332ca6ea1b7dde32d3ec04b5298c316" }, - "nvim-ts-autotag": { "branch": "main", "commit": "6be1192965df35f94b8ea6d323354f7dc7a557e4" }, - "nvim-ts-context-commentstring": { "branch": "main", "commit": "92e688f013c69f90c9bbd596019ec10235bc51de" }, - "nvim-ufo": { "branch": "main", "commit": "ebbab711d909d5f675e38ad489765bd22bd2c6b3" }, - "nvim-web-devicons": { "branch": "master", "commit": "5de460ca7595806044eced31e3c36c159a493857" }, - "plenary.nvim": { "branch": "master", "commit": "50012918b2fc8357b87cff2a7f7f0446e47da174" }, + "nvim-treesitter": { "branch": "master", "commit": "4a4dbe1cb1da34d87fc42a40aaf8e218af4cfe0f" }, + "nvim-ts-autotag": { "branch": "main", "commit": "8515e48a277a2f4947d91004d9aa92c29fdc5e18" }, + "nvim-ts-context-commentstring": { "branch": "main", "commit": "1277b4a1f451b0f18c0790e1a7f12e1e5fdebfee" }, + "nvim-ufo": { "branch": "main", "commit": "b0741a647efd98d9abb6cb653e056d24a07e4581" }, + "nvim-web-devicons": { "branch": "master", "commit": "140edfcf25093e8b321d13e154cbce89ee868ca0" }, + "plenary.nvim": { "branch": "master", "commit": "55d9fe89e33efd26f532ef20223e5f9430c8b0c0" }, "popup.nvim": { "branch": "master", "commit": "b7404d35d5d3548a82149238289fa71f7f6de4ac" }, - "promise-async": { "branch": "main", "commit": "e94f35161b8c5d4a4ca3b6ff93dd073eb9214c0e" }, - "rust-tools.nvim": { "branch": "master", "commit": "0cc8adab23117783a0292a0c8a2fbed1005dc645" }, - "telescope.nvim": { "branch": "master", "commit": "20bf20500c95208c3ac0ef07245065bf94dcab15" }, + "promise-async": { "branch": "main", "commit": "94f6f03c6c1e2aab551aacdf0c1e597a7269abb6" }, + "rust-tools.nvim": { "branch": "master", "commit": "676187908a1ce35ffcd727c654ed68d851299d3e" }, + "telescope.nvim": { "branch": "master", "commit": "9cf58f438f95f04cf1709b734bbcb9243c262d70" }, + "toggleterm.nvim": { "branch": "main", "commit": "e3805fed94d487b81e9c21548535cc820f62f840" }, "trouble.nvim": { "branch": "main", "commit": "f1168feada93c0154ede4d1fe9183bf69bac54ea" }, "twoslash-queries.nvim": { "branch": "main", "commit": "ea2dd86618d3aa4e176bfafc31cab2b1d1feb157" }, "vim-illuminate": { "branch": "master", "commit": "3bd2ab64b5d63b29e05691e624927e5ebbf0fb86" }, "vim-repeat": { "branch": "master", "commit": "24afe922e6a05891756ecf331f39a1f6743d3d5a" }, "vim-surround": { "branch": "master", "commit": "3d188ed2113431cf8dac77be61b842acb64433d9" }, - "vim-tmux-navigator": { "branch": "master", "commit": "7db70e08ea03b3e4d91f63713d76134512e28d7e" }, "which-key.nvim": { "branch": "main", "commit": "4433e5ec9a507e5097571ed55c02ea9658fb268a" } } \ No newline at end of file