From: Ruben Beltran del Rio Date: Sat, 4 Jan 2025 16:56:46 +0000 (+0100) Subject: Update plan, deps and git status X-Git-Url: https://git.r.bdr.sh/rbdr/dotfiles/commitdiff_plain/56404e1fffd04da9f3aef8be1bdf52642ca5ad67?ds=sidebyside Update plan, deps and git status --- diff --git a/config/nvim/lazy-lock.json b/config/nvim/lazy-lock.json index 2865a56..bcd7f36 100644 --- a/config/nvim/lazy-lock.json +++ b/config/nvim/lazy-lock.json @@ -3,25 +3,25 @@ "auto-save.nvim": { "branch": "main", "commit": "979b6c82f60cfa80f4cf437d77446d0ded0addf0" }, "autoclose.nvim": { "branch": "main", "commit": "b2077aa2c83df7ebc19b2a20a3a0654b24ae9c8f" }, "coq_nvim": { "branch": "coq", "commit": "976012b0c13763a47edbd55492ba53b03b498cdd" }, - "fzf-lua": { "branch": "main", "commit": "71de69c0a30829e2384b4beb08e4c0e3143e085e" }, + "fzf-lua": { "branch": "main", "commit": "b622a443ecfb40b54ec6c0114c31eed5b9b10b53" }, "gemini.vim": { "branch": "master", "commit": "c9efb59c97b71c28d4678c79fd21fbdd3a69d196" }, "lazy.nvim": { "branch": "main", "commit": "7e6c863bc7563efbdd757a310d17ebc95166cef3" }, "neodev.nvim": { "branch": "main", "commit": "46aa467dca16cf3dfe27098042402066d2ae242d" }, - "neogen": { "branch": "main", "commit": "37dd095892e3f846418c465852f7b21f81d0f46c" }, + "neogen": { "branch": "main", "commit": "dd0301bfba1f83a3bc009b5430fce7aa3cee6941" }, "nota.nvim": { "branch": "main", "commit": "503bfaa93968986a9df5376c4543207c70dd2a07" }, - "nvim-dap": { "branch": "master", "commit": "567da83810dd9da32f9414d941bc6848715fc102" }, - "nvim-dap-ui": { "branch": "master", "commit": "ffa89839f97bad360e78428d5c740fdad9a0ff02" }, + "nvim-dap": { "branch": "master", "commit": "0e673accbb512e1e191dfb4fecea89cc38c1bcdd" }, + "nvim-dap-ui": { "branch": "master", "commit": "e94d98649dccb6a3884b66aabc2e07beb279e535" }, "nvim-dap-vscode-js": { "branch": "main", "commit": "03bd29672d7fab5e515fc8469b7d07cc5994bbf6" }, - "nvim-lspconfig": { "branch": "master", "commit": "9f2c279cf9abe584f03bfeb37c6658d68e3ff49d" }, + "nvim-lspconfig": { "branch": "master", "commit": "88dff6268a068403c87b461aee69beb61ceb8303" }, "nvim-nio": { "branch": "master", "commit": "a428f309119086dc78dd4b19306d2d67be884eee" }, - "nvim-treesitter": { "branch": "master", "commit": "c47d8d27d047634d00a07ca80a1b694624743b38" }, + "nvim-treesitter": { "branch": "master", "commit": "fc687f38d4ea9a7399707a5a2d57297c2ac17323" }, "nvim-treesitter-endwise": { "branch": "master", "commit": "8b34305ffc28bd75a22f5a0a9928ee726a85c9a6" }, - "oil.nvim": { "branch": "master", "commit": "dba037598843973b8c54bc5ce0318db4a0da439d" }, + "oil.nvim": { "branch": "master", "commit": "ba858b662599eab8ef1cba9ab745afded99cb180" }, "oleoboard.nvim": { "branch": "main", "commit": "3652b39db3a8faca3fb767ace799479124bc79f3" }, "snes-syntax-vim": { "branch": "master", "commit": "a6a699c8905f7b6119bf91e44f960667d9f03d59" }, "tree-sitter-api-notation": { "branch": "main", "commit": "3113c6077d9ed1e662a891714ac00e1ee3bb7657" }, - "undotree": { "branch": "master", "commit": "78b5241191852ffa9bb5da5ff2ee033160798c3b" }, - "vim-fugitive": { "branch": "master", "commit": "fcb4db52e7f65b95705aa58f0f2df1312c1f2df2" }, + "undotree": { "branch": "master", "commit": "2556c6800b210b2096b55b66e74b4cc1d9ebbe4f" }, + "vim-fugitive": { "branch": "master", "commit": "174230d6a7f2df94705a7ffd8d5413e27ec10a80" }, "vim-indent-object": { "branch": "master", "commit": "8ab36d5ec2a3a60468437a95e142ce994df598c6" }, "vim-togglelist": { "branch": "master", "commit": "48f0d30292efdf20edc883e61b121e6123e03df7" }, "which-key.nvim": { "branch": "main", "commit": "8ab96b38a2530eacba5be717f52e04601eb59326" } diff --git a/plan b/plan index 7aa9a4a..fe3f078 100644 --- a/plan +++ b/plan @@ -1,19 +1,17 @@ # My plan for now, roughly -- Recheck aerc configuration +- Play with SwiftBar Scripts - I took some time to review my config with aerc. Basically only aesthetic - changes: column sizes, date format, and threading. + I recently discovered SwiftBar, and so far I love it. I do have very + different tools for work / projects, but with focus management I think + I can make this work for each use case. - I did add contacts integration but haven't really had a chance to try it - out. +- Rethink why I write -- Learn more about flow management in iOS + I've been trying to write on tech leadership and such, but haven't felt + confident about it. I've given it some thought and want to rethink why/how + I do this. - I ended up learning a lot about how to handle sync/async state changes in - iOS. I haven't updated any of my open source apps to reflect it yet. But - in the app where I changed it it's made a huge difference! +- Catch up with wardley maps material -- Read some more research on either problem solving or team dynamics - -[2024-09-07] +[2024-12-27] diff --git a/zsh/functions/status.zsh b/zsh/functions/status.zsh index 0153435..82544f0 100644 --- a/zsh/functions/status.zsh +++ b/zsh/functions/status.zsh @@ -38,21 +38,37 @@ function git_info { status_output=$(git status --short) - if echo "$status_output" | rg -q '^??'; then - echo -n "%{%F{magenta}%}?%f" + # Modified Files, Unstaged + if echo "$status_output" | rg -q '^ M'; then + echo -n "%{%F{magenta}%}△%f" fi - if echo "$status_output" | rg -q '^ M'; then - echo -n "%{%F{magenta}%}!%f" + # Modified Files, Staged + if echo "$status_output" | rg -q '^M'; then + echo -n "%{%F{green}%}△%f" fi - if echo "$status_output" | rg -q '^ D'; then - echo -n "%{%F{magenta}%}×%f" + # Untracked Files + if echo "$status_output" | rg -q '^\?\?'; then + echo -n "%{%F{magenta}%}+%f" fi + # Added Files if echo "$status_output" | rg -q '^A '; then echo -n "%{%F{green}%}+%f" fi + + # Deleted Files, Unstaged + if echo "$status_output" | rg -q '^ D'; then + echo -n "%{%F{magenta}%}×%f" + fi + + # Deleted Files, Staged + if echo "$status_output" | rg -q '^D'; then + echo -n "%{%F{green}%}×%f" + fi + + echo -n "%f" fi }