From 756779e79a2dc9d0f10d50510118c5ec7233b573 Mon Sep 17 00:00:00 2001 From: Luke Collier Date: Tue, 2 Jan 2024 10:41:52 +0000 Subject: [PATCH] fix: Fixed some java install issues clean: Removed starship and fnm by default --- Brewfile | 13 +- Brewfile.lock.json | 164 +++++++------ alacritty/alacritty.toml | 358 ++++++++++++++++++++++++++++ alacritty/alacritty.yaml | 502 --------------------------------------- alacritty/alacritty.yml | 143 ----------- copy.sh | 2 +- install.sh | 23 +- zsh/zshrc | 4 - 8 files changed, 462 insertions(+), 747 deletions(-) create mode 100644 alacritty/alacritty.toml delete mode 100644 alacritty/alacritty.yaml delete mode 100644 alacritty/alacritty.yml diff --git a/Brewfile b/Brewfile index d631f3c..51a672b 100644 --- a/Brewfile +++ b/Brewfile @@ -1,32 +1,23 @@ tap "coursier/formulas" tap "homebrew/bundle" tap "homebrew/cask-fonts" -tap "homebrew/core" tap "homebrew/services" tap "koekeishiya/formulae" -tap "michaeleisel/zld" tap "scalacenter/bloop" -brew "awscli" brew "exa" brew "fd" -brew "fnm" brew "fzf" brew "jq" brew "mill" brew "neovim" -brew "nnn" -brew "rename" brew "ripgrep" brew "rust-analyzer" brew "rustup-init" -brew "starship" -brew "terraform" brew "tmux" -brew "websocat" -brew "yarn" brew "zoxide" brew "zsh" +cask "raycast" +cask "alacritty" brew "reattach-to-user-namespace" brew "coursier/formulas/coursier" -brew "koekeishiya/formulae/yabai", args: ["HEAD"] cask "font-jetbrains-mono-nerd-font" diff --git a/Brewfile.lock.json b/Brewfile.lock.json index 2112f73..07044fb 100644 --- a/Brewfile.lock.json +++ b/Brewfile.lock.json @@ -2,13 +2,13 @@ "entries": { "tap": { "homebrew/cask-fonts": { - "revision": "bccf1a73fddbd5ba1245d94c51912c29a4738065" + "revision": "3074f5af3123ed481151a1e2be58aad45b280acf" }, "coursier/formulas": { "revision": "3f5f743839e6806ef51115a5017d5d6ef1736956" }, "homebrew/bundle": { - "revision": "d6fbeee54ba344be59731ff3e93fb105b2567e34" + "revision": "e4798d8075e1a793f065be3e5e1674ec09193d17" }, "homebrew/cask": { "revision": "200e7cd80a3dbb7b4e62942def4f2fcd1e6be1cf" @@ -17,16 +17,16 @@ "revision": "25a5a3009c89fc1d98389c38cb1539159ea9f379" }, "homebrew/services": { - "revision": "68336e969809338fa3f072dc05091912fa710a6d" + "revision": "6819359f72a8e0001370790685bf86c9897d9757" }, "koekeishiya/formulae": { - "revision": "d4c95802ca991ea41512320af412072e775c1eb7" + "revision": "3f1f36449166cb83f93a6cd8f6e723a6a7350a94" }, "michaeleisel/zld": { "revision": "49df886a77199e12ac825cab952fdedd805148ce" }, "scalacenter/bloop": { - "revision": "280fe342a392117413a8372b6b2055407717e91d" + "revision": "865ed553ea150f70fe7701fdf5d9dca80f379f87" } }, "cask": { @@ -41,6 +41,18 @@ "options": { "full_name": "firefox" } + }, + "raycast": { + "version": "1.64.4", + "options": { + "full_name": "raycast" + } + }, + "alacritty": { + "version": "0.13.0", + "options": { + "full_name": "alacritty" + } } }, "brew": { @@ -49,7 +61,7 @@ "bottle": false }, "neovim": { - "version": "HEAD-5fa88a7", + "version": "0.9.4", "bottle": { "rebuild": 0, "root_url": "https://ghcr.io/v2/homebrew/core", @@ -191,45 +203,45 @@ } }, "fzf": { - "version": "0.44.1", + "version": "0.45.0", "bottle": { "rebuild": 0, "root_url": "https://ghcr.io/v2/homebrew/core", "files": { "arm64_sonoma": { "cellar": ":any_skip_relocation", - "url": "https://ghcr.io/v2/homebrew/core/fzf/blobs/sha256:91b30c40eeb135cc8d7fc43883db66b888e96a9c993f1d9f97b70715017c33e8", - "sha256": "91b30c40eeb135cc8d7fc43883db66b888e96a9c993f1d9f97b70715017c33e8" + "url": "https://ghcr.io/v2/homebrew/core/fzf/blobs/sha256:a8f9376459ca6c779c6e13ecb4962ac5157bb0f0cb46aba1fafe167cacd0544a", + "sha256": "a8f9376459ca6c779c6e13ecb4962ac5157bb0f0cb46aba1fafe167cacd0544a" }, "arm64_ventura": { "cellar": ":any_skip_relocation", - "url": "https://ghcr.io/v2/homebrew/core/fzf/blobs/sha256:ddc4a849f777e7da251c665c1ff888bf96742f3b331179b2c87990cbac48fd51", - "sha256": "ddc4a849f777e7da251c665c1ff888bf96742f3b331179b2c87990cbac48fd51" + "url": "https://ghcr.io/v2/homebrew/core/fzf/blobs/sha256:3cb10f3b66ed5747870525b88e527e2c8c5a2cae5c486438b3d449bb0b3554f6", + "sha256": "3cb10f3b66ed5747870525b88e527e2c8c5a2cae5c486438b3d449bb0b3554f6" }, "arm64_monterey": { "cellar": ":any_skip_relocation", - "url": "https://ghcr.io/v2/homebrew/core/fzf/blobs/sha256:709eae88f69641ec620c7837dd55f74601956e7127cc7bbb185df22235af76c0", - "sha256": "709eae88f69641ec620c7837dd55f74601956e7127cc7bbb185df22235af76c0" + "url": "https://ghcr.io/v2/homebrew/core/fzf/blobs/sha256:6b5adb602f7cece57525a912d063d80d707b383688eaecf4507f83718270b4cc", + "sha256": "6b5adb602f7cece57525a912d063d80d707b383688eaecf4507f83718270b4cc" }, "sonoma": { "cellar": ":any_skip_relocation", - "url": "https://ghcr.io/v2/homebrew/core/fzf/blobs/sha256:f42c837ffe0a6baea94c448807bd7322502719cdfeb2059ac39ccbd7d6c08471", - "sha256": "f42c837ffe0a6baea94c448807bd7322502719cdfeb2059ac39ccbd7d6c08471" + "url": "https://ghcr.io/v2/homebrew/core/fzf/blobs/sha256:2901280f52bd99b2de6ef7b81218b6e8bb024306bd37024381a0a5ef06ccfd10", + "sha256": "2901280f52bd99b2de6ef7b81218b6e8bb024306bd37024381a0a5ef06ccfd10" }, "ventura": { "cellar": ":any_skip_relocation", - "url": "https://ghcr.io/v2/homebrew/core/fzf/blobs/sha256:a03539e95924bec724c781214acbb75b7c3aaf90b46a2fa4636c68ce8f31a63e", - "sha256": "a03539e95924bec724c781214acbb75b7c3aaf90b46a2fa4636c68ce8f31a63e" + "url": "https://ghcr.io/v2/homebrew/core/fzf/blobs/sha256:f24dadb0fa8af0f5b04dcac2494cea7283ec23a1bc54ec47500667918ddfa928", + "sha256": "f24dadb0fa8af0f5b04dcac2494cea7283ec23a1bc54ec47500667918ddfa928" }, "monterey": { "cellar": ":any_skip_relocation", - "url": "https://ghcr.io/v2/homebrew/core/fzf/blobs/sha256:50d3932e2a006b801400962d0c9be1e5b728d483aa6a8cd8d50b5cf9442e8278", - "sha256": "50d3932e2a006b801400962d0c9be1e5b728d483aa6a8cd8d50b5cf9442e8278" + "url": "https://ghcr.io/v2/homebrew/core/fzf/blobs/sha256:3550db8a9ef735ec6432f2462e651190a53aa4c9589ca9d5e5750aca118890ec", + "sha256": "3550db8a9ef735ec6432f2462e651190a53aa4c9589ca9d5e5750aca118890ec" }, "x86_64_linux": { "cellar": ":any_skip_relocation", - "url": "https://ghcr.io/v2/homebrew/core/fzf/blobs/sha256:39ebf3482ffaa9201dbec9bc781803f5926872982bb382a5e1be8d8dcc849525", - "sha256": "39ebf3482ffaa9201dbec9bc781803f5926872982bb382a5e1be8d8dcc849525" + "url": "https://ghcr.io/v2/homebrew/core/fzf/blobs/sha256:d93c4dee31e49ddb62133aa872ba7d90b03a25094fabcac161663d0da7b96696", + "sha256": "d93c4dee31e49ddb62133aa872ba7d90b03a25094fabcac161663d0da7b96696" } } } @@ -533,99 +545,89 @@ } }, "fd": { - "version": "8.7.1", + "version": "9.0.0", "bottle": { - "rebuild": 1, + "rebuild": 0, "root_url": "https://ghcr.io/v2/homebrew/core", "files": { "arm64_sonoma": { "cellar": ":any_skip_relocation", - "url": "https://ghcr.io/v2/homebrew/core/fd/blobs/sha256:314376b1b9785b927ebcf15e7395ddba0a1dfc8d10752b39a1e989651a07c8ed", - "sha256": "314376b1b9785b927ebcf15e7395ddba0a1dfc8d10752b39a1e989651a07c8ed" + "url": "https://ghcr.io/v2/homebrew/core/fd/blobs/sha256:fbd946a04fb7affea1dcbed915c312812b41bb2baa53d5cd21621e86bd85fdbe", + "sha256": "fbd946a04fb7affea1dcbed915c312812b41bb2baa53d5cd21621e86bd85fdbe" }, "arm64_ventura": { "cellar": ":any_skip_relocation", - "url": "https://ghcr.io/v2/homebrew/core/fd/blobs/sha256:1cdd3ad4bbd6f7edcd82b7e507c513cb8693bcf37669d67e23c985e8667b0f43", - "sha256": "1cdd3ad4bbd6f7edcd82b7e507c513cb8693bcf37669d67e23c985e8667b0f43" + "url": "https://ghcr.io/v2/homebrew/core/fd/blobs/sha256:9571530e58a9248c63ef228c24b2871366a93bc40819f56f3851e11b70cc122d", + "sha256": "9571530e58a9248c63ef228c24b2871366a93bc40819f56f3851e11b70cc122d" }, "arm64_monterey": { "cellar": ":any_skip_relocation", - "url": "https://ghcr.io/v2/homebrew/core/fd/blobs/sha256:ee8dda936246d9b6280f06ef7cf861b14f37926777f8d3746ed1694372c05e34", - "sha256": "ee8dda936246d9b6280f06ef7cf861b14f37926777f8d3746ed1694372c05e34" + "url": "https://ghcr.io/v2/homebrew/core/fd/blobs/sha256:7b6fc1b116843a790e8cc6e2fc5eefb0ec1e8be6e468aeea9843bf089cf8abbe", + "sha256": "7b6fc1b116843a790e8cc6e2fc5eefb0ec1e8be6e468aeea9843bf089cf8abbe" }, "sonoma": { "cellar": ":any_skip_relocation", - "url": "https://ghcr.io/v2/homebrew/core/fd/blobs/sha256:25ced192ca9dda96ebd8c52b4a944052a2147156ee10d01bb71211f1567ede17", - "sha256": "25ced192ca9dda96ebd8c52b4a944052a2147156ee10d01bb71211f1567ede17" + "url": "https://ghcr.io/v2/homebrew/core/fd/blobs/sha256:53da052d53334f6f60dad0add170b261044e50de2af61559ea32b5bc3487f816", + "sha256": "53da052d53334f6f60dad0add170b261044e50de2af61559ea32b5bc3487f816" }, "ventura": { "cellar": ":any_skip_relocation", - "url": "https://ghcr.io/v2/homebrew/core/fd/blobs/sha256:5bd1806efd2a1a79f387951528d82ffdba547ed4194a76e334d8e219d4bff3b3", - "sha256": "5bd1806efd2a1a79f387951528d82ffdba547ed4194a76e334d8e219d4bff3b3" + "url": "https://ghcr.io/v2/homebrew/core/fd/blobs/sha256:11bd142cf3d824bb24cb1867ed9a58960bbdb9b1ef23d4bd0d5edb443e80dd16", + "sha256": "11bd142cf3d824bb24cb1867ed9a58960bbdb9b1ef23d4bd0d5edb443e80dd16" }, "monterey": { "cellar": ":any_skip_relocation", - "url": "https://ghcr.io/v2/homebrew/core/fd/blobs/sha256:2c4c79a54ccd73e36730071793f42acbf8e39a262fcd6d26c8c6a52ef137ac2c", - "sha256": "2c4c79a54ccd73e36730071793f42acbf8e39a262fcd6d26c8c6a52ef137ac2c" + "url": "https://ghcr.io/v2/homebrew/core/fd/blobs/sha256:37e345f476ec684f75a111cbd51d6fd9e816b946fc3ef41abad27ccb7b814903", + "sha256": "37e345f476ec684f75a111cbd51d6fd9e816b946fc3ef41abad27ccb7b814903" }, "x86_64_linux": { "cellar": ":any_skip_relocation", - "url": "https://ghcr.io/v2/homebrew/core/fd/blobs/sha256:5b5cf8de26dcc9336857a3f93e9d66b92fdfe9aa874f697e8b579ed7bcde06f8", - "sha256": "5b5cf8de26dcc9336857a3f93e9d66b92fdfe9aa874f697e8b579ed7bcde06f8" + "url": "https://ghcr.io/v2/homebrew/core/fd/blobs/sha256:a9362fedd45bacbe528d85a3995a0069e83f36fee622cc2e732c1b55a7f53a16", + "sha256": "a9362fedd45bacbe528d85a3995a0069e83f36fee622cc2e732c1b55a7f53a16" } } } }, "jq": { - "version": "1.7", + "version": "1.7.1", "bottle": { "rebuild": 0, "root_url": "https://ghcr.io/v2/homebrew/core", "files": { "arm64_sonoma": { "cellar": ":any", - "url": "https://ghcr.io/v2/homebrew/core/jq/blobs/sha256:fe0e7ed9a1407256a50afe7f49af6018f450a6e2bf04d47eafec60f1f63111ac", - "sha256": "fe0e7ed9a1407256a50afe7f49af6018f450a6e2bf04d47eafec60f1f63111ac" + "url": "https://ghcr.io/v2/homebrew/core/jq/blobs/sha256:07bc9081c0fdb43aca089e5839f6a270fc45ca9aa7d7633e16fac0fdfe4c4ad8", + "sha256": "07bc9081c0fdb43aca089e5839f6a270fc45ca9aa7d7633e16fac0fdfe4c4ad8" }, "arm64_ventura": { "cellar": ":any", - "url": "https://ghcr.io/v2/homebrew/core/jq/blobs/sha256:976b252c6a3f6dfa2531ee1459718ab7a8338ac4fb84edacd6f6d55743713a16", - "sha256": "976b252c6a3f6dfa2531ee1459718ab7a8338ac4fb84edacd6f6d55743713a16" + "url": "https://ghcr.io/v2/homebrew/core/jq/blobs/sha256:1b27f5277eb2cdfac9f3970ee9adadddc5e04e45469de05a663bc16e793b4eea", + "sha256": "1b27f5277eb2cdfac9f3970ee9adadddc5e04e45469de05a663bc16e793b4eea" }, "arm64_monterey": { "cellar": ":any", - "url": "https://ghcr.io/v2/homebrew/core/jq/blobs/sha256:c702eade07a9a6914fc3aa075d89ccca3afc2d4ea77bee895f233ca4479e570d", - "sha256": "c702eade07a9a6914fc3aa075d89ccca3afc2d4ea77bee895f233ca4479e570d" - }, - "arm64_big_sur": { - "cellar": ":any", - "url": "https://ghcr.io/v2/homebrew/core/jq/blobs/sha256:d121938e0e87bd80584f6b452b29ac22cde7acca0b15ed3e91f8fd1d3c9014eb", - "sha256": "d121938e0e87bd80584f6b452b29ac22cde7acca0b15ed3e91f8fd1d3c9014eb" + "url": "https://ghcr.io/v2/homebrew/core/jq/blobs/sha256:41911a73dc6a44c9788c198abc18307213d070d7ca6375e8dd6994335aaee136", + "sha256": "41911a73dc6a44c9788c198abc18307213d070d7ca6375e8dd6994335aaee136" }, "sonoma": { "cellar": ":any", - "url": "https://ghcr.io/v2/homebrew/core/jq/blobs/sha256:8d0493297afbb4ae6131c51e4eed0369cf3aaacf0f845f6cca078b6201a7288b", - "sha256": "8d0493297afbb4ae6131c51e4eed0369cf3aaacf0f845f6cca078b6201a7288b" + "url": "https://ghcr.io/v2/homebrew/core/jq/blobs/sha256:b68d33a5e3c79a0f457d96de1ad1f200c05314f5fea9244d712847c92032b5f7", + "sha256": "b68d33a5e3c79a0f457d96de1ad1f200c05314f5fea9244d712847c92032b5f7" }, "ventura": { "cellar": ":any", - "url": "https://ghcr.io/v2/homebrew/core/jq/blobs/sha256:e4b23ebcff759f57e62e2573359ccb62e8e3426a1237082bf3301843230d3094", - "sha256": "e4b23ebcff759f57e62e2573359ccb62e8e3426a1237082bf3301843230d3094" + "url": "https://ghcr.io/v2/homebrew/core/jq/blobs/sha256:10b845b1505892ff585b49e89fe3b09761d148b2c14ca6f5a1aa58002452f8f0", + "sha256": "10b845b1505892ff585b49e89fe3b09761d148b2c14ca6f5a1aa58002452f8f0" }, "monterey": { "cellar": ":any", - "url": "https://ghcr.io/v2/homebrew/core/jq/blobs/sha256:748e1d8825d2961e082d412583e6e7b6e60ad75408325e976516c0db266720fe", - "sha256": "748e1d8825d2961e082d412583e6e7b6e60ad75408325e976516c0db266720fe" - }, - "big_sur": { - "cellar": ":any", - "url": "https://ghcr.io/v2/homebrew/core/jq/blobs/sha256:0edbe8f1792bd794762018699592fe24d4aac01a2de369a4c4a4e25b96bc213f", - "sha256": "0edbe8f1792bd794762018699592fe24d4aac01a2de369a4c4a4e25b96bc213f" + "url": "https://ghcr.io/v2/homebrew/core/jq/blobs/sha256:449c76665ac72b34daeb1a09dd19217e3be1e723c63ec3ac88e02b8c9a750f34", + "sha256": "449c76665ac72b34daeb1a09dd19217e3be1e723c63ec3ac88e02b8c9a750f34" }, "x86_64_linux": { "cellar": ":any_skip_relocation", - "url": "https://ghcr.io/v2/homebrew/core/jq/blobs/sha256:9dfc7c926478acd7652b60300155adf5df9a0afbb4f9fe1a838793529d968ca0", - "sha256": "9dfc7c926478acd7652b60300155adf5df9a0afbb4f9fe1a838793529d968ca0" + "url": "https://ghcr.io/v2/homebrew/core/jq/blobs/sha256:ed490b627b327b3458a70a78c546be07d57bfc6958921f875b76e85f6be51f47", + "sha256": "ed490b627b327b3458a70a78c546be07d57bfc6958921f875b76e85f6be51f47" } } } @@ -792,45 +794,45 @@ } }, "rust-analyzer": { - "version": "2023-12-04", + "version": "2024-01-01", "bottle": { "rebuild": 0, "root_url": "https://ghcr.io/v2/homebrew/core", "files": { "arm64_sonoma": { "cellar": ":any_skip_relocation", - "url": "https://ghcr.io/v2/homebrew/core/rust-analyzer/blobs/sha256:9b2fcd2c67bfd5cf015c8567edf19657da635066d8c4769d239349ba98392708", - "sha256": "9b2fcd2c67bfd5cf015c8567edf19657da635066d8c4769d239349ba98392708" + "url": "https://ghcr.io/v2/homebrew/core/rust-analyzer/blobs/sha256:b999aaaa38f3ad80443e4609047a4318a0e638a5905830dba53e2a183a858314", + "sha256": "b999aaaa38f3ad80443e4609047a4318a0e638a5905830dba53e2a183a858314" }, "arm64_ventura": { "cellar": ":any_skip_relocation", - "url": "https://ghcr.io/v2/homebrew/core/rust-analyzer/blobs/sha256:942169f2de3d8bb85d746af36248c84085a3d3b50670d1299200d10afdd41826", - "sha256": "942169f2de3d8bb85d746af36248c84085a3d3b50670d1299200d10afdd41826" + "url": "https://ghcr.io/v2/homebrew/core/rust-analyzer/blobs/sha256:d0b354723180102e9939d0a786559992aec0ed496c4443dbaf076afd3a8873b7", + "sha256": "d0b354723180102e9939d0a786559992aec0ed496c4443dbaf076afd3a8873b7" }, "arm64_monterey": { "cellar": ":any_skip_relocation", - "url": "https://ghcr.io/v2/homebrew/core/rust-analyzer/blobs/sha256:608b078d56cfda049292b789fd20d14b51cc84c7a0b0950a4a5264a2d9caf701", - "sha256": "608b078d56cfda049292b789fd20d14b51cc84c7a0b0950a4a5264a2d9caf701" + "url": "https://ghcr.io/v2/homebrew/core/rust-analyzer/blobs/sha256:946182bbc230f9d1f44c7597de97973b654fcec5c6ca75846bc75b537263c40d", + "sha256": "946182bbc230f9d1f44c7597de97973b654fcec5c6ca75846bc75b537263c40d" }, "sonoma": { "cellar": ":any_skip_relocation", - "url": "https://ghcr.io/v2/homebrew/core/rust-analyzer/blobs/sha256:3693beef0672d185be4e1fb1b887a72d5506fc80cad59b3f08395b3c94389d58", - "sha256": "3693beef0672d185be4e1fb1b887a72d5506fc80cad59b3f08395b3c94389d58" + "url": "https://ghcr.io/v2/homebrew/core/rust-analyzer/blobs/sha256:a6cd37629624d2910024481caf996439fbe100a68c7405741f75e5423dde4183", + "sha256": "a6cd37629624d2910024481caf996439fbe100a68c7405741f75e5423dde4183" }, "ventura": { "cellar": ":any_skip_relocation", - "url": "https://ghcr.io/v2/homebrew/core/rust-analyzer/blobs/sha256:d7e2db094bc4082f7ef8d4132dd9acde2abd3fde748949558c0d472e436a5d64", - "sha256": "d7e2db094bc4082f7ef8d4132dd9acde2abd3fde748949558c0d472e436a5d64" + "url": "https://ghcr.io/v2/homebrew/core/rust-analyzer/blobs/sha256:c2a611770b4f234b8a39e746db766b9c88281be355f0545a7a27c28e18303e0c", + "sha256": "c2a611770b4f234b8a39e746db766b9c88281be355f0545a7a27c28e18303e0c" }, "monterey": { "cellar": ":any_skip_relocation", - "url": "https://ghcr.io/v2/homebrew/core/rust-analyzer/blobs/sha256:44e8d287bc905cd9f91148c2ad5d1a4f3558986350da7dd0a79c0e3a0c09cc76", - "sha256": "44e8d287bc905cd9f91148c2ad5d1a4f3558986350da7dd0a79c0e3a0c09cc76" + "url": "https://ghcr.io/v2/homebrew/core/rust-analyzer/blobs/sha256:973b9acdf1137e9416c1991a34358690b19895e89af0d97b1a5c84208c8e2bb6", + "sha256": "973b9acdf1137e9416c1991a34358690b19895e89af0d97b1a5c84208c8e2bb6" }, "x86_64_linux": { "cellar": ":any_skip_relocation", - "url": "https://ghcr.io/v2/homebrew/core/rust-analyzer/blobs/sha256:067f6e4a0b179b502ecaf1e6797165b5b0f73187187fbc40a93b6ad9e8353c8a", - "sha256": "067f6e4a0b179b502ecaf1e6797165b5b0f73187187fbc40a93b6ad9e8353c8a" + "url": "https://ghcr.io/v2/homebrew/core/rust-analyzer/blobs/sha256:14f4395b6ad29132ae94830e0ad5eae2f2261260785115d047fc64d01dc9719c", + "sha256": "14f4395b6ad29132ae94830e0ad5eae2f2261260785115d047fc64d01dc9719c" } } } @@ -1107,6 +1109,14 @@ "CLT": "13.4.0.0.1.1651278267", "Xcode": "13.4.1", "macOS": "12.5" + }, + "sonoma": { + "HOMEBREW_VERSION": "4.2.2", + "HOMEBREW_PREFIX": "/opt/homebrew", + "Homebrew/homebrew-core": "api", + "CLT": "15.1.0.0.1.1700200546", + "Xcode": "15.1", + "macOS": "14.1" } } } diff --git a/alacritty/alacritty.toml b/alacritty/alacritty.toml new file mode 100644 index 0000000..d36ff4b --- /dev/null +++ b/alacritty/alacritty.toml @@ -0,0 +1,358 @@ +live_config_reload = true + +[bell] +animation = "EaseOutExpo" +color = "0xffffff" +duration = 0 + +[colors] +draw_bold_text_with_bright_colors = false + +[cursor] +style = "Block" +unfocused_hollow = true + +[debug] +log_level = "OFF" +persistent_logging = false +print_events = false +render_timer = false + +[font] +size = 14.0 + +[font.bold] +family = "JetBrainsMono Nerd Font" +style = "Regular" + +[font.glyph_offset] +x = 0 +y = 0 + +[font.italic] +family = "JetBrainsMono Nerd Font" +style = "Regular" + +[font.normal] +family = "JetBrainsMono Nerd Font" +style = "Regular" + +[font.offset] +x = 0 +y = 0 + +[[keyboard.bindings]] +action = "Paste" +key = "V" +mods = "Command" + +[[keyboard.bindings]] +action = "Copy" +key = "C" +mods = "Command" + +[[keyboard.bindings]] +action = "Quit" +key = "Q" +mods = "Command" + +[[keyboard.bindings]] +action = "SpawnNewInstance" +key = "N" +mods = "Command" + +[[keyboard.bindings]] +action = "ToggleFullscreen" +key = "Return" +mods = "Command" + +[[keyboard.bindings]] +chars = "\u001BOH" +key = "Home" +mode = "AppCursor" + +[[keyboard.bindings]] +chars = "\u001B[H" +key = "Home" +mode = "~AppCursor" + +[[keyboard.bindings]] +chars = "\u001BOF" +key = "End" +mode = "AppCursor" + +[[keyboard.bindings]] +chars = "\u001B[F" +key = "End" +mode = "~AppCursor" + +[[keyboard.bindings]] +action = "IncreaseFontSize" +key = "Equals" +mods = "Command" + +[[keyboard.bindings]] +action = "DecreaseFontSize" +key = "Minus" +mods = "Command" + +[[keyboard.bindings]] +action = "ResetFontSize" +key = "Minus" +mods = "Command|Shift" + +[[keyboard.bindings]] +chars = "\u001B[5;2~" +key = "PageUp" +mods = "Shift" + +[[keyboard.bindings]] +chars = "\u001B[5;5~" +key = "PageUp" +mods = "Control" + +[[keyboard.bindings]] +chars = "\u001B[5~" +key = "PageUp" + +[[keyboard.bindings]] +chars = "\u001B[6;2~" +key = "PageDown" +mods = "Shift" + +[[keyboard.bindings]] +chars = "\u001B[6;5~" +key = "PageDown" +mods = "Control" + +[[keyboard.bindings]] +chars = "\u001B[6~" +key = "PageDown" + +[[keyboard.bindings]] +chars = "\u001B[1;2D" +key = "Left" +mods = "Shift" + +[[keyboard.bindings]] +chars = "\u001B[1;5D" +key = "Left" +mods = "Control" + +[[keyboard.bindings]] +chars = "\u001B[1;3D" +key = "Left" +mods = "Alt" + +[[keyboard.bindings]] +chars = "\u001B[D" +key = "Left" +mode = "~AppCursor" + +[[keyboard.bindings]] +chars = "\u001BOD" +key = "Left" +mode = "AppCursor" + +[[keyboard.bindings]] +chars = "\u001B[1;2C" +key = "Right" +mods = "Shift" + +[[keyboard.bindings]] +chars = "\u001B[1;5C" +key = "Right" +mods = "Control" + +[[keyboard.bindings]] +chars = "\u001B[1;3C" +key = "Right" +mods = "Alt" + +[[keyboard.bindings]] +chars = "\u001B[C" +key = "Right" +mode = "~AppCursor" + +[[keyboard.bindings]] +chars = "\u001BOC" +key = "Right" +mode = "AppCursor" + +[[keyboard.bindings]] +chars = "\u001B[1;2A" +key = "Up" +mods = "Shift" + +[[keyboard.bindings]] +chars = "\u001B[1;5A" +key = "Up" +mods = "Control" + +[[keyboard.bindings]] +chars = "\u001B[1;3A" +key = "Up" +mods = "Alt" + +[[keyboard.bindings]] +chars = "\u001B[A" +key = "Up" +mode = "~AppCursor" + +[[keyboard.bindings]] +chars = "\u001BOA" +key = "Up" +mode = "AppCursor" + +[[keyboard.bindings]] +chars = "\u001B[1;2B" +key = "Down" +mods = "Shift" + +[[keyboard.bindings]] +chars = "\u001B[1;5B" +key = "Down" +mods = "Control" + +[[keyboard.bindings]] +chars = "\u001B[1;3B" +key = "Down" +mods = "Alt" + +[[keyboard.bindings]] +chars = "\u001B[B" +key = "Down" +mode = "~AppCursor" + +[[keyboard.bindings]] +chars = "\u001BOB" +key = "Down" +mode = "AppCursor" + +[[keyboard.bindings]] +chars = "\u001B[Z" +key = "Tab" +mods = "Shift" + +[[keyboard.bindings]] +chars = "\u001BOP" +key = "F1" + +[[keyboard.bindings]] +chars = "\u001BOQ" +key = "F2" + +[[keyboard.bindings]] +chars = "\u001BOR" +key = "F3" + +[[keyboard.bindings]] +chars = "\u001BOS" +key = "F4" + +[[keyboard.bindings]] +chars = "\u001B[15~" +key = "F5" + +[[keyboard.bindings]] +chars = "\u001B[17~" +key = "F6" + +[[keyboard.bindings]] +chars = "\u001B[18~" +key = "F7" + +[[keyboard.bindings]] +chars = "\u001B[19~" +key = "F8" + +[[keyboard.bindings]] +chars = "\u001B[20~" +key = "F9" + +[[keyboard.bindings]] +chars = "\u001B[21~" +key = "F10" + +[[keyboard.bindings]] +chars = "\u001B[23~" +key = "F11" + +[[keyboard.bindings]] +chars = "\u001B[24~" +key = "F12" + +[[keyboard.bindings]] +chars = "\u007F" +key = "Back" + +[[keyboard.bindings]] +chars = "\u001B\u007F" +key = "Back" +mods = "Alt" + +[[keyboard.bindings]] +chars = "\u001B[2~" +key = "Insert" + +[[keyboard.bindings]] +chars = "\u001B[3~" +key = "Delete" + +[[keyboard.bindings]] +chars = "\u0002&" +key = "W" +mods = "Command" + +[[keyboard.bindings]] +chars = "\u0002c" +key = "T" +mods = "Command" + +[[keyboard.bindings]] +chars = "\u0002n" +key = "RBracket" +mods = "Command|Shift" + +[[keyboard.bindings]] +chars = "\u0002p" +key = "LBracket" +mods = "Command|Shift" + +[[keyboard.bindings]] +chars = "\u0002o" +key = "RBracket" +mods = "Command" + +[[keyboard.bindings]] +chars = "\u0002;" +key = "LBracket" +mods = "Command" + +[[keyboard.bindings]] +chars = "\u0002/" +key = "F" +mods = "Command" + +[mouse] +hide_when_typing = true + +[[mouse.bindings]] +action = "PasteSelection" +mouse = "Middle" + + +[scrolling] +history = 10000 +multiplier = 3 + +[selection] +save_to_clipboard = false +semantic_escape_chars = ",│`|:\"' ()[]{}<>" + +[shell] +program = "/bin/zsh" + +[window] +decorations = "none" +dynamic_padding = false diff --git a/alacritty/alacritty.yaml b/alacritty/alacritty.yaml deleted file mode 100644 index 660d211..0000000 --- a/alacritty/alacritty.yaml +++ /dev/null @@ -1,502 +0,0 @@ -# Configuration for Alacritty, the GPU enhanced terminal emulator - -# Any items in the `env` entry below will be added as -# environment variables. Some entries may override variables -# set by alacritty it self. -# env: - # TERM env customization. - # - # If this property is not set, alacritty will set it to xterm-256color. - # - # Note that some xterm terminfo databases don't declare support for italics. - # You can verify this by checking for the presence of `smso` and `sitm` in - # `infocmp xterm-256color`. - # TERM: xterm-256color-italic - -window: - # Window dimensions (changes require restart) - # - # Specified in number of columns/lines, not pixels. If both are zero this - # setting is ignored. - dimensions: - columns: 100 - lines: 85 - - # Window padding (changes require restart) - # - # Blank space added around the window in pixels. This padding is not scaled by - # DPI and the specified value is always added at both opposing sides. - padding: - x: 0 - y: 0 - - # Spread additional padding evenly around the terminal content. - dynamic_padding: false - - # Window decorations - # - # Available values: - # - full: borders and title bar - # - none: neither borders nor title bar - # - transparent: title bar, transparent background and title bar buttons - # - buttonless: title bar, transparent background, but no title bar buttons - decorations: buttonless - - # Startup Mode (changes require restart) - # - # Values for `startup_mode`: - # - Windowed - # - Maximized - # - Fullscreen - # - # Values for `startup_mode` (macOS only): - # - SimpleFullscreen - startup_mode: SimpleFullscreen - -scrolling: - # maximum number of lines in the scrollback buffer. Specifying '0' will - # disable scrolling. - history: 0 - - # Number of lines the viewport will move for every line scrolled when - # scrollback is enabled (history > 0). - multiplier: 3 - -# Font configuration (changes require restart) -font: - # The normal (roman) font face to use. - # Style can be specified to pick a specific face. - normal: - family: Iosevka - style: Light - # family: "Fira Code" - # family: "Source Code Pro" - # style: Retina - - # The bold font face - bold: - family: Iosevka - style: Medium - # family: "Fira Code" - # family: "Source Code Pro" - - # The italic font face - italic: - family: Iosevka - style: "Light Italic" - # style: "Light Oblique" - # family: "Fira Code" - # family: "Source Code Pro" - # style: "Medium Italic" - - # Point size of the font - size: 14.0 - - # Offset is the extra space around each character. offset.y can be thought of - # as modifying the linespacing, and offset.x as modifying the letter spacing. - offset: - x: 0 - y: 0 - - # Glyph offset determines the locations of the glyphs within their cells with - # the default being at the bottom. Increase the x offset to move the glyph to - # the right, increase the y offset to move the glyph upward. - glyph_offset: - x: 0 - y: 0 - - # Thin stroke font rendering (macOS only) - # - # Thin strokes are suitable for retina displays, but for non-retina you - # probably want this set to false. - # - # macOS >= 10.14.x: - # - # If the font quality on non-retina display looks bad then set - # `use_thin_strokes` to `true` and enable font smoothing by running the - # following command: - # `defaults write -g CGFontRenderingFontSmoothingDisabled -bool NO` - # - # This is a global setting and will require a log out or restart to take - # effect. - use_thin_strokes: true - -# When true, bold text is drawn using the bright variant of colors. -draw_bold_text_with_bright_colors: false - -# Use custom cursor colors. If true, display the cursor in the cursor.foreground -# and cursor.background colors, otherwise invert the colors of the cursor. -custom_cursor_colors: true - -# Colors -colors: - - # Tomorrow (https://github.com/aarowill/base16-alacritty/blob/master/colors/base16-tomorrow.yml) - # Default colors - primary: - background: '0xffffff' - foreground: '0x4d4d4c' - # Colors the cursor will use if `custom_cursor_colors` is true - cursor: - text: '0xffffff' - cursor: '0x4d4d4c' - # Normal colors - normal: - black: '0xffffff' - red: '0xc82829' - green: '0x718c00' - yellow: '0xeab700' - blue: '0x4271ae' - magenta: '0x8959a8' - cyan: '0x3e999f' - white: '0x4d4d4c' - # Bright colors - bright: - black: '0x8e908c' - red: '0xf5871f' - green: '0xe0e0e0' - yellow: '0xd6d6d6' - blue: '0x969896' - magenta: '0x282a2e' - cyan: '0xa3685a' - white: '0x1d1f21' - - # # Tomorrow Night (https://github.com/aarowill/base16-alacritty/blob/master/colors/base16-tomorrow-night.yml) - # # Default colors - # primary: - # background: '0x1d1f21' - # foreground: '0xc5c8c6' - # # Colors the cursor will use if `custom_cursor_colors` is true - # cursor: - # text: '0x1d1f21' - # cursor: '0xc5c8c6' - # # Normal colors - # normal: - # black: '0x1d1f21' - # red: '0xcc6666' - # green: '0xb5bd68' - # yellow: '0xf0c674' - # blue: '0x81a2be' - # magenta: '0xb294bb' - # cyan: '0x8abeb7' - # white: '0xc5c8c6' - # # Bright colors - # bright: - # black: '0x969896' - # red: '0xde935f' - # green: '0x282a2e' - # yellow: '0x373b41' - # blue: '0xb4b7b4' - # magenta: '0xe0e0e0' - # cyan: '0xa3685a' - # white: '0xffffff' - - # Indexed Colors - # - # The indexed colors include all colors from 16 to 256. - # When these are not set, they're filled with sensible defaults. - # - # Example: - # `- { index: 16, color: '0xff00ff' }` - # - # indexed_colors: [] - -# Visual Bell -# -# Any time the BEL code is received, Alacritty "rings" the visual bell. Once -# rung, the terminal background will be set to white and transition back to the -# default background color. You can control the rate of this transition by -# setting the `duration` property (represented in milliseconds). You can also -# configure the transition function by setting the `animation` property. -# -# Possible values for `animation` -# `Ease` -# `EaseOut` -# `EaseOutSine` -# `EaseOutQuad` -# `EaseOutCubic` -# `EaseOutQuart` -# `EaseOutQuint` -# `EaseOutExpo` -# `EaseOutCirc` -# `Linear` -# -# To completely disable the visual bell, set its duration to 0. -# -bell: - animation: EaseOutExpo - color: '0xffffff' - duration: 0 - -# Background opacity -background_opacity: 1.0 - -# Key bindings -# -# Key bindings are specified as a list of objects. Each binding will specify a -# key and modifiers required to trigger it, terminal modes where the binding is -# applicable, and what should be done when the key binding fires. It can either -# send a byte sequence to the running application (`chars`), execute a -# predefined action (`action`) or fork and execute a specified command plus -# arguments (`command`). -# -# Bindings are always filled by default, but will be replaced when a new binding -# with the same triggers is defined. To unset a default binding, it can be -# mapped to the `None` action. -# -# Example: -# `- { key: V, mods: Control|Shift, action: Paste }` -# -# Available fields: -# - key -# - mods (optional) -# - chars | action | command (exactly one required) -# - mode (optional) -# -# Values for `key`: -# - `A` -> `Z` -# - `F1` -> `F12` -# - `Key1` -> `Key0` -# -# A full list with available key codes can be found here: -# https://docs.rs/glutin/*/glutin/enum.VirtualKeyCode.html#variants -# -# Instead of using the name of the keys, the `key` field also supports using -# the scancode of the desired key. Scancodes have to be specified as a -# decimal number. -# This command will allow you to display the hex scancodes for certain keys: -# `showkey --scancodes` -# -# Values for `mods`: -# - Command -# - Control -# - Option -# - Super -# - Shift -# - Alt -# -# Multiple `mods` can be combined using `|` like this: `mods: Control|Shift`. -# Whitespace and capitalization is relevant and must match the example. -# -# Values for `chars`: -# The `chars` field writes the specified string to the terminal. This makes -# it possible to pass escape sequences. -# To find escape codes for bindings like `PageUp` ("\x1b[5~"), you can run -# the command `showkey -a` outside of tmux. -# Note that applications use terminfo to map escape sequences back to -# keys. It is therefore required to update the terminfo when -# changing an escape sequence. -# -# Values for `action`: -# - Paste -# - PasteSelection -# - Copy -# - IncreaseFontSize -# - DecreaseFontSize -# - ResetFontSize -# - ScrollPageUp -# - ScrollPageDown -# - ScrollLineUp -# - ScrollLineDown -# - ScrollToTop -# - ScrollToBottom -# - ClearHistory -# - Hide -# - Quit -# - ClearLogNotice -# - SpawnNewInstance -# - ToggleFullscreen -# - None -# -# Values for `action` (macOS only): -# - ToggleSimpleFullscreen: Enters fullscreen without occupying another space -# -# Values for `command`: -# The `command` field must be a map containing a `program` string and -# an `args` array of command line parameter strings. -# -# Example: -# `command: { program: "alacritty", args: ["-e", "vttest"] }` -# -# Values for `mode`: -# - ~AppCursor -# - AppCursor -# - ~AppKeypad -# - AppKeypad -# -key_bindings: - - { key: V, mods: Command, action: Paste } - - { key: C, mods: Command, action: Copy } - - { key: Q, mods: Command, action: Quit } - - { key: N, mods: Command, action: SpawnNewInstance } - - { key: Return, mods: Command, action: ToggleFullscreen } - - - { key: Home, chars: "\x1bOH", mode: AppCursor } - - { key: Home, chars: "\x1b[H", mode: ~AppCursor } - - { key: End, chars: "\x1bOF", mode: AppCursor } - - { key: End, chars: "\x1b[F", mode: ~AppCursor } - - { key: Equals, mods: Command, action: IncreaseFontSize } - - { key: Minus, mods: Command, action: DecreaseFontSize } - - { key: Minus, mods: Command|Shift, action: ResetFontSize } - - { key: PageUp, mods: Shift, chars: "\x1b[5;2~" } - - { key: PageUp, mods: Control, chars: "\x1b[5;5~" } - - { key: PageUp, chars: "\x1b[5~" } - - { key: PageDown, mods: Shift, chars: "\x1b[6;2~" } - - { key: PageDown, mods: Control, chars: "\x1b[6;5~" } - - { key: PageDown, chars: "\x1b[6~" } - - { key: Left, mods: Shift, chars: "\x1b[1;2D" } - - { key: Left, mods: Control, chars: "\x1b[1;5D" } - - { key: Left, mods: Alt, chars: "\x1b[1;3D" } - - { key: Left, chars: "\x1b[D", mode: ~AppCursor } - - { key: Left, chars: "\x1bOD", mode: AppCursor } - - { key: Right, mods: Shift, chars: "\x1b[1;2C" } - - { key: Right, mods: Control, chars: "\x1b[1;5C" } - - { key: Right, mods: Alt, chars: "\x1b[1;3C" } - - { key: Right, chars: "\x1b[C", mode: ~AppCursor } - - { key: Right, chars: "\x1bOC", mode: AppCursor } - - { key: Up, mods: Shift, chars: "\x1b[1;2A" } - - { key: Up, mods: Control, chars: "\x1b[1;5A" } - - { key: Up, mods: Alt, chars: "\x1b[1;3A" } - - { key: Up, chars: "\x1b[A", mode: ~AppCursor } - - { key: Up, chars: "\x1bOA", mode: AppCursor } - - { key: Down, mods: Shift, chars: "\x1b[1;2B" } - - { key: Down, mods: Control, chars: "\x1b[1;5B" } - - { key: Down, mods: Alt, chars: "\x1b[1;3B" } - - { key: Down, chars: "\x1b[B", mode: ~AppCursor } - - { key: Down, chars: "\x1bOB", mode: AppCursor } - - { key: Tab, mods: Shift, chars: "\x1b[Z" } - - { key: F1, chars: "\x1bOP" } - - { key: F2, chars: "\x1bOQ" } - - { key: F3, chars: "\x1bOR" } - - { key: F4, chars: "\x1bOS" } - - { key: F5, chars: "\x1b[15~" } - - { key: F6, chars: "\x1b[17~" } - - { key: F7, chars: "\x1b[18~" } - - { key: F8, chars: "\x1b[19~" } - - { key: F9, chars: "\x1b[20~" } - - { key: F10, chars: "\x1b[21~" } - - { key: F11, chars: "\x1b[23~" } - - { key: F12, chars: "\x1b[24~" } - - { key: Back, chars: "\x7f" } - - { key: Back, mods: Alt, chars: "\x1b\x7f" } - - { key: Insert, chars: "\x1b[2~" } - - { key: Delete, chars: "\x1b[3~" } - - # shortcuts for tmux. the leader key is control-b (0x02) - - { key: W, mods: Command, chars: "\x02&" } # close tab (kill) - - { key: T, mods: Command, chars: "\x02c" } # new tab - - { key: RBracket, mods: Command|Shift, chars: "\x02n" } # select next tab - - { key: LBracket, mods: Command|Shift, chars: "\x02p" } # select previous tab - - { key: RBracket, mods: Command, chars: "\x02o" } # select next pane - - { key: LBracket, mods: Command, chars: "\x02;" } # select last (previously used) pane - - { key: F, mods: Command, chars: "\x02/" } # search (upwards) (see tmux.conf) - -mouse: - # Click settings - # - # The `double_click` and `triple_click` settings control the time - # alacritty should wait for accepting multiple clicks as one double - # or triple click. - double_click: { threshold: 300 } - triple_click: { threshold: 300 } - - # If this is `true`, the cursor is temporarily hidden when typing. - hide_when_typing: true - - # URL launcher - # url: - # This program is executed when clicking on a text which is recognized as a URL. - # The URL is always added to the command as the last parameter. - # - # When set to `None`, URL launching will be disabled completely. - # - # Default: - # - (macOS) open - # - (Linux) xdg-open - # - (Windows) explorer - # launcher: - # program: xdg-open - # args: [] - - # These are the modifiers that need to be held down for opening URLs when clicking - # on them. The available modifiers are documented in the key binding section. - # modifiers: Control|Shift - -selection: - semantic_escape_chars: ",│`|:\"' ()[]{}<>" - - # When set to `true`, selected text will be copied to the primary clipboard. - save_to_clipboard: false - -# Mouse bindings -# -# Available fields: -# - mouse -# - action -# - mods (optional) -# -# Values for `mouse`: -# - Middle -# - Left -# - Right -# - Numeric identifier such as `5` -# -# All available `mods` and `action` values are documented in the key binding -# section. -mouse_bindings: - - { mouse: Middle, action: PasteSelection } - -cursor: - # Cursor style - # - # Values for 'style': - # - ▇ Block - # - _ Underline - # - | Beam - style: Block - - # If this is `true`, the cursor will be rendered as a hollow box when the - # window is not focused. - unfocused_hollow: true - -# dynamic_title: false - -# Live config reload (changes require restart) -live_config_reload: true - -debug: - # Should display the render timer - render_timer: false - - # Keep the log file after quitting Alacritty. - persistent_logging: false - - # Log level - # - # Values for `log_level`: - # - OFF - # - ERROR - # - WARN - # - INFO - # - DEBUG - # - TRACE - log_level: OFF - - # Print all received window events. - print_events: false - - # Record all characters and escape sequences as test data. - ref_test: false - -# Shell -# -# You can set shell.program to the path of your favorite shell, e.g. /bin/fish. -# Entries in shell.args are passed unmodified as arguments to the shell. -shell: - program: /usr/local/bin/zsh - args: - - --command=tmux - -# vim: nospell - - diff --git a/alacritty/alacritty.yml b/alacritty/alacritty.yml deleted file mode 100644 index 898cd30..0000000 --- a/alacritty/alacritty.yml +++ /dev/null @@ -1,143 +0,0 @@ -window: - dynamic_padding: false - - decorations: none - -scrolling: - history: 0 - multiplier: 3 - -font: - normal: - family: "JetBrainsMono Nerd Font" - style: Regular - - bold: - family: "JetBrainsMono Nerd Font" - style: Regular - - italic: - family: "JetBrainsMono Nerd Font" - style: Regular - - size: 14.0 - - offset: - x: 0 - y: 0 - - glyph_offset: - x: 0 - y: 0 - -draw_bold_text_with_bright_colors: false - -custom_cursor_colors: true - -bell: - animation: EaseOutExpo - color: '0xffffff' - duration: 0 - -key_bindings: - - { key: V, mods: Command, action: Paste } - - { key: C, mods: Command, action: Copy } - - { key: Q, mods: Command, action: Quit } - - { key: N, mods: Command, action: SpawnNewInstance } - - { key: Return, mods: Command, action: ToggleFullscreen } - - - { key: Home, chars: "\x1bOH", mode: AppCursor } - - { key: Home, chars: "\x1b[H", mode: ~AppCursor } - - { key: End, chars: "\x1bOF", mode: AppCursor } - - { key: End, chars: "\x1b[F", mode: ~AppCursor } - - { key: Equals, mods: Command, action: IncreaseFontSize } - - { key: Minus, mods: Command, action: DecreaseFontSize } - - { key: Minus, mods: Command|Shift, action: ResetFontSize } - - { key: PageUp, mods: Shift, chars: "\x1b[5;2~" } - - { key: PageUp, mods: Control, chars: "\x1b[5;5~" } - - { key: PageUp, chars: "\x1b[5~" } - - { key: PageDown, mods: Shift, chars: "\x1b[6;2~" } - - { key: PageDown, mods: Control, chars: "\x1b[6;5~" } - - { key: PageDown, chars: "\x1b[6~" } - - { key: Left, mods: Shift, chars: "\x1b[1;2D" } - - { key: Left, mods: Control, chars: "\x1b[1;5D" } - - { key: Left, mods: Alt, chars: "\x1b[1;3D" } - - { key: Left, chars: "\x1b[D", mode: ~AppCursor } - - { key: Left, chars: "\x1bOD", mode: AppCursor } - - { key: Right, mods: Shift, chars: "\x1b[1;2C" } - - { key: Right, mods: Control, chars: "\x1b[1;5C" } - - { key: Right, mods: Alt, chars: "\x1b[1;3C" } - - { key: Right, chars: "\x1b[C", mode: ~AppCursor } - - { key: Right, chars: "\x1bOC", mode: AppCursor } - - { key: Up, mods: Shift, chars: "\x1b[1;2A" } - - { key: Up, mods: Control, chars: "\x1b[1;5A" } - - { key: Up, mods: Alt, chars: "\x1b[1;3A" } - - { key: Up, chars: "\x1b[A", mode: ~AppCursor } - - { key: Up, chars: "\x1bOA", mode: AppCursor } - - { key: Down, mods: Shift, chars: "\x1b[1;2B" } - - { key: Down, mods: Control, chars: "\x1b[1;5B" } - - { key: Down, mods: Alt, chars: "\x1b[1;3B" } - - { key: Down, chars: "\x1b[B", mode: ~AppCursor } - - { key: Down, chars: "\x1bOB", mode: AppCursor } - - { key: Tab, mods: Shift, chars: "\x1b[Z" } - - { key: F1, chars: "\x1bOP" } - - { key: F2, chars: "\x1bOQ" } - - { key: F3, chars: "\x1bOR" } - - { key: F4, chars: "\x1bOS" } - - { key: F5, chars: "\x1b[15~" } - - { key: F6, chars: "\x1b[17~" } - - { key: F7, chars: "\x1b[18~" } - - { key: F8, chars: "\x1b[19~" } - - { key: F9, chars: "\x1b[20~" } - - { key: F10, chars: "\x1b[21~" } - - { key: F11, chars: "\x1b[23~" } - - { key: F12, chars: "\x1b[24~" } - - { key: Back, chars: "\x7f" } - - { key: Back, mods: Alt, chars: "\x1b\x7f" } - - { key: Insert, chars: "\x1b[2~" } - - { key: Delete, chars: "\x1b[3~" } - - # shortcuts for tmux. the leader key is control-b (0x02) - - { key: W, mods: Command, chars: "\x02&" } # close tab (kill) - - { key: T, mods: Command, chars: "\x02c" } # new tab - - { key: RBracket, mods: Command|Shift, chars: "\x02n" } # select next tab - - { key: LBracket, mods: Command|Shift, chars: "\x02p" } # select previous tab - - { key: RBracket, mods: Command, chars: "\x02o" } # select next pane - - { key: LBracket, mods: Command, chars: "\x02;" } # select last (previously used) pane - - { key: F, mods: Command, chars: "\x02/" } # search (upwards) (see tmux.conf) - -mouse: - double_click: { threshold: 300 } - triple_click: { threshold: 300 } - - hide_when_typing: true - -selection: - semantic_escape_chars: ",│`|:\"' ()[]{}<>" - - save_to_clipboard: false - -mouse_bindings: - - { mouse: Middle, action: PasteSelection } - -cursor: - style: Block - unfocused_hollow: true - -live_config_reload: true - -debug: - render_timer: false - - persistent_logging: false - - log_level: OFF - - print_events: false - - ref_test: false - -vim: nospell - -shell: - program: /bin/zsh diff --git a/copy.sh b/copy.sh index 824f7a8..e61df1b 100755 --- a/copy.sh +++ b/copy.sh @@ -1,6 +1,6 @@ #!/bin/sh -cp -p ~/.config/alacritty/alacritty.yml ./alacritty/alacritty.yml +cp -p ~/.config/alacritty/alacritty.toml ./alacritty/alacritty.toml cp -p ~/.config/nvim/init.lua ./neovim/init.lua cp -p ~/.zshrc ./zsh/zshrc cp -p ~/.tmux.conf ./tmux/tmux.conf diff --git a/install.sh b/install.sh index 13803fe..20cddff 100755 --- a/install.sh +++ b/install.sh @@ -8,11 +8,15 @@ else echo "brew installed skipping" fi -if [[ $(uname -m) == 'arm64' ]]; then - arch -arm64 brew bundle --file ./Brewfile -else - brew bundle --file ./Brewfile -fi +brew install java +brew bundle --file ./Brewfile + +/opt/homebrew/opt/fzf/install --all + +sudo ln -sfn /opt/homebrew/opt/openjdk/libexec/openjdk.jdk \ + /Library/Java/JavaVirtualMachines/openjdk.jdk + +cs setup --yes coursier bootstrap \ --java-opt -XX:+UseG1GC \ @@ -22,10 +26,11 @@ coursier bootstrap \ org.scalameta:metals_2.12:0.11.2+177-fb896d65-SNAPSHOT -o metals -f mkdir -p ~/.config/alacritty -cp -p ./alacritty/alacritty.yml ~/.config/alacritty/alacritty.yml -cp -p ./neovim/init.lua ~/.config/nvim/init.lua -cp -p ./zsh/zshrc ~/.zshrc -cp -p ./tmux/tmux.conf ~/.tmux.conf +mkdir -p ~/.config/nvim +cp ./alacritty/alacritty.toml ~/.config/alacritty/alacritty.toml +cp ./neovim/init.lua ~/.config/nvim/init.lua +cp ./zsh/zshrc ~/.zshrc +cp ./tmux/tmux.conf ~/.tmux.conf echo "copying complete" sh -c 'curl -fLo "${XDG_DATA_HOME:-$HOME/.local/share}"/nvim/site/autoload/plug.vim --create-dirs \ diff --git a/zsh/zshrc b/zsh/zshrc index 2c3d15a..4388616 100644 --- a/zsh/zshrc +++ b/zsh/zshrc @@ -29,8 +29,6 @@ alias nnn="nnn -E" alias ls="exa" alias utcdate='date -u +"%Y-%m-%dT%H:%M:%SZ"' -eval "`fnm env`" - # # Feed the output of fd into fzf # fd --type f | fzf @@ -46,5 +44,3 @@ export FZF_CTRL_T_COMMAND="$FZF_DEFAULT_COMMAND" # install zoxide eval "$(zoxide init zsh)" -# terminal prompt -eval "$(starship init zsh)"