Update dotfiles

Author: timcole

Brewfile

@@ -1,8 +1,10 @@
 tap "1password/tap"
 tap "boz/repo"
+tap "hashicorp/tap"
 tap "homebrew/bundle"
 tap "homebrew/services"
 tap "koekeishiya/formulae"
+tap "oven-sh/bun"
 brew "awscli"
 brew "bat"
 brew "btop"
@@ -16,6 +18,7 @@ brew "gh"
 brew "git"
 brew "glow"
 brew "gnupg"
+brew "go"
 brew "gping"
 brew "helm"
 brew "htop"
@@ -29,6 +32,7 @@ brew "mtr"
 brew "ncdu"
 brew "neofetch"
 brew "neovim"
+brew "nmap"
 brew "oha"
 brew "[email protected]"
 brew "pinentry-mac"
@@ -40,10 +44,14 @@ brew "stow"
 brew "telnet"
 brew "tmux"
 brew "watch"
+brew "yt-dlp"
+brew "hashicorp/tap/packer"
 brew "koekeishiya/formulae/skhd"
+brew "oven-sh/bun/bun"
 cask "1password-cli"
 cask "kitty"
 cask "nrlquaker-winbox"
+cask "orbstack"
 mas "Keynote", id: 409183694
 mas "LightBlue", id: 557428110
 mas "Medis", id: 1579200037

git/.gitconfig

@@ -6,8 +6,8 @@
 [core]
   excludesfile = /Users/tim/.gitignore_global
 
-[url "ssh://[email protected]/"]
-  insteadOf = https://github.com/
+; [url "ssh://[email protected]/"]
+;   insteadOf = https://github.com/
 
 [init]
   defaultBranch = main

nvim/.config/nvim/ftplugin/go.vim

@@ -1,20 +1,3 @@
 set backspace=indent,eol,start
 
-let g:go_fmt_command = "goimports"
-let g:go_highlight_functions = 1
-let g:go_highlight_methods = 1
-let g:go_highlight_structs = 1
-let g:go_highlight_operators = 1
-let g:go_highlight_function_parameters = 1
-let g:go_highlight_function_calls = 1
-let g:go_highlight_types = 1
-let g:go_highlight_fields = 1
-let g:go_highlight_build_constraints = 1
-let g:go_def_mode='gopls'
-let g:go_info_mode='gopls'
-let g:go_def_mapping_enabled = 0
-let g:go_fmt_autosave = 1
-
-autocmd BufNewFile,BufRead *.go setlocal noexpandtab tabstop=2 shiftwidth=2
-
 nnoremap <leader>r :!tmux send-keys -t 1 C-c "clear; go run *.go" C-m<CR><C-L>

nvim/.config/nvim/init.lua

@@ -7,6 +7,7 @@ require('custom.telescope')
 require('custom.treesitter')
 require('custom.discord')
 require('custom.null_ls')
+require('custom.go')
 
 vim.opt.termguicolors = true
 

nvim/.config/nvim/lua/custom/go.lua

@@ -0,0 +1,27 @@
+local capabilities = require('cmp_nvim_lsp').default_capabilities(vim.lsp.protocol.make_client_capabilities())
+
+require ('go').setup({
+  goimport = 'gopls',
+  gofmt = 'gopls',
+  max_line_len = 120,
+  tag_transform = false,
+  lsp_cfg = {
+    capabilities = capabilities,
+  },
+  lsp_inlay_hints = {
+    enable = true,
+    only_current_line = true,
+  },
+  lsp_gofumpt = true,
+  lsp_on_attach = true,
+  dap_debug = false,
+})
+
+local format_sync_grp = vim.api.nvim_create_augroup("GoImport", {})
+vim.api.nvim_create_autocmd("BufWritePre", {
+  pattern = "*.go",
+  callback = function()
+   require('go.format').goimport()
+  end,
+  group = format_sync_grp,
+})

nvim/.config/nvim/lua/custom/keys.lua

@@ -1,5 +1,5 @@
 vim.g.mapleader = ","
