add asdf and update starship prompt
This commit is contained in:
2
.tool-versions
Normal file
2
.tool-versions
Normal file
@@ -0,0 +1,2 @@
|
||||
nodejs 24.3.0
|
||||
bun 1.2.18
|
||||
@@ -1,5 +1,7 @@
|
||||
shell-integration = zsh
|
||||
font-family = CommitMono
|
||||
font-family = SF Mono
|
||||
font-size = 14
|
||||
theme = dark:catppuccin-mocha,light:catppuccin-latte
|
||||
font-thicken = true
|
||||
theme = dark:catppuccin-macchiato,light:catppuccin-latte
|
||||
window-padding-x = 16
|
||||
|
||||
|
||||
@@ -10,6 +10,9 @@ else
|
||||
linux="";
|
||||
fi
|
||||
|
||||
# install asdf tool-versions
|
||||
ln -s "$HOME/dotfiles/.tool-versions" "$HOME/.tool-versions"
|
||||
|
||||
# install wezterm config
|
||||
ln -s "$HOME/dotfiles/.wezterm.lua" "$HOME/.wezterm.lua" || :
|
||||
|
||||
|
||||
@@ -105,7 +105,7 @@ function setup_plugins()
|
||||
require("auto-dark-mode").setup({
|
||||
set_dark_mode = function()
|
||||
vim.opt.background = "dark"
|
||||
vim.cmd("colorscheme catppuccin-mocha")
|
||||
vim.cmd("colorscheme catppuccin-macchiato")
|
||||
end,
|
||||
|
||||
set_light_mode = function()
|
||||
@@ -226,14 +226,9 @@ function setup_plugins()
|
||||
},
|
||||
}
|
||||
|
||||
require("mason").setup()
|
||||
require("mason-lspconfig").setup()
|
||||
require("mason-lspconfig").setup_handlers({
|
||||
function(server_name)
|
||||
local server = lsps[server_name] or {}
|
||||
require("lspconfig")[server_name].setup(server)
|
||||
end,
|
||||
})
|
||||
for lsp_name, config in pairs(lsps) do
|
||||
vim.lsp.config[lsp_name] = config
|
||||
end
|
||||
|
||||
require("lualine").setup({
|
||||
options = {
|
||||
@@ -350,6 +345,10 @@ function setup_plugins()
|
||||
|
||||
local cmp = require("cmp")
|
||||
cmp.setup({
|
||||
completion = {
|
||||
autocomplete = false,
|
||||
},
|
||||
|
||||
window = {
|
||||
completion = {
|
||||
winhighlight = "Normal:CmpNormal,FloatBorder:CmpNormal,Search:None",
|
||||
@@ -532,8 +531,16 @@ PLUGINS = {
|
||||
{ "nvim-tree/nvim-web-devicons" },
|
||||
{ "nvim-tree/nvim-tree.lua" },
|
||||
{ "nvim-lualine/lualine.nvim" },
|
||||
{ "williamboman/mason.nvim" },
|
||||
{ "williamboman/mason-lspconfig.nvim" },
|
||||
{
|
||||
"mason-org/mason-lspconfig.nvim",
|
||||
opts = {
|
||||
automatic_enable = true,
|
||||
},
|
||||
dependencies = {
|
||||
{ "mason-org/mason.nvim", opts = {} },
|
||||
"neovim/nvim-lspconfig",
|
||||
},
|
||||
},
|
||||
{ "neovim/nvim-lspconfig" },
|
||||
{ "onsails/lspkind.nvim" },
|
||||
{ "hrsh7th/cmp-nvim-lsp" },
|
||||
|
||||
@@ -1,33 +1,32 @@
|
||||
{
|
||||
"Comment.nvim": { "branch": "master", "commit": "e30b7f2008e52442154b66f7c519bfd2f1e32acb" },
|
||||
"LuaSnip": { "branch": "master", "commit": "50fcf17db7c75af80e6b6109acfbfb4504768780" },
|
||||
"auto-dark-mode.nvim": { "branch": "master", "commit": "2b8c938da9a7c9432120266b92936b2c22e8cfb8" },
|
||||
"catppuccin": { "branch": "main", "commit": "cc8e290d4c0d572171243087f8541e49be2c8764" },
|
||||
"cmp-buffer": { "branch": "main", "commit": "3022dbc9166796b644a841a02de8dd1cc1d311fa" },
|
||||
"cmp-cmdline": { "branch": "main", "commit": "d250c63aa13ead745e3a40f61fdd3470efde3923" },
|
||||
"cmp-nvim-lsp": { "branch": "main", "commit": "39e2eda76828d88b773cc27a3f61d2ad782c922d" },
|
||||
"LuaSnip": { "branch": "master", "commit": "fb525166ccc30296fb3457441eb979113de46b00" },
|
||||
"auto-dark-mode.nvim": { "branch": "master", "commit": "c31de126963ffe9403901b4b0990dde0e6999cc6" },
|
||||
"catppuccin": { "branch": "main", "commit": "fa42eb5e26819ef58884257d5ae95dd0552b9a66" },
|
||||
"cmp-buffer": { "branch": "main", "commit": "b74fab3656eea9de20a9b8116afa3cfc4ec09657" },
|
||||
"cmp-cmdline": { "branch": "main", "commit": "d126061b624e0af6c3a556428712dd4d4194ec6d" },
|
||||
"cmp-nvim-lsp": { "branch": "main", "commit": "a8912b88ce488f411177fc8aed358b04dc246d7b" },
|
||||
"cmp-nvim-lsp-signature-help": { "branch": "main", "commit": "031e6ba70b0ad5eee49fd2120ff7a2e325b17fa7" },
|
||||
"cmp-path": { "branch": "main", "commit": "91ff86cd9c29299a64f968ebb45846c485725f23" },
|
||||
"formatter.nvim": { "branch": "master", "commit": "ad246d34ce7a32f752071ed81b09b94e6b127fad" },
|
||||
"gitsigns.nvim": { "branch": "main", "commit": "4a143f13e122ab91abdc88f89eefbe70a4858a56" },
|
||||
"lazy.nvim": { "branch": "main", "commit": "4c6479e98ad643cd584e9e7c4095c463e0d810eb" },
|
||||
"lazygit.nvim": { "branch": "main", "commit": "ad3e1ea592f9d13e86e0d4e850224d9d78069508" },
|
||||
"lspkind.nvim": { "branch": "master", "commit": "1735dd5a5054c1fb7feaf8e8658dbab925f4f0cf" },
|
||||
"lualine.nvim": { "branch": "master", "commit": "0a5a66803c7407767b799067986b4dc3036e1983" },
|
||||
"mason-lspconfig.nvim": { "branch": "main", "commit": "8db12610bcb7ce67013cfdfaba4dd47a23c6e851" },
|
||||
"mason.nvim": { "branch": "main", "commit": "0950b15060067f752fde13a779a994f59516ce3d" },
|
||||
"no-neck-pain.nvim": { "branch": "main", "commit": "741ad26c4acc45f2164a3933f7825b0e555b724d" },
|
||||
"nvim-autopairs": { "branch": "master", "commit": "c15de7e7981f1111642e7e53799e1211d4606cb9" },
|
||||
"nvim-cmp": { "branch": "main", "commit": "a110e12d0b58eefcf5b771f533fc2cf3050680ac" },
|
||||
"nvim-lspconfig": { "branch": "master", "commit": "4d38bece98300e3e5cd24a9aa0d0ebfea4951c16" },
|
||||
"nvim-tree.lua": { "branch": "master", "commit": "2086e564c4d23fea714e8a6d63b881e551af2f41" },
|
||||
"nvim-treesitter": { "branch": "master", "commit": "9a7ad2ff7a7ea81016aca2fc89c9b2c1a5365421" },
|
||||
"nvim-ts-autotag": { "branch": "main", "commit": "06fe07d7523ba8c755fac7c913fceba43b1720ee" },
|
||||
"nvim-web-devicons": { "branch": "master", "commit": "c0cfc1738361b5da1cd0a962dd6f774cc444f856" },
|
||||
"plenary.nvim": { "branch": "master", "commit": "a3e3bc82a3f95c5ed0d7201546d5d2c19b20d683" },
|
||||
"rose-pine": { "branch": "main", "commit": "07a887a7bef4aacea8c7caebaf8cbf808cdc7a8e" },
|
||||
"cmp-path": { "branch": "main", "commit": "c6635aae33a50d6010bf1aa756ac2398a2d54c32" },
|
||||
"formatter.nvim": { "branch": "master", "commit": "b9d7f853da1197b83b8edb4cc4952f7ad3a42e41" },
|
||||
"gitsigns.nvim": { "branch": "main", "commit": "88205953bd748322b49b26e1dfb0389932520dc9" },
|
||||
"lazy.nvim": { "branch": "main", "commit": "6c3bda4aca61a13a9c63f1c1d1b16b9d3be90d7a" },
|
||||
"lazygit.nvim": { "branch": "main", "commit": "4839ab642962cc76bb1bf278427dc4c59be15072" },
|
||||
"lspkind.nvim": { "branch": "master", "commit": "d79a1c3299ad0ef94e255d045bed9fa26025dab6" },
|
||||
"lualine.nvim": { "branch": "master", "commit": "a94fc68960665e54408fe37dcf573193c4ce82c9" },
|
||||
"mason-lspconfig.nvim": { "branch": "main", "commit": "be159e939543777bbfe9e1fe5389984c4570afce" },
|
||||
"mason.nvim": { "branch": "main", "commit": "8024d64e1330b86044fed4c8494ef3dcd483a67c" },
|
||||
"no-neck-pain.nvim": { "branch": "main", "commit": "0b6e82a6f1db9ff0b694df2a8e3bd3f7828a3958" },
|
||||
"nvim-autopairs": { "branch": "master", "commit": "2647cce4cb64fb35c212146663384e05ae126bdf" },
|
||||
"nvim-cmp": { "branch": "main", "commit": "b5311ab3ed9c846b585c0c15b7559be131ec4be9" },
|
||||
"nvim-lspconfig": { "branch": "master", "commit": "9276b82935bf6b951d08c864eb5ac3f85d6b743b" },
|
||||
"nvim-tree.lua": { "branch": "master", "commit": "d54a1875a91e1a705795ea26074795210b92ce7f" },
|
||||
"nvim-treesitter": { "branch": "master", "commit": "42fc28ba918343ebfd5565147a42a26580579482" },
|
||||
"nvim-ts-autotag": { "branch": "main", "commit": "a1d526af391f6aebb25a8795cbc05351ed3620b5" },
|
||||
"nvim-web-devicons": { "branch": "master", "commit": "1fb58cca9aebbc4fd32b086cb413548ce132c127" },
|
||||
"plenary.nvim": { "branch": "master", "commit": "857c5ac632080dba10aae49dba902ce3abf91b35" },
|
||||
"telescope-ui-select.nvim": { "branch": "master", "commit": "6e51d7da30bd139a6950adf2a47fda6df9fa06d2" },
|
||||
"telescope.nvim": { "branch": "master", "commit": "6312868392331c9c0f22725041f1ec2bef57c751" },
|
||||
"typst-preview.nvim": { "branch": "master", "commit": "36a82aaff8931f96015ee7365afe2e253ab3b1ea" },
|
||||
"vim-floaterm": { "branch": "master", "commit": "4e28c8dd0271e10a5f55142fb6fe9b1599ee6160" }
|
||||
}
|
||||
"vim-floaterm": { "branch": "master", "commit": "b18b41d15d2492f74f01ecac12f786b81f38262e" }
|
||||
}
|
||||
|
||||
@@ -6,7 +6,7 @@ if [ "$query" = "Dark" ]; then
|
||||
sketchybar --bar color=0xff313244 \
|
||||
--set '/.*/' icon.color=0xffffffff label.color=0xffffffff
|
||||
else
|
||||
sketchybar --bar color=0x00eff1f5 \
|
||||
--set '/.*/' icon.color=0x80000000 label.color=0x80000000
|
||||
sketchybar --bar color=0x00000000 \
|
||||
--set '/.*/' icon.color=0xffffffff label.color=0xffffffff
|
||||
fi
|
||||
|
||||
|
||||
@@ -1,26 +1,25 @@
|
||||
format = """
|
||||
$cmd_duration\
|
||||
[╭─](dimmed) \
|
||||
$directory\
|
||||
$git_branch\
|
||||
$git_state\
|
||||
$git_status\
|
||||
$nix_shell\
|
||||
$python\
|
||||
$line_break\
|
||||
$character"""
|
||||
|
||||
|
||||
# Starship modules
|
||||
[character]
|
||||
# Note the use of Catppuccin color 'peach'
|
||||
success_symbol = "[[](green) ❯](peach)"
|
||||
error_symbol = "[[](red) ❯](peach)"
|
||||
vimcmd_symbol = "[ ❮](subtext1)" # For use with zsh-vi-mode
|
||||
|
||||
[directory]
|
||||
format = '[ $path]($style)'
|
||||
format = '[$path]($style)'
|
||||
style = "bold green"
|
||||
|
||||
[character]
|
||||
success_symbol = "[╰─（✿ ◕ ᴗ◕\\)つ━━✫・*。](dimmed)"
|
||||
error_symbol = "[╰─](dimmed)[ Ψ\\(`_´ # \\)↝ ](red)"
|
||||
vimcmd_symbol = "[❮](green)"
|
||||
|
||||
[git_branch]
|
||||
format = " [ $branch]($style)"
|
||||
format = " [ $branch]($style)"
|
||||
style = "yellow"
|
||||
|
||||
[git_status]
|
||||
|
||||
Reference in New Issue
Block a user