diff --git a/.claude/statusline.sh b/.claude/statusline.sh new file mode 100755 index 0000000..f46be0b --- /dev/null +++ b/.claude/statusline.sh @@ -0,0 +1,40 @@ +#!/bin/bash +input=$(cat) + +MODEL=$(echo "$input" | jq -r '.model.display_name') +DIR=$(echo "$input" | jq -r '.workspace.current_dir') +PCT=$(echo "$input" | jq -r '.context_window.used_percentage // 0' | cut -d. -f1) +DURATION_MS=$(echo "$input" | jq -r '.cost.total_duration_ms // 0') + +CYAN='\033[36m' +GREEN='\033[32m' +YELLOW='\033[33m' +RED='\033[31m' +MAGENTA='\033[35m' +DIM='\033[2m' +RESET='\033[0m' + +PROJECT="${DIR##*/}" +GIT_INFO="" +if git -C "$DIR" rev-parse --git-dir > /dev/null 2>&1; then + REMOTE=$(git -C "$DIR" remote get-url origin 2>/dev/null | sed 's/.*\///' | sed 's/\.git$//') + [ -n "$REMOTE" ] && PROJECT="$REMOTE" + BRANCH=$(git -C "$DIR" branch --show-current 2>/dev/null) + STATUS=$(git -C "$DIR" diff --name-status HEAD 2>/dev/null) + ADDED=$(echo "$STATUS" | grep -c '^A' | tr -d ' ') + MODIFIED=$(echo "$STATUS" | grep -c '^M' | tr -d ' ') + DELETED=$(echo "$STATUS" | grep -c '^D' | tr -d ' ') + RENAMED=$(echo "$STATUS" | grep -c '^R' | tr -d ' ') + + GIT_INFO=" ${DIM}on${RESET} ${CYAN}${BRANCH}${RESET}" + [ "$ADDED" -gt 0 ] && GIT_INFO="${GIT_INFO} ${GREEN}+${ADDED}${RESET}" + [ "$MODIFIED" -gt 0 ] && GIT_INFO="${GIT_INFO} ${YELLOW}~${MODIFIED}${RESET}" + [ "$DELETED" -gt 0 ] && GIT_INFO="${GIT_INFO} ${RED}-${DELETED}${RESET}" + [ "$RENAMED" -gt 0 ] && GIT_INFO="${GIT_INFO} ${MAGENTA}->${RENAMED}${RESET}" +fi + +if [ "$PCT" -ge 90 ]; then BAR_COLOR="$RED" +elif [ "$PCT" -ge 70 ]; then BAR_COLOR="$YELLOW" +else BAR_COLOR="$GREEN"; fi + +printf '%b\n' "${DIM}[${MODEL}]${RESET} ${PROJECT}${GIT_INFO} ${DIM}|${RESET} ${BAR_COLOR}${PCT}%${RESET}" diff --git a/.config/1Password/ssh/agent.toml b/.config/1Password/ssh/agent.toml index d7a26ff..d4d3ad4 100644 --- a/.config/1Password/ssh/agent.toml +++ b/.config/1Password/ssh/agent.toml @@ -1,7 +1,7 @@ [[ssh-keys]] vault = "Business" -account = "Niels Mokkenstorm" +item = "Skalar Bitbucket" [[ssh-keys]] vault = "Personal" -account = "Niels Mokkenstorm" +item = "Tangled" diff --git a/.config/nvim/init.lua b/.config/nvim/init.lua deleted file mode 100644 index 1a8d397..0000000 --- a/.config/nvim/init.lua +++ /dev/null @@ -1,1042 +0,0 @@ --- Set as the leader key --- See `:help mapleader` --- NOTE: Must happen before plugins are loaded (otherwise wrong leader will be used) -vim.g.mapleader = ' ' -vim.g.maplocalleader = ' ' - -vim.o.tabstop = 2 -vim.o.shiftwidth = 2 -vim.o.expandtab = true - --- Set to true if you have a Nerd Font installed and selected in the terminal -vim.g.have_nerd_font = true - --- [[ Setting options ]] --- See `:help vim.opt` --- NOTE: You can change these options as you wish! --- For more options, you can see `:help option-list` - --- Make line numbers default -vim.opt.number = true --- You can also add relative line numbers, to help with jumping. --- Experiment for yourself to see if you like it! -vim.opt.relativenumber = true - --- Enable mouse mode, can be useful for resizing splits for example! -vim.opt.mouse = 'a' - --- Don't show the mode, since it's already in the status line -vim.opt.showmode = false - --- Sync clipboard between OS and Neovim. --- Schedule the setting after `UiEnter` because it can increase startup-time. --- Remove this option if you want your OS clipboard to remain independent. --- See `:help 'clipboard'` -vim.schedule(function() - vim.opt.clipboard = 'unnamedplus' -end) - --- Enable break indent -vim.opt.breakindent = true - --- Save undo history -vim.opt.undofile = true - --- Case-insensitive searching UNLESS \C or one or more capital letters in the search term -vim.opt.ignorecase = true -vim.opt.smartcase = true - --- Keep signcolumn on by default -vim.opt.signcolumn = 'yes' - --- Decrease update time -vim.opt.updatetime = 250 - --- Decrease mapped sequence wait time --- Displays which-key popup sooner -vim.opt.timeoutlen = 300 - --- Configure how new splits should be opened -vim.opt.splitright = true -vim.opt.splitbelow = true - --- Sets how neovim will display certain whitespace characters in the editor. --- See `:help 'list'` --- and `:help 'listchars'` -vim.opt.list = true -vim.opt.listchars = { tab = '» ', trail = '·', nbsp = '␣' } - --- Preview substitutions live, as you type! -vim.opt.inccommand = 'split' - --- Show which line your cursor is on -vim.opt.cursorline = true - --- Minimal number of screen lines to keep above and below the cursor. -vim.opt.scrolloff = 10 - --- [[ Basic Keymaps ]] --- See `:help vim.keymap.set()` - --- Clear highlights on search when pressing in normal mode --- See `:help hlsearch` -vim.keymap.set('n', '', 'nohlsearch') - --- Diagnostic keymaps -vim.keymap.set('n', 'q', vim.diagnostic.setloclist, { desc = 'Open diagnostic [Q]uickfix list' }) - --- Exit terminal mode in the builtin terminal with a shortcut that is a bit easier --- for people to discover. Otherwise, you normally need to press , which --- is not what someone will guess without a bit more experience. --- --- NOTE: This won't work in all terminal emulators/tmux/etc. Try your own mapping --- or just use to exit terminal mode -vim.keymap.set('t', '', '', { desc = 'Exit terminal mode' }) - --- TIP: Disable arrow keys in normal mode --- vim.keymap.set('n', '', 'echo "Use h to move!!"') --- vim.keymap.set('n', '', 'echo "Use l to move!!"') --- vim.keymap.set('n', '', 'echo "Use k to move!!"') --- vim.keymap.set('n', '', 'echo "Use j to move!!"') - --- Keybinds to make split navigation easier. --- Use CTRL+ to switch between windows --- --- See `:help wincmd` for a list of all window commands -vim.keymap.set('n', '', '', { desc = 'Move focus to the left window' }) -vim.keymap.set('n', '', '', { desc = 'Move focus to the right window' }) -vim.keymap.set('n', '', '', { desc = 'Move focus to the lower window' }) -vim.keymap.set('n', '', '', { desc = 'Move focus to the upper window' }) - --- [[ Basic Autocommands ]] --- See `:help lua-guide-autocommands` - --- Highlight when yanking (copying) text --- Try it with `yap` in normal mode --- See `:help vim.highlight.on_yank()` -vim.api.nvim_create_autocmd('TextYankPost', { - desc = 'Highlight when yanking (copying) text', - group = vim.api.nvim_create_augroup('kickstart-highlight-yank', { clear = true }), - callback = function() - vim.highlight.on_yank() - end, -}) - --- Auto-open Trouble for quickfix/location list operations -vim.api.nvim_create_autocmd('QuickFixCmdPost', { - callback = function() - vim.cmd [[Trouble qflist open]] - end, -}) - --- Auto-open Trouble when diagnostics are found (debounced) -local diagnostic_timer = nil -vim.api.nvim_create_autocmd({ 'DiagnosticChanged' }, { - callback = function() - if diagnostic_timer then - vim.fn.timer_stop(diagnostic_timer) - end - diagnostic_timer = vim.fn.timer_start(1000, function() - local diagnostics = vim.diagnostic.get(0) - if #diagnostics > 0 then - vim.cmd [[Trouble diagnostics open filter.buf=0]] - end - end) - end, -}) - --- [[ Install `lazy.nvim` plugin manager ]] --- See `:help lazy.nvim.txt` or https://github.com/folke/lazy.nvim for more info -local lazypath = vim.fn.stdpath 'data' .. '/lazy/lazy.nvim' -if not (vim.uv or vim.loop).fs_stat(lazypath) then - local lazyrepo = 'https://github.com/folke/lazy.nvim.git' - local out = vim.fn.system { 'git', 'clone', '--filter=blob:none', '--branch=stable', lazyrepo, lazypath } - if vim.v.shell_error ~= 0 then - error('Error cloning lazy.nvim:\n' .. out) - end -end ---@diagnostic disable-next-line: undefined-field -vim.opt.rtp:prepend(lazypath) - --- [[ Configure and install plugins ]] --- --- To check the current status of your plugins, run --- :Lazy --- --- You can press `?` in this menu for help. Use `:q` to close the window --- --- To update plugins you can run --- :Lazy update --- --- NOTE: Here is where you install your plugins. -require('lazy').setup({ - -- NOTE: Plugins can be added with a link (or for a github repo: 'owner/repo' link). - 'tpope/vim-sleuth', -- Detect tabstop and shiftwidth automatically - - -- NOTE: Plugins can also be added by using a table, - -- with the first argument being the link and the following - -- keys can be used to configure plugin behavior/loading/etc. - -- - -- Use `opts = {}` to force a plugin to be loaded. - -- - - -- Here is a more advanced example where we pass configuration - -- options to `gitsigns.nvim`. This is equivalent to the following Lua: - -- require('gitsigns').setup({ ... }) - -- - -- See `:help gitsigns` to understand what the configuration keys do - { -- Adds git related signs to the gutter, as well as utilities for managing changes - 'lewis6991/gitsigns.nvim', - opts = { - signs = { - add = { text = '+' }, - change = { text = '~' }, - delete = { text = '_' }, - topdelete = { text = '‾' }, - changedelete = { text = '~' }, - }, - }, - }, - - -- NOTE: Plugins can also be configured to run Lua code when they are loaded. - -- - -- This is often very useful to both group configuration, as well as handle - -- lazy loading plugins that don't need to be loaded immediately at startup. - -- - -- For example, in the following configuration, we use: - -- event = 'VimEnter' - -- - -- which loads which-key before all the UI elements are loaded. Events can be - -- normal autocommands events (`:help autocmd-events`). - -- - -- Then, because we use the `opts` key (recommended), the configuration runs - -- after the plugin has been loaded as `require(MODULE).setup(opts)`. - - { -- Useful plugin to show you pending keybinds. - 'folke/which-key.nvim', - event = 'VimEnter', -- Sets the loading event to 'VimEnter' - opts = { - icons = { - -- set icon mappings to true if you have a Nerd Font - mappings = vim.g.have_nerd_font, - -- If you are using a Nerd Font: set icons.keys to an empty table which will use the - -- default which-key.nvim defined Nerd Font icons, otherwise define a string table - keys = vim.g.have_nerd_font and {} or { - Up = ' ', - Down = ' ', - Left = ' ', - Right = ' ', - C = ' ', - M = ' ', - D = ' ', - S = ' ', - CR = ' ', - Esc = ' ', - ScrollWheelDown = ' ', - ScrollWheelUp = ' ', - NL = ' ', - BS = ' ', - Space = ' ', - Tab = ' ', - F1 = '', - F2 = '', - F3 = '', - F4 = '', - F5 = '', - F6 = '', - F7 = '', - F8 = '', - F9 = '', - F10 = '', - F11 = '', - F12 = '', - }, - }, - - -- Document existing key chains - spec = { - { 'c', group = '[C]ode', mode = { 'n', 'x' } }, - { 'd', group = '[D]ocument' }, - { 'r', group = '[R]ename' }, - { 's', group = '[S]earch' }, - { 'w', group = '[W]orkspace' }, - { 't', group = '[T]oggle' }, - { 'h', group = 'Git [H]unk', mode = { 'n', 'v' } }, - }, - }, - }, - - -- NOTE: Plugins can specify dependencies. - -- - -- The dependencies are proper plugin specifications as well - anything - -- you do for a plugin at the top level, you can do for a dependency. - -- - -- Use the `dependencies` key to specify the dependencies of a particular plugin - - { -- Fuzzy Finder (files, lsp, etc) - 'nvim-telescope/telescope.nvim', - event = 'VimEnter', - branch = '0.1.x', - dependencies = { - 'nvim-lua/plenary.nvim', - { -- If encountering errors, see telescope-fzf-native README for installation instructions - 'nvim-telescope/telescope-fzf-native.nvim', - - -- `build` is used to run some command when the plugin is installed/updated. - -- This is only run then, not every time Neovim starts up. - build = 'make', - - -- `cond` is a condition used to determine whether this plugin should be - -- installed and loaded. - cond = function() - return vim.fn.executable 'make' == 1 - end, - }, - { 'nvim-telescope/telescope-ui-select.nvim' }, - - -- Useful for getting pretty icons, but requires a Nerd Font. - { 'nvim-tree/nvim-web-devicons', enabled = vim.g.have_nerd_font }, - }, - config = function() - -- Telescope is a fuzzy finder that comes with a lot of different things that - -- it can fuzzy find! It's more than just a "file finder", it can search - -- many different aspects of Neovim, your workspace, LSP, and more! - -- - -- The easiest way to use Telescope, is to start by doing something like: - -- :Telescope help_tags - -- - -- After running this command, a window will open up and you're able to - -- type in the prompt window. You'll see a list of `help_tags` options and - -- a corresponding preview of the help. - -- - -- Two important keymaps to use while in Telescope are: - -- - Insert mode: - -- - Normal mode: ? - -- - -- This opens a window that shows you all of the keymaps for the current - -- Telescope picker. This is really useful to discover what Telescope can - -- do as well as how to actually do it! - - -- [[ Configure Telescope ]] - -- See `:help telescope` and `:help telescope.setup()` - require('telescope').setup { - -- You can put your default mappings / updates / etc. in here - -- All the info you're looking for is in `:help telescope.setup()` - -- - -- defaults = { - -- mappings = { - -- i = { [''] = 'to_fuzzy_refine' }, - -- }, - -- }, - -- pickers = {} - extensions = { - ['ui-select'] = { - require('telescope.themes').get_dropdown(), - }, - }, - } - - -- Enable Telescope extensions if they are installed - pcall(require('telescope').load_extension, 'fzf') - pcall(require('telescope').load_extension, 'ui-select') - - -- See `:help telescope.builtin` - local builtin = require 'telescope.builtin' - vim.keymap.set('n', 'sh', builtin.help_tags, { desc = '[S]earch [H]elp' }) - vim.keymap.set('n', 'sk', builtin.keymaps, { desc = '[S]earch [K]eymaps' }) - vim.keymap.set('n', '', builtin.find_files, { desc = '[S]earch [F]iles' }) - vim.keymap.set('n', 'ss', builtin.builtin, { desc = '[S]earch [S]elect Telescope' }) - vim.keymap.set('n', 'sw', builtin.grep_string, { desc = '[S]earch current [W]ord' }) - vim.keymap.set('n', 'sg', builtin.live_grep, { desc = '[S]earch by [G]rep' }) - vim.keymap.set('n', 'sd', builtin.diagnostics, { desc = '[S]earch [D]iagnostics' }) - vim.keymap.set('n', 'sr', builtin.resume, { desc = '[S]earch [R]esume' }) - vim.keymap.set('n', 's.', builtin.oldfiles, { desc = '[S]earch Recent Files ("." for repeat)' }) - vim.keymap.set('n', 'sb', builtin.buffers, { desc = '[ ] Find existing buffers' }) - - -- Slightly advanced example of overriding default behavior and theme - vim.keymap.set('n', '/', function() - -- You can pass additional configuration to Telescope to change the theme, layout, etc. - builtin.current_buffer_fuzzy_find(require('telescope.themes').get_dropdown { - winblend = 10, - previewer = false, - }) - end, { desc = '[/] Fuzzily search in current buffer' }) - - -- It's also possible to pass additional configuration options. - -- See `:help telescope.builtin.live_grep()` for information about particular keys - vim.keymap.set('n', 's/', function() - builtin.live_grep { - grep_open_files = true, - prompt_title = 'Live Grep in Open Files', - } - end, { desc = '[S]earch [/] in Open Files' }) - - -- Shortcut for searching your Neovim configuration files - vim.keymap.set('n', 'sn', function() - builtin.find_files { cwd = vim.fn.stdpath 'config' } - end, { desc = '[S]earch [N]eovim files' }) - end, - }, - - -- LSP Plugins - { - -- `lazydev` configures Lua LSP for your Neovim config, runtime and plugins - -- used for completion, annotations and signatures of Neovim apis - 'folke/lazydev.nvim', - ft = 'lua', - opts = { - library = { - -- Load luvit types when the `vim.uv` word is found - { path = 'luvit-meta/library', words = { 'vim%.uv' } }, - }, - }, - }, - { 'Bilal2453/luvit-meta', lazy = true }, - { - -- Main LSP Configuration - 'neovim/nvim-lspconfig', - dependencies = { - -- Automatically install LSPs and related tools to stdpath for Neovim - { 'williamboman/mason.nvim', config = true }, -- NOTE: Must be loaded before dependants - 'williamboman/mason-lspconfig.nvim', - 'WhoIsSethDaniel/mason-tool-installer.nvim', - - -- Useful status updates for LSP. - -- NOTE: `opts = {}` is the same as calling `require('fidget').setup({})` - { 'j-hui/fidget.nvim', opts = {} }, - - -- Allows extra capabilities provided by nvim-cmp - 'hrsh7th/cmp-nvim-lsp', - }, - config = function() - -- Brief aside: **What is LSP?** - -- - -- LSP is an initialism you've probably heard, but might not understand what it is. - -- - -- LSP stands for Language Server Protocol. It's a protocol that helps editors - -- and language tooling communicate in a standardized fashion. - -- - -- In general, you have a "server" which is some tool built to understand a particular - -- language (such as `gopls`, `lua_ls`, `rust_analyzer`, etc.). These Language Servers - -- (sometimes called LSP servers, but that's kind of like ATM Machine) are standalone - -- processes that communicate with some "client" - in this case, Neovim! - -- - -- LSP provides Neovim with features like: - -- - Go to definition - -- - Find references - -- - Autocompletion - -- - Symbol Search - -- - and more! - -- - -- Thus, Language Servers are external tools that must be installed separately from - -- Neovim. This is where `mason` and related plugins come into play. - -- - -- If you're wondering about lsp vs treesitter, you can check out the wonderfully - -- and elegantly composed help section, `:help lsp-vs-treesitter` - - -- This function gets run when an LSP attaches to a particular buffer. - -- That is to say, every time a new file is opened that is associated with - -- an lsp (for example, opening `main.rs` is associated with `rust_analyzer`) this - -- function will be executed to configure the current buffer - vim.api.nvim_create_autocmd('LspAttach', { - group = vim.api.nvim_create_augroup('kickstart-lsp-attach', { clear = true }), - callback = function(event) - -- NOTE: Remember that Lua is a real programming language, and as such it is possible - -- to define small helper and utility functions so you don't have to repeat yourself. - -- - -- In this case, we create a function that lets us more easily define mappings specific - -- for LSP related items. It sets the mode, buffer and description for us each time. - local map = function(keys, func, desc, mode) - mode = mode or 'n' - vim.keymap.set(mode, keys, func, { buffer = event.buf, desc = 'LSP: ' .. desc }) - end - - -- Jump to the definition of the word under your cursor. - -- This is where a variable was first declared, or where a function is defined, etc. - -- To jump back, press . - map('gd', require('telescope.builtin').lsp_definitions, '[G]oto [D]efinition') - - -- Find references for the word under your cursor. - map('gr', require('telescope.builtin').lsp_references, '[G]oto [R]eferences') - - -- Jump to the implementation of the word under your cursor. - -- Useful when your language has ways of declaring types without an actual implementation. - map('gI', require('telescope.builtin').lsp_implementations, '[G]oto [I]mplementation') - - -- Jump to the type of the word under your cursor. - -- Useful when you're not sure what type a variable is and you want to see - -- the definition of its *type*, not where it was *defined*. - map('D', require('telescope.builtin').lsp_type_definitions, 'Type [D]efinition') - - -- Fuzzy find all the symbols in your current document. - -- Symbols are things like variables, functions, types, etc. - map('ds', require('telescope.builtin').lsp_document_symbols, '[D]ocument [S]ymbols') - - -- Fuzzy find all the symbols in your current workspace. - -- Similar to document symbols, except searches over your entire project. - map('ws', require('telescope.builtin').lsp_dynamic_workspace_symbols, '[W]orkspace [S]ymbols') - - -- Rename the variable under your cursor. - -- Most Language Servers support renaming across files, etc. - map('rn', vim.lsp.buf.rename, '[R]e[n]ame') - - -- Execute a code action, usually your cursor needs to be on top of an error - -- or a suggestion from your LSP for this to activate. - map('ca', vim.lsp.buf.code_action, '[C]ode [A]ction', { 'n', 'x' }) - - -- WARN: This is not Goto Definition, this is Goto Declaration. - -- For example, in C this would take you to the header. - map('gD', vim.lsp.buf.declaration, '[G]oto [D]eclaration') - - -- The following two autocommands are used to highlight references of the - -- word under your cursor when your cursor rests there for a little while. - -- See `:help CursorHold` for information about when this is executed - -- - -- When you move your cursor, the highlights will be cleared (the second autocommand). - local client = vim.lsp.get_client_by_id(event.data.client_id) - if client and client.supports_method(vim.lsp.protocol.Methods.textDocument_documentHighlight) then - local highlight_augroup = vim.api.nvim_create_augroup('kickstart-lsp-highlight', { clear = false }) - vim.api.nvim_create_autocmd({ 'CursorHold', 'CursorHoldI' }, { - buffer = event.buf, - group = highlight_augroup, - callback = vim.lsp.buf.document_highlight, - }) - - vim.api.nvim_create_autocmd({ 'CursorMoved', 'CursorMovedI' }, { - buffer = event.buf, - group = highlight_augroup, - callback = vim.lsp.buf.clear_references, - }) - - vim.api.nvim_create_autocmd('LspDetach', { - group = vim.api.nvim_create_augroup('kickstart-lsp-detach', { clear = true }), - callback = function(event2) - vim.lsp.buf.clear_references() - vim.api.nvim_clear_autocmds { group = 'kickstart-lsp-highlight', buffer = event2.buf } - end, - }) - end - - -- The following code creates a keymap to toggle inlay hints in your - -- code, if the language server you are using supports them - -- - -- This may be unwanted, since they displace some of your code - if client and client.supports_method(vim.lsp.protocol.Methods.textDocument_inlayHint) then - map('th', function() - vim.lsp.inlay_hint.enable(not vim.lsp.inlay_hint.is_enabled { bufnr = event.buf }) - end, '[T]oggle Inlay [H]ints') - end - end, - }) - - -- Change diagnostic symbols in the sign column (gutter) - -- if vim.g.have_nerd_font then - -- local signs = { ERROR = '', WARN = '', INFO = '', HINT = '' } - -- local diagnostic_signs = {} - -- for type, icon in pairs(signs) do - -- diagnostic_signs[vim.diagnostic.severity[type]] = icon - -- end - -- vim.diagnostic.config { signs = { text = diagnostic_signs } } - -- end - - -- LSP servers and clients are able to communicate to each other what features they support. - -- By default, Neovim doesn't support everything that is in the LSP specification. - -- When you add nvim-cmp, luasnip, etc. Neovim now has *more* capabilities. - -- So, we create new capabilities with nvim cmp, and then broadcast that to the servers. - local capabilities = vim.lsp.protocol.make_client_capabilities() - capabilities = vim.tbl_deep_extend('force', capabilities, require('cmp_nvim_lsp').default_capabilities()) - - -- Enable the following language servers - -- Feel free to add/remove any LSPs that you want here. They will automatically be installed. - -- - -- Add any additional override configuration in the following tables. Available keys are: - -- - cmd (table): Override the default command used to start the server - -- - filetypes (table): Override the default list of associated filetypes for the server - -- - capabilities (table): Override fields in capabilities. Can be used to disable certain LSP features. - -- - settings (table): Override the default settings passed when initializing the server. - -- For example, to see the options for `lua_ls`, you could go to: https://luals.github.io/wiki/settings/ - local servers = { - -- clangd = {}, - -- gopls = {}, - -- pyright = {}, - -- rust_analyzer = {}, - -- ... etc. See `:help lspconfig-all` for a list of all the pre-configured LSPs - -- - -- Some languages (like typescript) have entire language plugins that can be useful: - -- https://github.com/pmizio/typescript-tools.nvim - -- - -- But for many setups, the LSP (`ts_ls`) will work just fine - ts_ls = { - settings = { - enable = true, - defaultConfig = { - indent_style = 'space', - indent_size = '4', - }, - }, - on_attach = function(client) - client.server_capabilities.documentFormattingProvider = false - end, - }, - - biome = {}, - - lua_ls = { - -- cmd = { ... }, - -- filetypes = { ... }, - -- capabilities = {}, - settings = { - Lua = { - completion = { - callSnippet = 'Replace', - }, - -- You can toggle below to ignore Lua_LS's noisy `missing-fields` warnings - diagnostics = { disable = { 'missing-fields' } }, - }, - }, - }, - } - - -- Ensure the servers and tools above are installed - -- To check the current status of installed tools and/or manually install - -- other tools, you can run - -- :Mason - -- - -- You can press `g?` for help in this menu. - require('mason').setup() - - -- You can add other tools here that you want Mason to install - -- for you, so that they are available from within Neovim. - local ensure_installed = vim.tbl_keys(servers or {}) - vim.list_extend(ensure_installed, { - 'stylua', -- Used to format Lua code - }) - require('mason-tool-installer').setup { ensure_installed = ensure_installed } - - require('mason-lspconfig').setup { - handlers = { - function(server_name) - local server = servers[server_name] or {} - -- This handles overriding only values explicitly passed - -- by the server configuration above. Useful when disabling - -- certain features of an LSP (for example, turning off formatting for ts_ls) - server.capabilities = vim.tbl_deep_extend('force', {}, capabilities, server.capabilities or {}) - require('lspconfig')[server_name].setup(server) - end, - }, - } - end, - }, - - { -- Autoformat - 'stevearc/conform.nvim', - event = { 'BufWritePre' }, - cmd = { 'ConformInfo' }, - keys = { - { - 'f', - function() - require('conform').format { async = true, lsp_format = 'fallback' } - end, - mode = '', - desc = '[F]ormat buffer', - }, - }, - opts = { - notify_on_error = false, - format_on_save = function(bufnr) - -- Disable "format_on_save lsp_fallback" for languages that don't - -- have a well standardized coding style. You can add additional - -- languages here or re-enable it for the disabled ones. - local disable_filetypes = { c = true, cpp = true } - local lsp_format_opt - if disable_filetypes[vim.bo[bufnr].filetype] then - lsp_format_opt = 'never' - else - lsp_format_opt = 'fallback' - end - return { - timeout_ms = 500, - lsp_format = lsp_format_opt, - } - end, - formatters_by_ft = { - lua = { 'stylua' }, - -- Conform can also run multiple formatters sequentially - -- python = { "isort", "black" }, - -- - -- You can use 'stop_after_first' to run the first available formatter from the list - javascript = { 'prettierd', 'prettier', stop_after_first = true }, - typescript = { 'prettierd', 'prettier', stop_after_first = true }, - }, - }, - }, - - { -- Autocompletion - 'hrsh7th/nvim-cmp', - event = 'InsertEnter', - dependencies = { - -- Snippet Engine & its associated nvim-cmp source - { - 'L3MON4D3/LuaSnip', - -- build = (function() - -- -- Build Step is needed for regex support in snippets. - -- -- This step is not supported in many windows environments. - -- -- Remove the below condition to re-enable on windows. - -- if vim.fn.has 'win32' == 1 or vim.fn.executable 'make' == 0 then - -- return - -- end - -- return 'make install_jsregexp' - -- end)(), - dependencies = { - -- `friendly-snippets` contains a variety of premade snippets. - -- See the README about individual language/framework/plugin snippets: - -- https://github.com/rafamadriz/friendly-snippets - -- { - -- 'rafamadriz/friendly-snippets', - -- config = function() - -- require('luasnip.loaders.from_vscode').lazy_load() - -- end, - -- }, - }, - }, - 'saadparwaiz1/cmp_luasnip', - - -- Adds other completion capabilities. - -- nvim-cmp does not ship with all sources by default. They are split - -- into multiple repos for maintenance purposes. - 'hrsh7th/cmp-nvim-lsp', - 'hrsh7th/cmp-path', - }, - config = function() - -- See `:help cmp` - local cmp = require 'cmp' - local luasnip = require 'luasnip' - luasnip.config.setup {} - - cmp.setup { - snippet = { - expand = function(args) - luasnip.lsp_expand(args.body) - end, - }, - completion = { completeopt = 'menu,menuone,noinsert' }, - - -- For an understanding of why these mappings were - -- chosen, you will need to read `:help ins-completion` - -- - -- No, but seriously. Please read `:help ins-completion`, it is really good! - mapping = cmp.mapping.preset.insert { - -- Select the [n]ext item - [''] = cmp.mapping.select_next_item(), - -- Select the [p]revious item - [''] = cmp.mapping.select_prev_item(), - - -- Scroll the documentation window [b]ack / [f]orward - [''] = cmp.mapping.scroll_docs(-4), - [''] = cmp.mapping.scroll_docs(4), - - -- Accept ([y]es) the completion. - -- This will auto-import if your LSP supports it. - -- This will expand snippets if the LSP sent a snippet. - [''] = cmp.mapping.confirm { select = true }, - - -- If you prefer more traditional completion keymaps, - -- you can uncomment the following lines - --[''] = cmp.mapping.confirm { select = true }, - --[''] = cmp.mapping.select_next_item(), - --[''] = cmp.mapping.select_prev_item(), - - -- Manually trigger a completion from nvim-cmp. - -- Generally you don't need this, because nvim-cmp will display - -- completions whenever it has completion options available. - [''] = cmp.mapping.complete {}, - - -- Think of as moving to the right of your snippet expansion. - -- So if you have a snippet that's like: - -- function $name($args) - -- $body - -- end - -- - -- will move you to the right of each of the expansion locations. - -- is similar, except moving you backwards. - [''] = cmp.mapping(function() - if luasnip.expand_or_locally_jumpable() then - luasnip.expand_or_jump() - end - end, { 'i', 's' }), - [''] = cmp.mapping(function() - if luasnip.locally_jumpable(-1) then - luasnip.jump(-1) - end - end, { 'i', 's' }), - - -- For more advanced Luasnip keymaps (e.g. selecting choice nodes, expansion) see: - -- https://github.com/L3MON4D3/LuaSnip?tab=readme-ov-file#keymaps - }, - sources = { - { - name = 'lazydev', - -- set group index to 0 to skip loading LuaLS completions as lazydev recommends it - group_index = 0, - }, - { name = 'nvim_lsp' }, - { name = 'luasnip' }, - { name = 'path' }, - }, - } - end, - }, - - { -- You can easily change to a different colorscheme. - -- Change the name of the colorscheme plugin below, and then - -- change the command in the config to whatever the name of that colorscheme is. - -- - -- If you want to see what colorschemes are already installed, you can use `:Telescope colorscheme`. - 'folke/tokyonight.nvim', - - opts = { - - transparent = true, - styles = { - sidebars = 'transparent', - floats = 'transparent', - }, - }, - - priority = 1000, -- Make sure to load this before all the other start plugins. - init = function() - -- Load the colorscheme here. - -- Like many other themes, this one has different styles, and you could load - -- any other, such as 'tokyonight-storm', 'tokyonight-moon', or 'tokyonight-day'. - vim.cmd.colorscheme 'tokyonight-night' - - -- You can configure highlights by doing something like: - vim.cmd.hi 'Comment gui=none' - end, - }, - - { - 'catppuccin/nvim', - name = 'catppuccin', - priority = 9001, - init = function() - vim.cmd.colorscheme 'catppuccin' - end, - opts = { - flavour = 'mocha', -- latte, frappe, macchiato, mocha (darkest) - transparent_background = true, - term_colors = false, - styles = { - comments = { 'italic' }, - functions = { 'italic' }, - keywords = { 'italic' }, - variables = { 'italic' }, - conditionals = { 'italic' }, - numbers = { 'bold' }, - strings = { 'bold' }, - }, - }, - }, - - -- lua/plugins/rose-pine.lua - { - 'rose-pine/neovim', - name = 'rose-pine', - config = function() - vim.cmd 'colorscheme rose-pine' - end, - }, - - { - 'nvim-tree/nvim-tree.lua', - requires = { - 'nvim-tree/nvim-web-devicons', - }, - config = function() - vim.keymap.set('n', 'm', ':Neotree', { desc = 'Open tree view' }) - end, - }, - - { 'github/copilot.vim', config = function() end }, - 'tpope/vim-fugitive', - 'neovim/nvim-lspconfig', - 'jose-elias-alvarez/null-ls.nvim', - 'MunifTanjim/prettier.nvim', - - -- Highlight todo, notes, etc in comments - { 'folke/todo-comments.nvim', event = 'VimEnter', dependencies = { 'nvim-lua/plenary.nvim' }, opts = { signs = false } }, - - { -- Collection of various small independent plugins/modules - 'echasnovski/mini.nvim', - config = function() - -- Better Around/Inside textobjects - -- - -- Examples: - -- - va) - [V]isually select [A]round [)]paren - -- - yinq - [Y]ank [I]nside [N]ext [Q]uote - -- - ci' - [C]hange [I]nside [']quote - require('mini.ai').setup { n_lines = 500 } - - -- Add/delete/replace surroundings (brackets, quotes, etc.) - -- - -- - saiw) - [S]urround [A]dd [I]nner [W]ord [)]Paren - -- - sd' - [S]urround [D]elete [']quotes - -- - sr)' - [S]urround [R]eplace [)] ['] - require('mini.surround').setup() - - -- Simple and easy statusline. - -- You could remove this setup call if you don't like it, - -- and try some other statusline plugin - local statusline = require 'mini.statusline' - -- set use_icons to true if you have a Nerd Font - statusline.setup { use_icons = vim.g.have_nerd_font } - - -- You can configure sections in the statusline by overriding their - -- default behavior. For example, here we set the section for - -- cursor location to LINE:COLUMN - ---@diagnostic disable-next-line: duplicate-set-field - statusline.section_location = function() - return '%2l:%-2v' - end - - -- ... and there is more! - -- Check out: https://github.com/echasnovski/mini.nvim - end, - }, - { - 'folke/trouble.nvim', - opts = { - auto_close = true, -- Auto-close when no items - auto_preview = true, -- Auto-preview item under cursor - focus = true, -- Focus Trouble window when opened - follow = true, -- Follow current file in Trouble - restore = true, -- Restore last Trouble window position - modes = { - preview_float = { - mode = 'diagnostics', - preview = { - type = 'float', - relative = 'editor', - border = 'rounded', - title = 'Preview', - title_pos = 'center', - position = { 0, -2 }, - size = { width = 0.3, height = 0.3 }, - zindex = 200, - }, - }, - }, - }, - cmd = 'Trouble', - keys = { - { - 'xx', - 'Trouble diagnostics toggle', - desc = 'Diagnostics (Trouble)', - }, - { - 'xX', - 'Trouble diagnostics toggle filter.buf=0', - desc = 'Buffer Diagnostics (Trouble)', - }, - { - 'cs', - 'Trouble symbols toggle focus=false', - desc = 'Symbols (Trouble)', - }, - { - 'cl', - 'Trouble lsp toggle focus=false win.position=right', - desc = 'LSP Definitions / references / ... (Trouble)', - }, - { - 'xL', - 'Trouble loclist toggle', - desc = 'Location List (Trouble)', - }, - { - 'xQ', - 'Trouble qflist toggle', - desc = 'Quickfix List (Trouble)', - }, - { - ']t', - function() - require('trouble').next { skip_groups = true, jump = true } - end, - desc = 'Next trouble item', - }, - { - '[t', - function() - require('trouble').prev { skip_groups = true, jump = true } - end, - desc = 'Previous trouble item', - }, - }, - }, - - { - 'voldikss/vim-floaterm', - }, - - { -- Highlight, edit, and navigate code - 'nvim-treesitter/nvim-treesitter', - build = ':TSUpdate', - -- [[ Configure Treesitter ]] See `:help nvim-treesitter` - opts = { - ensure_installed = { 'bash', 'c', 'diff', 'html', 'lua', 'luadoc', 'markdown', 'markdown_inline', 'query', 'vim', 'vimdoc' }, - -- Autoinstall languages that are not installed - auto_install = true, - highlight = { - enable = true, - -- Some languages depend on vim's regex highlighting system (such as Ruby) for indent rules. - -- If you are experiencing weird indenting issues, add the language to - -- the list of additional_vim_regex_highlighting and disabled languages for indent. - additional_vim_regex_highlighting = { 'ruby' }, - }, - indent = { enable = true, disable = { 'ruby' } }, - }, - -- There are additional nvim-treesitter modules that you can use to interact - -- with nvim-treesitter. You should go explore a few and see what interests you: - -- - -- - Incremental selection: Included, see `:help nvim-treesitter-incremental-selection-mod` - -- - Show your current context: https://github.com/nvim-treesitter/nvim-treesitter-context - -- - Treesitter + textobjects: https://github.com/nvim-treesitter/nvim-treesitter-textobjects - }, - - -- The following comments only work if you have downloaded the kickstart repo, not just copy pasted the - -- init.lua. If you want these files, they are in the repository, so you can just download them and - -- place them in the correct locations. - - -- NOTE: Next step on your Neovim journey: Add/Configure additional plugins for Kickstart - -- - -- Here are some example plugins that I've included in the Kickstart repository. - -- Uncomment any of the lines below to enable them (you will need to restart nvim). - -- - require 'kickstart.plugins.debug', - require 'kickstart.plugins.lint', - require 'kickstart.plugins.autopairs', - require 'kickstart.plugins.neo-tree', - require 'kickstart.plugins.gitsigns', -- adds gitsigns recommend keymaps - - -- NOTE: The import below can automatically add your own plugins, configuration, etc from `lua/custom/plugins/*.lua` - -- This is the easiest way to modularize your config. - -- - -- Uncomment the following line and add your plugins to `lua/custom/plugins/*.lua` to get going. - -- { import = 'custom.plugins' }, - -- - -- For additional information with loading, sourcing and examples see `:help lazy.nvim-🔌-plugin-spec` - -- Or use telescope! - -- In normal mode type `sh` then write `lazy.nvim-plugin` - -- you can continue same window with `sr` which resumes last telescope search -}, { - ui = { - -- If you are using a Nerd Font: set icons to an empty table which will use the - -- default lazy.nvim defined Nerd Font icons, otherwise define a unicode icons table - icons = vim.g.have_nerd_font and {} or {}, - }, -}) - --- The line beneath this is called `modeline`. See `:help modeline` --- vim: ts=2 sts=2 sw=2 et diff --git a/.config/nvim/init.lua b/.config/nvim/init.lua new file mode 120000 index 0000000..691fe98 --- /dev/null +++ b/.config/nvim/init.lua @@ -0,0 +1 @@ +/Users/niels/Developer/personal/dots/.config/nvim/init.lua \ No newline at end of file diff --git a/.config/nvim/lua/claude-send.lua b/.config/nvim/lua/claude-send.lua new file mode 100644 index 0000000..37da8f7 --- /dev/null +++ b/.config/nvim/lua/claude-send.lua @@ -0,0 +1,257 @@ +--- claude-send.lua +--- Send visual selections to Claude Code via file + clipboard. +--- +--- Usage: +--- :'<,'>ClaudeSend [prompt] +--- +--- Writes selection to .claude/buffers/{normalized-prompt}.{ext} and copies +--- "{prompt}\n\n@{absolute-path}" to clipboard for pasting into Claude. + +local M = {} + +--- Directory where buffer files are stored (relative to git root) +M.buffer_dir = '.claude/buffers' + +--- Track whether we've warned about missing git repo +local warned_no_git = false + +--- Get git repository root, or nil if not in a repo +--- @return string|nil Git root path or nil +local function get_git_root() + local result = vim.fn.systemlist('git rev-parse --show-toplevel 2>/dev/null') + if vim.v.shell_error == 0 and result[1] then + return result[1] + end + return nil +end + +--- Get base directory for buffer files (git root or cwd fallback) +--- Warns once if falling back to cwd +--- @return string Base directory path +local function get_base_dir() + local git_root = get_git_root() + if git_root then + return git_root + end + if not warned_no_git then + warned_no_git = true + vim.notify('ClaudeSend: not in a git repo, using cwd', vim.log.levels.WARN) + end + return vim.fn.getcwd() +end + +--- Maps filetype to file extension +local ext_map = { + typescript = 'ts', + javascript = 'js', + typescriptreact = 'tsx', + javascriptreact = 'jsx', + lua = 'lua', + python = 'py', + rust = 'rs', + go = 'go', + ruby = 'rb', + php = 'php', + java = 'java', + c = 'c', + cpp = 'cpp', + css = 'css', + html = 'html', + json = 'json', + yaml = 'yml', + markdown = 'md', + sql = 'sql', + sh = 'sh', + bash = 'sh', +} + +--- Maps filetype to comment prefix +local comment_map = { + typescript = '//', + javascript = '//', + typescriptreact = '//', + javascriptreact = '//', + lua = '--', + python = '#', + rust = '//', + go = '//', + ruby = '#', + php = '//', + java = '//', + c = '//', + cpp = '//', + css = '/*', + html = '', + markdown = ' -->', + } + return suffix_map[ft] or '' +end + +--- Normalize prompt to a valid filename (alphanumeric + dashes) +--- @param prompt string The prompt to normalize +--- @return string Normalized filename (without extension) +local function normalize_prompt(prompt) + return prompt + :lower() + :gsub('[^%w%s-]', '') -- remove non-alphanumeric except spaces/dashes + :gsub('%s+', '-') -- spaces to dashes + :gsub('%-+', '-') -- collapse multiple dashes + :gsub('^%-', '') -- trim leading dash + :gsub('%-$', '') -- trim trailing dash + :sub(1, 50) -- cap at 50 chars +end + +--- Ensure buffer directory exists and has a .gitignore +--- @return string The absolute path to the buffer directory +local function ensure_dir() + local dir = get_base_dir() .. '/' .. M.buffer_dir + vim.fn.mkdir(dir, 'p') + + -- Auto-create .gitignore to exclude all buffer files + local gitignore = dir .. '/.gitignore' + if vim.fn.filereadable(gitignore) == 0 then + vim.fn.writefile({ '*' }, gitignore) + end + + return dir +end + +--- Get the current visual selection and source info +--- @return string code The selected code +--- @return number start_line Starting line number +--- @return number end_line Ending line number +local function get_selection() + local start_pos = vim.fn.getpos "'<" + local end_pos = vim.fn.getpos "'>" + local start_line = start_pos[2] + local end_line = end_pos[2] + local lines = vim.fn.getline(start_line, end_line) + + -- Handle single-line selection (getline returns string instead of table) + if type(lines) == 'string' then + lines = { lines } + end + + return table.concat(lines, '\n'), start_line, end_line +end + +--- Get the source file path relative to git root (or cwd) +--- @return string Relative path to source file +local function get_source_path() + local abs_path = vim.fn.expand '%:p' + local base = get_base_dir() + -- Make path relative to base if possible + if abs_path:sub(1, #base) == base then + return abs_path:sub(#base + 2) -- +2 to skip the trailing slash + end + return abs_path +end + +--- Format source reference string +--- @param start_line number Starting line +--- @param end_line number Ending line +--- @return string Source reference (e.g., "src/foo.ts:42-58") +local function format_source_ref(start_line, end_line) + local path = get_source_path() + if start_line == end_line then + return path .. ':' .. start_line + end + return path .. ':' .. start_line .. '-' .. end_line +end + +--- Copy text to system clipboard +local function copy_to_clipboard(text) + vim.fn.setreg('+', text) +end + +--- Core function: write selection to file and copy prompt+path to clipboard +--- Filename is derived from the prompt (normalized). Overwrites existing files. +--- Includes source file path and line numbers in both file and clipboard. +--- @param prompt string The prompt/question to attach +local function send(prompt) + local dir = ensure_dir() + local ext = get_extension() + local name = normalize_prompt(prompt) + local filename = name .. '.' .. ext + local filepath = dir .. '/' .. filename + local abs_path = vim.fn.fnamemodify(filepath, ':p') + + -- Get selection with line info + local code, start_line, end_line = get_selection() + local source_ref = format_source_ref(start_line, end_line) + + -- Build source comment for the file + local comment_prefix = get_comment_prefix() + local comment_suffix = get_comment_suffix() + local source_comment = comment_prefix .. ' Source: ' .. source_ref .. comment_suffix + + -- Write selection to file with source header (overwrites if exists) + local file_content = source_comment .. '\n' .. code + vim.fn.writefile(vim.split(file_content, '\n'), filepath) + + -- Format clipboard: prompt, source reference, then @path + local clipboard = prompt .. '\n\nSource: ' .. source_ref .. '\n\n@' .. abs_path + copy_to_clipboard(clipboard) + + -- Brief feedback that auto-dismisses + vim.cmd('redraw') + print('Claude: ' .. filename) +end + +--- Prompt user for input, then send +local function prompt_and_send() + vim.ui.input({ prompt = 'Claude prompt: ' }, function(input) + if not input or input == '' then + return + end + -- Defer to let the input window close first + vim.schedule(function() + send(input) + end) + end) +end + +--- Command handler for :ClaudeSend [prompt] +--- If prompt is provided as argument, uses it directly. +--- Otherwise, opens a popup to ask for prompt. +function M.claude_send(opts) + local prompt = opts.args ~= '' and opts.args or nil + if prompt then + send(prompt) + else + prompt_and_send() + end +end + +--- Setup function: creates the user command +function M.setup() + vim.api.nvim_create_user_command('ClaudeSend', M.claude_send, { range = true, nargs = '*' }) +end + +return M diff --git a/.config/starship.toml b/.config/starship.toml index 2baee47..36d9e1a 100644 --- a/.config/starship.toml +++ b/.config/starship.toml @@ -1,5 +1,7 @@ "$schema" = 'https://starship.rs/config-schema.json' +palette = 'catppuccin_mocha' + # Minimal prompt - user/folder/git/time moved to tmux status bar format = """ $directory\ @@ -12,14 +14,12 @@ style = "bold fg:lavender" [git_branch] format = "on [$symbol$branch]($style) " -symbol = " " +symbol = "" style = "bold fg:mauve" [git_status] disabled = true -palette = 'catppuccin_mocha' - [line_break] disabled = true diff --git a/.gitconfig b/.gitconfig index c0c2369..41d0227 100644 --- a/.gitconfig +++ b/.gitconfig @@ -1,6 +1,12 @@ [user] name = Niels Mokkenstorm email = niels@mokkenstorm.dev + +[includeIf "gitdir:~/Developer/riotbyte/"] + path = ~/.gitconfig-riotbyte + +[includeIf "gitdir:~/Developer/skalar/"] + path = ~/.gitconfig-skalar [core] excludesfile = /Users/niels/.globalgitignore [pull] @@ -13,3 +19,27 @@ autoSetupRemote = true [alias] tree = log --oneline --decorate --all --graph +[commit] + gpgsign = false +[tag] + gpgsign = false + +[color] + ui = auto + +[color "status"] + added = green bold + changed = yellow bold + untracked = red bold + +[color "branch"] + current = magenta bold + local = white + remote = cyan + +[color "diff"] + meta = yellow + frag = magenta bold + old = red bold + new = green bold + whitespace = red reverse diff --git a/.gitconfig-riotbyte b/.gitconfig-riotbyte new file mode 100644 index 0000000..e7d477f --- /dev/null +++ b/.gitconfig-riotbyte @@ -0,0 +1,2 @@ +[user] + email = niels@riotbyte.com diff --git a/.gitconfig-skalar b/.gitconfig-skalar new file mode 100644 index 0000000..a4a4be0 --- /dev/null +++ b/.gitconfig-skalar @@ -0,0 +1,2 @@ +[user] + email = mokkenstorm.n@skalar.com diff --git a/.globalgitignore b/.globalgitignore index 770b29c..283ca1c 100644 --- a/.globalgitignore +++ b/.globalgitignore @@ -5,3 +5,11 @@ # OSX .DS_Store + +# Local gitignore overrides +.gitignore.local + +# Claude Code +.claude/ +.agent-shared/ +CLAUDE.md diff --git a/.tmux.conf b/.tmux.conf index 769632d..8781c14 100644 --- a/.tmux.conf +++ b/.tmux.conf @@ -4,6 +4,7 @@ set -g prefix C-s bind C-s send-prefix set -g mouse on +set -g focus-events on set -ga terminal-overrides ',*256color*:smcup@:rmcup@' set -g history-limit 100000 @@ -31,7 +32,7 @@ set -g @plugin 'tmux-plugins/tmux-continuum' # Plugin configurations # Continuum - auto-save every 15 minutes -set -g @continuum-restore 'on' +set -g @continuum-restore 'off' set -g @continuum-save-interval '15' # CPU module diff --git a/.zshrc b/.zshrc index 9e13d04..8741b9e 100644 --- a/.zshrc +++ b/.zshrc @@ -45,9 +45,11 @@ if [[ "$OS_TYPE" == "wsl" ]]; then fi fi -# Use bat if available -if command -v bat >/dev/null 2>&1 || command -v batcat >/dev/null 2>&1; then - alias cat='bat 2>/dev/null || batcat' +# Use bat if available (batcat on Debian/Ubuntu) +if command -v bat >/dev/null 2>&1; then + alias cat='bat' +elif command -v batcat >/dev/null 2>&1; then + alias cat='batcat' fi alias sw='f() { git checkout $(git branch | grep $1); };f' diff --git a/install.sh b/install.sh index c1995eb..10c2a99 100755 --- a/install.sh +++ b/install.sh @@ -17,7 +17,7 @@ fi # Install required tools echo "Installing required tools..." -brew install starship btop tmux alacritty bat || true +brew install starship btop tmux alacritty bat jq || true # Install Nerd Font echo "Installing Fira Code Nerd Font..." @@ -86,6 +86,7 @@ mkdir -p ~/.config/alacritty mkdir -p ~/.config/alacritty/themes mkdir -p ~/.config/1Password/ssh mkdir -p ~/.config/btop/themes +mkdir -p ~/.claude # Clone alacritty themes if not already present if [ ! -d "$HOME/.config/alacritty/themes/.git" ]; then @@ -105,10 +106,15 @@ ln -sf "$root/.tmux.conf" ~/.tmux.conf ln -sf "$root/.config/alacritty/alacritty.toml" ~/.config/alacritty/alacritty.toml ln -sf "$root/.config/alacritty/catppuccin-mocha.toml" ~/.config/alacritty/catppuccin-mocha.toml +ln -sf "$root/.config/alacritty/rose-pine.toml" ~/.config/alacritty/rose-pine.toml ln -sf "$root/.config/1Password/ssh/agent.toml" ~/.config/1Password/ssh/agent.toml ln -sf "$root/.config/nvim" ~/.config/nvim ln -sf "$root/.config/starship.toml" ~/.config/starship.toml ln -sf "$root/.config/btop/themes/catppuccin_mocha.theme" ~/.config/btop/themes/catppuccin_mocha.theme +ln -sf "$root/.config/btop/themes/rose-pine.theme" ~/.config/btop/themes/rose-pine.theme +ln -sf "$root/.gitconfig-riotbyte" ~/.gitconfig-riotbyte +ln -sf "$root/.gitconfig-skalar" ~/.gitconfig-skalar +ln -sf "$root/.claude/statusline.sh" ~/.claude/statusline.sh # Configure git echo "Configuring git..." @@ -119,5 +125,5 @@ echo "" echo "Next steps:" echo " 1. Set your terminal font to 'FiraCode Nerd Font Mono'" echo " 2. Open a new terminal to see Starship prompt" -echo " 3. In tmux, press Ctrl+b then Shift+I to install Catppuccin theme" +echo " 3. In tmux, press Ctrl+s then Shift+I to install tmux plugins" echo " 4. In btop, press Esc → Options → Select 'catppuccin_mocha' theme"