feat(opencode): add opencode.json

Signed-off-by: Anthony Oteri <4360016+anthonyoteri@users.noreply.github.com>

.config/btop/btop.conf

@@ -1,18 +1,18 @@
-#? Config file for btop v. 1.4.5
+#? Config file for btop v.1.4.6
 
 #* Name of a btop++/bpytop/bashtop formatted ".theme" file, "Default" and "TTY" for builtin themes.
 #* Themes should be placed in "../share/btop/themes" relative to binary or "$HOME/.config/btop/themes"
 color_theme = "gruvbox"
 
 #* If the theme set background should be shown, set to False if you want terminal background transparency.
-theme_background = True
+theme_background = true
 
 #* Sets if 24-bit truecolor should be used, will convert 24-bit colors to 256 color (6x6x6 color cube) if false.
-truecolor = True
+truecolor = true
 
 #* Set to true to force tty mode regardless if a real tty has been detected or not.
 #* Will force 16-color mode and TTY theme, set all graph symbols to "tty" and swap out other non tty friendly symbols.
-force_tty = False
+force_tty = false
 
 #* Define presets for the layout of the boxes. Preset 0 is always all boxes shown with default settings. Max 9 presets.
 #* Format: "box_name:P:G,box_name:P:G" P=(0 or 1) for alternate positions, G=graph symbol to use for box.
@@ -22,10 +22,13 @@ presets = "cpu:1:default,proc:0:default cpu:0:default,mem:0:default,net:0:defaul
 
 #* Set to True to enable "h,j,k,l,g,G" keys for directional control in lists.
 #* Conflicting keys for h:"help" and k:"kill" is accessible while holding shift.
-vim_keys = True
+vim_keys = true
 
 #* Rounded corners on boxes, is ignored if TTY mode is ON.
-rounded_corners = True
+rounded_corners = true
+
+#* Use terminal synchronized output sequences to reduce flickering on supported terminals.
+terminal_sync = true
 
 #* Default symbols to use for graph creation, "braille", "block" or "tty".
 #* "braille" offers the highest resolution but might not be included in all fonts.
@@ -57,37 +60,40 @@ update_ms = 2000
 proc_sorting = "cpu lazy"
 
 #* Reverse sorting order, True or False.
-proc_reversed = False
+proc_reversed = false
 
 #* Show processes as a tree.
-proc_tree = False
+proc_tree = false
 
 #* Use the cpu graph colors in the process list.
-proc_colors = True
+proc_colors = true
 
 #* Use a darkening gradient in the process list.
-proc_gradient = True
+proc_gradient = true
 
 #* If process cpu usage should be of the core it's running on or usage of the total available cpu power.
-proc_per_core = False
+proc_per_core = false
 
 #* Show process memory as bytes instead of percent.
-proc_mem_bytes = True
+proc_mem_bytes = true
 
 #* Show cpu graph for each process.
-proc_cpu_graphs = True
+proc_cpu_graphs = true
 
 #* Use /proc/[pid]/smaps for memory information in the process info box (very slow but more accurate)
-proc_info_smaps = False
+proc_info_smaps = false
 
 #* Show proc box on left side of screen instead of right.
-proc_left = False
+proc_left = false
 
 #* (Linux) Filter processes tied to the Linux kernel(similar behavior to htop).
-proc_filter_kernel = False
+proc_filter_kernel = false
 
 #* In tree-view, always accumulate child process resources in the parent process.
-proc_aggregate = False
+proc_aggregate = false
+
+#* Should cpu and memory usage display be preserved for dead processes when paused.
+keep_dead_proc_usage = false
 
 #* Sets the CPU stat shown in upper half of the CPU graph, "total" is always available.
 #* Select from a list of detected attributes from the options menu.
@@ -98,28 +104,28 @@ cpu_graph_upper = "Auto"
 cpu_graph_lower = "Auto"
 
 #* Toggles if the lower CPU graph should be inverted.
-cpu_invert_lower = True
+cpu_invert_lower = true
 
 #* Set to True to completely disable the lower CPU graph.
-cpu_single_graph = False
+cpu_single_graph = false
 
 #* Show cpu box at bottom of screen instead of top.
-cpu_bottom = False
+cpu_bottom = false
 
 #* Shows the system uptime in the CPU box.
-show_uptime = True
+show_uptime = true
 
 #* Shows the CPU package current power consumption in watts. Requires running `make setcap` or `make setuid` or running with sudo.
-show_cpu_watts = True
+show_cpu_watts = true
 
 #* Show cpu temperature.
-check_temp = True
+check_temp = true
 
 #* Which sensor to use for cpu temperature, use options menu to select from list of available sensors.
 cpu_sensor = "Auto"
 
 #* Show temperatures for cpu cores also if check_temp is True and sensors has been found.
-show_coretemp = True
+show_coretemp = true
 
 #* Set a custom mapping between core and coretemp, can be needed on certain cpus to get correct temperature for correct core.
 #* Use lm-sensors or similar to see which cores are reporting temperatures on your machine.
@@ -131,17 +137,17 @@ cpu_core_map = ""
 temp_scale = "celsius"
 
 #* Use base 10 for bits/bytes sizes, KB = 1000 instead of KiB = 1024.
-base_10_sizes = False
+base_10_sizes = false
 
 #* Show CPU frequency.
-show_cpu_freq = True
+show_cpu_freq = true
 
 #* Draw a clock at top of screen, formatting according to strftime, empty string to disable.
 #* Special formatting: /host = hostname | /user = username | /uptime = system uptime
 clock_format = "%X"
 
 #* Update main ui in background when menus are showing, set this to false if the menus is flickering too much for comfort.
-background_update = True
+background_update = true
 
 #* Custom cpu model name, empty string to disable.
 custom_cpu_name = ""
@@ -151,43 +157,43 @@ custom_cpu_name = ""
 disks_filter = ""
 
 #* Show graphs instead of meters for memory values.
-mem_graphs = True
+mem_graphs = true
 
 #* Show mem box below net box instead of above.
-mem_below_net = False
+mem_below_net = false
 
 #* Count ZFS ARC in cached and available memory.
-zfs_arc_cached = True
+zfs_arc_cached = true
 
 #* If swap memory should be shown in memory box.
-show_swap = True
+show_swap = true
 
 #* Show swap as a disk, ignores show_swap value above, inserts itself after first disk.
-swap_disk = True
+swap_disk = true
 
 #* If mem box should be split to also show disks info.
-show_disks = True
+show_disks = true
 
 #* Filter out non physical disks. Set this to False to include network disks, RAM disks and similar.
-only_physical = True
+only_physical = true
 
 #* Read disks list from /etc/fstab. This also disables only_physical.
-use_fstab = True
+use_fstab = true
 
 #* Setting this to True will hide all datasets, and only show ZFS pools. (IO stats will be calculated per-pool)
-zfs_hide_datasets = False
+zfs_hide_datasets = false
 
 #* Set to true to show available disk space for privileged users.
-disk_free_priv = False
+disk_free_priv = false
 
 #* Toggles if io activity % (disk busy time) should be shown in regular disk usage view.
-show_io_stat = True
+show_io_stat = true
 
 #* Toggles io mode for disks, showing big graphs for disk read/write speeds.
-io_mode = False
+io_mode = false
 
 #* Set to True to show combined read/write io graphs in io mode.
-io_graph_combined = False
+io_graph_combined = false
 
 #* Set the top speed for the io graphs in MiB/s (100 by default), use format "mountpoint:speed" separate disks with whitespace " ".
 #* Example: "/mnt/media:100 /:20 /boot:1".
@@ -199,10 +205,10 @@ net_download = 100
 net_upload = 100
 
 #* Use network graphs auto rescaling mode, ignores any values set above and rescales down to 10 Kibibytes at the lowest.
