From ebbb2d97e47d313406c94216806dad9cdd5cd5ea Mon Sep 17 00:00:00 2001 From: brett Date: Wed, 5 Jun 2024 22:19:49 -0600 Subject: [PATCH] move doom to zinit if emacs installed --- base.yml | 1 + base/.zshrc | 6 +++ dev.yml | 3 -- dev/.config/emacs | 1 - dev/.config/nvim/lazy-lock.json | 12 +++--- mac/Brewfile.lock.json | 68 ++++++++++++++++----------------- 6 files changed, 47 insertions(+), 44 deletions(-) delete mode 160000 dev/.config/emacs diff --git a/base.yml b/base.yml index f4f0790..f8bc30a 100644 --- a/base.yml +++ b/base.yml @@ -49,6 +49,7 @@ - ['[ -f "$HOME/.zinit/plugins/direnv---direnv/direnv" ] && direnv allow $HOME || true'] - ['[ -f /bin/zsh ] && /bin/zsh -c "source ~/.zshrc; zinit self-update"'] - ['/usr/bin/vim +PlugInstall +qall > /dev/null'] + - ['[ -x "$(command -v doom)" ] && doom upgrade'] - # https://github.com/tmux-plugins/tpm/blob/master/docs/managing_plugins_via_cmd_line.md - >- diff --git a/base/.zshrc b/base/.zshrc index 039ba8c..2f9abe5 100644 --- a/base/.zshrc +++ b/base/.zshrc @@ -183,6 +183,12 @@ if [ -x "$(command -v atuin)" ]; then export ATUIN_SYNC_ADDRESS=https://sh.internal.brett.cloud fi +# Emacs +if [ -x "$(command -v emacs)" ]; then + zinit ice as"program" atclone'./bin/doom install --env --fonts' pick"./bin/*" + zinit light doomemacs/doomemacs +fi + # -- Prompt diff --git a/dev.yml b/dev.yml index 5a152da..367aa92 100644 --- a/dev.yml +++ b/dev.yml @@ -23,12 +23,9 @@ path: dev/.zshrc.dev ~/.config/nvim: path: dev/.config/nvim - ~/.config/emacs: - path: dev/.config/emacs ~/.functions/: glob: true path: base/.functions/* - shell: - - ['doom upgrade'] - ['nvim --headless "+Lazy! sync" -c "quitall"'] diff --git a/dev/.config/emacs b/dev/.config/emacs deleted file mode 160000 index 9620bb4..0000000 --- a/dev/.config/emacs +++ /dev/null @@ -1 +0,0 @@ -Subproject commit 9620bb45ac4cd7b0274c497b2d9d93c4ad9364ee diff --git a/dev/.config/nvim/lazy-lock.json b/dev/.config/nvim/lazy-lock.json index 7a721e4..9fb4fc1 100644 --- a/dev/.config/nvim/lazy-lock.json +++ b/dev/.config/nvim/lazy-lock.json @@ -1,10 +1,10 @@ { - "AstroNvim": { "branch": "main", "commit": "96591229d15d5e6946e12166d26b110019067ec3" }, + "AstroNvim": { "branch": "main", "commit": "fbe786db13dc16d10cca714ebcd7b7ca067ade68" }, "Comment.nvim": { "branch": "master", "commit": "0236521ea582747b58869cb72f70ccfa967d2e89" }, "LuaSnip": { "branch": "master", "commit": "03c8e67eb7293c404845b3982db895d59c0d1538" }, "aerial.nvim": { "branch": "master", "commit": "4d10acbcb760802ea74381ac3ed98cbb6e5f7805" }, "alpha-nvim": { "branch": "main", "commit": "41283fb402713fc8b327e60907f74e46166f4cfd" }, - "astrocore": { "branch": "main", "commit": "6ccb7e149440d72baf7c885f60a1f2ab2853903f" }, + "astrocore": { "branch": "main", "commit": "6e6baab9ea46874c5eec0a782546b8804cb599d8" }, "astrolsp": { "branch": "main", "commit": "fd2666a283af98182b1e8b01c85656071093a825" }, "astrotheme": { "branch": "main", "commit": "2bcd030c93489a02aab6cff2288e49adb0c84fad" }, "astroui": { "branch": "main", "commit": "a79b6fc3d9b67a0a93e486801ef354967c80e9d6" }, @@ -19,8 +19,8 @@ "guess-indent.nvim": { "branch": "main", "commit": "b8ae749fce17aa4c267eec80a6984130b94f80b2" }, "heirline.nvim": { "branch": "master", "commit": "0d797435e54645a5f98bad7ad6046aac1ef95c1e" }, "indent-blankline.nvim": { "branch": "master", "commit": "d98f537c3492e87b6dc6c2e3f66ac517528f406f" }, - "lazy.nvim": { "branch": "main", "commit": "24fa2a97085ca8a7220b5b078916f81e316036fd" }, - "lsp_signature.nvim": { "branch": "master", "commit": "529e8861d0410389f0163a5e5c2199d4a4ef5bf6" }, + "lazy.nvim": { "branch": "main", "commit": "b0ba3f9399bf48c86abaa4db1a40bd0b681d5018" }, + "lsp_signature.nvim": { "branch": "master", "commit": "2ec2ba23882329c1302dff773b0d3620371d634f" }, "lspkind.nvim": { "branch": "master", "commit": "1735dd5a5054c1fb7feaf8e8658dbab925f4f0cf" }, "mason-lspconfig.nvim": { "branch": "main", "commit": "9ae570e206360e47d30b4c35a4550c165f4ea7b7" }, "mason-null-ls.nvim": { "branch": "main", "commit": "2b8433f76598397fcc97318d410e0c4f7a4bea6a" }, @@ -51,11 +51,11 @@ "presence.nvim": { "branch": "main", "commit": "87c857a56b7703f976d3a5ef15967d80508df6e6" }, "promise-async": { "branch": "main", "commit": "38a4575da9497326badd3995e768b4ccf0bb153e" }, "resession.nvim": { "branch": "master", "commit": "cc819b0489938d03e4f3532a583354f0287c015b" }, - "smart-splits.nvim": { "branch": "master", "commit": "2179ec0d26aacd4f40c766c79f6ebc83b7001e48" }, + "smart-splits.nvim": { "branch": "master", "commit": "66fda3a601a5b4c679656f15eb6ddd613c8d3216" }, "telescope-fzf-native.nvim": { "branch": "main", "commit": "9ef21b2e6bb6ebeaf349a0781745549bbb870d27" }, "telescope.nvim": { "branch": "master", "commit": "a0bbec21143c7bc5f8bb02e0005fa0b982edc026" }, "todo-comments.nvim": { "branch": "main", "commit": "a7e39ae9e74f2c8c6dc4eea6d40c3971ae84752d" }, "toggleterm.nvim": { "branch": "main", "commit": "066cccf48a43553a80a210eb3be89a15d789d6e6" }, "vim-illuminate": { "branch": "master", "commit": "5eeb7951fc630682c322e88a9bbdae5c224ff0aa" }, - "which-key.nvim": { "branch": "main", "commit": "ce741eb559c924d72e3a67d2189ad3771a231414" } + "which-key.nvim": { "branch": "main", "commit": "4b7167f8fb2dba3d01980735e3509e172c024c29" } } \ No newline at end of file diff --git a/mac/Brewfile.lock.json b/mac/Brewfile.lock.json index b0b4d54..6d39ae0 100644 --- a/mac/Brewfile.lock.json +++ b/mac/Brewfile.lock.json @@ -8,45 +8,45 @@ }, "brew": { "git": { - "version": "2.45.1", + "version": "2.45.2", "bottle": { "rebuild": 0, "root_url": "https://ghcr.io/v2/homebrew/core", "files": { "arm64_sonoma": { "cellar": "/opt/homebrew/Cellar", - "url": "https://ghcr.io/v2/homebrew/core/git/blobs/sha256:afe93a73a2605a89e7c41ddb41159ee05081177a126507a9221265155139a5ef", - "sha256": "afe93a73a2605a89e7c41ddb41159ee05081177a126507a9221265155139a5ef" + "url": "https://ghcr.io/v2/homebrew/core/git/blobs/sha256:46ac8df4305f4c039e8cb628c8196b93b245b111118cce3d6277f1f34a01da55", + "sha256": "46ac8df4305f4c039e8cb628c8196b93b245b111118cce3d6277f1f34a01da55" }, "arm64_ventura": { "cellar": "/opt/homebrew/Cellar", - "url": "https://ghcr.io/v2/homebrew/core/git/blobs/sha256:f30916cb2799e8e9526f57331182737840bf6a49d6a286663a5e3f98527e97ee", - "sha256": "f30916cb2799e8e9526f57331182737840bf6a49d6a286663a5e3f98527e97ee" + "url": "https://ghcr.io/v2/homebrew/core/git/blobs/sha256:5483b750a6cd84c43cca38fc18ffceffcdb8dcc852f01a810c33ce38d6c3ddbd", + "sha256": "5483b750a6cd84c43cca38fc18ffceffcdb8dcc852f01a810c33ce38d6c3ddbd" }, "arm64_monterey": { "cellar": "/opt/homebrew/Cellar", - "url": "https://ghcr.io/v2/homebrew/core/git/blobs/sha256:133cafdf38f924f4ac75cfd55e044196f93ee98a07d13e9b9c1f601f906b15b7", - "sha256": "133cafdf38f924f4ac75cfd55e044196f93ee98a07d13e9b9c1f601f906b15b7" + "url": "https://ghcr.io/v2/homebrew/core/git/blobs/sha256:71f806ab059815dc4e97a0a097b3ff78b5cf3aa2887b8f48a5e2e6a35b9b2988", + "sha256": "71f806ab059815dc4e97a0a097b3ff78b5cf3aa2887b8f48a5e2e6a35b9b2988" }, "sonoma": { "cellar": "/usr/local/Cellar", - "url": "https://ghcr.io/v2/homebrew/core/git/blobs/sha256:9b7a1a74341999561dd0f8dc15525cbc95c5fa9ba6b7a4b1eee75ef35ff4184e", - "sha256": "9b7a1a74341999561dd0f8dc15525cbc95c5fa9ba6b7a4b1eee75ef35ff4184e" + "url": "https://ghcr.io/v2/homebrew/core/git/blobs/sha256:40d2997b10a9894998d2594d66108fbf1ea939b220bfc9361032d21f9bf930da", + "sha256": "40d2997b10a9894998d2594d66108fbf1ea939b220bfc9361032d21f9bf930da" }, "ventura": { "cellar": "/usr/local/Cellar", - "url": "https://ghcr.io/v2/homebrew/core/git/blobs/sha256:aae5afd95a2fc684b1ffa97f9397f11f50f6488b5ed39728771400342900bae0", - "sha256": "aae5afd95a2fc684b1ffa97f9397f11f50f6488b5ed39728771400342900bae0" + "url": "https://ghcr.io/v2/homebrew/core/git/blobs/sha256:0a058629bc59f3a5b04d34cbb2e921477b2fe75257018621503979e5b72370de", + "sha256": "0a058629bc59f3a5b04d34cbb2e921477b2fe75257018621503979e5b72370de" }, "monterey": { "cellar": "/usr/local/Cellar", - "url": "https://ghcr.io/v2/homebrew/core/git/blobs/sha256:59aefff18d6a17caf66ce097f3ef2c92e8c91612ab298349807c0688478cae9c", - "sha256": "59aefff18d6a17caf66ce097f3ef2c92e8c91612ab298349807c0688478cae9c" + "url": "https://ghcr.io/v2/homebrew/core/git/blobs/sha256:2f9a96a1ad587587b13178f279022593ba4b30b120232694de7f592db1145851", + "sha256": "2f9a96a1ad587587b13178f279022593ba4b30b120232694de7f592db1145851" }, "x86_64_linux": { "cellar": "/home/linuxbrew/.linuxbrew/Cellar", - "url": "https://ghcr.io/v2/homebrew/core/git/blobs/sha256:913bc3c739d4eeb50573dcdd35d9e3587e4313691838c09f05aca36b81f5bf35", - "sha256": "913bc3c739d4eeb50573dcdd35d9e3587e4313691838c09f05aca36b81f5bf35" + "url": "https://ghcr.io/v2/homebrew/core/git/blobs/sha256:3bbbc48fcd76bc10de893768b8860ae5d32520e11ae6dfa008e36eac9a15e8e8", + "sha256": "3bbbc48fcd76bc10de893768b8860ae5d32520e11ae6dfa008e36eac9a15e8e8" } } } @@ -404,45 +404,45 @@ } }, "broot": { - "version": "1.38.0", + "version": "1.39.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/broot/blobs/sha256:97c60892bfe8300b19180e4d6fc649324ece783dc62632f77a2cf8d9187a4908", - "sha256": "97c60892bfe8300b19180e4d6fc649324ece783dc62632f77a2cf8d9187a4908" + "url": "https://ghcr.io/v2/homebrew/core/broot/blobs/sha256:a84a6211e4229f1ce856181db3736217f9ecf8f63b932d9f740c6a9d51c56bdc", + "sha256": "a84a6211e4229f1ce856181db3736217f9ecf8f63b932d9f740c6a9d51c56bdc" }, "arm64_ventura": { "cellar": ":any_skip_relocation", - "url": "https://ghcr.io/v2/homebrew/core/broot/blobs/sha256:819d98dde6bb37da8bd25cfd2dc3170e15e125f121cf264560b1cb0f774d096e", - "sha256": "819d98dde6bb37da8bd25cfd2dc3170e15e125f121cf264560b1cb0f774d096e" + "url": "https://ghcr.io/v2/homebrew/core/broot/blobs/sha256:bbe155596f7918cd1a00014a3173ccb77a5a903b4828a52f8e353898eef9280c", + "sha256": "bbe155596f7918cd1a00014a3173ccb77a5a903b4828a52f8e353898eef9280c" }, "arm64_monterey": { "cellar": ":any_skip_relocation", - "url": "https://ghcr.io/v2/homebrew/core/broot/blobs/sha256:5db744b68ab5766878334f122154d2f86f8e252feb0f8a37c00befecba2f7dae", - "sha256": "5db744b68ab5766878334f122154d2f86f8e252feb0f8a37c00befecba2f7dae" + "url": "https://ghcr.io/v2/homebrew/core/broot/blobs/sha256:394560cee60dbc2fba018365b63aafcdec444b6d2beab64b4fd9095671ec20b5", + "sha256": "394560cee60dbc2fba018365b63aafcdec444b6d2beab64b4fd9095671ec20b5" }, "sonoma": { "cellar": ":any_skip_relocation", - "url": "https://ghcr.io/v2/homebrew/core/broot/blobs/sha256:c1f69612aaa7af04cbbceb9eeb07cb193eb9aac30dd98382b597323fbb805ac2", - "sha256": "c1f69612aaa7af04cbbceb9eeb07cb193eb9aac30dd98382b597323fbb805ac2" + "url": "https://ghcr.io/v2/homebrew/core/broot/blobs/sha256:90201d3ef3b0365ca8e9ae1ab9b77549b9dd6ad8cfeb4e5c5cdac6a08b1b7d33", + "sha256": "90201d3ef3b0365ca8e9ae1ab9b77549b9dd6ad8cfeb4e5c5cdac6a08b1b7d33" }, "ventura": { "cellar": ":any_skip_relocation", - "url": "https://ghcr.io/v2/homebrew/core/broot/blobs/sha256:6afae2ed8b86e085f21c60f5a23d04c9b1fe19f8a9c9b3d151c0e2c826dd77da", - "sha256": "6afae2ed8b86e085f21c60f5a23d04c9b1fe19f8a9c9b3d151c0e2c826dd77da" + "url": "https://ghcr.io/v2/homebrew/core/broot/blobs/sha256:ff43d30b8105827df76c78adf9abb63fae021836e26090845c67811433161c26", + "sha256": "ff43d30b8105827df76c78adf9abb63fae021836e26090845c67811433161c26" }, "monterey": { "cellar": ":any_skip_relocation", - "url": "https://ghcr.io/v2/homebrew/core/broot/blobs/sha256:70f9589190959efd0fe540ea0945329f31945ee09356075e1d1fee75cd87ca62", - "sha256": "70f9589190959efd0fe540ea0945329f31945ee09356075e1d1fee75cd87ca62" + "url": "https://ghcr.io/v2/homebrew/core/broot/blobs/sha256:eeec145ebbe4de510ddce9f7841a763bc2372ede3310f98019b102e9002dda13", + "sha256": "eeec145ebbe4de510ddce9f7841a763bc2372ede3310f98019b102e9002dda13" }, "x86_64_linux": { "cellar": ":any_skip_relocation", - "url": "https://ghcr.io/v2/homebrew/core/broot/blobs/sha256:3987c115a7e354b4a14b6f9aac29e6546d7e1a2e89093b930f57cfd05848009a", - "sha256": "3987c115a7e354b4a14b6f9aac29e6546d7e1a2e89093b930f57cfd05848009a" + "url": "https://ghcr.io/v2/homebrew/core/broot/blobs/sha256:4fa6545662a0e67c2b60d6ddc2bc25e8a21369f005e7b144d02f21ba3d3d1b0a", + "sha256": "4fa6545662a0e67c2b60d6ddc2bc25e8a21369f005e7b144d02f21ba3d3d1b0a" } } } @@ -1052,7 +1052,7 @@ } }, "visual-studio-code": { - "version": "1.89.1", + "version": "1.90.0", "options": { "full_name": "visual-studio-code" } @@ -1076,7 +1076,7 @@ } }, "spotify": { - "version": "1.2.38.720,a4a70a0e,1231", + "version": "1.2.39.578,0ea3f38b,108", "options": { "full_name": "spotify" } @@ -1112,7 +1112,7 @@ } }, "telegram": { - "version": "10.12.2,262594", + "version": "10.13,264000", "options": { "full_name": "telegram" } @@ -1165,7 +1165,7 @@ "macOS": "12.5.1" }, "sonoma": { - "HOMEBREW_VERSION": "4.3.2", + "HOMEBREW_VERSION": "4.3.3", "HOMEBREW_PREFIX": "/opt/homebrew", "Homebrew/homebrew-core": "api", "CLT": "15.3.0.0.1.1708646388",