diff --git a/fastfetch/config.jsonc b/fastfetch/config.jsonc new file mode 100644 index 0000000..abe4602 --- /dev/null +++ b/fastfetch/config.jsonc @@ -0,0 +1,109 @@ +{ + "$schema": "https://github.com/fastfetch-cli/fastfetch/raw/dev/doc/json_schema.json", + "logo": { + "padding": { + "top": 2 + } + }, + "display": { + "separator": " ➜ " + }, + "modules": [ + "break", + "break", + "break", + { + "type": "os", + "key": "OS ", + "keyColor": "31" + }, + { + "type": "kernel", + "key": " ├  ", + "keyColor": "31", + }, + { + "type": "packages", + "format": "{} (brew)", + "key": " ├ 󰏖 ", + "keyColor": "31", + }, + { + "type": "shell", + "key": " └  ", + "keyColor": "31", + }, + "break", + { + "type": "wm", + "key": "WM ", + "keyColor": "32", + }, + { + "type": "wmtheme", + "key": " ├ 󰉼 ", + "keyColor": "32", + }, + { + "type": "icons", + "key": " ├ 󰀻 ", + "keyColor": "32", + }, + { + "type": "cursor", + "key": " ├  ", + "keyColor": "32", + }, + { + "type": "terminal", + "key": " ├  ", + "keyColor": "32", + }, + { + "type": "terminalfont", + "key": " └  ", + "keyColor": "32", + }, + "break", + { + "type": "host", + "format": "{5} {1} Type {2}", + "key": "PC ", + "keyColor": "33", + }, + { + "type": "cpu", + "format": "{1} ({3}) @ {7} GHz", + "key": " ├  ", + "keyColor": "33", + }, + { + "type": "gpu", + "format": "{1} {2} @ {12} GHz", + "key": " ├ 󰢮 ", + "keyColor": "33", + }, + { + "type": "memory", + "key": " ├  ", + "keyColor": "33", + }, + { + "type": "swap", + "key": " ├ 󰓡 ", + "keyColor": "33", + }, + { + "type": "disk", + "key": " ├ 󰋊 ", + "keyColor": "33", + }, + { + "type": "monitor", + "key": " └  ", + "keyColor": "33", + }, + "break", + "break", + ] +} diff --git a/nvim/lazy-lock.json b/nvim/lazy-lock.json index 27a44da..95495b5 100644 --- a/nvim/lazy-lock.json +++ b/nvim/lazy-lock.json @@ -20,10 +20,10 @@ "mason.nvim": { "branch": "main", "commit": "49ff59aded1047a773670651cfa40e76e63c6377" }, "mini.nvim": { "branch": "main", "commit": "eb2dd6d187e1ab5fefec66f0d37b1a3dc8633d17" }, "neodev.nvim": { "branch": "main", "commit": "ce9a2e8eaba5649b553529c5498acb43a6c317cd" }, - "noice.nvim": { "branch": "main", "commit": "cade1f972ba226e7753a7a113f3f1a942908e73c" }, "nvim-cmp": { "branch": "main", "commit": "5260e5e8ecadaf13e6b82cf867a909f54e15fd07" }, "nvim-dap": { "branch": "master", "commit": "5a2f7121869394502521c52b2bc581ab22c69447" }, "nvim-dap-go": { "branch": "main", "commit": "5faf165f5062187320eaf9d177c3c1f647adc22e" }, + "nvim-dap-python": { "branch": "master", "commit": "7c427e2bbc72d46ea3c9602bede6465ef61b8c19" }, "nvim-dap-ui": { "branch": "master", "commit": "71bfe9bd6b3465e169b53bea4f83775034d822dd" }, "nvim-dap-virtual-text": { "branch": "master", "commit": "3e8e207513e6ef520894950acd76b79902714103" }, "nvim-lint": { "branch": "master", "commit": "1f98d6c863f91706369d74aeb2eb3f02b2e96861" }, diff --git a/nvim/lua/lilJ/plugins/debug.lua b/nvim/lua/lilJ/plugins/debug.lua index 873000f..212c275 100644 --- a/nvim/lua/lilJ/plugins/debug.lua +++ b/nvim/lua/lilJ/plugins/debug.lua @@ -1,5 +1,4 @@ -- debug.lua --- -- Shows how to use the DAP plugin to debug your code. -- -- Primarily focused on configuring the debugger for Go, but can @@ -17,6 +16,7 @@ return { -- GO DEBUG "leoluz/nvim-dap-go", + "mfussenegger/nvim-dap-python", }, config = function() local dap = require "dap" @@ -27,19 +27,21 @@ return { require("nvim-dap-virtual-text").setup { -- This just tries to mitigate the chance that I leak tokens here. Probably won't stop it from happening... - display_callback = function(variable) - local name = string.lower(variable.name) - local value = string.lower(variable.value) - if name:match "secret" or name:match "api" or value:match "secret" or value:match "api" then - return "*****" - end - - if #variable.value > 15 then - return " " .. string.sub(variable.value, 1, 15) .. "... " - end - - return " " .. variable.value - end, + -- But I am not a streamer, so I may not want this, or prolly change it in future, but rn its commented + -- + -- display_callback = function(variable) + -- local name = string.lower(variable.name) + -- local value = string.lower(variable.value) + -- if name:match "secret" or name:match "api" or value:match "secret" or value:match "api" then + -- return "*****" + -- end + -- + -- if #variable.value > 15 then + -- return " " .. string.sub(variable.value, 1, 15) .. "... " + -- end + -- + -- return " " .. variable.value + -- end, } require("mason-nvim-dap").setup { @@ -49,18 +51,25 @@ return { handlers = {}, ensure_installed = { + "debugpy", "delve", }, } - -- Basic debugging keymaps, feel free to change to your liking! - vim.keymap.set("n", "dc", dap.continue, { desc = "Debug: Start/Continue" }) - vim.keymap.set("n", "", dap.step_into, { desc = "Debug: Step Into" }) - vim.keymap.set("n", "", dap.step_over, { desc = "Debug: Step Over" }) - vim.keymap.set("n", "", dap.step_out, { desc = "Debug: Step Out" }) - vim.keymap.set("n", "dt", dap.toggle_breakpoint, { desc = "Debug: Toggle Breakpoint" }) + vim.keymap.set("n", "?", function() + require("dapui").eval(nil, { enter = true }) + end) + + -- Basic debugging keymaps, feel free to change to your liking! + vim.keymap.set("n", "", dap.continue, { desc = "Start/Continue" }) + vim.keymap.set("n", "", dap.step_into, { desc = "Step Into" }) + vim.keymap.set("n", "", dap.step_over, { desc = "Step Over" }) + vim.keymap.set("n", "", dap.step_out, { desc = "Step Out" }) + vim.keymap.set("n", "", dap.step_back, { desc = "Step Back" }) + vim.keymap.set("n", "", dap.restart, { desc = "Restart" }) + dap.listeners.before.attach.dapui_config = function() ui.open() end @@ -75,5 +84,6 @@ return { end require("dap-go").setup() + require("dap-python").setup "~/.local/share/nvim/mason/packages/debugpy/venv/bin/python" end, } diff --git a/nvim/lua/lilJ/plugins/lint.lua b/nvim/lua/lilJ/plugins/lint.lua index 063d18c..2d2c887 100644 --- a/nvim/lua/lilJ/plugins/lint.lua +++ b/nvim/lua/lilJ/plugins/lint.lua @@ -7,6 +7,10 @@ return { lint.linters_by_ft = { python = { "ruff", "mypy" }, + dockerfile = { "hadolint" }, + json = { "jsonlint" }, + markdown = { "vale" }, + text = { "vale" }, } -- To allow other plugins to add linters to require('lint').linters_by_ft, diff --git a/nvim/lua/lilJ/plugins/lsp.lua b/nvim/lua/lilJ/plugins/lsp.lua index 26825fd..de09184 100644 --- a/nvim/lua/lilJ/plugins/lsp.lua +++ b/nvim/lua/lilJ/plugins/lsp.lua @@ -28,14 +28,14 @@ return { html = { filetypes = { "html", "tmpl" }, }, - -- jsonls = { - -- settings = { - -- json = { - -- schemas = require("schemastore").json.schemas(), - -- validate = { enable = true }, - -- }, - -- }, - -- }, + jsonls = { + settings = { + json = { + schemas = require("schemastore").json.schemas(), + validate = { enable = true }, + }, + }, + }, lua_ls = { -- cmd = {...}, -- filetypes = { ...}, @@ -50,7 +50,7 @@ return { }, }, }, - -- pyright = {}, + pyright = {}, tsserver = {}, tailwindcss = { filetypes = { "html", "css", "typescript", "typescriptreact" }, @@ -64,10 +64,13 @@ return { "clang-format", "gofumpt", "goimports-reviser", - -- "mypy", + "hadolint", + "jsonlint", + "mypy", "prettier", - -- "ruff", + "ruff", "stylua", + "vale", }) require("mason-tool-installer").setup { ensure_installed = ensure_installed } diff --git a/nvim/lua/lilJ/plugins/noice.lua b/nvim/lua/lilJ/plugins/noice.lua deleted file mode 100644 index 4de9f29..0000000 --- a/nvim/lua/lilJ/plugins/noice.lua +++ /dev/null @@ -1,7 +0,0 @@ -return { - -- "folke/noice.nvim", - -- event = "VeryLazy", - -- dependencies = { - -- "MunifTanjim/nui.nvim", - -- }, -} diff --git a/readme.md b/readme.md index 0895167..4326453 100644 --- a/readme.md +++ b/readme.md @@ -1,26 +1,12 @@ # Every week ```bash -brew install --cask aerial alacritty cloudflare-warp discord font-anonymous-pro font-hack-nerd-font font-meslo-lg-nerd-font google-chrome httpie keka kitty linearmouse obsidian raycast spotify stats telegram +brew install --cask alacritty discord font-hack-nerd-font font-meslo-lg-nerd-font google-chrome httpie keka kitty obsidian raycast spotify stats telegram ``` ```bash -brew install awscli docker fastfetch git go neovim node python3 ripgrep starship tmux zsh-syntax-highlighting +brew install btop fastfetch fzf git go neovim node ripgrep starship tmux zoxide zsh-syntax-highlighting ``` -## nah brew installs - -- [amie](amie.so) -- steam - -## I always forget to set it up first - -- set up github pat -- `git config --global credential.helper cache` - -## misc stuff - -**Wallpapers [drive - fkc u](https://drive.google.com/drive/folders/1Bdx17wD76t5JKWm4U7bPDri1SqV-SeSj?usp=drive_link)** - +## won't work unless you do it - [tmux/tpm](https://github.com/tmux-plugins/tpm) -- [bun](https://bun.sh/docs/installation) diff --git a/starship.toml b/starship.toml index c3b9963..f480b30 100644 --- a/starship.toml +++ b/starship.toml @@ -37,6 +37,8 @@ truncate_to_repo = true truncation_symbol = " " style = "bold blue" +[docker_context] +format = 'in [$symbol$context]($style) ' [git_branch] format='[ $symbol$branch :\($remote_branch\) ]($style)' @@ -69,7 +71,7 @@ version_format = '${major}.${minor}' disabled = true [package] -disabled = false +disabled = true [palettes.catppuccin_mocha] rosewater = "#f5e0dc" diff --git a/zsh/.zshrc b/zsh/.zshrc index 891dce0..fb54045 100644 --- a/zsh/.zshrc +++ b/zsh/.zshrc @@ -14,14 +14,14 @@ alias python='python3' alias ls='ls --color' alias nv='nvim' -# ---- Air GO hot reload ---- -alias air="~/go/bin/air" +# cool to use tools (if ever wanted to) +alias neofetch="fastfetch" # ---- homebrew ---- eval "$(/opt/homebrew/bin/brew shellenv)" -# cool to use tools (if ever wanted to) -alias neofetch="fastfetch" +# ---- Air GO hot reload ---- +alias air="~/go/bin/air" # ---- bun ---- export BUN_INSTALL="$HOME/.bun" @@ -31,3 +31,5 @@ export PATH="$BUN_INSTALL/bin:$PATH" eval "$(starship init zsh)" export PATH="/opt/homebrew/opt/node@20/bin:$PATH" + +source <(fzf --zsh)