-net_auto = True
+net_auto = true
 
 #* Sync the auto scaling for download and upload to whichever currently has the highest scale.
-net_sync = True
+net_sync = true
 
 #* Starts with the Network Interface specified here.
 net_iface = ""
@@ -211,14 +217,17 @@ net_iface = ""
 base_10_bitrate = "Auto"
 
 #* Show battery stats in top right if battery is present.
-show_battery = True
+show_battery = true
 
 #* Which battery to use if multiple are present. "Auto" for auto detection.
 selected_battery = "Auto"
 
 #* Show power stats of battery next to charge indicator.
-show_battery_watts = True
+show_battery_watts = true
 
-#* Set loglevel for "~/.config/btop/btop.log" levels are: "ERROR" "WARNING" "INFO" "DEBUG".
+#* Set loglevel for "~/.local/state/btop.log" levels are: "ERROR" "WARNING" "INFO" "DEBUG".
 #* The level set includes all lower levels, i.e. "DEBUG" will show all logging info.
 log_level = "WARNING"
+
+#* Automatically save current settings to config file on exit.
+save_config_on_exit = true

.config/catppuccin-mocha-mauve.yaml

@@ -0,0 +1 @@
+eza/catppuccin-mocha-mauve.yaml

.config/eza/catppuccin-mocha-mauve.yaml

@@ -0,0 +1 @@
+

.config/ghostty/config

@@ -0,0 +1,10 @@
+theme = catppuccin mocha
+font-family = "JetBrainsMonoNL Nerd Font Mono"
+font-size = 14
+copy-on-select = clipboard
+background-opacity = 0.9
+background-blur = 90
+adjust-cell-height = 5%
+window-colorspace = "display-p3"
+shell-integration-features = cursor,sudo,title,ssh-env,ssh-terminfo,path
+term = xterm-256color

.config/lazygit/config.yml

@@ -1,10 +1,4 @@
 gui:
-    authorColors: {}
-    branchColors: {}
-    branchColorPatterns: {}
-    customIcons:
-        filenames: {}
-        extensions: {}
     scrollHeight: 2
     scrollPastBottom: true
     scrollOffMargin: 2
@@ -24,47 +18,17 @@ gui:
     enlargedSideViewLocation: left
     wrapLinesInStagingView: true
     useHunkModeInStagingView: true
-    language: auto
-    timeFormat: 02 Jan 06
-    shortTimeFormat: 3:04PM
-    theme:
-        activeBorderColor:
-            - '#b8bb26'
-            - bold
-        inactiveBorderColor:
-            - '#665c54'
-        searchingActiveBorderColor:
-            - '#8ec07c'
-            - bold
-        optionsTextColor:
-            - '#fabd2f'
-        selectedLineBgColor:
-            - '#3c3836'
-        inactiveViewSelectedLineBgColor:
-            - '#7c6f64'
-        cherryPickedCommitFgColor:
-            - '#b8bb26'
-        cherryPickedCommitBgColor:
-            - '#282828'
-        markedBaseCommitFgColor:
-            - '#fabd2f'
-        markedBaseCommitBgColor:
-            - '#282828'
-        unstagedChangesColor:
-            - '#fb4934'
-        defaultFgColor:
-            - '#ebdbb2'
     commitLength:
         show: true
     showListFooter: true
     showFileTree: true
-    showRootItemInFileTree: true
+    showRootItemInFileTree: false
     showNumstatInFilesView: false
-    showRandomTip: true
+    showRandomTip: false
-    showCommandLog: true
+    showCommandLog: false
     showBottomLine: true
     showPanelJumps: true
-    showIcons: false
+    showIcons: true
     nerdFontsVersion: ""
     showFileIcons: true
     commitAuthorShortLength: 2
@@ -73,25 +37,41 @@ gui:
     showBranchCommitHash: false
     showDivergenceFromBaseBranch: none
     commandLogSize: 8
-    splitDiff: always
+    splitDiff: auto
     screenMode: normal
     border: rounded
     animateExplosion: true
     portraitMode: auto
     filterMode: substring
-    spinner:
-        frames:
-            - '|'
-            - /
-            - '-'
-            - \
-        rate: 50
     statusPanelView: dashboard
     switchToFilesAfterStashPop: true
     switchToFilesAfterStashApply: true
     switchTabsWithPanelJumpKeys: false
+    theme:
+      activeBorderColor:
+        - '#89b4fa'
+        - bold
+      inactiveBorderColor:
+        - '#a6adc8'
+      optionsTextColor:
+        - '#89b4fa'
+      selectedLineBgColor:
+        - '#313244'
+      cherryPickedCommitBgColor:
+        - '#45475a'
+      cherryPickedCommitFgColor:
+        - '#89b4fa'
+      unstagedChangesColor:
+        - '#f38ba8'
+      defaultFgColor:
+        - '#cdd6f4'
+      searchingActiveBorderColor:
+        - '#f9e2af'
+
+    authorColors:
+      '*': '#b4befe'
 git:
-    diffCommand: "delta --dark --syntax-theme=gruvbox --paging=always"
+    diffCommand: "delta --dark --paging=always"
     fzfIntegration: true
     pagers: []
     commit:
@@ -127,10 +107,13 @@ git:
     log:
         order: topo-order
         showGraph: always
-    showWholeGraph: true
+    showWholeGraph: false
     localBranchSortOrder: date
     remoteBranchSortOrder: date
     truncateCopiedCommitHashesTo: 12
+    paging:
+        colorArg: always
+        pager: delta --dark --paging=never --syntax-theme base16-256 -s
 update:
     method: prompt
     days: 14
@@ -143,178 +126,5 @@ disableStartupPopups: false
 customCommands: []
 services: {}
 notARepository: prompt