-vim.keymap.set('n', '<leader>o', '<cmd>!tmux splitw -h -p 30 -c $(pwd)<cr><c-l>')
+vim.keymap.set('n', '<leader>o', '<cmd>!tmux splitw -h -l 30\\% -c $(pwd)<cr><c-l>')
 vim.keymap.set('n', '<leader>t', '<cmd>!tmux send-keys -t 1 C-c<cr><c-l>')
 
 require('Comment').setup({

nvim/.config/nvim/lua/custom/lsp.lua

@@ -31,7 +31,9 @@ vim.api.nvim_create_autocmd('LspAttach', {
 vim.opt.completeopt = {'menuone', 'noselect'}
 
 require("mason").setup()
-require("mason-lspconfig").setup()
+require("mason-lspconfig").setup({
+  ensure_installed = { "tsserver", "rust_analyzer", "tailwindcss", "gopls" },
+})
 
 lsp.rust_analyzer.setup{
   procMacro = {

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

@@ -58,8 +58,31 @@ return require('packer').startup(function(use)
   use 'folke/todo-comments.nvim'
 
   use 'rust-lang/rust.vim'
-  use 'tpope/vim-fugitive'
-  use 'airblade/vim-gitgutter'
+  use "sindrets/diffview.nvim"
+
+  use {
+    "NeogitOrg/neogit",
+    requires = {
+      "nvim-lua/plenary.nvim",
+      "sindrets/diffview.nvim",
+      "nvim-telescope/telescope.nvim"
+    },
+    config = function() require("neogit").setup() end
+  }
+  use {
+    "lewis6991/gitsigns.nvim",
+    config = function()
+      require("gitsigns").setup({
+        current_line_blame = true,
+        current_line_blame_opts = {
+          delay = 100
+        }
+      })
+    end
+  }
+  
+  use 'ray-x/guihua.lua'
+  use 'ray-x/go.nvim'
 
   use 'pantharshit00/vim-prisma'
 

nvim/.config/nvim/plugin/packer_compiled.lua

@@ -49,8 +49,8 @@ local function save_profiles(threshold)
 end
 
 time([[Luarocks path setup]], true)
-local package_path_str = "/Users/tim/.cache/nvim/packer_hererocks/2.1.0-beta3/share/lua/5.1/?.lua;/Users/tim/.cache/nvim/packer_hererocks/2.1.0-beta3/share/lua/5.1/?/init.lua;/Users/tim/.cache/nvim/packer_hererocks/2.1.0-beta3/lib/luarocks/rocks-5.1/?.lua;/Users/tim/.cache/nvim/packer_hererocks/2.1.0-beta3/lib/luarocks/rocks-5.1/?/init.lua"
-local install_cpath_pattern = "/Users/tim/.cache/nvim/packer_hererocks/2.1.0-beta3/lib/lua/5.1/?.so"
+local package_path_str = "/Users/tim/.cache/nvim/packer_hererocks/2.1.1703358377/share/lua/5.1/?.lua;/Users/tim/.cache/nvim/packer_hererocks/2.1.1703358377/share/lua/5.1/?/init.lua;/Users/tim/.cache/nvim/packer_hererocks/2.1.1703358377/lib/luarocks/rocks-5.1/?.lua;/Users/tim/.cache/nvim/packer_hererocks/2.1.1703358377/lib/luarocks/rocks-5.1/?/init.lua"
+local install_cpath_pattern = "/Users/tim/.cache/nvim/packer_hererocks/2.1.1703358377/lib/lua/5.1/?.so"
 if not string.find(package.path, package_path_str, 1, true) then
   package.path = package.path .. ';' .. package_path_str
 end
@@ -115,12 +115,33 @@ _G.packer_plugins = {
     path = "/Users/tim/.local/share/nvim/site/pack/packer/start/cmp_luasnip",
     url = "https://github.com/saadparwaiz1/cmp_luasnip"
   },
+  ["diffview.nvim"] = {
+    loaded = true,
+    path = "/Users/tim/.local/share/nvim/site/pack/packer/start/diffview.nvim",
+    url = "https://github.com/sindrets/diffview.nvim"
+  },
+  ["gitsigns.nvim"] = {
+    config = { "\27LJ\2\n|\0\0\4\0\6\0\t6\0\0\0'\2\1\0B\0\2\0029\0\2\0005\2\3\0005\3\4\0=\3\5\2B\0\2\1K\0\1\0\28current_line_blame_opts\1\0\1\ndelay\3d\1\0\1\23current_line_blame\2\nsetup\rgitsigns\frequire\0" },
+    loaded = true,
+    path = "/Users/tim/.local/share/nvim/site/pack/packer/start/gitsigns.nvim",
+    url = "https://github.com/lewis6991/gitsigns.nvim"
+  },
   ["glow.nvim"] = {
     config = { "\27LJ\2\n2\0\0\3\0\3\0\0066\0\0\0'\2\1\0B\0\2\0029\0\2\0B\0\1\1K\0\1\0\nsetup\tglow\frequire\0" },
     loaded = true,
     path = "/Users/tim/.local/share/nvim/site/pack/packer/start/glow.nvim",
     url = "https://github.com/ellisonleao/glow.nvim"
   },
+  ["go.nvim"] = {
+    loaded = true,
+    path = "/Users/tim/.local/share/nvim/site/pack/packer/start/go.nvim",
+    url = "https://github.com/ray-x/go.nvim"
+  },
+  ["guihua.lua"] = {
+    loaded = true,
+    path = "/Users/tim/.local/share/nvim/site/pack/packer/start/guihua.lua",
+    url = "https://github.com/ray-x/guihua.lua"
+  },
   ["lspkind-nvim"] = {
     loaded = true,
     path = "/Users/tim/.local/share/nvim/site/pack/packer/start/lspkind-nvim",
@@ -141,6 +162,12 @@ _G.packer_plugins = {
     path = "/Users/tim/.local/share/nvim/site/pack/packer/start/mason.nvim",
     url = "https://github.com/williamboman/mason.nvim"
   },
+  neogit = {
+    config = { "\27LJ\2\n4\0\0\3\0\3\0\0066\0\0\0'\2\1\0B\0\2\0029\0\2\0B\0\1\1K\0\1\0\nsetup\vneogit\frequire\0" },
+    loaded = true,
+    path = "/Users/tim/.local/share/nvim/site/pack/packer/start/neogit",
+    url = "https://github.com/NeogitOrg/neogit"
+  },
   ["null-ls.nvim"] = {
     loaded = true,
     path = "/Users/tim/.local/share/nvim/site/pack/packer/start/null-ls.nvim",
@@ -223,16 +250,6 @@ _G.packer_plugins = {
     path = "/Users/tim/.local/share/nvim/site/pack/packer/start/todo-comments.nvim",
     url = "https://github.com/folke/todo-comments.nvim"
   },
-  ["vim-fugitive"] = {
-    loaded = true,
-    path = "/Users/tim/.local/share/nvim/site/pack/packer/start/vim-fugitive",
-    url = "https://github.com/tpope/vim-fugitive"
-  },
-  ["vim-gitgutter"] = {
-    loaded = true,
-    path = "/Users/tim/.local/share/nvim/site/pack/packer/start/vim-gitgutter",
-    url = "https://github.com/airblade/vim-gitgutter"
-  },
   ["vim-prisma"] = {
     loaded = true,
     path = "/Users/tim/.local/share/nvim/site/pack/packer/start/vim-prisma",
@@ -241,14 +258,6 @@ _G.packer_plugins = {
 }
 
 time([[Defining packer_plugins]], false)
--- Config for: nvim-cmp
-time([[Config for nvim-cmp]], true)
-require('custom.lsp')
-time([[Config for nvim-cmp]], false)
--- Config for: Comment.nvim
-time([[Config for Comment.nvim]], true)
-try_loadstring("\27LJ\2\n5\0\0\3\0\3\0\0066\0\0\0'\2\1\0B\0\2\0029\0\2\0B\0\1\1K\0\1\0\nsetup\fComment\frequire\0", "config", "Comment.nvim")
-time([[Config for Comment.nvim]], false)
 -- Config for: glow.nvim
 time([[Config for glow.nvim]], true)
 try_loadstring("\27LJ\2\n2\0\0\3\0\3\0\0066\0\0\0'\2\1\0B\0\2\0029\0\2\0B\0\1\1K\0\1\0\nsetup\tglow\frequire\0", "config", "glow.nvim")
@@ -257,6 +266,22 @@ time([[Config for glow.nvim]], false)
 time([[Config for nvim-autopairs]], true)
 try_loadstring("\27LJ\2\ne\0\0\4\0\6\0\t6\0\0\0'\2\1\0B\0\2\0029\0\2\0005\2\4\0005\3\3\0=\3\5\2B\0\2\1K\0\1\0\21disable_filetype\1\0\0\1\2\0\0\trust\nsetup\19nvim-autopairs\frequire\0", "config", "nvim-autopairs")
 time([[Config for nvim-autopairs]], false)
+-- Config for: Comment.nvim
+time([[Config for Comment.nvim]], true)
+try_loadstring("\27LJ\2\n5\0\0\3\0\3\0\0066\0\0\0'\2\1\0B\0\2\0029\0\2\0B\0\1\1K\0\1\0\nsetup\fComment\frequire\0", "config", "Comment.nvim")
+time([[Config for Comment.nvim]], false)
+-- Config for: nvim-cmp
+time([[Config for nvim-cmp]], true)
+require('custom.lsp')
+time([[Config for nvim-cmp]], false)
+-- Config for: gitsigns.nvim
+time([[Config for gitsigns.nvim]], true)
+try_loadstring("\27LJ\2\n|\0\0\4\0\6\0\t6\0\0\0'\2\1\0B\0\2\0029\0\2\0005\2\3\0005\3\4\0=\3\5\2B\0\2\1K\0\1\0\28current_line_blame_opts\1\0\1\ndelay\3d\1\0\1\23current_line_blame\2\nsetup\rgitsigns\frequire\0", "config", "gitsigns.nvim")
+time([[Config for gitsigns.nvim]], false)
+-- Config for: neogit
+time([[Config for neogit]], true)
+try_loadstring("\27LJ\2\n4\0\0\3\0\3\0\0066\0\0\0'\2\1\0B\0\2\0029\0\2\0B\0\1\1K\0\1\0\nsetup\vneogit\frequire\0", "config", "neogit")
+time([[Config for neogit]], false)
 
 _G._packer.inside_compile = false
 if _G._packer.needs_bufread == true then

scripts/bin/sb

@@ -1,13 +1,12 @@
 #!/bin/sh
-CONTEXT="gke_social-blade-website_us-east1_production"
+CONTEXT="socialblade"
 NAMESPACE="default"
 SOCIALBLADE_EPOCH="1202446179000"
 
 sb_help(){
   echo "Usage: sb <command> [options]\n"
   echo "Commands:"
   echo "  snow  Convert snowflake to timestamp"
-  echo "  fwd   Port forward services"
   echo "  sh    Exec /bin/sh on a deployment"
 }
 
@@ -17,18 +16,10 @@ sb_snow() {
     exit 1
   fi
 
-  epoch=$(($1 >> 23 + $SOCIALBLADE_EPOCH))
+  epoch=$((($1 >> 23) + $SOCIALBLADE_EPOCH))
   date -r $(($epoch/1000))
 }
 
-sb_fwd() {
-  if [[ $# -eq 0 ]] ; then
-    sudo -E kubefwd svc -x $CONTEXT -n $NAMESPACE
-  else
-    sudo -E kubefwd svc -x $CONTEXT -n $NAMESPACE -l "app in ($1)"
-  fi
-}
-
 sb_sh() {
   if [[ $# -eq 0 ]] ; then
     echo 'missing selector (try: deployments/web)'
@@ -55,6 +46,28 @@ sb_log() {
   fi
 }
 
+sb_pull() {
+  if [[ $# -eq 0 ]] ; then
+    echo 'missing type web, api, realtime'
+    exit 1
+  fi
+
+  case $1 in
+    web)
+      gcloud compute instances list | grep sb-website | awk '{print $1}' | xargs -P 0 -I{} gcloud compute ssh t@{} --zone us-east1-d --command "sudo -u www-data git -C /var/www/html/socialblade.com pull"
+      ;;
+    api)
+      gcloud compute instances list | grep sb-api | awk '{print $1}' | xargs -P 0 -I{} gcloud compute ssh t@{} --zone us-east1-d --command "sudo -u www-data git -C /var/www/html/api pull"
+      ;;
+    realtime)
+      gcloud compute instances list | grep sb-realtime | awk '{print $1}' | xargs -P 0 -I{} gcloud compute ssh t@{} --zone us-east1-d --command "sudo -u www-data git -C /var/www/html/realtime pull"
+      ;;
+    *)
+      echo -n "Invalid Option: web, api, realtime"
+      ;;
+  esac
+}
+
 sub=$1
 case $sub in
   "" | "-h" | "--help")

zsh/.alias

@@ -3,7 +3,7 @@ alias icloud="~/Library/Mobile\ Documents/com~apple~CloudDocs/"
 alias cat="bat --theme TwoDark"
 # Remove all docker containers
 alias dk="docker ps -a | grep Exit | cut -d ' ' -f 1 | xargs docker rm"
-alias rust-musl-builder='docker run --rm -it -v "$(pwd)":/volume clux/muslrust:stable'
+alias rust-musl-builder='docker run --rm -it -v "$(pwd)":/home/rust/src ekidd/rust-musl-builder'
 
 if [ $TERM = 'xterm-kitty' ]; then
   export PATH=/Applications/kitty.app/Contents/MacOS/kitty:$PATH