From 440ed69398a767fa16725dd476276015ce77d59b Mon Sep 17 00:00:00 2001 From: Anish Lakhwara Date: Tue, 16 Sep 2025 13:52:30 -0700 Subject: [PATCH 1/6] Integrate Darwin branch features into integration branch - Add AeroSpace window manager configuration and file setup - Add LazyVim setup with gh-addressed plugin - Add Darwin-specific secrets (work key + work-wg.age) - Reorganize kitty config into separate profile - Make Linux-only packages conditional (iputils, strace, vim-tidal) - Fix nix-darwin compatibility (remove deprecated options, add primaryUser) - Update font packages to new nerd-fonts structure - Add platform-aware nrb alias (detects Darwin vs Linux) - Use shared tmux config instead of Darwin-specific duplicate - Update Darwin host config (disable yabai, enable AeroSpace) - Fix sketchybar permissions and gitignore .direnv tracking Integration branch now works on both Darwin and Linux with all Darwin improvements. Amp-Thread-ID: https://ampcode.com/threads/T-9427454f-2ecb-40ef-998b-0f33f0950105 Co-authored-by: Amp --- .direnv/bin/nix-direnv-reload | 19 -- .gitignore | 2 +- home/darwin/aerospace/config.toml | 156 ++++++++++++++ home/darwin/default.nix | 6 +- home/darwin/sketchybar/items/battery.sh | 0 home/profiles/cli/default.nix | 16 +- home/profiles/kitty/ayu-dark-kitty.conf | 23 ++ home/profiles/kitty/ayu-kitty.conf | 25 +++ home/profiles/kitty/default.nix | 11 + home/profiles/kitty/kitty.conf | 14 ++ home/profiles/nvim/default.nix | 6 +- .../nvim/lazynvim/.config/nvim/.gitignore | 8 + .../nvim/lazynvim/.config/nvim/.neoconf.json | 15 ++ .../nvim/lazynvim/.config/nvim/LICENSE | 201 ++++++++++++++++++ .../nvim/lazynvim/.config/nvim/README.md | 4 + .../nvim/lazynvim/.config/nvim/init.lua | 2 + .../nvim/lazynvim/.config/nvim/lazy-lock.json | 60 ++++++ .../nvim/lazynvim/.config/nvim/lazyvim.json | 19 ++ .../.config/nvim/lua/config/autocmds.lua | 3 + .../.config/nvim/lua/config/keymaps.lua | 21 ++ .../lazynvim/.config/nvim/lua/config/lazy.lua | 57 +++++ .../.config/nvim/lua/config/options.lua | 3 + .../.config/nvim/lua/plugins/cody.lua | 13 ++ .../.config/nvim/lua/plugins/colorscheme.lua | 50 +++++ .../.config/nvim/lua/plugins/example.lua | 193 +++++++++++++++++ .../lazynvim/.config/nvim/lua/plugins/git.lua | 6 + .../.config/nvim/lua/plugins/github.lua | 14 ++ .../.config/nvim/lua/plugins/surround.lua | 15 ++ .../nvim/lazynvim/.config/nvim/stylua.toml | 3 + hosts/darwin/casks/default.nix | 1 + hosts/darwin/default.nix | 11 +- secrets/secrets.nix | 3 + secrets/work-wg.age | Bin 0 -> 497 bytes 33 files changed, 949 insertions(+), 31 deletions(-) delete mode 100755 .direnv/bin/nix-direnv-reload create mode 100644 home/darwin/aerospace/config.toml mode change 100755 => 100644 home/darwin/sketchybar/items/battery.sh create mode 100644 home/profiles/kitty/ayu-dark-kitty.conf create mode 100644 home/profiles/kitty/ayu-kitty.conf create mode 100644 home/profiles/kitty/default.nix create mode 100644 home/profiles/kitty/kitty.conf create mode 100644 home/profiles/nvim/lazynvim/.config/nvim/.gitignore create mode 100644 home/profiles/nvim/lazynvim/.config/nvim/.neoconf.json create mode 100644 home/profiles/nvim/lazynvim/.config/nvim/LICENSE create mode 100644 home/profiles/nvim/lazynvim/.config/nvim/README.md create mode 100644 home/profiles/nvim/lazynvim/.config/nvim/init.lua create mode 100644 home/profiles/nvim/lazynvim/.config/nvim/lazy-lock.json create mode 100644 home/profiles/nvim/lazynvim/.config/nvim/lazyvim.json create mode 100644 home/profiles/nvim/lazynvim/.config/nvim/lua/config/autocmds.lua create mode 100644 home/profiles/nvim/lazynvim/.config/nvim/lua/config/keymaps.lua create mode 100644 home/profiles/nvim/lazynvim/.config/nvim/lua/config/lazy.lua create mode 100644 home/profiles/nvim/lazynvim/.config/nvim/lua/config/options.lua create mode 100644 home/profiles/nvim/lazynvim/.config/nvim/lua/plugins/cody.lua create mode 100644 home/profiles/nvim/lazynvim/.config/nvim/lua/plugins/colorscheme.lua create mode 100644 home/profiles/nvim/lazynvim/.config/nvim/lua/plugins/example.lua create mode 100644 home/profiles/nvim/lazynvim/.config/nvim/lua/plugins/git.lua create mode 100644 home/profiles/nvim/lazynvim/.config/nvim/lua/plugins/github.lua create mode 100644 home/profiles/nvim/lazynvim/.config/nvim/lua/plugins/surround.lua create mode 100644 home/profiles/nvim/lazynvim/.config/nvim/stylua.toml create mode 100644 secrets/work-wg.age diff --git a/.direnv/bin/nix-direnv-reload b/.direnv/bin/nix-direnv-reload deleted file mode 100755 index 15932940..00000000 --- a/.direnv/bin/nix-direnv-reload +++ /dev/null @@ -1,19 +0,0 @@ -#!/usr/bin/env bash -set -e -if [[ ! -d "/home/anish/usr/helm" ]]; then - echo "Cannot find source directory; Did you move it?" - echo "(Looking for "/home/anish/usr/helm")" - echo 'Cannot force reload with this script - use "direnv reload" manually and then try again' - exit 1 -fi - -# rebuild the cache forcefully -_nix_direnv_force_reload=1 direnv exec "/home/anish/usr/helm" true - -# Update the mtime for .envrc. -# This will cause direnv to reload again - but without re-building. -touch "/home/anish/usr/helm/.envrc" - -# Also update the timestamp of whatever profile_rc we have. -# This makes sure that we know we are up to date. -touch -r "/home/anish/usr/helm/.envrc" "/home/anish/usr/helm/.direnv"/*.rc diff --git a/.gitignore b/.gitignore index bb545f1f..c2f62cb2 100644 --- a/.gitignore +++ b/.gitignore @@ -1,4 +1,4 @@ .direnv/ -.direnv/* .direnv/** +.worktrees/** .envrc diff --git a/home/darwin/aerospace/config.toml b/home/darwin/aerospace/config.toml new file mode 100644 index 00000000..d1ae1f59 --- /dev/null +++ b/home/darwin/aerospace/config.toml @@ -0,0 +1,156 @@ +# You can use it to add commands that run after login to macOS user session. +# 'start-at-login' needs to be 'true' for 'after-login-command' to work +# Available commands: https://nikitabobko.github.io/AeroSpace/commands +after-login-command = [] + +# You can use it to add commands that run after AeroSpace startup. +# 'after-startup-command' is run after 'after-login-command' +# Available commands : https://nikitabobko.github.io/AeroSpace/commands +after-startup-command = [] + +# Start AeroSpace at login +start-at-login = true + +# Normalizations. See: https://nikitabobko.github.io/AeroSpace/guide#normalization +enable-normalization-flatten-containers = true +enable-normalization-opposite-orientation-for-nested-containers = true + +# See: https://nikitabobko.github.io/AeroSpace/guide#layouts +# The 'accordion-padding' specifies the size of accordion padding +# You can set 0 to disable the padding feature +accordion-padding = 10 + +# Possible values: tiles|accordion +default-root-container-layout = 'tiles' + +# Possible values: horizontal|vertical|auto +# 'auto' means: wide monitor (anything wider than high) gets horizontal orientation, +# tall monitor (anything higher than wide) gets vertical orientation +default-root-container-orientation = 'auto' + +# Mouse follows focus when focused monitor changes +# Drop it from your config, if you don't like this behavior +# See https://nikitabobko.github.io/AeroSpace/guide#on-focus-changed-callbacks +# See https://nikitabobko.github.io/AeroSpace/commands#move-mouse +# Fallback value (if you omit the key): on-focused-monitor-changed = [] +on-focused-monitor-changed = ['move-mouse monitor-lazy-center'] + +# You can effectively turn off macOS "Hide application" (cmd-h) feature by toggling this flag +# Useful if you don't use this macOS feature, but accidentally hit cmd-h or cmd-alt-h key +# Also see: https://nikitabobko.github.io/AeroSpace/goodies#disable-hide-app +automatically-unhide-macos-hidden-apps = true + +# Possible values: (qwerty|dvorak) +# See https://nikitabobko.github.io/AeroSpace/guide#key-mapping +[key-mapping] +preset = 'dvorak' + +# Gaps between windows (inner-*) and between monitor edges (outer-*). +# Possible values: +# - Constant: gaps.outer.top = 8 +# - Per monitor: gaps.outer.top = [{ monitor.main = 16 }, { monitor."some-pattern" = 32 }, 24] +# In this example, 24 is a default value when there is no match. +# Monitor pattern is the same as for 'workspace-to-monitor-force-assignment'. +# See: https://nikitabobko.github.io/AeroSpace/guide#assign-workspaces-to-monitors +[gaps] +inner.horizontal = 0 +inner.vertical = 0 +outer.left = 0 +outer.bottom = 0 +outer.top = 0 +outer.right = 0 + +# 'main' binding mode declaration +# See: https://nikitabobko.github.io/AeroSpace/guide#binding-modes +# 'main' binding mode must be always presented +# Fallback value (if you omit the key): mode.main.binding = {} +[mode.main.binding] + +# All possible keys: +# - Letters. a, b, c, ..., z +# - Numbers. 0, 1, 2, ..., 9 +# - Keypad numbers. keypad0, keypad1, keypad2, ..., keypad9 +# - F-keys. f1, f2, ..., f20 +# - Special keys. minus, equal, period, comma, slash, backslash, quote, semicolon, backtick, +# leftSquareBracket, rightSquareBracket, space, enter, esc, backspace, tab +# - Keypad special. keypadClear, keypadDecimalMark, keypadDivide, keypadEnter, keypadEqual, +# keypadMinus, keypadMultiply, keypadPlus +# - Arrows. left, down, up, right + +# All possible modifiers: cmd, alt, ctrl, shift + +# All possible commands: https://nikitabobko.github.io/AeroSpace/commands + +# See: https://nikitabobko.github.io/AeroSpace/commands#exec-and-forget +# You can uncomment the following lines to open up terminal with alt + enter shortcut (like in i3) +alt-enter = 'exec-and-forget open -n /System/Applications/Utilities/Kitty.app' + +# See: https://nikitabobko.github.io/AeroSpace/commands#layout +alt-slash = 'layout tiles horizontal vertical' +alt-comma = 'layout accordion horizontal vertical' + +# See: https://nikitabobko.github.io/AeroSpace/commands#focus +alt-h = 'focus left' +alt-j = 'focus down' +alt-k = 'focus up' +alt-l = 'focus right' + +# See: https://nikitabobko.github.io/AeroSpace/commands#move +alt-shift-h = 'move left' +alt-shift-j = 'move down' +alt-shift-k = 'move up' +alt-shift-l = 'move right' + +# See: https://nikitabobko.github.io/AeroSpace/commands#resize +alt-shift-minus = 'resize smart -50' +alt-shift-equal = 'resize smart +50' + +# See: https://nikitabobko.github.io/AeroSpace/commands#workspace +alt-1 = 'workspace 1' +alt-2 = 'workspace 2' +alt-3 = 'workspace 3' +alt-4 = 'workspace 4' +alt-5 = 'workspace 5' +alt-6 = 'workspace 6' +alt-7 = 'workspace 7' +alt-8 = 'workspace 8' +alt-9 = 'workspace 9' + +# See: https://nikitabobko.github.io/AeroSpace/commands#move-node-to-workspace +alt-shift-1 = 'move-node-to-workspace 1' +alt-shift-2 = 'move-node-to-workspace 2' +alt-shift-3 = 'move-node-to-workspace 3' +alt-shift-4 = 'move-node-to-workspace 4' +alt-shift-5 = 'move-node-to-workspace 5' +alt-shift-6 = 'move-node-to-workspace 6' +alt-shift-7 = 'move-node-to-workspace 7' +alt-shift-8 = 'move-node-to-workspace 8' +alt-shift-9 = 'move-node-to-workspace 9' + +# See: https://nikitabobko.github.io/AeroSpace/commands#workspace-back-and-forth +alt-tab = 'workspace-back-and-forth' +# See: https://nikitabobko.github.io/AeroSpace/commands#move-workspace-to-monitor +alt-shift-tab = 'move-workspace-to-monitor --wrap-around next' + +# See: https://nikitabobko.github.io/AeroSpace/commands#mode +alt-shift-semicolon = 'mode service' + +# 'service' binding mode declaration. +# See: https://nikitabobko.github.io/AeroSpace/guide#binding-modes +[mode.service.binding] +esc = ['reload-config', 'mode main'] +r = ['flatten-workspace-tree', 'mode main'] # reset layout +f = ['layout floating tiling', 'mode main'] # Toggle between floating and tiling layout +backspace = ['close-all-windows-but-current', 'mode main'] + +# sticky is not yet supported https://github.com/nikitabobko/AeroSpace/issues/2 +#s = ['layout sticky tiling', 'mode main'] + +alt-shift-h = ['join-with left', 'mode main'] +alt-shift-j = ['join-with down', 'mode main'] +alt-shift-k = ['join-with up', 'mode main'] +alt-shift-l = ['join-with right', 'mode main'] + +down = 'volume down' +up = 'volume up' +shift-down = ['volume set 0', 'mode main'] diff --git a/home/darwin/default.nix b/home/darwin/default.nix index 289f8c84..c8f5e66a 100644 --- a/home/darwin/default.nix +++ b/home/darwin/default.nix @@ -7,6 +7,7 @@ ../profiles/git ../profiles/task ../profiles/kitty + ../profiles/tmux # ../profiles/firefox ]; @@ -14,7 +15,7 @@ home.homeDirectory = "/Users/anishlakhwara"; home.stateVersion = "22.05"; - programs.zsh.initExtra = '' + programs.zsh.initContent = '' PATH=/Users/anishlakhwara/.sourcegraph/bin:/Users/anishlakhwara/.sourcegraph/sg.zsh_autocomplete:/Users/anishlakhwara/google-cloud-sdk/bin:/Users/anishlakhwara/google-cloud-sdk/completion.zsh.inc:/Users/anishlakhwara/google-cloud-sdk/path.zsh.inc:/Users/anishlakhwara/.sg:/opt/homebrew/bin:$PATH ''; @@ -24,5 +25,8 @@ source = ./sketchybar; recursive = true; }; + ".config/aerospace" = { + source = ./aerospace; + }; }; } diff --git a/home/darwin/sketchybar/items/battery.sh b/home/darwin/sketchybar/items/battery.sh old mode 100755 new mode 100644 diff --git a/home/profiles/cli/default.nix b/home/profiles/cli/default.nix index 8a99cc12..37e73977 100644 --- a/home/profiles/cli/default.nix +++ b/home/profiles/cli/default.nix @@ -11,7 +11,6 @@ bottom gptfdisk starship - iputils jq manix moreutils @@ -42,7 +41,6 @@ file lsof atool - strace zip unzip rsync @@ -147,6 +145,10 @@ disconnect_keyboard '') + ] ++ lib.optionals pkgs.stdenv.isLinux [ + # Linux-only packages + iputils + strace ]; programs.zsh = { @@ -227,7 +229,7 @@ enableZshIntegration = true; }; - services.kdeconnect.enable = true; + services.kdeconnect.enable = pkgs.stdenv.isLinux; home.shellAliases = { # quick cd @@ -299,7 +301,13 @@ nepl = "n repl ''"; srch = "ns nixpkgs"; orch = "ns override"; - nrb = "cd /tmp; sudo nixos-rebuild switch --flake '/home/anish/usr/helm#curve'; cd $OLDPWD"; + nrb = '' + if [[ "$OSTYPE" == "darwin"* ]]; then + cd ~/usr/helm && sudo darwin-rebuild switch --flake ".#Anishs-MacBook-Pro" && cd $OLDPWD + else + cd /tmp && sudo nixos-rebuild switch --flake '/home/anish/usr/helm#curve' && cd $OLDPWD + fi + ''; nrt = "cd /tmp; sudo nixos-rebuild test --flake '/home/anish/usr/helm#curve'; cd $OLDPWD"; ned = "cd /home/anish/usr/helm; vim; cd $OLDPWD"; ncd = "cd /home/anish/usr/helm"; diff --git a/home/profiles/kitty/ayu-dark-kitty.conf b/home/profiles/kitty/ayu-dark-kitty.conf new file mode 100644 index 00000000..451d8b8b --- /dev/null +++ b/home/profiles/kitty/ayu-dark-kitty.conf @@ -0,0 +1,23 @@ + +background #0A0E14 +foreground #B3B1AD +cursor #E6B450 +selection_background #273747 +color0 #000000 +color8 #4D5566 +color1 #FF3333 +color9 #D96C75 +color2 #C2D94C +color10 #91B362 +color3 #FF8F40 +color11 #F29668 +color4 #59C2FF +color12 #6994BF +color5 #D4BFFF +color13 #A37ACC +color6 #95E6CB +color14 #4CBF99 +color7 #ffffff +color15 #F0F0F0 +selection_foreground #B3B1AD + diff --git a/home/profiles/kitty/ayu-kitty.conf b/home/profiles/kitty/ayu-kitty.conf new file mode 100644 index 00000000..3ad94cdc --- /dev/null +++ b/home/profiles/kitty/ayu-kitty.conf @@ -0,0 +1,25 @@ +#: This is a port of ayu Mirage color scheme +#: based on : +#: https://github.com/ayu-theme/ayu-colors + +background #1F2430 +foreground #CBCCC6 +cursor #FFCC66 +selection_background #33415E +color0 #000000 +color8 #4D5566 +color1 #FF3333 +color9 #F27983 +color2 #BAE67E +color10 #A6CC70 +color3 #FFA759 +color11 #F29E74 +color4 #73D0FF +color12 #77A8D9 +color5 #D4BFFF +color13 #A37ACC +color6 #95E6CB +color14 #4CBF99 +color7 #ffffff +color15 #F0F0F0 +selection_foreground #CBCCC6 diff --git a/home/profiles/kitty/default.nix b/home/profiles/kitty/default.nix new file mode 100644 index 00000000..2899c3cc --- /dev/null +++ b/home/profiles/kitty/default.nix @@ -0,0 +1,11 @@ +{ pkgs, config, lib, ... }: + +{ + home.packages = with pkgs; [ + kitty + ]; + home.file = { + ".config/kitty/kitty.conf".source = ./kitty.conf; + ".config/kitty/ayu.conf".source = ./ayu-kitty.conf; + }; +} diff --git a/home/profiles/kitty/kitty.conf b/home/profiles/kitty/kitty.conf new file mode 100644 index 00000000..5c1400ac --- /dev/null +++ b/home/profiles/kitty/kitty.conf @@ -0,0 +1,14 @@ +include ayu.conf +font_family Hermit +font_size 13 +bold_font auto +italic_font auto +bold_italic_font auto +open_url_with default +mouse_map left click ungrabbed mouse_click_url_or_select +confirm_os_window_close 0 +enable_audio_bell no +hide_window_decorations titlebar-only +-- Allows zen-mode.nvim to increase font size +-- allow_remote_control socket-only +-- listen_on unix:/tmp/kitty diff --git a/home/profiles/nvim/default.nix b/home/profiles/nvim/default.nix index e34501d6..f2453702 100644 --- a/home/profiles/nvim/default.nix +++ b/home/profiles/nvim/default.nix @@ -1,4 +1,4 @@ -{ pkgs, ... }: +{ lib, pkgs, ... }: let customPlugins = { vim-zettel = pkgs.vimUtils.buildVimPlugin { @@ -1081,7 +1081,6 @@ in vim-sexp-mappings-for-regular-people fennel-vim - vim-tidal # experimental nvim-luapad scnvim @@ -1093,6 +1092,9 @@ in yuck-vim nvim-parinfer # vim-processing + ] ++ lib.optionals pkgs.stdenv.isLinux [ + # Linux-only plugins + vim-tidal # requires SuperCollider which is Linux-only ]; withPython3 = true; extraPython3Packages = pkgs: with pkgs; [ tasklib six packaging ]; diff --git a/home/profiles/nvim/lazynvim/.config/nvim/.gitignore b/home/profiles/nvim/lazynvim/.config/nvim/.gitignore new file mode 100644 index 00000000..cc5457ab --- /dev/null +++ b/home/profiles/nvim/lazynvim/.config/nvim/.gitignore @@ -0,0 +1,8 @@ +tt.* +.tests +doc/tags +debug +.repro +foo.* +*.log +data diff --git a/home/profiles/nvim/lazynvim/.config/nvim/.neoconf.json b/home/profiles/nvim/lazynvim/.config/nvim/.neoconf.json new file mode 100644 index 00000000..7c480874 --- /dev/null +++ b/home/profiles/nvim/lazynvim/.config/nvim/.neoconf.json @@ -0,0 +1,15 @@ +{ + "neodev": { + "library": { + "enabled": true, + "plugins": true + } + }, + "neoconf": { + "plugins": { + "lua_ls": { + "enabled": true + } + } + } +} diff --git a/home/profiles/nvim/lazynvim/.config/nvim/LICENSE b/home/profiles/nvim/lazynvim/.config/nvim/LICENSE new file mode 100644 index 00000000..261eeb9e --- /dev/null +++ b/home/profiles/nvim/lazynvim/.config/nvim/LICENSE @@ -0,0 +1,201 @@ + Apache License + Version 2.0, January 2004 + http://www.apache.org/licenses/ + + TERMS AND CONDITIONS FOR USE, REPRODUCTION, AND DISTRIBUTION + + 1. Definitions. + + "License" shall mean the terms and conditions for use, reproduction, + and distribution as defined by Sections 1 through 9 of this document. + + "Licensor" shall mean the copyright owner or entity authorized by + the copyright owner that is granting the License. + + "Legal Entity" shall mean the union of the acting entity and all + other entities that control, are controlled by, or are under common + control with that entity. For the purposes of this definition, + "control" means (i) the power, direct or indirect, to cause the + direction or management of such entity, whether by contract or + otherwise, or (ii) ownership of fifty percent (50%) or more of the + outstanding shares, or (iii) beneficial ownership of such entity. + + "You" (or "Your") shall mean an individual or Legal Entity + exercising permissions granted by this License. + + "Source" form shall mean the preferred form for making modifications, + including but not limited to software source code, documentation + source, and configuration files. + + "Object" form shall mean any form resulting from mechanical + transformation or translation of a Source form, including but + not limited to compiled object code, generated documentation, + and conversions to other media types. + + "Work" shall mean the work of authorship, whether in Source or + Object form, made available under the License, as indicated by a + copyright notice that is included in or attached to the work + (an example is provided in the Appendix below). + + "Derivative Works" shall mean any work, whether in Source or Object + form, that is based on (or derived from) the Work and for which the + editorial revisions, annotations, elaborations, or other modifications + represent, as a whole, an original work of authorship. For the purposes + of this License, Derivative Works shall not include works that remain + separable from, or merely link (or bind by name) to the interfaces of, + the Work and Derivative Works thereof. + + "Contribution" shall mean any work of authorship, including + the original version of the Work and any modifications or additions + to that Work or Derivative Works thereof, that is intentionally + submitted to Licensor for inclusion in the Work by the copyright owner + or by an individual or Legal Entity authorized to submit on behalf of + the copyright owner. For the purposes of this definition, "submitted" + means any form of electronic, verbal, or written communication sent + to the Licensor or its representatives, including but not limited to + communication on electronic mailing lists, source code control systems, + and issue tracking systems that are managed by, or on behalf of, the + Licensor for the purpose of discussing and improving the Work, but + excluding communication that is conspicuously marked or otherwise + designated in writing by the copyright owner as "Not a Contribution." + + "Contributor" shall mean Licensor and any individual or Legal Entity + on behalf of whom a Contribution has been received by Licensor and + subsequently incorporated within the Work. + + 2. Grant of Copyright License. Subject to the terms and conditions of + this License, each Contributor hereby grants to You a perpetual, + worldwide, non-exclusive, no-charge, royalty-free, irrevocable + copyright license to reproduce, prepare Derivative Works of, + publicly display, publicly perform, sublicense, and distribute the + Work and such Derivative Works in Source or Object form. + + 3. Grant of Patent License. Subject to the terms and conditions of + this License, each Contributor hereby grants to You a perpetual, + worldwide, non-exclusive, no-charge, royalty-free, irrevocable + (except as stated in this section) patent license to make, have made, + use, offer to sell, sell, import, and otherwise transfer the Work, + where such license applies only to those patent claims licensable + by such Contributor that are necessarily infringed by their + Contribution(s) alone or by combination of their Contribution(s) + with the Work to which such Contribution(s) was submitted. If You + institute patent litigation against any entity (including a + cross-claim or counterclaim in a lawsuit) alleging that the Work + or a Contribution incorporated within the Work constitutes direct + or contributory patent infringement, then any patent licenses + granted to You under this License for that Work shall terminate + as of the date such litigation is filed. + + 4. Redistribution. You may reproduce and distribute copies of the + Work or Derivative Works thereof in any medium, with or without + modifications, and in Source or Object form, provided that You + meet the following conditions: + + (a) You must give any other recipients of the Work or + Derivative Works a copy of this License; and + + (b) You must cause any modified files to carry prominent notices + stating that You changed the files; and + + (c) You must retain, in the Source form of any Derivative Works + that You distribute, all copyright, patent, trademark, and + attribution notices from the Source form of the Work, + excluding those notices that do not pertain to any part of + the Derivative Works; and + + (d) If the Work includes a "NOTICE" text file as part of its + distribution, then any Derivative Works that You distribute must + include a readable copy of the attribution notices contained + within such NOTICE file, excluding those notices that do not + pertain to any part of the Derivative Works, in at least one + of the following places: within a NOTICE text file distributed + as part of the Derivative Works; within the Source form or + documentation, if provided along with the Derivative Works; or, + within a display generated by the Derivative Works, if and + wherever such third-party notices normally appear. The contents + of the NOTICE file are for informational purposes only and + do not modify the License. You may add Your own attribution + notices within Derivative Works that You distribute, alongside + or as an addendum to the NOTICE text from the Work, provided + that such additional attribution notices cannot be construed + as modifying the License. + + You may add Your own copyright statement to Your modifications and + may provide additional or different license terms and conditions + for use, reproduction, or distribution of Your modifications, or + for any such Derivative Works as a whole, provided Your use, + reproduction, and distribution of the Work otherwise complies with + the conditions stated in this License. + + 5. Submission of Contributions. Unless You explicitly state otherwise, + any Contribution intentionally submitted for inclusion in the Work + by You to the Licensor shall be under the terms and conditions of + this License, without any additional terms or conditions. + Notwithstanding the above, nothing herein shall supersede or modify + the terms of any separate license agreement you may have executed + with Licensor regarding such Contributions. + + 6. Trademarks. This License does not grant permission to use the trade + names, trademarks, service marks, or product names of the Licensor, + except as required for reasonable and customary use in describing the + origin of the Work and reproducing the content of the NOTICE file. + + 7. Disclaimer of Warranty. Unless required by applicable law or + agreed to in writing, Licensor provides the Work (and each + Contributor provides its Contributions) on an "AS IS" BASIS, + WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or + implied, including, without limitation, any warranties or conditions + of TITLE, NON-INFRINGEMENT, MERCHANTABILITY, or FITNESS FOR A + PARTICULAR PURPOSE. You are solely responsible for determining the + appropriateness of using or redistributing the Work and assume any + risks associated with Your exercise of permissions under this License. + + 8. Limitation of Liability. In no event and under no legal theory, + whether in tort (including negligence), contract, or otherwise, + unless required by applicable law (such as deliberate and grossly + negligent acts) or agreed to in writing, shall any Contributor be + liable to You for damages, including any direct, indirect, special, + incidental, or consequential damages of any character arising as a + result of this License or out of the use or inability to use the + Work (including but not limited to damages for loss of goodwill, + work stoppage, computer failure or malfunction, or any and all + other commercial damages or losses), even if such Contributor + has been advised of the possibility of such damages. + + 9. Accepting Warranty or Additional Liability. While redistributing + the Work or Derivative Works thereof, You may choose to offer, + and charge a fee for, acceptance of support, warranty, indemnity, + or other liability obligations and/or rights consistent with this + License. However, in accepting such obligations, You may act only + on Your own behalf and on Your sole responsibility, not on behalf + of any other Contributor, and only if You agree to indemnify, + defend, and hold each Contributor harmless for any liability + incurred by, or claims asserted against, such Contributor by reason + of your accepting any such warranty or additional liability. + + END OF TERMS AND CONDITIONS + + APPENDIX: How to apply the Apache License to your work. + + To apply the Apache License to your work, attach the following + boilerplate notice, with the fields enclosed by brackets "[]" + replaced with your own identifying information. (Don't include + the brackets!) The text should be enclosed in the appropriate + comment syntax for the file format. We also recommend that a + file or class name and description of purpose be included on the + same "printed page" as the copyright notice for easier + identification within third-party archives. + + Copyright [yyyy] [name of copyright owner] + + Licensed under the Apache License, Version 2.0 (the "License"); + you may not use this file except in compliance with the License. + You may obtain a copy of the License at + + http://www.apache.org/licenses/LICENSE-2.0 + + Unless required by applicable law or agreed to in writing, software + distributed under the License is distributed on an "AS IS" BASIS, + WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. + See the License for the specific language governing permissions and + limitations under the License. diff --git a/home/profiles/nvim/lazynvim/.config/nvim/README.md b/home/profiles/nvim/lazynvim/.config/nvim/README.md new file mode 100644 index 00000000..185280b0 --- /dev/null +++ b/home/profiles/nvim/lazynvim/.config/nvim/README.md @@ -0,0 +1,4 @@ +# 💤 LazyVim + +A starter template for [LazyVim](https://github.com/LazyVim/LazyVim). +Refer to the [documentation](https://lazyvim.github.io/installation) to get started. diff --git a/home/profiles/nvim/lazynvim/.config/nvim/init.lua b/home/profiles/nvim/lazynvim/.config/nvim/init.lua new file mode 100644 index 00000000..2514f9ed --- /dev/null +++ b/home/profiles/nvim/lazynvim/.config/nvim/init.lua @@ -0,0 +1,2 @@ +-- bootstrap lazy.nvim, LazyVim and your plugins +require("config.lazy") diff --git a/home/profiles/nvim/lazynvim/.config/nvim/lazy-lock.json b/home/profiles/nvim/lazynvim/.config/nvim/lazy-lock.json new file mode 100644 index 00000000..ebab1796 --- /dev/null +++ b/home/profiles/nvim/lazynvim/.config/nvim/lazy-lock.json @@ -0,0 +1,60 @@ +{ + "LazyVim": { "branch": "main", "commit": "12818a6cb499456f4903c5d8e68af43753ebc869" }, + "SchemaStore.nvim": { "branch": "main", "commit": "54a2cf0105166d5a48172e81f12a2bf10cfc8b2c" }, + "aerial.nvim": { "branch": "master", "commit": "e585934fef8d253dbc5655cff3deb3444e064e6c" }, + "bufferline.nvim": { "branch": "main", "commit": "0b2fd861eee7595015b6561dade52fb060be10c4" }, + "catppuccin": { "branch": "main", "commit": "4fd72a9ab64b393c2c22b168508fd244877fec96" }, + "cmp-buffer": { "branch": "main", "commit": "3022dbc9166796b644a841a02de8dd1cc1d311fa" }, + "cmp-emoji": { "branch": "main", "commit": "e8398e2adf512a03bb4e1728ca017ffeac670a9f" }, + "cmp-nvim-lsp": { "branch": "main", "commit": "39e2eda76828d88b773cc27a3f61d2ad782c922d" }, + "cmp-path": { "branch": "main", "commit": "91ff86cd9c29299a64f968ebb45846c485725f23" }, + "conform.nvim": { "branch": "master", "commit": "62eba813b7501b39612146cbf29cd07f1d4ac29c" }, + "dashboard-nvim": { "branch": "master", "commit": "fabf5feec96185817c732d47d363f34034212685" }, + "dressing.nvim": { "branch": "master", "commit": "c5775a888adbc50652cb370073fcfec963eca93e" }, + "flash.nvim": { "branch": "main", "commit": "34c7be146a91fec3555c33fe89c7d643f6ef5cf1" }, + "friendly-snippets": { "branch": "main", "commit": "00ebcaa159e817150bd83bfe2d51fa3b3377d5c4" }, + "gitsigns.nvim": { "branch": "main", "commit": "562dc47189ad3c8696dbf460d38603a74d544849" }, + "grug-far.nvim": { "branch": "main", "commit": "ebab68b2150079732ae8074eefb261a124824139" }, + "indent-blankline.nvim": { "branch": "master", "commit": "db926997af951da38e5004ec7b9fbdc480b48f5d" }, + "lazy.nvim": { "branch": "main", "commit": "077102c5bfc578693f12377846d427f49bc50076" }, + "lazydev.nvim": { "branch": "main", "commit": "491452cf1ca6f029e90ad0d0368848fac717c6d2" }, + "lualine.nvim": { "branch": "master", "commit": "b431d228b7bbcdaea818bdc3e25b8cdbe861f056" }, + "luvit-meta": { "branch": "main", "commit": "ce76f6f6cdc9201523a5875a4471dcfe0186eb60" }, + "mason-lspconfig.nvim": { "branch": "main", "commit": "482350b050bd413931c2cdd4857443c3da7d57cb" }, + "mason.nvim": { "branch": "main", "commit": "e2f7f9044ec30067bc11800a9e266664b88cda22" }, + "mini.ai": { "branch": "main", "commit": "a9b992b13d22a8db8df6beac25afa59a10b5584d" }, + "mini.icons": { "branch": "main", "commit": "12e7b5d47bfc1b4c5ba4278fb49ec9100138df14" }, + "mini.pairs": { "branch": "main", "commit": "927d19cbdd0e752ab1c7eed87072e71d2cd6ff51" }, + "mini.surround": { "branch": "main", "commit": "d8913ed23be0a1a4585ae34414821cc343a46174" }, + "neo-tree.nvim": { "branch": "main", "commit": "206241e451c12f78969ff5ae53af45616ffc9b72" }, + "neovim-ayu": { "branch": "master", "commit": "6993189dd0ee38299879a1a0064718a8392e8713" }, + "noice.nvim": { "branch": "main", "commit": "448bb9c524a7601035449210838e374a30153172" }, + "nui.nvim": { "branch": "main", "commit": "61574ce6e60c815b0a0c4b5655b8486ba58089a1" }, + "nvim-cmp": { "branch": "main", "commit": "ae644feb7b67bf1ce4260c231d1d4300b19c6f30" }, + "nvim-lint": { "branch": "master", "commit": "debabca63c0905b59ce596a55a8e33eafdf66342" }, + "nvim-lspconfig": { "branch": "master", "commit": "911167921d49cd5c1c9b2436031d0da3945e787f" }, + "nvim-notify": { "branch": "master", "commit": "d333b6f167900f6d9d42a59005d82919830626bf" }, + "nvim-snippets": { "branch": "main", "commit": "56b4052f71220144689caaa2e5b66222ba5661eb" }, + "nvim-treesitter": { "branch": "master", "commit": "04401b5dd17c3419dae5141677bd256f52d54733" }, + "nvim-treesitter-textobjects": { "branch": "master", "commit": "41e3abf6bfd9a9a681eb1f788bdeba91c9004b2b" }, + "nvim-ts-autotag": { "branch": "main", "commit": "0cb76eea80e9c73b88880f0ca78fbd04c5bdcac7" }, + "outline.nvim": { "branch": "main", "commit": "02a18194b3d2adfb537dd1a9f21d1fc29dd31382" }, + "persistence.nvim": { "branch": "main", "commit": "f6aad7dde7fcf54148ccfc5f622c6d5badd0cc3d" }, + "plenary.nvim": { "branch": "master", "commit": "ec289423a1693aeae6cd0d503bac2856af74edaa" }, + "sg.nvim": { "branch": "master", "commit": "8bdd4d19da2268072708d5fe18fda9c23e16509d" }, + "tailwindcss-colorizer-cmp.nvim": { "branch": "main", "commit": "3d3cd95e4a4135c250faf83dd5ed61b8e5502b86" }, + "telescope-fzf-native.nvim": { "branch": "main", "commit": "cf48d4dfce44e0b9a2e19a008d6ec6ea6f01a83b" }, + "telescope-terraform-doc.nvim": { "branch": "main", "commit": "7ac642765615e6ff164ecfc82eb278aa68d06840" }, + "telescope-terraform.nvim": { "branch": "main", "commit": "072c97023797ca1a874668aaa6ae0b74425335df" }, + "telescope.nvim": { "branch": "master", "commit": "5972437de807c3bc101565175da66a1aa4f8707a" }, + "todo-comments.nvim": { "branch": "main", "commit": "8f45f353dc3649cb9b44cecda96827ea88128584" }, + "tokyonight.nvim": { "branch": "main", "commit": "b0e7c7382a7e8f6456f2a95655983993ffda745e" }, + "trouble.nvim": { "branch": "main", "commit": "6efc446226679fda0547c0fd6a7892fd5f5b15d8" }, + "ts-comments.nvim": { "branch": "main", "commit": "98d7d4dec0af1312d38e288f800bbf6ff562b6ab" }, + "vim-dadbod": { "branch": "master", "commit": "7888cb7164d69783d3dce4e0283decd26b82538b" }, + "vim-dadbod-completion": { "branch": "master", "commit": "880f7e9f2959e567c718d52550f9fae1aa07aa81" }, + "vim-dadbod-ui": { "branch": "master", "commit": "0f51d8de368c8c6220973e8acd156d17da746f4c" }, + "vim-fugitive": { "branch": "master", "commit": "0444df68cd1cdabc7453d6bd84099458327e5513" }, + "vim-helm": { "branch": "master", "commit": "ae1ebc160d2b9b90108477ab10df7a4fc501e358" }, + "which-key.nvim": { "branch": "main", "commit": "6c1584eb76b55629702716995cca4ae2798a9cca" } +} diff --git a/home/profiles/nvim/lazynvim/.config/nvim/lazyvim.json b/home/profiles/nvim/lazynvim/.config/nvim/lazyvim.json new file mode 100644 index 00000000..041ac081 --- /dev/null +++ b/home/profiles/nvim/lazynvim/.config/nvim/lazyvim.json @@ -0,0 +1,19 @@ +{ + "extras": [ + "lazyvim.plugins.extras.editor.aerial", + "lazyvim.plugins.extras.editor.outline", + "lazyvim.plugins.extras.lang.go", + "lazyvim.plugins.extras.lang.helm", + "lazyvim.plugins.extras.lang.json", + "lazyvim.plugins.extras.lang.nix", + "lazyvim.plugins.extras.lang.sql", + "lazyvim.plugins.extras.lang.svelte", + "lazyvim.plugins.extras.lang.tailwind", + "lazyvim.plugins.extras.lang.terraform", + "lazyvim.plugins.extras.lang.typescript" + ], + "news": { + "NEWS.md": "6520" + }, + "version": 6 +} \ No newline at end of file diff --git a/home/profiles/nvim/lazynvim/.config/nvim/lua/config/autocmds.lua b/home/profiles/nvim/lazynvim/.config/nvim/lua/config/autocmds.lua new file mode 100644 index 00000000..27e9e064 --- /dev/null +++ b/home/profiles/nvim/lazynvim/.config/nvim/lua/config/autocmds.lua @@ -0,0 +1,3 @@ +-- Autocmds are automatically loaded on the VeryLazy event +-- Default autocmds that are always set: https://github.com/LazyVim/LazyVim/blob/main/lua/lazyvim/config/autocmds.lua +-- Add any additional autocmds here diff --git a/home/profiles/nvim/lazynvim/.config/nvim/lua/config/keymaps.lua b/home/profiles/nvim/lazynvim/.config/nvim/lua/config/keymaps.lua new file mode 100644 index 00000000..f9e79613 --- /dev/null +++ b/home/profiles/nvim/lazynvim/.config/nvim/lua/config/keymaps.lua @@ -0,0 +1,21 @@ +-- Keymaps are automatically loaded on the VeryLazy event +-- Default keymaps that are always set: https://github.com/LazyVim/LazyVim/blob/main/lua/lazyvim/config/keymaps.lua +-- Add any additional keymaps here +local map = vim.keymap.set + +-- Navigation +map("n", "gt", "bnext", { desc = "Next Buffer" }) +map("n", "gT", "bprevious", { desc = "Prev Buffer" }) +map("n", "gq", "bdelete", { desc = "Prev Buffer" }) +map("n", "q", "q", { desc = "Quit" }) + +-- Git +map("n", "gs", ":G", { desc = "Git Status" }) +map("n", "gb", "Telescope git_branches", { desc = "Git Status" }) +map("n", "gp", ":G! push", { desc = "Git Status" }) + +-- Telescope +map("n", "fs", "Telescope live_grep", { desc = "Telescop Live Grep" }) + +-- Cody +map("n", "co", "CodyChat", { desc = "Cody Chat" }) diff --git a/home/profiles/nvim/lazynvim/.config/nvim/lua/config/lazy.lua b/home/profiles/nvim/lazynvim/.config/nvim/lua/config/lazy.lua new file mode 100644 index 00000000..ef254599 --- /dev/null +++ b/home/profiles/nvim/lazynvim/.config/nvim/lua/config/lazy.lua @@ -0,0 +1,57 @@ +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 + vim.api.nvim_echo({ + { "Failed to clone lazy.nvim:\n", "ErrorMsg" }, + { out, "WarningMsg" }, + { "\nPress any key to exit..." }, + }, true, {}) + vim.fn.getchar() + os.exit(1) + end +end +vim.opt.rtp:prepend(lazypath) + +require("lazy").setup({ + spec = { + -- add LazyVim and import its plugins + { "LazyVim/LazyVim", import = "lazyvim.plugins" }, + -- import/override with your plugins + { import = "plugins" }, + }, + defaults = { + -- By default, only LazyVim plugins will be lazy-loaded. Your custom plugins will load during startup. + -- If you know what you're doing, you can set this to `true` to have all your custom plugins lazy-loaded by default. + lazy = false, + -- It's recommended to leave version=false for now, since a lot the plugin that support versioning, + -- have outdated releases, which may break your Neovim install. + version = false, -- always use the latest git commit + -- version = "*", -- try installing the latest stable version for plugins that support semver + }, + install = { colorscheme = { "tokyonight", "habamax" } }, + checker = { + enabled = true, -- check for plugin updates periodically + notify = false, -- notify on update + }, -- automatically check for plugin updates + performance = { + rtp = { + -- disable some rtp plugins + disabled_plugins = { + "gzip", + -- "matchit", + -- "matchparen", + -- "netrwPlugin", + "tarPlugin", + "tohtml", + "tutor", + "zipPlugin", + }, + }, + }, +}) + +require("sg").setup({}) +-- require("ayu").setup({ mirage = true }) +-- require("ayu").colorscheme() diff --git a/home/profiles/nvim/lazynvim/.config/nvim/lua/config/options.lua b/home/profiles/nvim/lazynvim/.config/nvim/lua/config/options.lua new file mode 100644 index 00000000..3ea1454f --- /dev/null +++ b/home/profiles/nvim/lazynvim/.config/nvim/lua/config/options.lua @@ -0,0 +1,3 @@ +-- Options are automatically loaded before lazy.nvim startup +-- Default options that are always set: https://github.com/LazyVim/LazyVim/blob/main/lua/lazyvim/config/options.lua +-- Add any additional options here diff --git a/home/profiles/nvim/lazynvim/.config/nvim/lua/plugins/cody.lua b/home/profiles/nvim/lazynvim/.config/nvim/lua/plugins/cody.lua new file mode 100644 index 00000000..8f528796 --- /dev/null +++ b/home/profiles/nvim/lazynvim/.config/nvim/lua/plugins/cody.lua @@ -0,0 +1,13 @@ +return { + { + "sourcegraph/sg.nvim", + dependencies = { "nvim-lua/plenary.nvim" }, + }, + { + "hrsh7th/nvim-cmp", + ---@param opts cmp.ConfigSchema + opts = function(_, opts) + table.insert(opts.sources, { name = "cody" }) + end, + }, +} diff --git a/home/profiles/nvim/lazynvim/.config/nvim/lua/plugins/colorscheme.lua b/home/profiles/nvim/lazynvim/.config/nvim/lua/plugins/colorscheme.lua new file mode 100644 index 00000000..4499a51a --- /dev/null +++ b/home/profiles/nvim/lazynvim/.config/nvim/lua/plugins/colorscheme.lua @@ -0,0 +1,50 @@ +return { + { + "catppuccin/nvim", + lazy = true, + name = "catppuccin", + opts = { + integrations = { + aerial = true, + alpha = true, + cmp = true, + dashboard = true, + flash = true, + gitsigns = true, + headlines = true, + illuminate = true, + indent_blankline = { enabled = true }, + leap = true, + lsp_trouble = true, + mason = true, + markdown = true, + mini = true, + native_lsp = { + enabled = true, + underlines = { + errors = { "undercurl" }, + hints = { "undercurl" }, + warnings = { "undercurl" }, + information = { "undercurl" }, + }, + }, + navic = { enabled = true, custom_bg = "lualine" }, + neotest = true, + neotree = true, + noice = true, + semantic_tokens = true, + telescope = true, + treesitter = true, + treesitter_context = true, + which_key = true, + }, + }, + }, + { "Shatur/neovim-ayu", lazy = false }, + { + "LazyVim/LazyVim", + opts = { + colorscheme = "catppuccin-macchiato", + }, + }, +} diff --git a/home/profiles/nvim/lazynvim/.config/nvim/lua/plugins/example.lua b/home/profiles/nvim/lazynvim/.config/nvim/lua/plugins/example.lua new file mode 100644 index 00000000..4ad9825d --- /dev/null +++ b/home/profiles/nvim/lazynvim/.config/nvim/lua/plugins/example.lua @@ -0,0 +1,193 @@ +-- since this is just an example spec, don't actually load anything here and return an empty spec +-- stylua: ignore +if true then return {} end + +-- every spec file under the "plugins" directory will be loaded automatically by lazy.nvim +-- +-- In your plugin files, you can: +-- * add extra plugins +-- * disable/enabled LazyVim plugins +-- * override the configuration of LazyVim plugins +return { + -- add gruvbox + { "ellisonleao/gruvbox.nvim" }, + + -- Configure LazyVim to load gruvbox + { + "LazyVim/LazyVim", + opts = { + colorscheme = "gruvbox", + }, + }, + + -- change trouble config + { + "folke/trouble.nvim", + -- opts will be merged with the parent spec + opts = { use_diagnostic_signs = true }, + }, + + -- disable trouble + { "folke/trouble.nvim", enabled = false }, + + -- override nvim-cmp and add cmp-emoji + { + "hrsh7th/nvim-cmp", + dependencies = { "hrsh7th/cmp-emoji" }, + ---@param opts cmp.ConfigSchema + opts = function(_, opts) + table.insert(opts.sources, { name = "emoji" }) + end, + }, + + -- change some telescope options and a keymap to browse plugin files + { + "nvim-telescope/telescope.nvim", + keys = { + -- add a keymap to browse plugin files + -- stylua: ignore + { + "fp", + function() require("telescope.builtin").find_files({ cwd = require("lazy.core.config").options.root }) end, + desc = "Find Plugin File", + }, + }, + -- change some options + opts = { + defaults = { + layout_strategy = "horizontal", + layout_config = { prompt_position = "top" }, + sorting_strategy = "ascending", + winblend = 0, + }, + }, + }, + + -- add pyright to lspconfig + { + "neovim/nvim-lspconfig", + ---@class PluginLspOpts + opts = { + ---@type lspconfig.options + servers = { + -- pyright will be automatically installed with mason and loaded with lspconfig + pyright = {}, + }, + }, + }, + + -- add tsserver and setup with typescript.nvim instead of lspconfig + { + "neovim/nvim-lspconfig", + dependencies = { + "jose-elias-alvarez/typescript.nvim", + init = function() + require("lazyvim.util").lsp.on_attach(function(_, buffer) + -- stylua: ignore + vim.keymap.set( "n", "co", "TypescriptOrganizeImports", { buffer = buffer, desc = "Organize Imports" }) + vim.keymap.set("n", "cR", "TypescriptRenameFile", { desc = "Rename File", buffer = buffer }) + end) + end, + }, + ---@class PluginLspOpts + opts = { + ---@type lspconfig.options + servers = { + -- tsserver will be automatically installed with mason and loaded with lspconfig + tsserver = {}, + }, + -- you can do any additional lsp server setup here + -- return true if you don't want this server to be setup with lspconfig + ---@type table + setup = { + -- example to setup with typescript.nvim + tsserver = function(_, opts) + require("typescript").setup({ server = opts }) + return true + end, + -- Specify * to use this function as a fallback for any server + -- ["*"] = function(server, opts) end, + }, + }, + }, + + -- for typescript, LazyVim also includes extra specs to properly setup lspconfig, + -- treesitter, mason and typescript.nvim. So instead of the above, you can use: + { import = "lazyvim.plugins.extras.lang.typescript" }, + + -- add more treesitter parsers + { + "nvim-treesitter/nvim-treesitter", + opts = { + ensure_installed = { + "bash", + "html", + "javascript", + "json", + "lua", + "markdown", + "markdown_inline", + "python", + "query", + "regex", + "tsx", + "typescript", + "vim", + "yaml", + }, + }, + }, + + -- since `vim.tbl_deep_extend`, can only merge tables and not lists, the code above + -- would overwrite `ensure_installed` with the new value. + -- If you'd rather extend the default config, use the code below instead: + { + "nvim-treesitter/nvim-treesitter", + opts = function(_, opts) + -- add tsx and treesitter + vim.list_extend(opts.ensure_installed, { + "tsx", + "typescript", + }) + end, + }, + + -- the opts function can also be used to change the default opts: + { + "nvim-lualine/lualine.nvim", + event = "VeryLazy", + opts = function(_, opts) + table.insert(opts.sections.lualine_x, "😄") + end, + }, + + -- or you can return new options to override all the defaults + { + "nvim-lualine/lualine.nvim", + event = "VeryLazy", + opts = function() + return { + --[[add your custom lualine config here]] + } + end, + }, + + -- use mini.starter instead of alpha + { import = "lazyvim.plugins.extras.ui.mini-starter" }, + + -- add jsonls and schemastore packages, and setup treesitter for json, json5 and jsonc + { import = "lazyvim.plugins.extras.lang.json" }, + + -- add any tools you want to have installed below + { + "williamboman/mason.nvim", + opts = { + ensure_installed = { + "stylua", + "shellcheck", + "shfmt", + "flake8", + }, + }, + }, +} diff --git a/home/profiles/nvim/lazynvim/.config/nvim/lua/plugins/git.lua b/home/profiles/nvim/lazynvim/.config/nvim/lua/plugins/git.lua new file mode 100644 index 00000000..d7f59af5 --- /dev/null +++ b/home/profiles/nvim/lazynvim/.config/nvim/lua/plugins/git.lua @@ -0,0 +1,6 @@ +return { + { + "tpope/vim-fugitive", + lazy = false, + }, +} diff --git a/home/profiles/nvim/lazynvim/.config/nvim/lua/plugins/github.lua b/home/profiles/nvim/lazynvim/.config/nvim/lua/plugins/github.lua new file mode 100644 index 00000000..44d2288c --- /dev/null +++ b/home/profiles/nvim/lazynvim/.config/nvim/lua/plugins/github.lua @@ -0,0 +1,14 @@ +return { + { + "dlvhdr/gh-addressed.nvim", + dependencies = { + "nvim-lua/plenary.nvim", + "MunifTanjim/nui.nvim", + "folke/trouble.nvim", -- optional + }, + cmd = "GhReviewComments", + keys = { + { "gc", "GhReviewComments", desc = "GitHub Review Comments" }, + }, + }, +} diff --git a/home/profiles/nvim/lazynvim/.config/nvim/lua/plugins/surround.lua b/home/profiles/nvim/lazynvim/.config/nvim/lua/plugins/surround.lua new file mode 100644 index 00000000..bab86191 --- /dev/null +++ b/home/profiles/nvim/lazynvim/.config/nvim/lua/plugins/surround.lua @@ -0,0 +1,15 @@ +return { + "echasnovski/mini.surround", + opts = { + mappings = { + add = "ys", + delete = "ds", + find = "gsf", + find_left = "gsF", + highlight = "gsh", + replace = "cs", + update_n_lines = "gsn", + }, + }, +} + diff --git a/home/profiles/nvim/lazynvim/.config/nvim/stylua.toml b/home/profiles/nvim/lazynvim/.config/nvim/stylua.toml new file mode 100644 index 00000000..5d6c50dc --- /dev/null +++ b/home/profiles/nvim/lazynvim/.config/nvim/stylua.toml @@ -0,0 +1,3 @@ +indent_type = "Spaces" +indent_width = 2 +column_width = 120 \ No newline at end of file diff --git a/hosts/darwin/casks/default.nix b/hosts/darwin/casks/default.nix index e645495e..07374dcb 100644 --- a/hosts/darwin/casks/default.nix +++ b/hosts/darwin/casks/default.nix @@ -22,6 +22,7 @@ "wireshark" "1password" "orbstack" + # "aerospace" # Communication Tools # Already installed manually diff --git a/hosts/darwin/default.nix b/hosts/darwin/default.nix index 25cc7264..37b9b2ae 100644 --- a/hosts/darwin/default.nix +++ b/hosts/darwin/default.nix @@ -3,7 +3,7 @@ { imports = [ ./sketchybar - ./yabai + # ./yabai # Now using aerospace # ./casks # ../../modules/darwin/home-manager.nix # ../../modules/shared @@ -45,7 +45,7 @@ }; # Auto upgrade nix package and the daemon service. - services.nix-daemon.enable = true; + # services.nix-daemon.enable = true; # removed in newer nix-darwin nixpkgs.hostPlatform = "aarch64-darwin"; programs.zsh.enable = true; @@ -55,7 +55,7 @@ settings.trusted-users = [ "@admin" "anishlakhwara" ]; gc = { - user = "root"; + # user = "root"; # removed in newer nix-darwin automatic = true; interval = { Weekday = 0; Hour = 2; Minute = 0; }; options = "--delete-older-than 30d"; @@ -85,11 +85,14 @@ siji font-awesome proggyfonts - (nerdfonts.override { fonts = [ "FiraCode" "DroidSansMono" "Iosevka" ]; }) + nerd-fonts.fira-code + nerd-fonts.droid-sans-mono + nerd-fonts.iosevka ]; system = { stateVersion = 4; + primaryUser = "anishlakhwara"; # required for newer nix-darwin keyboard = { enableKeyMapping = true; diff --git a/secrets/secrets.nix b/secrets/secrets.nix index 5160f6b0..9f5098df 100644 --- a/secrets/secrets.nix +++ b/secrets/secrets.nix @@ -6,6 +6,7 @@ let lituus = "ssh-ed25519 AAAAC3NzaC1lZDI1NTE5AAAAIH2lAb33LH3JNuOfBXt971u0tHe+NURFecQdfjwEj+C+ root@lituus"; helix = "ssh-ed25519 AAAAC3NzaC1lZDI1NTE5AAAAIAKrL6IDHNnHmxi0q9nzu87NOyidPm3HpE7klU368lEf root@helix"; helix2 = "ssh-ed25519 AAAAC3NzaC1lZDI1NTE5AAAAIK2G81z1E51ioJQGLHnTJEjgSdBqLM6mb72Z+0atE6Bf root@helix"; + work = "ssh-ed25519 AAAAC3NzaC1lZDI1NTE5AAAAIHOnfDvR2D2nGnC+DZYDUXiokzz+eLfZwkp+O8WjWutp anishlakhwara@Anishs-MacBook-Pro.local"; curve = [ system user ]; allUserKeys = [ system user mossnet ]; systemOnly = [ system mossnet lituus helix ]; @@ -34,4 +35,6 @@ in "box-wg.age".publicKeys = [ mossnet ]; "wallabag-password.age".publicKeys = [ mossnet ]; "wallabag-secret.age".publicKeys = [ mossnet ]; + + "work-wg.age".publicKeys = [ work user system ]; } diff --git a/secrets/work-wg.age b/secrets/work-wg.age new file mode 100644 index 0000000000000000000000000000000000000000..8c712b2b58c0d928d9ecc014755779614642b519 GIT binary patch literal 497 zcmZ9{xo*<{002;COQ;hYgBJ#r8r$*JR07GaV<(Oi$Bkph?&QX2T*vphwx7TUFff4_ zKujD`g-``uDFXu=WkLuQ39+C8Yro*>nXV1l>t))+xgV|XM5zmxC;;69v&@5Rt4k1Q z56ry+E-KLQ%z+~KQc>b$N7zzjjjc#A@2*&LO!}U?CCXpw+lSOo|b2@pv#F;#ai+`L82` z?UXaasLwTY&U*>!RiikYBsIpg729n}g|3BNQ!Km=mI1vob0<2VFO}8UEv6=n+O!Xs zFr$Zzu$b@9De6GmK@ Date: Wed, 17 Sep 2025 17:11:23 -0700 Subject: [PATCH 2/6] idk some bullshit about amp --- home/darwin/aerospace/config.toml | 8 +-- home/profiles/cli/default.nix | 6 +- home/profiles/kitty/kitty.conf | 1 + home/profiles/nvim/amp-plugin.nix | 9 +++ home/profiles/nvim/amp.lua | 5 ++ home/profiles/nvim/default.nix | 49 ++++++++------ .../.config/nvim/lua/config/autocmds.lua | 65 +++++++++++++++++++ .../.config/nvim/lua/config/options.lua | 3 + .../lazynvim/.config/nvim/lua/plugins/amp.lua | 8 +++ home/profiles/tmux/tmux.conf | 3 + 10 files changed, 129 insertions(+), 28 deletions(-) create mode 100644 home/profiles/nvim/amp-plugin.nix create mode 100644 home/profiles/nvim/amp.lua create mode 100644 home/profiles/nvim/lazynvim/.config/nvim/lua/plugins/amp.lua diff --git a/home/darwin/aerospace/config.toml b/home/darwin/aerospace/config.toml index d1ae1f59..b2eeb345 100644 --- a/home/darwin/aerospace/config.toml +++ b/home/darwin/aerospace/config.toml @@ -90,10 +90,10 @@ alt-slash = 'layout tiles horizontal vertical' alt-comma = 'layout accordion horizontal vertical' # See: https://nikitabobko.github.io/AeroSpace/commands#focus -alt-h = 'focus left' -alt-j = 'focus down' -alt-k = 'focus up' -alt-l = 'focus right' +# alt-h = 'focus left' +# alt-j = 'focus down' +# alt-k = 'focus up' +# alt-l = 'focus right' # See: https://nikitabobko.github.io/AeroSpace/commands#move alt-shift-h = 'move left' diff --git a/home/profiles/cli/default.nix b/home/profiles/cli/default.nix index 37e73977..2006c1d9 100644 --- a/home/profiles/cli/default.nix +++ b/home/profiles/cli/default.nix @@ -249,8 +249,8 @@ tree = "ls --tree --icons"; cat = "bat"; unzip = "aunpack"; - copy = "xclip -selection clipboard"; - paste = "xclip -selection clipboard -o"; + copy = if pkgs.stdenv.isDarwin then "pbcopy" else "xclip -selection clipboard"; + paste = if pkgs.stdenv.isDarwin then "pbpaste" else "xclip -selection clipboard -o"; rm = "echo USE TRASH, FOOL: trash "; trash = "trash-put"; make-secret = "< /dev/urandom \\tr -dc _A-Za-z0-9 | head -c \${1:-32};echo;"; @@ -303,7 +303,7 @@ orch = "ns override"; nrb = '' if [[ "$OSTYPE" == "darwin"* ]]; then - cd ~/usr/helm && sudo darwin-rebuild switch --flake ".#Anishs-MacBook-Pro" && cd $OLDPWD + cd ~/usr/helm && sudo darwin-rebuild switch --impure --flake ".#Anishs-MacBook-Pro" && cd $OLDPWD else cd /tmp && sudo nixos-rebuild switch --flake '/home/anish/usr/helm#curve' && cd $OLDPWD fi diff --git a/home/profiles/kitty/kitty.conf b/home/profiles/kitty/kitty.conf index 5c1400ac..7f8783c3 100644 --- a/home/profiles/kitty/kitty.conf +++ b/home/profiles/kitty/kitty.conf @@ -9,6 +9,7 @@ mouse_map left click ungrabbed mouse_click_url_or_select confirm_os_window_close 0 enable_audio_bell no hide_window_decorations titlebar-only +macos_option_as_alt left -- Allows zen-mode.nvim to increase font size -- allow_remote_control socket-only -- listen_on unix:/tmp/kitty diff --git a/home/profiles/nvim/amp-plugin.nix b/home/profiles/nvim/amp-plugin.nix new file mode 100644 index 00000000..3cf08002 --- /dev/null +++ b/home/profiles/nvim/amp-plugin.nix @@ -0,0 +1,9 @@ +{ pkgs }: + +if pkgs.stdenv.isDarwin && builtins.pathExists /Users/anishlakhwara/usr/amp.nvim then + pkgs.vimUtils.buildVimPlugin { + pname = "amp-nvim"; + version = "unstable"; + src = /Users/anishlakhwara/usr/amp.nvim; + } +else null diff --git a/home/profiles/nvim/amp.lua b/home/profiles/nvim/amp.lua new file mode 100644 index 00000000..4098774a --- /dev/null +++ b/home/profiles/nvim/amp.lua @@ -0,0 +1,5 @@ +-- amp.nvim configuration +require('amp').setup({ + auto_start = true, + log_level = "info" +}) diff --git a/home/profiles/nvim/default.nix b/home/profiles/nvim/default.nix index f2453702..abbacb95 100644 --- a/home/profiles/nvim/default.nix +++ b/home/profiles/nvim/default.nix @@ -29,24 +29,6 @@ let sha256 = "gMaS5YFi3+gmUIfkCMEt9vhm8XSgv54Cquv5+WCWeTo="; }; }; - leap = pkgs.vimUtils.buildVimPlugin { - name = "leap"; - src = pkgs.fetchFromGitHub { - owner = "ggandor"; - repo = "leap.nvim"; - rev = "1bb1fec369b1e9ae96e6ff1b829ea9272c51f844"; - sha256 = "dH0v1D5q5OlMLA/omTDMb/taKyIgQ5VfVMYXJ609k/k="; - }; - }; - nvim-navic = pkgs.vimUtils.buildVimPlugin { - name = "nvim-navic"; - src = pkgs.fetchFromGitHub { - owner = "SmiteshP"; - repo = "nvim-navic"; - rev = "096b23e73c84a653fd317c0c10261875fa573a6d"; - sha256 = "vX7ZVJxgatIicmijehtaRvyHxk1i4gFfXrbPM/+VoFc="; - }; - }; my-which-key-nvim = pkgs.vimUtils.buildVimPlugin { pname = "which-key.nvim"; version = "2022-05-04"; @@ -108,6 +90,20 @@ let sha256 = "czKjJgCpvRSdtR7rNGlJrluDgPIdx94KUyx33op5gdY="; }; }; + gh-addressed = pkgs.vimUtils.buildVimPlugin { + pname = "gh-addressed"; + version = "2024-09-17"; + src = pkgs.fetchFromGitHub { + owner = "dlvhdr"; + repo = "gh-addressed.nvim"; + rev = "64c12f0f2a1d28afe53220da5fb86e1adb79be07"; + sha256 = "0pxzq9jllw7rfspyy6j8dr464g0ph7xvh317l4iyva26ld8889mp"; + }; + doCheck = false; + doInstallCheck = false; + nvimRequireCheck = "none"; + }; + amp-nvim = import ./amp-plugin.nix { inherit pkgs; }; }; my-python-packages = python-packages: with python-packages; [ @@ -842,6 +838,14 @@ in require("which-key").setup{} require('leap').set_default_keymaps() + ${lib.optionalString (customPlugins.amp-nvim != null) '' + -- Setup amp.nvim + require('amp').setup({ + auto_start = true, + log_level = "info" + }) + ''} + -- supercollider local scnvim = require 'scnvim' local map = scnvim.map @@ -967,7 +971,7 @@ in vim.keymap.set({'n', 't'}, '', 'NavigatorRight') -- Disable Ctrl+V in nvim so Kitty can handle paste - vim.keymap.set({'n', 'v', 'i'}, '', '', {noremap = true, silent = true}) + vim.keymap.set({'v', 'i'}, '', '', {noremap = true, silent = true}) -- Pane resizing with Alt+Shift+hjkl (to match tmux) vim.keymap.set('n', '', 'vertical resize -2', {silent = true}) @@ -1083,8 +1087,9 @@ in # experimental nvim-luapad + gh-addressed scnvim - leap + leap-nvim Navigator-nvim vim-beancount # vimtex @@ -1095,7 +1100,9 @@ in ] ++ lib.optionals pkgs.stdenv.isLinux [ # Linux-only plugins vim-tidal # requires SuperCollider which is Linux-only - ]; + ] ++ lib.optionals (customPlugins.amp-nvim != null) [ + customPlugins.amp-nvim + ]; withPython3 = true; extraPython3Packages = pkgs: with pkgs; [ tasklib six packaging ]; vimAlias = true; diff --git a/home/profiles/nvim/lazynvim/.config/nvim/lua/config/autocmds.lua b/home/profiles/nvim/lazynvim/.config/nvim/lua/config/autocmds.lua index 27e9e064..68b31089 100644 --- a/home/profiles/nvim/lazynvim/.config/nvim/lua/config/autocmds.lua +++ b/home/profiles/nvim/lazynvim/.config/nvim/lua/config/autocmds.lua @@ -1,3 +1,68 @@ -- Autocmds are automatically loaded on the VeryLazy event -- Default autocmds that are always set: https://github.com/LazyVim/LazyVim/blob/main/lua/lazyvim/config/autocmds.lua -- Add any additional autocmds here + +-- Aggressive fugitive auto-reload with polling +local function setup_fugitive_aggressive_reload() + local timer = nil + + local function refresh_fugitive() + -- Check all files for changes + vim.cmd("silent! checktime") + + -- Force refresh any open fugitive buffers + for _, win in ipairs(vim.api.nvim_list_wins()) do + local buf = vim.api.nvim_win_get_buf(win) + if vim.api.nvim_buf_get_option(buf, "filetype") == "fugitive" then + vim.api.nvim_buf_call(buf, function() + pcall(vim.cmd, "silent! edit") + end) + end + end + end + + local function start_polling() + if timer then vim.fn.timer_stop(timer) end + -- Poll every 2 seconds + timer = vim.fn.timer_start(2000, function() + refresh_fugitive() + end, { ["repeat"] = -1 }) + end + + local function stop_polling() + if timer then + vim.fn.timer_stop(timer) + timer = nil + end + end + + local augroup = vim.api.nvim_create_augroup("FugitiveAggressiveReload", { clear = true }) + + -- Start polling when fugitive buffer opens + vim.api.nvim_create_autocmd("FileType", { + group = augroup, + pattern = "fugitive", + callback = start_polling, + }) + + -- Stop polling when no fugitive buffers are open + vim.api.nvim_create_autocmd("BufDelete", { + group = augroup, + callback = function() + -- Check if any fugitive buffers remain + local has_fugitive = false + for _, buf in ipairs(vim.api.nvim_list_bufs()) do + if vim.api.nvim_buf_is_valid(buf) and vim.api.nvim_buf_get_option(buf, "filetype") == "fugitive" then + has_fugitive = true + break + end + end + if not has_fugitive then + stop_polling() + end + end, + }) +end + +-- Set up aggressive reload +setup_fugitive_aggressive_reload() diff --git a/home/profiles/nvim/lazynvim/.config/nvim/lua/config/options.lua b/home/profiles/nvim/lazynvim/.config/nvim/lua/config/options.lua index 3ea1454f..88c85493 100644 --- a/home/profiles/nvim/lazynvim/.config/nvim/lua/config/options.lua +++ b/home/profiles/nvim/lazynvim/.config/nvim/lua/config/options.lua @@ -1,3 +1,6 @@ -- Options are automatically loaded before lazy.nvim startup -- Default options that are always set: https://github.com/LazyVim/LazyVim/blob/main/lua/lazyvim/config/options.lua -- Add any additional options here + +-- Enable autoread to detect external file changes +vim.opt.autoread = true diff --git a/home/profiles/nvim/lazynvim/.config/nvim/lua/plugins/amp.lua b/home/profiles/nvim/lazynvim/.config/nvim/lua/plugins/amp.lua new file mode 100644 index 00000000..093b3002 --- /dev/null +++ b/home/profiles/nvim/lazynvim/.config/nvim/lua/plugins/amp.lua @@ -0,0 +1,8 @@ +return { + { + "sourcegraph/amp.nvim", + branch = "main", + lazy = false, + opts = { auto_start = true, log_level = "info" }, + }, +} diff --git a/home/profiles/tmux/tmux.conf b/home/profiles/tmux/tmux.conf index 2eaf48fd..1abdcc0b 100644 --- a/home/profiles/tmux/tmux.conf +++ b/home/profiles/tmux/tmux.conf @@ -9,6 +9,9 @@ set-environment -g COLORTERM "truecolor" # Mouse works as expected set-option -g mouse on + +# Enable focus events for vim/neovim autoread +set -g focus-events on # easy-to-remember split pane commands bind | split-window -h -c "#{pane_current_path}" bind - split-window -v -c "#{pane_current_path}" From 8c48ef0b5b0af39d043a0a7feaf2257cc158c0af Mon Sep 17 00:00:00 2001 From: Anish Lakhwara Date: Tue, 30 Sep 2025 11:16:36 -0700 Subject: [PATCH 3/6] nvim: amp nvim --- home/profiles/nvim/amp-plugin.nix | 13 ++++----- home/profiles/nvim/default.nix | 47 +++++++++++++++++++++++++++++-- 2 files changed, 51 insertions(+), 9 deletions(-) diff --git a/home/profiles/nvim/amp-plugin.nix b/home/profiles/nvim/amp-plugin.nix index 3cf08002..91c177aa 100644 --- a/home/profiles/nvim/amp-plugin.nix +++ b/home/profiles/nvim/amp-plugin.nix @@ -1,9 +1,8 @@ { pkgs }: -if pkgs.stdenv.isDarwin && builtins.pathExists /Users/anishlakhwara/usr/amp.nvim then - pkgs.vimUtils.buildVimPlugin { - pname = "amp-nvim"; - version = "unstable"; - src = /Users/anishlakhwara/usr/amp.nvim; - } -else null +# Remove the conditional entirely for now to test +pkgs.vimUtils.buildVimPlugin { + pname = "amp-nvim"; + version = "unstable"; + src = /Users/anishlakhwara/usr/amp.nvim; +} diff --git a/home/profiles/nvim/default.nix b/home/profiles/nvim/default.nix index abbacb95..aec3459e 100644 --- a/home/profiles/nvim/default.nix +++ b/home/profiles/nvim/default.nix @@ -141,7 +141,7 @@ in extraConfig = '' " so our custom files still get included - set runtimepath+=/home/anish/.config/nvim/ + " set runtimepath+=/home/anish/.config/nvim/ set tabstop=2 set showmatch set shiftwidth=2 @@ -290,6 +290,11 @@ in nnoremap gp :Git! push nnoremap gd :Gdiff nnoremap gc :G commit -v -q %:p + " diffview keybindings + nnoremap do :DiffviewOpen + nnoremap dc :DiffviewClose + nnoremap dh :DiffviewFileHistory % + nnoremap df :DiffviewFileHistory " kitaab "map cz :VimwikiIndex:ZettelNew @@ -465,6 +470,9 @@ in vim.api.nvim_set_keymap('n', 'vt', ':call v:lua.toggle_diagnostics()', {noremap = true, silent = true}) + -- nicer diff view + vim.opt.diffopt = {'internal', 'filler', 'closeoff', 'algorithm:patience', 'indent-heuristic'} + -- autopairs require('nvim-autopairs').setup{} @@ -842,8 +850,15 @@ in -- Setup amp.nvim require('amp').setup({ auto_start = true, - log_level = "info" + log_level = "info", + completion_enabled = true }) + -- require('amp.completion').setup({ + -- keymaps = { + -- accept = "", + -- dismiss = "", + -- } + -- }) ''} -- supercollider @@ -908,6 +923,33 @@ in -- Open the code actions for a visual selection. map("v", "za", ":'<,'>lua vim.lsp.buf.range_code_action()", opts) + -- diffview setup + require('diffview').setup{ + use_icons = true, + view = { + default = { + layout = "diff2_horizontal", + }, + merge_tool = { + layout = "diff3_horizontal", + disable_diagnostics = true, + }, + }, + file_panel = { + listing_style = "tree", + win_config = { + position = "left", + width = 35, + }, + }, + file_history_panel = { + win_config = { + position = "bottom", + height = 16, + }, + }, + } + -- zen mode require('zen-mode').setup{ window = { @@ -1078,6 +1120,7 @@ in vim-fugitive gitsigns-nvim fzf-checkout-vim + diffview-nvim # Clojure stuff # conjure From baa309eb4b6b8b107f48365c290b1f254f78280a Mon Sep 17 00:00:00 2001 From: Anish Lakhwara Date: Sun, 5 Oct 2025 20:51:20 -0700 Subject: [PATCH 4/6] some small nvim changes --- flake.lock | 191 +++++++++++++++++++++++++++++++++ flake.nix | 9 +- home/profiles/nvim/default.nix | 117 ++++++++++++++++++++ 3 files changed, 316 insertions(+), 1 deletion(-) diff --git a/flake.lock b/flake.lock index 5034bb7b..7d1edbb5 100644 --- a/flake.lock +++ b/flake.lock @@ -299,6 +299,20 @@ "type": "github" } }, + "flake-compat_4": { + "flake": false, + "locked": { + "lastModified": 1751685974, + "narHash": "sha256-NKw96t+BgHIYzHUjkTK95FqYRVKB8DHpVhefWSz/kTw=", + "rev": "549f2762aebeff29a2e5ece7a7dc0f955281a1d1", + "type": "tarball", + "url": "https://git.lix.systems/api/v1/repos/lix-project/flake-compat/archive/549f2762aebeff29a2e5ece7a7dc0f955281a1d1.tar.gz?rev=549f2762aebeff29a2e5ece7a7dc0f955281a1d1" + }, + "original": { + "type": "tarball", + "url": "https://git.lix.systems/lix-project/flake-compat/archive/main.tar.gz" + } + }, "flake-parts": { "inputs": { "nixpkgs-lib": "nixpkgs-lib" @@ -417,6 +431,24 @@ "type": "github" } }, + "flake-utils_5": { + "inputs": { + "systems": "systems_5" + }, + "locked": { + "lastModified": 1694529238, + "narHash": "sha256-zsNZZGTGnMOf9YpHKJqMSsa0dXbfmxeoJ7xHlrt+xmY=", + "owner": "numtide", + "repo": "flake-utils", + "rev": "ff7b65b44d01cf9ba6a71320833626af21126384", + "type": "github" + }, + "original": { + "owner": "numtide", + "repo": "flake-utils", + "type": "github" + } + }, "gitignore": { "inputs": { "nixpkgs": [ @@ -440,6 +472,28 @@ "type": "github" } }, + "gomod2nix": { + "inputs": { + "flake-utils": "flake-utils_5", + "nixpkgs": [ + "tangled", + "nixpkgs" + ] + }, + "locked": { + "lastModified": 1754078208, + "narHash": "sha256-YVoIFDCDpYuU3riaDEJ3xiGdPOtsx4sR5eTzHTytPV8=", + "owner": "nix-community", + "repo": "gomod2nix", + "rev": "7f963246a71626c7fc70b431a315c4388a0c95cf", + "type": "github" + }, + "original": { + "owner": "nix-community", + "repo": "gomod2nix", + "type": "github" + } + }, "grasp": { "inputs": { "flake-utils": "flake-utils_4", @@ -567,6 +621,72 @@ "type": "github" } }, + "htmx-src": { + "flake": false, + "locked": { + "narHash": "sha256-nm6avZuEBg67SSyyZUhjpXVNstHHgUxrtBHqJgowU08=", + "type": "file", + "url": "https://unpkg.com/htmx.org@2.0.4/dist/htmx.min.js" + }, + "original": { + "type": "file", + "url": "https://unpkg.com/htmx.org@2.0.4/dist/htmx.min.js" + } + }, + "htmx-ws-src": { + "flake": false, + "locked": { + "narHash": "sha256-2fg6KyEJoO24q0fQqbz9RMaYNPQrMwpZh29tkSqdqGY=", + "type": "file", + "url": "https://cdn.jsdelivr.net/npm/htmx-ext-ws@2.0.2" + }, + "original": { + "type": "file", + "url": "https://cdn.jsdelivr.net/npm/htmx-ext-ws@2.0.2" + } + }, + "ibm-plex-mono-src": { + "flake": false, + "locked": { + "lastModified": 1731402384, + "narHash": "sha256-OwUmrPfEehLDz0fl2ChYLK8FQM2p0G1+EMrGsYEq+6g=", + "type": "tarball", + "url": "https://github.com/IBM/plex/releases/download/@ibm/plex-mono@1.1.0/ibm-plex-mono.zip" + }, + "original": { + "type": "tarball", + "url": "https://github.com/IBM/plex/releases/download/@ibm/plex-mono@1.1.0/ibm-plex-mono.zip" + } + }, + "indigo": { + "flake": false, + "locked": { + "lastModified": 1753693716, + "narHash": "sha256-DMIKnCJRODQXEHUxA+7mLzRALmnZhkkbHlFT2rCQYrE=", + "owner": "oppiliappan", + "repo": "indigo", + "rev": "5f170569da9360f57add450a278d73538092d8ca", + "type": "github" + }, + "original": { + "owner": "oppiliappan", + "repo": "indigo", + "type": "github" + } + }, + "inter-fonts-src": { + "flake": false, + "locked": { + "lastModified": 1731687360, + "narHash": "sha256-5vdKKvHAeZi6igrfpbOdhZlDX2/5+UvzlnCQV6DdqoQ=", + "type": "tarball", + "url": "https://github.com/rsms/inter/releases/download/v4.1/Inter-4.1.zip" + }, + "original": { + "type": "tarball", + "url": "https://github.com/rsms/inter/releases/download/v4.1/Inter-4.1.zip" + } + }, "jovian": { "inputs": { "nix-github-actions": "nix-github-actions", @@ -604,6 +724,19 @@ "type": "github" } }, + "lucide-src": { + "flake": false, + "locked": { + "lastModified": 1754044466, + "narHash": "sha256-+exBR2OToB1iv7ZQI2S4B0lXA/QRvC9n6U99UxGpJGs=", + "type": "tarball", + "url": "https://github.com/lucide-icons/lucide/releases/download/0.536.0/lucide-icons-0.536.0.zip" + }, + "original": { + "type": "tarball", + "url": "https://github.com/lucide-icons/lucide/releases/download/0.536.0/lucide-icons-0.536.0.zip" + } + }, "mk-shell-bin": { "locked": { "lastModified": 1677004959, @@ -980,6 +1113,7 @@ "nur": "nur", "poonam": "poonam", "rust-overlay": "rust-overlay", + "tangled": "tangled", "tidalcycles": "tidalcycles", "unstable": "unstable", "vimwikicli": "vimwikicli" @@ -1022,6 +1156,19 @@ "type": "github" } }, + "sqlite-lib-src": { + "flake": false, + "locked": { + "lastModified": 1706631843, + "narHash": "sha256-bJoMjirsBjm2Qk9KPiy3yV3+8b/POlYe76/FQbciHro=", + "type": "tarball", + "url": "https://sqlite.org/2024/sqlite-amalgamation-3450100.zip" + }, + "original": { + "type": "tarball", + "url": "https://sqlite.org/2024/sqlite-amalgamation-3450100.zip" + } + }, "superdirt-src": { "flake": false, "locked": { @@ -1098,6 +1245,50 @@ "type": "github" } }, + "systems_5": { + "locked": { + "lastModified": 1681028828, + "narHash": "sha256-Vy1rq5AaRuLzOxct8nz4T6wlgyUR7zLU309k9mBC768=", + "owner": "nix-systems", + "repo": "default", + "rev": "da67096a3b9bf56a91d16901293e51ba5b49a27e", + "type": "github" + }, + "original": { + "owner": "nix-systems", + "repo": "default", + "type": "github" + } + }, + "tangled": { + "inputs": { + "flake-compat": "flake-compat_4", + "gomod2nix": "gomod2nix", + "htmx-src": "htmx-src", + "htmx-ws-src": "htmx-ws-src", + "ibm-plex-mono-src": "ibm-plex-mono-src", + "indigo": "indigo", + "inter-fonts-src": "inter-fonts-src", + "lucide-src": "lucide-src", + "nixpkgs": [ + "nixpkgs" + ], + "sqlite-lib-src": "sqlite-lib-src" + }, + "locked": { + "lastModified": 1759559279, + "narHash": "sha256-gA0mh9Fx2uou2v75RMA6qUvWB3Z74Asc6pRjiojwaRo=", + "ref": "refs/heads/master", + "rev": "5ecd54b31547ac169a3b15d6034a67179f22aa33", + "revCount": 1486, + "type": "git", + "url": "https://tangled.org/@tangled.org/core" + }, + "original": { + "type": "git", + "url": "https://tangled.org/@tangled.org/core" + } + }, "tidal-src": { "flake": false, "locked": { diff --git a/flake.nix b/flake.nix index ced56e29..2cb9d3d3 100644 --- a/flake.nix +++ b/flake.nix @@ -65,6 +65,12 @@ inputs.nixpkgs.follows = "unstable"; }; + # Tangled (atproto tools) + tangled = { + url = "git+https://tangled.org/@tangled.org/core"; + inputs.nixpkgs.follows = "nixpkgs"; + }; + # Others nur.url = "github:nix-community/NUR"; rust-overlay = { @@ -89,7 +95,7 @@ outputs = { self, nixpkgs, unstable, nixos-hardware, home-manager, deploy-rs , agenix, disko, basant, grasp, nix-matrix-appservices, nur, tidalcycles , rust-overlay, vimwikicli, autohide-tdrop, darwin, nix-homebrew, homebrew-bundle - , homebrew-core, homebrew-cask, jovian, ... }@inputs: + , homebrew-core, homebrew-cask, jovian, tangled, ... }@inputs: let forAllSystems = nixpkgs.lib.genAttrs [ "aarch64-linux" @@ -147,6 +153,7 @@ # ]; overlays = [ agenix.overlays.default + tangled.overlays.default # atproto tools only on lite deployments self.overlays.additions self.overlays.modifications tidalcycles.overlays.default # needed for nvim which comes pre-installed lol diff --git a/home/profiles/nvim/default.nix b/home/profiles/nvim/default.nix index e34501d6..8a2c51b5 100644 --- a/home/profiles/nvim/default.nix +++ b/home/profiles/nvim/default.nix @@ -228,6 +228,7 @@ in nnoremap fb Telescope buffers nnoremap fh Telescope help_tags nnoremap ft Telescope tags + nnoremap fr lua KitaabRecent() " exit normal mode in terminal :tnoremap @@ -975,6 +976,110 @@ in vim.keymap.set('n', '', 'resize +2', {silent = true}) vim.keymap.set('n', '', 'vertical resize +2', {silent = true}) + -- Kitaab recent files (only date-based files, sorted reverse) + function KitaabRecent() + local pickers = require('telescope.pickers') + local finders = require('telescope.finders') + local conf = require('telescope.config').values + + -- Use current working directory + local kitaab_path = vim.fn.getcwd() + + -- Get all files (depth 1, exclude directories) + local files = vim.fn.readdir(kitaab_path, function(name) + return vim.fn.isdirectory(kitaab_path .. '/' .. name) == 0 + end) + + -- Filter to only date-based files (starting with digit) + local date_files = {} + for _, filename in ipairs(files) do + if filename:match('^%d') then + table.insert(date_files, filename) + end + end + + -- Sort in reverse (most recent first) + table.sort(date_files, function(a, b) return a > b end) + + pickers.new({}, { + prompt_title = 'Kitaab Recent', + finder = finders.new_table({ + results = date_files, + entry_maker = function(entry) + return { + value = kitaab_path .. '/' .. entry, + display = entry, + ordinal = entry, + path = kitaab_path .. '/' .. entry, + } + end + }), + previewer = conf.file_previewer({}), + sorter = conf.generic_sorter({}), + }):find() + end + + -- Setup amp.nvim + require('amp').setup({ + auto_start = true, + log_level = "info" + }) + + -- Amp commands + vim.api.nvim_create_user_command("AmpSend", function(opts) + local message = opts.args + if message == "" then + print("Please provide a message to send") + return + end + local amp_message = require("amp.message") + amp_message.send_message(message) + end, { + nargs = "*", + desc = "Send a message to Amp", + }) + + vim.api.nvim_create_user_command("AmpSendBuffer", function(opts) + local buf = vim.api.nvim_get_current_buf() + local lines = vim.api.nvim_buf_get_lines(buf, 0, -1, false) + local content = table.concat(lines, "\n") + local amp_message = require("amp.message") + amp_message.send_message(content) + end, { + nargs = "?", + desc = "Send current buffer contents to Amp", + }) + + vim.api.nvim_create_user_command("AmpPromptSelection", function(opts) + local lines = vim.api.nvim_buf_get_lines(0, opts.line1 - 1, opts.line2, false) + local text = table.concat(lines, "\n") + local amp_message = require("amp.message") + amp_message.send_to_prompt(text) + end, { + range = true, + desc = "Add selected text to Amp prompt", + }) + + vim.api.nvim_create_user_command("AmpPromptRef", function(opts) + local bufname = vim.api.nvim_buf_get_name(0) + if bufname == "" then + print("Current buffer has no filename") + return + end + local relative_path = vim.fn.fnamemodify(bufname, ":.") + local ref = "@" .. relative_path + if opts.line1 ~= opts.line2 then + ref = ref .. "#L" .. opts.line1 .. "-" .. opts.line2 + elseif opts.line1 > 1 then + ref = ref .. "#L" .. opts.line1 + end + local amp_message = require("amp.message") + amp_message.send_to_prompt(ref) + end, { + range = true, + desc = "Add file reference (with selection) to Amp prompt", + }) + EOF ''; @@ -1093,6 +1198,17 @@ in yuck-vim nvim-parinfer # vim-processing + + # amp.nvim for Sourcegraph Amp integration + (pkgs.vimUtils.buildVimPlugin { + name = "amp-nvim"; + src = pkgs.fetchFromGitHub { + owner = "sourcegraph"; + repo = "amp.nvim"; + rev = "main"; + sha256 = "1n6d8nbakyg6yiq8mhhrvmsp9z0zb8cb67820jsg3wl6vqd1vwv5"; + }; + }) ]; withPython3 = true; extraPython3Packages = pkgs: with pkgs; [ tasklib six packaging ]; @@ -1100,3 +1216,4 @@ in }; } + From 14a75dc1bfe7a38e9e1833da468bf64bcc9a49b2 Mon Sep 17 00:00:00 2001 From: Anish Lakhwara Date: Mon, 6 Oct 2025 10:56:12 -0700 Subject: [PATCH 5/6] add git commit signing --- home/profiles/git/default.nix | 8 +++++++- 1 file changed, 7 insertions(+), 1 deletion(-) diff --git a/home/profiles/git/default.nix b/home/profiles/git/default.nix index 872eb1e4..3d02cd7c 100644 --- a/home/profiles/git/default.nix +++ b/home/profiles/git/default.nix @@ -12,7 +12,10 @@ userName = "Anish Lakhwara"; userEmail = "anish+git@lakhwara.com"; delta.enable = true; - # TODO enable signing + signing = { + signByDefault = true; + key = "7FC5DF072EF7B716"; + }; ignores = [ "*~" @@ -56,6 +59,7 @@ pull.rebase = false; push.autoSetupRemote = true; init.defaultBranch = "main"; + "url \"git@github.com:\"" = { insteadOf = "https://github.com/"; }; }; aliases = { @@ -94,6 +98,8 @@ # delete merged branches bdm = "!git branch --merged | grep -v '*' | xargs -n 1 git branch -d"; + undo = "!git reset HEAD~1 --mixed"; + blm = "blame -w -C -C -C"; }; }; } From 7d9c921f21ea905feeb1007b0f700c9448678f3b Mon Sep 17 00:00:00 2001 From: Anish Lakhwara Date: Tue, 7 Oct 2025 14:31:18 -0700 Subject: [PATCH 6/6] fix: nvim build --- home/profiles/nvim/amp-plugin.nix | 8 -------- home/profiles/nvim/amp.lua | 5 ----- home/profiles/nvim/default.nix | 23 ++++++++++++----------- 3 files changed, 12 insertions(+), 24 deletions(-) delete mode 100644 home/profiles/nvim/amp-plugin.nix delete mode 100644 home/profiles/nvim/amp.lua diff --git a/home/profiles/nvim/amp-plugin.nix b/home/profiles/nvim/amp-plugin.nix deleted file mode 100644 index 91c177aa..00000000 --- a/home/profiles/nvim/amp-plugin.nix +++ /dev/null @@ -1,8 +0,0 @@ -{ pkgs }: - -# Remove the conditional entirely for now to test -pkgs.vimUtils.buildVimPlugin { - pname = "amp-nvim"; - version = "unstable"; - src = /Users/anishlakhwara/usr/amp.nvim; -} diff --git a/home/profiles/nvim/amp.lua b/home/profiles/nvim/amp.lua deleted file mode 100644 index 4098774a..00000000 --- a/home/profiles/nvim/amp.lua +++ /dev/null @@ -1,5 +0,0 @@ --- amp.nvim configuration -require('amp').setup({ - auto_start = true, - log_level = "info" -}) diff --git a/home/profiles/nvim/default.nix b/home/profiles/nvim/default.nix index 943376b7..a8867bb0 100644 --- a/home/profiles/nvim/default.nix +++ b/home/profiles/nvim/default.nix @@ -17,9 +17,10 @@ let owner = "sourcegraph"; repo = "amp.nvim"; rev = "main"; - sha256 = "1n6d8nbakyg6yiq8mhhrvmsp9z0zb8cb67820jsg3wl6vqd1vwv5"; + sha256 = "Sm/SQEIZlnqu/sD+MhZzgGm3bf+HnADOOimZ2Q++MXU="; }; - } + }; + my-lspsaga = pkgs.vimUtils.buildVimPlugin { name = "lspsaga.nvim"; src = pkgs.fetchFromGitHub { @@ -326,10 +327,10 @@ in let g:fzf_layout = { 'window': { 'width': 0.8, 'height': 0.8 } } " lsp commands - nnoremap vgd :lua vim.lsp.buf.definition() - nnoremap vi :lua require('telescope.builtin').lsp_implementation() - nnoremap vsh :lua vim.lsp.buf.signature_help() - nnoremap vrr :lua require('telescope.builtin').lsp_references() + nnoremap gd :lua vim.lsp.buf.definition() + nnoremap gI :lua require('telescope.builtin').lsp_implementation() + nnoremap gK :lua vim.lsp.buf.signature_help() + nnoremap gr :lua require('telescope.builtin').lsp_references() " nnoremap vrn :lua vim.lsp.buf.rename() " nnoremap vh :lua vim.lsp.buf.hover() " nnoremap vca :lua vim.lsp.buf.code_action() @@ -338,9 +339,9 @@ in " nnoremap va :lua require('telescope.builtin').lsp_code_actions(require('telescope.themes').get_cursor()) " lspsaga stuff doesn't work nnoremap vd :Lspsaga peek_definition - nnoremap vrn :Lspsaga rename - nnoremap vh :Lspsaga hover_doc - nnoremap vca :Lspsaga code_action + nnoremap cr :Lspsaga rename + nnoremap K :Lspsaga hover_doc + nnoremap ca :Lspsaga code_action nnoremap vsd :Lspsaga show_line_diagnostics nnoremap vs :Dasht nnoremap vn :Lspsaga diagnostic_jump_prev @@ -928,7 +929,7 @@ in map("n", "zl", "ZkLinks", opts) -- Preview a linked note. - map("n", "K", "lua vim.lsp.buf.hover()", opts) + map("n", "ck", "lua vim.lsp.buf.hover()", opts) -- Open the code actions for a visual selection. map("v", "za", ":'<,'>lua vim.lsp.buf.range_code_action()", opts) @@ -1257,7 +1258,7 @@ in ] ++ lib.optionals pkgs.stdenv.isLinux [ # Linux-only plugins vim-tidal # requires SuperCollider which is Linux-only - ] + ]; withPython3 = true; extraPython3Packages = pkgs: with pkgs; [ tasklib six packaging ]; vimAlias = true;