-promptToReturnFromSubprocess: true
+promptToReturnFromSubprocess: false
-keybinding:
-    universal:
-        quit: q
-        quit-alt1: <c-c>
-        suspendApp: <c-z>
-        return: <esc>
-        quitWithoutChangingDirectory: Q
-        togglePanel: <tab>
-        prevItem: <up>
-        nextItem: <down>
-        prevItem-alt: k
-        nextItem-alt: j
-        prevPage: ','
-        nextPage: .
-        scrollLeft: H
-        scrollRight: L
-        gotoTop: <
-        gotoBottom: '>'
-        gotoTop-alt: <home>
-        gotoBottom-alt: <end>
-        toggleRangeSelect: v
-        rangeSelectDown: <s-down>
-        rangeSelectUp: <s-up>
-        prevBlock: <left>
-        nextBlock: <right>
-        prevBlock-alt: h
-        nextBlock-alt: l
-        nextBlock-alt2: <tab>
-        prevBlock-alt2: <backtab>
-        jumpToBlock:
-            - "1"
-            - "2"
-            - "3"
-            - "4"
-            - "5"
-        focusMainView: "0"
-        nextMatch: "n"
-        prevMatch: "N"
-        startSearch: /
-        optionMenu: <disabled>
-        optionMenu-alt1: '?'
-        select: <space>
-        goInto: <enter>
-        confirm: <enter>
-        confirmMenu: <enter>
-        confirmSuggestion: <enter>
-        confirmInEditor: <a-enter>
-        confirmInEditor-alt: <c-s>
-        remove: d
-        new: "n"
-        edit: e
-        openFile: o
-        scrollUpMain: <pgup>
-        scrollDownMain: <pgdown>
-        scrollUpMain-alt1: K
-        scrollDownMain-alt1: J
-        scrollUpMain-alt2: <c-u>
-        scrollDownMain-alt2: <c-d>
-        executeShellCommand: ':'
-        createRebaseOptionsMenu: m
-        pushFiles: P
-        pullFiles: p
-        refresh: R
-        createPatchOptionsMenu: <c-p>
-        nextTab: ']'
-        prevTab: '['
-        nextScreenMode: +
-        prevScreenMode: _
-        cyclePagers: '|'
-        undo: z
-        redo: Z
-        filteringMenu: <c-s>
-        diffingMenu: W
-        diffingMenu-alt: <c-e>
-        copyToClipboard: <c-o>
-        openRecentRepos: <c-r>
-        submitEditorText: <enter>
-        extrasMenu: '@'
-        toggleWhitespaceInDiffView: <c-w>
-        increaseContextInDiffView: '}'
-        decreaseContextInDiffView: '{'
-        increaseRenameSimilarityThreshold: )
-        decreaseRenameSimilarityThreshold: (
-        openDiffTool: <c-t>
-    status:
-        checkForUpdate: u
-        recentRepos: <enter>
-        allBranchesLogGraph: a
-    files:
-        commitChanges: c
-        commitChangesWithoutHook: w
-        amendLastCommit: A
-        commitChangesWithEditor: C
-        findBaseCommitForFixup: <c-f>
-        confirmDiscard: x
-        ignoreFile: i
-        refreshFiles: r
-        stashAllChanges: s
-        viewStashOptions: S
-        toggleStagedAll: a
-        viewResetOptions: D
-        fetch: f
-        toggleTreeView: '`'
-        openMergeOptions: M
-        openStatusFilter: <c-b>
-        copyFileInfoToClipboard: "y"
-        collapseAll: '-'
-        expandAll: =
-    branches:
-        createPullRequest: o
-        viewPullRequestOptions: O
-        copyPullRequestURL: <c-y>
-        checkoutBranchByName: c
-        forceCheckoutBranch: F
-        checkoutPreviousBranch: '-'
-        rebaseBranch: r
-        renameBranch: R
-        mergeIntoCurrentBranch: M
-        moveCommitsToNewBranch: "N"
-        viewGitFlowOptions: i
-        fastForward: f
-        createTag: T
-        pushTag: P
-        setUpstream: u
-        fetchRemote: f
-        sortOrder: s
-    worktrees:
-        viewWorktreeOptions: w
-    commits:
-        squashDown: s
-        renameCommit: r
-        renameCommitWithEditor: R
-        viewResetOptions: g
-        markCommitAsFixup: f
-        createFixupCommit: F
-        squashAboveCommits: S
-        moveDownCommit: <c-j>
-        moveUpCommit: <c-k>
-        amendToCommit: A
-        resetCommitAuthor: a
-        pickCommit: p
-        revertCommit: t
-        cherryPickCopy: C
-        pasteCommits: V
-        markCommitAsBaseForRebase: B
-        tagCommit: T
-        checkoutCommit: <space>
-        resetCherryPick: <c-R>
-        copyCommitAttributeToClipboard: "y"
-        openLogMenu: <c-l>
-        openInBrowser: o
-        viewBisectOptions: b
-        startInteractiveRebase: i
-        selectCommitsOfCurrentBranch: '*'
-    amendAttribute:
-        resetAuthor: a
-        setAuthor: A
-        addCoAuthor: c
-    stash:
-        popStash: g
-        renameStash: r
-    commitFiles:
-        checkoutCommitFile: c
-    main:
-        toggleSelectHunk: a
-        pickBothHunks: b
-        editSelectHunk: E
-    submodules:
-        init: i
-        update: u
-        bulkMenu: b
-    commitMessage:
-        commitMenu: <c-o>
 

.config/nvim/lazy-lock.json

@@ -0,0 +1,59 @@
+{
+  "LazyVim": { "branch": "main", "commit": "fca0af57cc3851b14f96a795a9c9bfafc5096dd1" },
+  "SchemaStore.nvim": { "branch": "main", "commit": "157fa3f37a3be55ceb375274e2f3ea2d7d2f9ef6" },
+  "blink-copilot": { "branch": "main", "commit": "7ad8209b2f880a2840c94cdcd80ab4dc511d4f39" },
+  "blink.cmp": { "branch": "main", "commit": "451168851e8e2466bc97ee3e026c3dcb9141ce07" },
+  "bufferline.nvim": { "branch": "main", "commit": "655133c3b4c3e5e05ec549b9f8cc2894ac6f51b3" },
+  "catppuccin": { "branch": "main", "commit": "384f304c8b04664c9e0091fbfb3923c5f97c1bcf" },
+  "cmake-tools.nvim": { "branch": "master", "commit": "b3a5d4d3e889d0f8f0c94ccd910407c6ce466b25" },
+  "conform.nvim": { "branch": "master", "commit": "086a40dc7ed8242c03be9f47fbcee68699cc2395" },
+  "copilot.lua": { "branch": "master", "commit": "8e2a91828210d6043744468f6d7027d256a41f42" },
+  "crates.nvim": { "branch": "main", "commit": "ac9fa498a9edb96dc3056724ff69d5f40b898453" },
+  "dial.nvim": { "branch": "master", "commit": "f2634758455cfa52a8acea6f142dcd6271a1bf57" },
+  "flash.nvim": { "branch": "main", "commit": "fcea7ff883235d9024dc41e638f164a450c14ca2" },
+  "friendly-snippets": { "branch": "main", "commit": "6cd7280adead7f586db6fccbd15d2cac7e2188b9" },
+  "fzf-lua": { "branch": "main", "commit": "6e41ba7505f35a6f054ca682b043aa0cea36c2ef" },
+  "gh.nvim": { "branch": "main", "commit": "6f367b2ab8f9d4a0a23df2b703a3f91137618387" },
+  "gitsigns.nvim": { "branch": "main", "commit": "7c4faa3540d0781a28588cafbd4dd187a28ac6e3" },
+  "grug-far.nvim": { "branch": "main", "commit": "dc4684e163971bb1f5bfb93fbd4bb3e892bf9b15" },
+  "inc-rename.nvim": { "branch": "main", "commit": "0074b551a17338ccdcd299bd86687cc651bcb33d" },
+  "lazy.nvim": { "branch": "main", "commit": "85c7ff3711b730b4030d03144f6db6375044ae82" },
+  "lazydev.nvim": { "branch": "main", "commit": "ff2cbcba459b637ec3fd165a2be59b7bbaeedf0d" },
+  "litee.nvim": { "branch": "main", "commit": "4efaf373322d9e71eaff31164abb393417cc6f6a" },
+  "lualine.nvim": { "branch": "master", "commit": "47f91c416daef12db467145e16bed5bbfe00add8" },
+  "markdown-preview.nvim": { "branch": "master", "commit": "a923f5fc5ba36a3b17e289dc35dc17f66d0548ee" },
+  "mason-lspconfig.nvim": { "branch": "main", "commit": "a676ab7282da8d651e175118bcf54483ca11e46d" },
+  "mason.nvim": { "branch": "main", "commit": "44d1e90e1f66e077268191e3ee9d2ac97cc18e65" },
+  "mini.ai": { "branch": "main", "commit": "4b0a6207341d895b6cfe9bcb1e4d3e8607bfe4f4" },
+  "mini.hipatterns": { "branch": "main", "commit": "2c5dce6dc7443de814d16f7470549811ee86e664" },
+  "mini.icons": { "branch": "main", "commit": "5b9076dae1bfbe47ba4a14bc8b967cde0ab5d77e" },
+  "mini.pairs": { "branch": "main", "commit": "b7fde3719340946feb75017ef9d75edebdeb0566" },
+  "neotest": { "branch": "master", "commit": "deadfb1af5ce458742671ad3a013acb9a6b41178" },
+  "neotest-golang": { "branch": "main", "commit": "58d07a76d714f8f768bbe27711b06d41ca237728" },
+  "neotest-python": { "branch": "master", "commit": "b0d3a861bd85689d8ed73f0590c47963a7eb1bf9" },
+  "neotest-zig": { "branch": "main", "commit": "de63f3b9a182d374d2e71cf44385326682ec90e7" },
+  "noice.nvim": { "branch": "main", "commit": "7bfd942445fb63089b59f97ca487d605e715f155" },
+  "nui.nvim": { "branch": "main", "commit": "de740991c12411b663994b2860f1a4fd0937c130" },
+  "nvim-ansible": { "branch": "main", "commit": "c7f595d568b588942d4d0c37b5cd6cae3764a148" },
+  "nvim-lint": { "branch": "master", "commit": "606b823a57b027502a9ae00978ebf4f5d5158098" },
+  "nvim-lspconfig": { "branch": "master", "commit": "dd261ad5266ab5bbec249d21efeceda98ff3e1a6" },
+  "nvim-nio": { "branch": "master", "commit": "21f5324bfac14e22ba26553caf69ec76ae8a7662" },
+  "nvim-treesitter": { "branch": "main", "commit": "ebc3201290b8372df2b3a1c23b71b9f007d972ff" },
+  "nvim-treesitter-textobjects": { "branch": "main", "commit": "4e91b5d0394329a229725b021a8ea217099826ef" },
+  "nvim-ts-autotag": { "branch": "main", "commit": "8e1c0a389f20bf7f5b0dd0e00306c1247bda2595" },
+  "persistence.nvim": { "branch": "main", "commit": "b20b2a7887bd39c1a356980b45e03250f3dce49c" },
+  "plenary.nvim": { "branch": "master", "commit": "b9fd5226c2f76c951fc8ed5923d85e4de065e509" },
+  "render-markdown.nvim": { "branch": "main", "commit": "e3c18ddd27a853f85a6f513a864cf4f2982b9f26" },
+  "rustaceanvim": { "branch": "master", "commit": "f2f0c1231a5b019dbc1fd6dafac1751c878925a3" },
+  "snacks.nvim": { "branch": "main", "commit": "a049339328e2599ad6e85a69fa034ac501e921b2" },
+  "todo-comments.nvim": { "branch": "main", "commit": "31e3c38ce9b29781e4422fc0322eb0a21f4e8668" },
+  "tokyonight.nvim": { "branch": "main", "commit": "5da1b76e64daf4c5d410f06bcb6b9cb640da7dfd" },
+  "trouble.nvim": { "branch": "main", "commit": "bd67efe408d4816e25e8491cc5ad4088e708a69a" },
+  "ts-comments.nvim": { "branch": "main", "commit": "123a9fb12e7229342f807ec9e6de478b1102b041" },
+  "venv-selector.nvim": { "branch": "main", "commit": "42e8faadf9b819654f29eb1a785797a3a328f301" },
+  "vim-dadbod": { "branch": "master", "commit": "6d1d41da4873a445c5605f2005ad2c68c99d8770" },
+  "vim-dadbod-completion": { "branch": "master", "commit": "a8dac0b3cf6132c80dc9b18bef36d4cf7a9e1fe6" },
+  "vim-dadbod-ui": { "branch": "master", "commit": "07e92e22114cc5b1ba4938d99897d85b58e20475" },
+  "which-key.nvim": { "branch": "main", "commit": "3aab2147e74890957785941f0c1ad87d0a44c15a" },
+  "yanky.nvim": { "branch": "main", "commit": "784188e0a7363e762e53140f39124d786aec0832" }
+}

.config/nvim/lazyvim.json

@@ -1,8 +1,32 @@
 {
   "extras": [
-
+    "lazyvim.plugins.extras.ai.copilot",
+    "lazyvim.plugins.extras.coding.yanky",
+    "lazyvim.plugins.extras.editor.dial",
+    "lazyvim.plugins.extras.editor.fzf",
+    "lazyvim.plugins.extras.editor.inc-rename",
+    "lazyvim.plugins.extras.formatting.black",
+    "lazyvim.plugins.extras.formatting.prettier",
+    "lazyvim.plugins.extras.lang.ansible",
+    "lazyvim.plugins.extras.lang.cmake",
+    "lazyvim.plugins.extras.lang.docker",
+    "lazyvim.plugins.extras.lang.git",
+    "lazyvim.plugins.extras.lang.go",
+    "lazyvim.plugins.extras.lang.json",
+    "lazyvim.plugins.extras.lang.markdown",
+    "lazyvim.plugins.extras.lang.python",
+    "lazyvim.plugins.extras.lang.rust",
+    "lazyvim.plugins.extras.lang.sql",
+    "lazyvim.plugins.extras.lang.toml",
+    "lazyvim.plugins.extras.lang.yaml",
+    "lazyvim.plugins.extras.lang.zig",
+    "lazyvim.plugins.extras.test.core",
+    "lazyvim.plugins.extras.util.dot",
+    "lazyvim.plugins.extras.util.gh",
+    "lazyvim.plugins.extras.util.gitui",
+    "lazyvim.plugins.extras.util.mini-hipatterns"
   ],
-  "install_version": 7,
+  "install_version": 8,
   "news": {
     "NEWS.md": "11866"
   },

.config/nvim/lua/config/lazy.lua

@@ -1,53 +1,53 @@
 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 lazyrepo = "https://github.com/folke/lazy.nvim.git"
-  local out = vim.fn.system({ "git", "clone", "--filter=blob:none", "--branch=stable", lazyrepo, lazypath })
+    local out = vim.fn.system({ "git", "clone", "--filter=blob:none", "--branch=stable", lazyrepo, lazypath })
-  if vim.v.shell_error ~= 0 then
+    if vim.v.shell_error ~= 0 then
-    vim.api.nvim_echo({
+        vim.api.nvim_echo({
-      { "Failed to clone lazy.nvim:\n", "ErrorMsg" },
+            { "Failed to clone lazy.nvim:\n", "ErrorMsg" },
-      { out, "WarningMsg" },
+            { out, "WarningMsg" },
-      { "\nPress any key to exit..." },
+            { "\nPress any key to exit..." },
-    }, true, {})
+        }, true, {})
-    vim.fn.getchar()
+        vim.fn.getchar()
-    os.exit(1)
+        os.exit(1)
-  end
+    end
 end
 vim.opt.rtp:prepend(lazypath)
 
 require("lazy").setup({
-  spec = {
+    spec = {
-    -- add LazyVim and import its plugins
+        -- add LazyVim and import its plugins
-    { "LazyVim/LazyVim", import = "lazyvim.plugins" },
+        { "LazyVim/LazyVim", import = "lazyvim.plugins" },
-    -- import/override with your plugins
+        -- import/override with your plugins
-    { import = "plugins" },
+        { import = "plugins" },
-  },
+    },
-  defaults = {
+    defaults = {
-    -- By default, only LazyVim plugins will be lazy-loaded. Your custom plugins will load during startup.
+        -- 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.
+        -- 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,
+        lazy = false,
-    -- It's recommended to leave version=false for now, since a lot the plugin that support versioning,
+        -- 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.
+        -- have outdated releases, which may break your Neovim install.
-    version = false, -- always use the latest git commit
+        version = false, -- always use the latest git commit
-    -- version = "*", -- try installing the latest stable version for plugins that support semver
+        -- version = "*", -- try installing the latest stable version for plugins that support semver
-  },
+    },
-  install = { colorscheme = { "tokyonight", "habamax" } },
+    install = { colorscheme = { "catppuccin" } },
-  checker = {
+    checker = {
-    enabled = true, -- check for plugin updates periodically
+        enabled = true, -- check for plugin updates periodically
-    notify = false, -- notify on update
+        notify = false, -- notify on update
-  }, -- automatically check for plugin updates
+    }, -- automatically check for plugin updates
-  performance = {
+    performance = {
-    rtp = {
+        rtp = {
-      -- disable some rtp plugins
+            -- disable some rtp plugins
-      disabled_plugins = {
+            disabled_plugins = {
-        "gzip",
+                "gzip",
-        -- "matchit",
+                -- "matchit",
-        -- "matchparen",
+                -- "matchparen",
-        -- "netrwPlugin",
+                -- "netrwPlugin",
-        "tarPlugin",
+                "tarPlugin",
-        "tohtml",
+                "tohtml",
-        "tutor",
+                "tutor",
-        "zipPlugin",
+                "zipPlugin",
-      },
+            },
+        },
     },
-  },
 })

.config/nvim/lua/plugins/catppuccin.lua

@@ -0,0 +1,24 @@
+return {
+    {
+        "catppuccin/nvim",
+        name = "catppuccin",
+        priority = 1000,
+        opts = {
+            flavour = "mocha", -- Choose: latte, frappe, macchiato, mocha
+            transparent_background = true,
+            integrations = {
+                cmp = true,
+                gitsigns = true,
+                nvimtree = true,
+                notify = true,
+                mini = { enabled = true },
+                navic = { enabled = true, custom_bg = "lualine" },
+                telescope = true,
+                which_key = true,
+                -- Add other integrations as needed
+            },
+            dim_inactive = { enabled = false },
+        },
+    },
+    { "LazyVim/LazyVim", opts = { colorscheme = "catppuccin" } },
+}

.config/nvim/lua/plugins/colorscheme.lua

@@ -1,12 +0,0 @@
-return {
-    -- add gruvbox
-    { "ellisonleao/gruvbox.nvim" },
-
-    -- Configure LazyVim to load gruvbox
-    {
-        "LazyVim/LazyVim",
-        opts = {
-            colorscheme = "gruvbox",
-        },
-    },
-}

.config/ohmyposh/omp.toml

@@ -1,160 +1,127 @@
 console_title_template = '{{ .Shell }} in {{ .Folder }}'
-version = 3
+version = 4
 final_space = true
 
 [palette]
-  black = '#282828'
+black = '#1e1e2e'    # Base
-  blue = '#458588'
+surface = '#313244'  # Surface0
-  green = '#98971a'
+white = '#cdd6f4'    # Text
-  orange = '#d79921'
+blue = '#89b4fa'     # Blue
-  red = '#cc241d'
+sapphire = '#74c7ec' # Sapphire
-  white = '#ebdbb2'
+lavender = '#b4befe' # Lavender
-  yellow = '#fabd2f'
+green = '#a6e3a1'    # Green
+mauve = '#cba6f7'    # Mauve
+red = '#f38ba8'      # Red
+yellow = '#f9e2af'   # Yellow
 
 [secondary_prompt]
-  template = '<p:yellow,transparent></><,p:yellow> > </><p:yellow,transparent></> '
+template = '<p:mauve,transparent></><,p:mauve> > </><p:mauve,transparent></> '
-  foreground = 'p:black'
+foreground = 'p:black'
-  background = 'transparent'
+background = 'transparent'
 
 [transient_prompt]
-  template = '<p:yellow,transparent></><,p:yellow> {{ .Folder }} </><p:yellow,transparent></> '
+template = '<p:mauve,transparent></><,p:mauve> {{ .Folder }} </><p:mauve,transparent></> '
-  foreground = 'p:black'
+foreground = 'p:black'
-  background = 'transparent'
+background = 'transparent'
 
 [upgrade]
-  source = 'cdn'
+source = 'cdn'
-  interval = '168h'
+interval = '168h'
-  auto = false
+auto = false
-  notice = false
+notice = false
 
 [[blocks]]
-  type = 'prompt'
+type = 'prompt'
-  alignment = 'left'
+alignment = 'left'
-  newline = true
+newline = true
 
-  [[blocks.segments]]
+[[blocks.segments]]
-    leading_diamond = ''
+leading_diamond = ''
-    trailing_diamond = ''
+trailing_diamond = ''
-    template = ' {{ if .SSHSession }} {{ end }}{{ .UserName }} '
+template = ' {{ if .SSHSession }} {{ end }}{{ .UserName }} '
-    foreground = 'p:black'
+foreground = 'p:black'
-    background = 'p:yellow'
+background = 'p:mauve'
-    type = 'session'
+type = 'session'
-    style = 'diamond'
+style = 'diamond'
 
-  [[blocks.segments]]
+[[blocks.segments]]
-    template = '  <b>{{ path .Path .Location }}</b> '
+template = '  <b>{{ path .Path .Location }}</b> '
-    foreground = 'p:orange'
+foreground = 'p:sapphire'
-    powerline_symbol = ''
+powerline_symbol = ''
-    background = 'p:black'
+background = 'p:surface'
-    type = 'path'
+type = 'path'
-    style = 'powerline'
+style = 'powerline'
 
-    [blocks.segments.properties]
+[[blocks.segments]]
-      style = 'folder'
+template = '  <b>{{ .HEAD }}</b>{{ if .BranchStatus }} {{ .BranchStatus }}{{ end }}{{ if .Working.Changed }}  {{ .Working.String }}{{ end }}{{ if .Staging.Changed }}  {{ .Staging.String }}{{ end }} '
+foreground = 'p:green'
+powerline_symbol = ''
+background = 'p:surface'
+type = 'git'
+style = 'powerline'
+foreground_templates = [
+  '{{ if or (.Working.Changed) (.Staging.Changed) }}p:black{{ end }}',
+]
+background_templates = [
+  '{{ if or (.Working.Changed) (.Staging.Changed) }}p:yellow{{ end }}',
+]
 
-  [[blocks.segments]]
+[[blocks.segments]]
-    template = '  <b>{{ .HEAD }}</b>{{ if .BranchStatus }} {{ .BranchStatus }}{{ end }}{{ if .Working.Changed }}  {{ .Working.String }}{{ end }}{{ if .Staging.Changed }}  {{ .Staging.String }}{{ end }} '
+template = '  '
-    foreground = 'p:green'
+foreground = 'p:yellow'
-    powerline_symbol = ''
+powerline_symbol = ''
-    background = 'p:black'
+background = 'p:surface'
-    type = 'git'
+type = 'root'
-    style = 'powerline'
+style = 'powerline'
-  foreground_templates = ['{{ if or (.Working.Changed) (.Staging.Changed) }}p:green{{ end }}', '{{ if eq .Background "p:yellow" }}p:black{{ end }}']
-  background_templates = ['{{ if or (.Working.Changed) (.Staging.Changed) }}p:yellow{{ end }}']
 
-    [blocks.segments.properties]
+[[blocks.segments]]
-      branch_template = '{{ trunc 25 .Branch }}'
+leading_diamond = '<transparent,background></>'
-      fetch_status = true
+trailing_diamond = ''
-      fetch_upstream_icon = false
+template = ' {{ if gt .Code 0 }}{{ else }}{{ end }} '
-
+foreground = 'p:lavender'
-  [[blocks.segments]]
+background = 'p:surface'
-    template = '  '
+type = 'status'
-    foreground = 'p:yellow'
+style = 'diamond'
-    powerline_symbol = ''
+background_templates = ['{{ if gt .Code 0 }}p:red{{ end }}']
-    background = 'p:black'
+foreground_templates = ['{{ if gt .Code 0 }}p:black{{ end }}']
-    type = 'root'
-    style = 'powerline'
-
-  [[blocks.segments]]
-    leading_diamond = '<transparent,background></>'
-    trailing_diamond = ''
-    template = ' {{ if gt .Code 0 }}{{ else }}{{ end }} '
-    foreground = 'p:blue'
-    background = 'p:black'
-    type = 'status'
-    style = 'diamond'
-    background_templates = ['{{ if gt .Code 0 }}p:red{{ end }}']
-
-    [blocks.segments.properties]
-      always_enabled = true
 
 [[blocks]]
-  type = 'rprompt'
+type = 'rprompt'
 
-  [[blocks.segments]]
+[[blocks.segments]]
-    template = ' <b>{{ .Version }}</b>'
+template = ' <b>{{ .Version }}</b>'
-    foreground = 'p:green'
+foreground = 'p:green'
-    background = 'transparent'
+background = 'transparent'
-    type = 'node'
+type = 'node'
-    style = 'plain'
+style = 'plain'
 
-    [blocks.segments.properties]
+[[blocks.segments]]
-      display_mode = 'files'
+template = ' <b>{{ .Version }}</b>'
-      fetch_package_manager = false
+foreground = 'p:blue'
-      home_enabled = false
+background = 'transparent'
-      fetch_version = true
+type = 'python'
+style = 'plain'
 
-  [[blocks.segments]]
+[[blocks.segments]]
-    template = ' <b>{{ .Version }}</b>'
+template = ' <b>{{ .Version }}</b>'
-    foreground = 'p:yellow'
+foreground = 'p:red'                 # Rust looks great in Red/Maroon for Mocha
-    background = 'transparent'
+background = 'transparent'
-    type = 'python'
+type = 'rust'
-    style = 'plain'
+style = 'plain'
 
-    [blocks.segments.properties]
+[[blocks.segments]]
-      display_mode = 'files'
+template = 'at <p:mauve><b>{{ .CurrentDate | date "15:04:05" }}</b></>'
-      fetch_version = true
+foreground = 'p:white'
-      fetch_virtual_env = true
+background = 'transparent'
-
+type = 'time'
-  [[blocks.segments]]
+style = 'plain'
-    template = ' <b>{{ .Version }}</b>'
-    foreground = 'p:blue'
-    background = 'transparent'
-    type = 'rust'
-    style = 'plain'
-
-    [blocks.segments.properties]
-      fetch_version = true
-
-  [[blocks.segments]]
-    template = 'at <p:blue><b>{{ .CurrentDate | date "15:04:05" }}</b></>'
-    foreground = 'p:white'
-    background = 'transparent'
-    type = 'time'
-    style = 'plain'
 
 [[tooltips]]
-  leading_diamond = ''
+leading_diamond = ''
-  trailing_diamond = ''
+trailing_diamond = ''
-  template = '  {{ .Profile }}{{ if .Region }}@{{ .Region }}{{ end }} '
+template = '  {{ .Profile }}{{ if .Region }}@{{ .Region }}{{ end }} '
-  foreground = 'p:white'
+foreground = 'p:black'
-  background = 'p:orange'
+background = 'p:blue'
-  type = 'aws'
+type = 'aws'
-  style = 'diamond'
+style = 'diamond'
-  tips = ['aws']
+tips = ['aws']
-
-  [tooltips.properties]
-    display_default = true
-
-[[tooltips]]
-  leading_diamond = ''
-  trailing_diamond = ''
-  template = '  {{ .Name }} '
-  foreground = 'p:white'
-  background = 'p:blue'
-  type = 'az'
-  style = 'diamond'
-  tips = ['az']
-
-  [tooltips.properties]
-    display_default = true

.config/opencode/opencode.json

@@ -0,0 +1,42 @@
+{
+  "$schema": "https://opencode.ai/config.json",
+  "permission": {
+    "*": "ask",
+    "todowrite": "allow",
+    "read": {
+      "*": "allow",
+      "*.env": "deny"
+    },
+    "edit": "ask",
+    "webfetch": "allow",
+    "websearch": "allow",
+    "question": "allow",
+    "grep": "allow",
+    "glob": "allow",
+    "lsp": "allow",
+    "skill": "allow",
+    "bash": {
+      "*": "ask",
+      "ls": "allow",
+      "ls *": "allow",
+      "pwd": "allow",
+      "git status": "allow",
+      "git status *": "allow",
+      "git diff *": "allow",
+      "git log": "allow",
+      "git log *": "allow",
+      "grep *": "allow",
+      "just *": "allow",
+      "cargo test *": "allow",
+      "cargo fmt": "allow",
+      "cargo fmt *": "allow",
+      "cargo check": "allow",
+      "cargo check *": "allow",
+      "cargo clippy": "allow",
+      "cargo clippy *": "allow",
+      "gh issue view *": "allow",
+      "gh issue list *": "allow",
+      "gh pr view *": "allow",
+    }
+  }
+}

.config/themes

@@ -0,0 +1 @@
+eza/themes

.config/tmux/tmux.conf

@@ -1,40 +1,19 @@
-# =============================================================
-# Tmux Configuration - Gruvbox Dark, Vim Navigation, Fast Clipboard, Minimal Plugins
-#
-# Features:
-# - Gruvbox dark theme for status bar and UI
-# - Vim-style navigation and pane resizing
-# - Mouse support and fast copy-paste
-# - Minimal, fast plugin setup
-# =============================================================
-# Fast pane splitting shortcuts (already present)
-# Copy-paste integration (already present with tmux-yank and set-clipboard)
-# Plugin setup is minimal and fast with TPM and sensible plugins
-
 # Additional: Make pane resizing easier with vim-style keys
 bind -r h resize-pane -L 5
 bind -r j resize-pane -D 5
 bind -r k resize-pane -U 5
 bind -r l resize-pane -R 5
-# Gruvbox color palette
-set -g @gruvbox_fg '#ebdbb2'
-set -g @gruvbox_bg '#282828'
-set -g @gruvbox_yellow '#fabd2f'
-set -g @gruvbox_blue '#458588'
-set -g @gruvbox_red '#cc241d'
-set -g @gruvbox_green '#98971a'
-set -g @gruvbox_orange '#d79921'
 
 # Status bar customization
-set -g status-bg '#282828'
+set -g status-bg '#1e1e2e'
-set -g status-fg '#ebdbb2'
+set -g status-fg '#cdd6f4'
 set -g status-left-length 40
 set -g status-right-length 100
 set -g status-interval 2
 
-set -g status-left "#[fg=#fabd2f,bg=#282828,bold] #S #[fg=#282828,bg=#fabd2f,nobold] #[fg=#ebdbb2,bg=#fabd2f] #(whoami)@#H #[fg=#fabd2f,bg=#282828] #[fg=#ebdbb2,bg=#282828] #(basename #{pane_current_path}) "
+set -g status-left "#[fg=#1e1e2e,bg=#cba6f7,bold] #S #[fg=#cba6f7,bg=#74c7ec,nobold]#[fg=#1e1e2e,bg=#74c7ec,bold] #(whoami)@#H #[fg=#74c7ec,bg=#313244,nobold]#[fg=#cdd6f4,bg=#313244] #(basename #{pane_current_path}) #[fg=#313244,bg=default,nobold]"
+set -g status-right "#[fg=#b4befe,bg=default]#[fg=#1e1e2e,bg=#b4befe,bold] #(git rev-parse --abbrev-ref HEAD 2>/dev/null || echo '-') #[fg=#313244,bg=#b4befe,nobold]#[fg=#cdd6f4,bg=#313244] %Y-%m-%d %H:%M "
 
-set -g status-right "#[fg=#fabd2f,bg=#282828]#[fg=#282828,bg=#fabd2f] #(git rev-parse --abbrev-ref HEAD 2>/dev/null || echo '-') #[fg=#fabd2f,bg=#282828]#[fg=#ebdbb2,bg=#282828] %Y-%m-%d %H:%M "
 # --- Terminal & Compatibility ---
 # Use 256-color mode and ensure compatibility with xterm
 set-option -g default-terminal 'screen-256color'
@@ -44,6 +23,10 @@ set-option -sa terminal-overrides ",xterm-256color:RGB"
 # Enable mouse support for pane/window selection and resizing
 set -g mouse on
 
+# Reduce scroll speed (3 lines per notch)
+bind -n WheelUpPane if-shell -F -t = "#{mouse_any_flag}" "send-keys -M" "if -Ft= '#{pane_in_mode}' 'send-keys -M' 'copy-mode -e; send-keys -N 3 Up'"
+bind -n WheelDownPane if-shell -F -t = "#{mouse_any_flag}" "send-keys -M" "if -Ft= '#{pane_in_mode}' 'send-keys -M' 'send-keys -N 3 Down'"
+
 # (Optional) Change prefix to Ctrl+Space instead of default Ctrl+B
 
 # Alt+Shift+H/L to switch windows (vim-style)
@@ -83,59 +66,24 @@ set -g pane-border-lines double
 
 # --- Plugins ---
 # Plugin Manager (TPM) and useful plugins:
-# tmux-plugins/tpm         - Plugin manager
-# tmux-plugins/tmux-sensible - Sensible defaults
-# tmux-plugins/tmux-yank   - Fast copy to clipboard
-# tmux-plugins/tmux-resurrect - Save/restore sessions
-# tmux-plugins/tmux-continuum - Auto-save sessions
-# fcsonline/tmux-thumbs    - Fuzzy select text
-# sainnhe/tmux-fzf         - Fuzzy find in tmux
-# wfxr/tmux-fzf-url        - Fuzzy find URLs
-# egel/tmux-gruvbox        - Gruvbox theme
-# christoomey/vim-tmux-navigator - Vim navigation between panes
-# omerxx/tmux-sessionx     - Session management
-# omerxx/tmux-floax        - Floating windows
 set -g @plugin 'tmux-plugins/tpm'
+set -g @plugin 'catppuccin/tmux#v2.1.3'
 set -g @plugin 'tmux-plugins/tmux-sensible'
 set -g @plugin 'tmux-plugins/tmux-yank'
-set -g @plugin 'tmux-plugins/tmux-resurrect'
-set -g @plugin 'tmux-plugins/tmux-continuum'
 set -g @plugin 'fcsonline/tmux-thumbs'
 set -g @plugin 'sainnhe/tmux-fzf'
 set -g @plugin 'wfxr/tmux-fzf-url'
-set -g @plugin 'egel/tmux-gruvbox'
 set -g @plugin 'christoomey/vim-tmux-navigator'
-set -g @plugin 'omerxx/tmux-sessionx'
 set -g @plugin 'omerxx/tmux-floax'
 
-
 # Floax plugin settings (floating windows)
 set -g @floax-width '80%'
 set -g @floax-height '80%'
 set -g @floax-bind 'p'
 set -g @floax-change-path 'true'
 
-
+# Theme settings
-# Sessionx plugin settings (session management)
+set -g @catppuccin_flavor 'mocha'
-set -g @sessionx-x-path '~/dotfiles'
-set -g @sessionx-window-height '85%'
-set -g @sessionx-window-width '75%'
-set -g @sessionx-zoxide-mode 'on'
-set -g @sessionx-custom-paths-subdirectories 'false'
-set -g @sessionx-filter-current 'false'
-
-
-# Continuum plugin: auto-restore sessions
-set -g @continuum-restore 'on'
-
-
-# Resurrect plugin: save/restore nvim sessions
-set -g @resurrect-strategy-nvim 'session'
-
-
-# Gruvbox theme plugin: use dark mode
-set -g @tmux-gruvbox 'dark'
-
 
 # Initialize TPM (Tmux Plugin Manager)
 run '~/.tmux/plugins/tpm/tpm'

.gitconfig

@@ -1,151 +1,145 @@
 [alias]
-	a = add
+    a = add
-	aa = add --all
+    aa = add --all
-	ap = add --patch
+    ap = add --patch
-	au = add --update
+    au = add --update
-
+    b = branch
-	b = branch
+    ba = branch --all
-	ba = branch --all
+    bd = branch --delete
-	bd = branch --delete
+    bD = branch --delete --force
-	bD = branch --delete --force
+    bm = branch --move
-	bm = branch --move
+    bM = branch --move --force
-	bM = branch --move --force
+    c = commit
-
+    cs = commit --signoff
-	c = commit
+    ca = commit --amend
-	cs = commit --signoff
+    cas = commit --amend --signoff
-	ca = commit --amend
+    can = commit --amend --no-edit
-	cas = commit --amend --signoff
+    cans = commit --amend --no-edit --signoff
-	can = commit --amend --no-edit
+    ci = commit --interactive
-	cans == commit --amend --no-edit --signoff
+    cis = commit --amend --signoff
-	ci = commit --interactive
+    cm = commit --message
-	cis = commit --amend --signoff
+    cms = commit --signoff --message
-	cm = commit --message
+    cv = commit --verbose
-	cms = commit --signoff --message
+    cvs = commit --verbose --signoff
-	cv = commit --verbose
+    cl = clone
-	cvs = commit --verbose --signoff
+    clb = clone --bare
-
+    clm = clone --mirror
-	cl = clone
+    clr = clone --recurse-submodules
-	clb = clone --bare
+    d = diff
-	clm = clone --mirror
+    dc = diff --cached
-	clr = clone --recurse-submodules
+    ds = diff --staged
-
+    dw = diff --word-diff
-	d = diff
+    f = fetch --atomic
-	dc = diff --cached
+    F = fetch --force
-	ds = diff --staged
+    fa = fetch --all
-	dw = diff --word-diff
+    fp = fetch --atomic --prune --prune-tags
-
+    fpa = fetch --prune --prune-tags --all
-	f = fetch --atomic
+    l = log
-	F = fetch --force
+    lc = log --pretty=format:'- %s by %an %h' --no-merges
-	fa = fetch --all
+    lg = log --graph
-	fp = fetch --atomic --prune --prune-tags
+    lk = log --graph --topo-order --abbrev-commit --date=short --decorate --all --boundary --pretty=format:'%Cgreen%ad %Cred%h%Creset -%C(yellow)%d%Creset %s %Cblue[%cn]%Creset'
-	fpa = fetch --prune --prune-tags --all
+    lo = log --oneline
-
+    lp = log --patch
-	l = log
+    lt = log --topo-order
-	lc = log --pretty=format:'- %s by %an %h' --no-merges
+    o = checkout
-	lg = log --graph
+    ob = checkout -b
-	lk = log --graph --topo-order --abbrev-commit --date=short --decorate --all --boundary --pretty=format:'%Cgreen%ad %Cred%h%Creset -%C(yellow)%d%Creset %s %Cblue[%cn]%Creset'
+    p = push
-	lo = log --oneline
+    pf = push --force
-	lp = log --patch
+    puh = push -u origin HEAD
-	lt = log --topo-order
+    r = rebase
-
+    ri = rebase --interactive
-	o = checkout
+    rim = rebase --interactive origin/master
-	ob = checkout -b
+    s = status --short --branch
-
+    branch-list-merged = "!git branch --merged master | grep -v -E '(origin|master)'"
-	p = push
+    branch-delete-merged = "!git branch-list-merged | xargs git branch --delete"
-	pf = push --force 
+    unstage = reset HEAD
-	puh = push -u origin HEAD
+    undo-commit = reset --soft HEAD^
-
+    set-upstream = !git branch --set-upstream-to=origin/`git symbolic-ref --short HEAD`
-	r = rebase
-	ri = rebase --interactive
-	rim = rebase --interactive origin/master
-
-	s = status --short --branch
-
-	branch-list-merged = "!git branch --merged master | grep -v -E '(origin|master)'"
-	branch-delete-merged = "!git branch-list-merged | xargs git branch --delete"
-
-	unstage = reset HEAD
-	undo-commit = reset --soft HEAD^
-	set-upstream = !git branch --set-upstream-to=origin/`git symbolic-ref --short HEAD`
 
 [color]
-	ui = auto
+    ui = auto
-	status = auto
+    status = auto
 
 [commit]
-	gpgsign = true
+    gpgsign = true
+    signoff = true
 
 [core]
-	editor = nvim
+    editor = nvim
-	autocrlf = input
+    autocrlf = input
-	excludesfile = ~/.gitignore
+    excludesfile = ~/.gitignore
-	attributesfile = ~/.gitattributes
+    attributesfile = ~/.gitattributes
-	pager = delta
+    pager = delta
+
+[credential]
+    helper = cache --timeout 21600
+    helper = oauth
+    helper = !/opt/homebrew/bin/gh auth git-credential
+    helper = !/usr/bin/glab auth git-credential
 
 [credential "https://github.com"]
-	helper = !/opt/homebrew/bin/gh auth git-credential
+    helper = !/opt/homebrew/bin/gh auth git-credential
 
 [credential "https://gitlab.oteri.xyz"]
-	helper = !/usr/bin/glab auth git-credential
+    helper = !/usr/bin/glab auth git-credential
 
 [delta]
-	line-numbers = true
+    line-numbers = true
-	syntax-theme = Dracula
+    syntax-theme = Gruvbox
-	plus-style = "syntax #2A363B"
+    plus-style = "syntax #3c3836"
-	plus-emph-style = "syntax #2D4E45"
+    plus-emph-style = "syntax #504945"
-	minus-style = "syntax #3B2C37"
+    minus-style = "syntax #282828"
-	minux-emph-style = "syntax #613038"
+    minux-emph-style = "syntax #fb4934"
 
 [diff]
     colorMoved = default
 
 [fetch]
-	prune = true
+    prune = true
 
 [filter "lfs"]
-	clean = git-lfs clean -- %f
+    clean = git-lfs clean -- %f
-	smudge = git-lfs smudge -- %f
+    smudge = git-lfs smudge -- %f
-	process = git-lfs filter-process
+    process = git-lfs filter-process
-	required = true
+    required = true
 
 [gpg]
-	program = gpg
+    program = gpg
 
 [help]
-	autocorrect = 10
+    autocorrect = 10
 
 [include]
-	path = ~/.gitconfig.local
+    path = ~/.gitconfig.local
 
 [init]
-	defaultBranch = master
+    defaultBranch = master
 
 [interactive]
-	diffFilter = delta --color-only
+    diffFilter = delta --color-only
 
 [merge]
-	conflictstyle = diff3
+    conflictstyle = zdiff3
 
 [pull]
-	autosetupmerge = true
+    autosetupmerge = true
-	autosetuprebase = true
+    autosetuprebase = true
-	rebase = true
+    rebase = true
 
 [push]
-	default = current
+    default = simple
 
 [rerere]
-	enabled = true
+    enabled = true
 
 [user]
-	name = Anthony Oteri
+    name = Anthony Oteri
-	email = 4360016+anthonyoteri@users.noreply.github.com
+    email = 4360016+anthonyoteri@users.noreply.github.com
-	signingkey = D0B1B355AF8E6121
+    signingkey = D0B1B355AF8E6121
-
-# vim: set commentstring=#\ %s:
-[credential]
-	helper = cache --timeout 21600
-	helper = oauth
 
 [safe]
-	directory = *
+    directory = *
+
+# vim: set commentstring=#\ %s:
+[rebase]
+	updateRefs = true

.ssh/config

@@ -1,53 +1,36 @@
-Host ol8-dev
+# Disable strict host key checking for Edgeware hosts
-    HostName ol8-dev
-    User anthony
-
-Host srv-nebula-master srv-nebula-master.edgeware.tv
-    User=oneadmin
-    Compression=yes
-
-Host 10.16.48.100 anthony-acd-router
-    User root
-    StrictHostKeyChecking no
-    UserKnownHostsFile=/dev/null
-    Compression=yes
-    ForwardAgent=yes
-
-Host anthony-remote.edgeware.tv
-    User root
-    Compression=yes
-    ForwardAgent=yes
-    DynamicForward 12345
-
 Host 10.16.*.* 10.19.* orbit-* anthony-* *.edgeware.tv
-    User root
     StrictHostKeyChecking no
     UserKnownHostsFile=/dev/null
-    Compression=yes
+    ForwardAgent yes
-    ForwardAgent=yes
+    Compression yes
 
-Host 192.168.11.13, anthony-dev
+# Example for non-standard port
-    User root
+Host custom-port-host
-    StrictHostKeyChecking no
+    HostName custom.example.com
-    UserKnownHostsFile=/dev/null
+    User anthony
-    Compression=yes
+    Port 2222
-    ForwardAgent=yes
+    ForwardAgent yes
+    Compression yes
 
-Host convoy
+# Specific hosts
-  User=edgeware
+Host srv-nebula-master srv-nebula-master.edgeware.tv
-  HostName=convoy.local.oteri.xyz
+    User oneadmin
-
+    Compression yes
-Host acd-router
-  User=edgeware
-  HostName=acd-router.local.oteri.xyz
-
-Host streamer
-  User=edgeware
-  HostName=streamer.local.oteri.xyz
-
-Host repackager
-  User=edgeware
-  HostName=repackager.local.oteri.xyz
 
+# Production host
 Host newenglandsalts.com
-    User=root
+    User root
+
+# Global SSH options for productivity
+Host *
+    ForwardAgent yes
+    AddKeysToAgent yes
+    ControlMaster auto
+    ControlPath ~/.ssh/control-%r@%h:%p
+    ControlPersist 10m
+    ServerAliveInterval 60
+    ServerAliveCountMax 3
+    User root
+    Compression yes
+    StrictHostKeyChecking yes

.zshrc

@@ -45,7 +45,7 @@ zinit ice wait"2"; zinit snippet OMZP::common-aliases
 zinit ice wait"2"; zinit snippet OMZP::debian
 zinit ice wait"2"; zinit snippet OMZP::docker
 zinit ice wait"2"; zinit snippet OMZP::docker-compose
-zinit ice wait"2"; zinit snippet OMZP::dotenv
+#zinit ice wait"2"; zinit snippet OMZP::dotenv
 zinit ice wait"1"; zinit snippet OMZP::eza
 zinit ice wait"2"; zinit snippet OMZP::gh
 zinit ice wait"1"; zinit snippet OMZP::git
@@ -98,6 +98,17 @@ zstyle ':fzf-tab:complete:__zoxide_z:*' fzf-preview 'ls --color $realpath'
 eval "$(fzf --zsh)"
 eval "$(zoxide init --cmd cd zsh)"
 
+############################################################
+# Google Cloud SDK
+############################################################
+if [ -f "${HOME}/.google-cloud-sdk/path.zsh.inc" ]; then
+  . "${HOME}/.google-cloud-sdk/path.zsh.inc"
+fi
+
+if [ -f "${HOME}/.google-cloud-sdk/completion.zsh.inc" ]; then
+  . "${HOME}/.google-cloud-sdk/completion.zsh.inc"
+fi
+
 ############################################################
 # Custom environment variables
 ############################################################
@@ -106,7 +117,7 @@ export EDITOR='nvim'
 export ARCHFLAGS='-arch x86_64'
 export BAT_CONFIG_PATH=~/.config/bat/config.conf
 export GPG_TTY=$(tty)
-export PATH="$HOME/.local/bin:$HOME/.cargo/bin:$HOME/go/bin:$PATH"
+export PATH="$(brew --prefix rustup)/bin:$HOME/.local/bin:$HOME/.cargo/bin:$HOME/go/bin:$PATH"
 export MONOREPO_ROOT="$HOME/Projects/monorepo"
 export DOCKER_BUILDKIT=1
 
@@ -126,3 +137,4 @@ alias docker-compose='docker compose'
 alias neofetch='fastfetch'
 alias lazygit='lazygit -ucd $HOME/.config/lazygit'
 
+