diff options
| -rw-r--r-- | mac/.config/TheSiahxyz/lua/TheSiahxyz/plugins/lsp.lua | 12 | ||||
| -rw-r--r-- | mac/.config/TheSiahxyz/lua/TheSiahxyz/plugins/markdown.lua | 2 | ||||
| -rw-r--r-- | mac/.config/aerospace/aerospace.toml | 21 | ||||
| -rw-r--r-- | mac/.config/tmux/tmux.conf | 4 |
4 files changed, 29 insertions, 10 deletions
diff --git a/mac/.config/TheSiahxyz/lua/TheSiahxyz/plugins/lsp.lua b/mac/.config/TheSiahxyz/lua/TheSiahxyz/plugins/lsp.lua index 8beb058..6aafad3 100644 --- a/mac/.config/TheSiahxyz/lua/TheSiahxyz/plugins/lsp.lua +++ b/mac/.config/TheSiahxyz/lua/TheSiahxyz/plugins/lsp.lua @@ -84,7 +84,11 @@ return { }, }) - require("mason").setup() + require("mason").setup({ + pip = { + use_python3_host_prog = true, + }, + }) require("mason-lspconfig").setup({ ensure_installed = { "bashls", @@ -94,12 +98,12 @@ return { "jdtls", "jsonls", "lua_ls", - "mutt_ls", + -- "mutt_ls", "pyright", "ruff", "ts_ls", }, - automatic_installation = true, + automatic_enable = true, handlers = { function(server_name) -- default handler (optional) require("lspconfig")[server_name].setup({ @@ -242,7 +246,7 @@ return { "black", -- python formatter "debugpy", -- python debuger "eslint_d", -- eslint linter - "hadolint", -- docker linter + -- "hadolint", -- docker linter "isort", -- python formatter "java-debug-adapter", -- java debugger "java-test", -- java test diff --git a/mac/.config/TheSiahxyz/lua/TheSiahxyz/plugins/markdown.lua b/mac/.config/TheSiahxyz/lua/TheSiahxyz/plugins/markdown.lua index dc96a9e..0987818 100644 --- a/mac/.config/TheSiahxyz/lua/TheSiahxyz/plugins/markdown.lua +++ b/mac/.config/TheSiahxyz/lua/TheSiahxyz/plugins/markdown.lua @@ -552,7 +552,7 @@ return { local venv_name = vim.fn.fnamemodify(venv_path, ":t") vim.cmd(("MoltenInit %s"):format(venv_name)) else - vim.cmd("MoltenInit python3") + vim.cmd("MoltenInit /opt/homebrew/bin/python@3.13") end end, { desc = "Init default molten" }) end, diff --git a/mac/.config/aerospace/aerospace.toml b/mac/.config/aerospace/aerospace.toml index 686e00d..c684090 100644 --- a/mac/.config/aerospace/aerospace.toml +++ b/mac/.config/aerospace/aerospace.toml @@ -106,7 +106,14 @@ on-focus-changed = ['move-mouse window-lazy-center'] # You can uncomment this line to open up terminal with alt + enter shortcut # See: https://nikitabobko.github.io/AeroSpace/commands#exec-and-forget # alt-enter = 'exec-and-forget open -n /System/Applications/Utilities/Terminal.app' - alt-enter = 'exec-and-forget open -n /Applications/kitty.app' + alt-enter = 'exec-and-forget open -n /Applications/Kitty.app' + alt-c = 'exec-and-forget /Applications/kitty.app/Contents/MacOS/kitty --title "calcurse" -e calcurse' + alt-d = 'exec-and-forget open -na Dbeaver' + alt-e = 'exec-and-forget /Applications/kitty.app/Contents/MacOS/kitty --title "neomutt" -e neomutt' + alt-n = 'exec-and-forget /Applications/kitty.app/Contents/MacOS/kitty --title "newsboat" -e newsboat' + alt-r = 'exec-and-forget /Applications/kitty.app/Contents/MacOS/kitty --title "htop" -e htop' + alt-t = 'exec-and-forget open -na "Microsoft Teams"' + alt-w = 'exec-and-forget open -na Firefox' # See: https://nikitabobko.github.io/AeroSpace/commands#layout alt-slash = 'layout tiles horizontal vertical' @@ -226,16 +233,24 @@ if.app-id = 'com.microsoft.VSCode' run = ['move-node-to-workspace 4'] [[on-window-detected]] +if.app-id = 'org.jkiss.dbeaver.core.product' +run = ['move-node-to-workspace 5'] + +[[on-window-detected]] if.app-id = 'com.clickup.desktop-app' run = ['move-node-to-workspace 5'] [[on-window-detected]] +if.app-name-regex-substring = 'vimwiki' +run = ['move-node-to-workspace 6'] + +[[on-window-detected]] if.app-id = "md.obsidian" -run = ['move-node-to-workspace 5'] +run = ['move-node-to-workspace 6'] [[on-window-detected]] if.app-id = 'com.colliderli.iina' -run = ['move-node-to-workspace 6'] +run = ['move-node-to-workspace 7'] [[on-window-detected]] if.app-id = 'com.apple.Music' diff --git a/mac/.config/tmux/tmux.conf b/mac/.config/tmux/tmux.conf index eb67362..ef58fc7 100644 --- a/mac/.config/tmux/tmux.conf +++ b/mac/.config/tmux/tmux.conf @@ -111,8 +111,8 @@ bind -r 'BSpace' switch-client -l # window bind -r '<' swap-window -d -t -1 bind -r '>' swap-window -d -t +1 -bind -nr 'M-n' previous-window \; refresh-client -S -bind -nr 'M-p' next-window \; refresh-client -S +bind -nr 'M-p' previous-window \; refresh-client -S +bind -nr 'M-n' next-window \; refresh-client -S bind 'c' new-window -c "#{pane_current_path}" bind -nr 'M-BSpace' last-window |