diff --git a/config/fish/config.fish b/config/fish/config.fish index 9c685d7..880959e 100644 --- a/config/fish/config.fish +++ b/config/fish/config.fish @@ -27,6 +27,13 @@ if command -v nvim >/dev/null 2>&1 set -x GIT_EDITOR nvim end +# Check for Homebrew path +if test (uname -m) = arm64 + set brew_prefix /opt/homebrew +else + set brew_prefix /usr/local +end + # XDG base directory specification set -x XDG_CACHE_HOME $HOME/.cache set -x XDG_CONFIG_HOME $HOME/.config @@ -51,9 +58,9 @@ set -x FZF_TMUX 1 set -x FZF_TMUX_OPTS -p # OpenSSL -set -x LDFLAGS "-L/opt/homebrew/opt/openssl@1.1/lib" -set -x CPPFLAGS "-I/opt/homebrew/opt/openssl@1.1/include" -set -x PKG_CONFIG_PATH "/opt/homebrew/opt/openssl@1.1/lib/pkgconfig" +set -x LDFLAGS "-L$brew_prefix/opt/openssl@1.1/lib" +set -x CPPFLAGS "-I$brew_prefix/opt/openssl@1.1/include" +set -x PKG_CONFIG_PATH "$brew_prefix/opt/openssl@1.1/lib/pkgconfig" # Man set -x MANPATH /usr/local/man $MANPATH @@ -96,7 +103,7 @@ fish_add_path $HOME/.asdf/shims # *** *** Tools *** *** # Homebrew -eval "$(/opt/homebrew/bin/brew shellenv)" +eval "$($brew_prefix/bin/brew shellenv)" # asdf source (brew --prefix asdf)/libexec/asdf.fish diff --git a/config/nvim/lazy-lock.json b/config/nvim/lazy-lock.json index 9113c86..a0b3369 100644 --- a/config/nvim/lazy-lock.json +++ b/config/nvim/lazy-lock.json @@ -1,8 +1,8 @@ { - "ChatGPT.nvim": { "branch": "main", "commit": "f081338f07216a46d3915ce46c1fcb083bcb5016" }, + "ChatGPT.nvim": { "branch": "main", "commit": "4d9d297c2409c8ebc715da7f1d7705a221564555" }, "CopilotChat.nvim": { "branch": "canary", "commit": "43d033b68c8bede4cc87092c7db6bb3bbb2fe145" }, "LazyVim": { "branch": "main", "commit": "12818a6cb499456f4903c5d8e68af43753ebc869" }, - "SchemaStore.nvim": { "branch": "main", "commit": "2ff2063191144005eb754356517de65ae45f2e41" }, + "SchemaStore.nvim": { "branch": "main", "commit": "54a2cf0105166d5a48172e81f12a2bf10cfc8b2c" }, "aerial.nvim": { "branch": "master", "commit": "e585934fef8d253dbc5655cff3deb3444e064e6c" }, "auto-save.nvim": { "branch": "main", "commit": "979b6c82f60cfa80f4cf437d77446d0ded0addf0" }, "baleia.nvim": { "branch": "main", "commit": "1b25eac3ac03659c3d3af75c7455e179e5f197f7" }, @@ -33,15 +33,15 @@ "flash.nvim": { "branch": "main", "commit": "34c7be146a91fec3555c33fe89c7d643f6ef5cf1" }, "fm-nvim": { "branch": "master", "commit": "8e6a77049330e7c797eb9e63affd75eb796fe75e" }, "friendly-snippets": { "branch": "main", "commit": "00ebcaa159e817150bd83bfe2d51fa3b3377d5c4" }, - "fzf": { "branch": "master", "commit": "74f196eebbc6adfbb4d6423fbefe3c8cdeebe67e" }, - "fzf-lua": { "branch": "main", "commit": "c9c79bb8dfae5abe3bcdeca12e2469e9517195d0" }, - "fzf.vim": { "branch": "master", "commit": "6f28c8c7bb551161a0315a76488522204f39c1f4" }, + "fzf": { "branch": "master", "commit": "2775b771f27d7a1d89cdf067a56cc0e9238f101d" }, + "fzf-lua": { "branch": "main", "commit": "9226c5a2291ef623ef157e0e1ffea034ffc8b8de" }, + "fzf.vim": { "branch": "master", "commit": "04bfa8115716f9222fe307303f9803e7264ac303" }, "gen.nvim": { "branch": "main", "commit": "c9a73d8c0d462333da6d2191806ff98f2884d706" }, "gh.nvim": { "branch": "main", "commit": "ebbaac254ef7dd6f85b439825fbce82d0dc84515" }, - "gitsigns.nvim": { "branch": "main", "commit": "562dc47189ad3c8696dbf460d38603a74d544849" }, - "grug-far.nvim": { "branch": "main", "commit": "85cadf849bdb22540c36da2034d21de0b37c0952" }, + "gitsigns.nvim": { "branch": "main", "commit": "80214a857ce512cc64964abddc1d8eb5a3e28396" }, + "grug-far.nvim": { "branch": "main", "commit": "ebab68b2150079732ae8074eefb261a124824139" }, "harpoon": { "branch": "harpoon2", "commit": "0378a6c428a0bed6a2781d459d7943843f374bce" }, - "harpoon-lualine": { "branch": "master", "commit": "d1b873c19b701fd80d60a67d086dbb3bcc4eb00e" }, + "harpoon-lualine": { "branch": "master", "commit": "f41b2e0ef97efe498a80eb6dc94f0ec5ac3ccd45" }, "highlight-undo.nvim": { "branch": "main", "commit": "1ea1c79372d7d93c88fd97543880927b7635e3d2" }, "inc-rename.nvim": { "branch": "main", "commit": "8ba77017ca468f3029bf88ef409c2d20476ea66b" }, "indent-blankline.nvim": { "branch": "master", "commit": "db926997af951da38e5004ec7b9fbdc480b48f5d" }, @@ -84,22 +84,22 @@ "nvim-dap-ui": { "branch": "master", "commit": "a5606bc5958db86f8d92803bea7400ee26a8d7e4" }, "nvim-dap-virtual-text": { "branch": "master", "commit": "484995d573c0f0563f6a66ebdd6c67b649489615" }, "nvim-lint": { "branch": "master", "commit": "debabca63c0905b59ce596a55a8e33eafdf66342" }, - "nvim-lspconfig": { "branch": "master", "commit": "911167921d49cd5c1c9b2436031d0da3945e787f" }, + "nvim-lspconfig": { "branch": "master", "commit": "8a3610d29df83d8632f8ee7c3afc779c12725531" }, "nvim-navic": { "branch": "master", "commit": "8649f694d3e76ee10c19255dece6411c29206a54" }, "nvim-nio": { "branch": "master", "commit": "a428f309119086dc78dd4b19306d2d67be884eee" }, "nvim-notify": { "branch": "master", "commit": "d333b6f167900f6d9d42a59005d82919830626bf" }, "nvim-silicon": { "branch": "main", "commit": "feb882f04c992b797daa118101a239fb3bedfc04" }, "nvim-snippets": { "branch": "main", "commit": "56b4052f71220144689caaa2e5b66222ba5661eb" }, - "nvim-transparent": { "branch": "main", "commit": "2c78d94448b534c35ca1d88a3bae90b1cd1a3d4d" }, - "nvim-treesitter": { "branch": "master", "commit": "04401b5dd17c3419dae5141677bd256f52d54733" }, + "nvim-transparent": { "branch": "main", "commit": "8a2749a2fa74f97fe6557f61b89ac7fd873f3c21" }, + "nvim-treesitter": { "branch": "master", "commit": "7499f7379459db3b31c75cf5cec45f785be6e2c7" }, "nvim-treesitter-textobjects": { "branch": "master", "commit": "41e3abf6bfd9a9a681eb1f788bdeba91c9004b2b" }, "nvim-ts-autotag": { "branch": "main", "commit": "0cb76eea80e9c73b88880f0ca78fbd04c5bdcac7" }, - "nvim-ufo": { "branch": "main", "commit": "7dcb8fea3e7b3ccdb50f2c3ae7c248cdf6fe1ae1" }, + "nvim-ufo": { "branch": "main", "commit": "b23a46aa06f5f653d107efbc67fd2aa3877ac344" }, "nvim-various-textobjs": { "branch": "main", "commit": "8dbc655f794202f45ab6a1cac1cb323a218ac6a1" }, "nvim-web-devicons": { "branch": "master", "commit": "3722e3d1fb5fe1896a104eb489e8f8651260b520" }, "oatmeal.nvim": { "branch": "master", "commit": "c8cdd0a182cf77f88ea5fa4703229ddb3f47c1f7" }, "obsidian.nvim": { "branch": "main", "commit": "ae1f76a75c7ce36866e1d9342a8f6f5b9c2caf9b" }, - "oil.nvim": { "branch": "master", "commit": "a632c898fbe0e363ef89b9577f1a7714ab67d682" }, + "oil.nvim": { "branch": "master", "commit": "4f3c6780ff272d8facab69a658cf8693582b7a54" }, "persistence.nvim": { "branch": "main", "commit": "f6aad7dde7fcf54148ccfc5f622c6d5badd0cc3d" }, "plenary.nvim": { "branch": "master", "commit": "ec289423a1693aeae6cd0d503bac2856af74edaa" }, "popup.nvim": { "branch": "master", "commit": "b7404d35d5d3548a82149238289fa71f7f6de4ac" }, @@ -108,7 +108,7 @@ "rainbow_csv": { "branch": "master", "commit": "3dbbfd7d17536aebfb80f571255548495574c32b" }, "remote-nvim.nvim": { "branch": "main", "commit": "66fc20fd259401c7bb6ac5189ecb6283c2eb65d2" }, "smart-open.nvim": { "branch": "0.2.x", "commit": "87626ee8748b9bba22093adec7bb58c63e7214f0" }, - "smart-splits.nvim": { "branch": "master", "commit": "b518cfb5283a2da43fa9935e850ba9d77873453d" }, + "smart-splits.nvim": { "branch": "master", "commit": "d39e1f1920c5c6772b716d6ee05fd3ffa82a0d2f" }, "sqlite.lua": { "branch": "master", "commit": "d0ffd703b56d090d213b497ed4eb840495f14a11" }, "symbols-outline.nvim": { "branch": "master", "commit": "564ee65dfc9024bdde73a6621820866987cbb256" }, "tabular": { "branch": "master", "commit": "12437cd1b53488e24936ec4b091c9324cafee311" }, @@ -116,7 +116,7 @@ "tailwind-tools.nvim": { "branch": "master", "commit": "bf7c89151b55673c1d47f6699fc3d1a4c5b68f11" }, "tailwindcss-colorizer-cmp.nvim": { "branch": "main", "commit": "3d3cd95e4a4135c250faf83dd5ed61b8e5502b86" }, "telescope-file-browser.nvim": { "branch": "master", "commit": "a46780830b576049c675680650f773bedfa8677a" }, - "telescope-frecency.nvim": { "branch": "master", "commit": "673585ee997b40d2600eb86c3693d552e4f5d79f" }, + "telescope-frecency.nvim": { "branch": "master", "commit": "db32047232a2959146345b0c7e675a815bd78bd1" }, "telescope-fzf-native.nvim": { "branch": "main", "commit": "cf48d4dfce44e0b9a2e19a008d6ec6ea6f01a83b" }, "telescope-fzy-native.nvim": { "branch": "master", "commit": "282f069504515eec762ab6d6c89903377252bf5b" }, "telescope-github.nvim": { "branch": "master", "commit": "ee95c509901c3357679e9f2f9eaac3561c811736" }, @@ -151,6 +151,6 @@ "vimux": { "branch": "master", "commit": "b110cd95062f5d83a4cb58b807783d783e1fbcd8" }, "which-key.nvim": { "branch": "main", "commit": "6c1584eb76b55629702716995cca4ae2798a9cca" }, "worktrees.nvim": { "branch": "main", "commit": "9b705e702b29297009702e492c28c0277a5bb8fa" }, - "wrapping.nvim": { "branch": "master", "commit": "3a823200c297885b70515fa8d974e1763c578e26" }, + "wrapping.nvim": { "branch": "master", "commit": "a5210c29be19ed736eb3333677e08a57efebce78" }, "zen-mode.nvim": { "branch": "main", "commit": "29b292bdc58b76a6c8f294c961a8bf92c5a6ebd6" } } diff --git a/config/nvim/lua/plugins/telescope-frecency.lua b/config/nvim/lua/plugins/telescope-frecency.lua index b73b14d..523e619 100644 --- a/config/nvim/lua/plugins/telescope-frecency.lua +++ b/config/nvim/lua/plugins/telescope-frecency.lua @@ -1,27 +1,27 @@ -- Telescope extensionn that offers intelligent priorization -- https://github.com/nvim-telescope/telescope-frecency.nvim return { - "telescope.nvim", - dependencies = { - "nvim-telescope/telescope-frecency.nvim", - dependencies = { - "kkharji/sqlite.lua", - }, - keys = { - { ";mr", "Telescope frecency", desc = "Most recently used files" }, - }, - opts = { - extensions = { - frecency = { - show_scores = false, - show_unindexed = true, - ignore_patterns = { "*.git/*", "*/tmp/*" }, - disable_devicons = false, - }, - }, - }, - config = function() - require("telescope").load_extension("frecency") - end, - }, + "telescope.nvim", + dependencies = { + "nvim-telescope/telescope-frecency.nvim", + dependencies = { + "kkharji/sqlite.lua", + }, + keys = { + { ";mr", "Telescope frecency", desc = "Most recently used files" }, + }, + opts = { + extensions = { + frecency = { + show_scores = false, + show_unindexed = true, + ignore_patterns = { "*.git/*", "*/tmp/*" }, + disable_devicons = false, + }, + }, + }, + config = function() + -- require("telescope").load_extension("frecency") + end, + }, }