From 70533b3bb4e98e93cfaa1d29e0a0e008c656a57d Mon Sep 17 00:00:00 2001 From: Ben Kreeger Date: Thu, 11 Sep 2025 12:08:55 -0500 Subject: [PATCH] Update devcontainer setup functions --- nvim/lazy-lock.json | 16 ++++++++-------- setup.sh | 2 +- zsh/functions.zsh | 16 +++++++++------- 3 files changed, 18 insertions(+), 16 deletions(-) diff --git a/nvim/lazy-lock.json b/nvim/lazy-lock.json index 15c2b7a..e5c00eb 100644 --- a/nvim/lazy-lock.json +++ b/nvim/lazy-lock.json @@ -1,29 +1,29 @@ { - "avante.nvim": { "branch": "main", "commit": "8794356cf4af90b6677696e3f772ac18c51face4" }, + "avante.nvim": { "branch": "main", "commit": "56951378f10b25f8bb0f5bb516b8d778a1e498a7" }, "barbar.nvim": { "branch": "master", "commit": "53b5a2f34b68875898f0531032fbf090e3952ad7" }, "blink.cmp": { "branch": "main", "commit": "bae4bae0eedd1fa55f34b685862e94a222d5c6f8" }, "catppuccin": { "branch": "main", "commit": "30fa4d122d9b22ad8b2e0ab1b533c8c26c4dde86" }, "conform.nvim": { "branch": "master", "commit": "b4aab989db276993ea5dcb78872be494ce546521" }, - "dropbar.nvim": { "branch": "master", "commit": "a0ad7e24e9dfde6f0b11f6a436f56aeceaf58e9b" }, + "dropbar.nvim": { "branch": "master", "commit": "3460930700ca67b4590a69ac3f1d65d5f9658fb6" }, "fidget.nvim": { "branch": "main", "commit": "4d5858bd4c471c895060e1b9f3575f1551184dc5" }, "gitsigns.nvim": { "branch": "main", "commit": "6e3c66548035e50db7bd8e360a29aec6620c3641" }, "lazy.nvim": { "branch": "main", "commit": "6c3bda4aca61a13a9c63f1c1d1b16b9d3be90d7a" }, "lazydev.nvim": { "branch": "main", "commit": "2367a6c0a01eb9edb0464731cc0fb61ed9ab9d2c" }, "lualine.nvim": { "branch": "master", "commit": "b8c23159c0161f4b89196f74ee3a6d02cdc3a955" }, - "mason-lspconfig.nvim": { "branch": "main", "commit": "5e085efe67fccb13372d54331d849219662a7e93" }, + "mason-lspconfig.nvim": { "branch": "main", "commit": "7f9a39fcd2ac6e979001f857727d606888f5909c" }, "mason-tool-installer.nvim": { "branch": "main", "commit": "517ef5994ef9d6b738322664d5fdd948f0fdeb46" }, "mason.nvim": { "branch": "main", "commit": "7dc4facca9702f95353d5a1f87daf23d78e31c2a" }, - "mini.nvim": { "branch": "main", "commit": "ddb70da6ec6aa896cfde87350d1e8dffb57ddef0" }, - "neo-tree.nvim": { "branch": "main", "commit": "5bb90268c45010842a12821ba34af650b8f97bfc" }, + "mini.nvim": { "branch": "main", "commit": "d12b7c1b4dccc5245a3d2b7bc73da6dd910af2c0" }, + "neo-tree.nvim": { "branch": "main", "commit": "ed057048a281b418d5318dd5153f9486daa517a3" }, "neogen": { "branch": "main", "commit": "d7f9461727751fb07f82011051338a9aba07581d" }, "nui.nvim": { "branch": "main", "commit": "de740991c12411b663994b2860f1a4fd0937c130" }, "nvim-autopairs": { "branch": "master", "commit": "23320e75953ac82e559c610bec5a90d9c6dfa743" }, - "nvim-lspconfig": { "branch": "master", "commit": "cb4765526f7201ce4ff0c49888f80c18da614e68" }, - "nvim-notify": { "branch": "master", "commit": "397c7c1184745fca649e5104de659e6392ef5a4d" }, + "nvim-lspconfig": { "branch": "master", "commit": "bc09aa236d7d2af66f56a5a35d0577588eca7800" }, + "nvim-notify": { "branch": "master", "commit": "8701bece920b38ea289b457f902e2ad184131a5d" }, "nvim-surround": { "branch": "main", "commit": "a868c256c861044beb9794b4dd126480dcdfbdad" }, "nvim-treesitter": { "branch": "master", "commit": "42fc28ba918343ebfd5565147a42a26580579482" }, "nvim-treesitter-textobjects": { "branch": "master", "commit": "71385f191ec06ffc60e80e6b0c9a9d5daed4824c" }, - "nvim-web-devicons": { "branch": "master", "commit": "f66cdfef5e84112045b9ebc3119fee9bddb3c687" }, + "nvim-web-devicons": { "branch": "master", "commit": "6e51ca170563330e063720449c21f43e27ca0bc1" }, "plenary.nvim": { "branch": "master", "commit": "b9fd5226c2f76c951fc8ed5923d85e4de065e509" }, "project-cli-commands.nvim": { "branch": "main", "commit": "9a2a2fdfd38a3d71cc927e3a398ac0ddfa846b3d" }, "telescope-fzf-native.nvim": { "branch": "main", "commit": "1f08ed60cafc8f6168b72b80be2b2ea149813e55" }, diff --git a/setup.sh b/setup.sh index 9205b04..00273ae 100755 --- a/setup.sh +++ b/setup.sh @@ -18,6 +18,6 @@ done zshfiles=("zshenv" "zprofile" "zshrc") for file in "${zshfiles[@]}"; do - if [[ -a "$HOME/.$file" && $* != *--force* ]]; then continue; fi + if [[ -a "$HOME/.$file" && $* == *--no-force* ]]; then continue; fi ln -sfv "$SCRIPTPATH/zsh/$file" "$HOME/.$file" done diff --git a/zsh/functions.zsh b/zsh/functions.zsh index 17ead13..e31c83a 100644 --- a/zsh/functions.zsh +++ b/zsh/functions.zsh @@ -56,17 +56,19 @@ function random_string() { } # devcontainer aliases -function devconbuild() { +function devcup() { + devcontainer up --workspace-folder . --remove-existing-container \ + --dotfiles-repository "https://git.kree.gr/kreeger/dotfiles.git" \ + --dotfiles-install-command "setup.sh" +} +function devcb() { devcontainer build --workspace-folder . } -function devconup() { - devcontainer up --workspace-folder . -} -function devconexec() { +function devce() { devcontainer exec --workspace-folder . $1 } -function devconshell() { - devconexec /usr/bin/zsh +function devcs() { + devce /usr/bin/zsh } # Dotfile update command(s)