wow rookie mistake

ssh/.ssh/ssh/config

@@ -1,27 +0,0 @@
-Host workstation
-    Hostname cnieves.aus.corp.google.com
-    User cnieves
-    LocalForward 5005 localhost:5005 # Java Debug
-    RemoteForward 5037 localhost:5037 # ADB
-    RemoteForward 2222 localhost:22 # SSH/SCP
-    RemoteForward 2489 localhost:2489 # Lemonade
-    Compression no
-    ControlMaster auto
-    ControlPath /tmp/ssh_control-%r-%h-%p
-    ControlPersist 5m
-
-Host vilya
-    Hostname vilya.c.googlers.com
-    User cnieves
-    LocalForward 5005 localhost:5005 # Java Debug
-    RemoteForward 5037 localhost:5037 # ADB
-    RemoteForward 2222 localhost:22 # SSH/SCP
-    RemoteForward 2489 localhost:2489 # Lemonade
-    Compression yes
-    ControlMaster auto
-    ControlPath /tmp/ssh_control-%r-%h-%p
-    ControlPersist 5m
-
-Host gateway-workaround
-    Hostname cnieves.aus.corp.google.com
-    ProxyCommand /usr/local/bin/corp-ssh-helper -relay=sup-ssh-relay.corp.google.com -enable_measurements -report_measurement_results -proxy-mode=grue -dst_username=%r %h %p

ssh/.ssh/ssh/id_ed25519

@@ -1,7 +0,0 @@
------BEGIN OPENSSH PRIVATE KEY-----
-b3BlbnNzaC1rZXktdjEAAAAABG5vbmUAAAAEbm9uZQAAAAAAAAABAAAAMwAAAAtzc2gtZW
-QyNTUxOQAAACAiobqOMGqa/WV98SogFgRxmR8piZIjB9YHv+EaKOszPwAAAJgwYgAoMGIA
-KAAAAAtzc2gtZWQyNTUxOQAAACAiobqOMGqa/WV98SogFgRxmR8piZIjB9YHv+EaKOszPw
-AAAEDCx1cXVSYtGOaZ3eY5Pi+vxI8IFQePfbR6anh7EIXnQSKhuo4wapr9ZX3xKiAWBHGZ
-HymJkiMH1ge/4Roo6zM/AAAAE2NocmlzdGlhbkBuaWV2ZXMuaW8BAg==
------END OPENSSH PRIVATE KEY-----

ssh/.ssh/ssh/id_ed25519.pub

@@ -1 +0,0 @@
-ssh-ed25519 AAAAC3NzaC1lZDI1NTE5AAAAICKhuo4wapr9ZX3xKiAWBHGZHymJkiMH1ge/4Roo6zM/ christian@nieves.io

ssh/.ssh/ssh/known_hosts

@@ -1,6 +0,0 @@
-|1|CIIWBGAPZWh0AC6+VhzGeTCp2zU=|tvDRuKqQI9R5hYflMTFC0UjxSLg= ssh-ed25519 AAAAC3NzaC1lZDI1NTE5AAAAIOMqqnkVzrm0SdG6UOoqKLsabgH5C9okWi0dh2l9GKJl
-|1|2zYwaWz04YT0n3X4DoUJ/GyfvJc=|qEkYdDiBbUaZBIJuJgSjpgAIIcc= ssh-rsa AAAAB3NzaC1yc2EAAAADAQABAAABgQCj7ndNxQowgcQnjshcLrqPEiiphnt+VTTvDP6mHBL9j1aNUkY4Ue1gvwnGLVlOhGeYrnZaMgRK6+PKCUXaDbC7qtbW8gIkhL7aGCsOr/C56SJMy/BCZfxd1nWzAOxSDPgVsmerOBYfNqltV9/hWCqBywINIR+5dIg6JTJ72pcEpEjcYgXkE2YEFXV1JHnsKgbLWNlhScqb2UmyRkQyytRLtL+38TGxkxCflmO+5Z8CSSNY7GidjMIZ7Q4zMjA2n1nGrlTDkzwDCsw+wqFPGQA179cnfGWOWRVruj16z6XyvxvjJwbz0wQZ75XK5tKSb7FNyeIEs4TT4jk+S4dhPeAUC5y+bDYirYgM4GC7uEnztnZyaVWQ7B381AK4Qdrwt51ZqExKbQpTUNn+EjqoTwvqNj4kqx5QUCI0ThS/YkOxJCXmPUWZbhjpCg56i+2aB6CmK2JGhn57K5mj0MNdBXA4/WnwH6XoPWJzK5Nyu2zB3nAZp+S5hpQs+p1vN1/wsjk=
-|1|kyd+2TLRVx5WkeYWt5KZG5xkiRY=|Av44XxYX/tB5AylJYGwe1+aYRH8= ecdsa-sha2-nistp256 AAAAE2VjZHNhLXNoYTItbmlzdHAyNTYAAAAIbmlzdHAyNTYAAABBBEmKSENjQEezOmxkZMy7opKgwFB9nkt5YRrYMjNuG5N87uRgg6CLrbo5wAdT/y6v0mKV0U2w0WZ2YB/++Tpockg=
-|1|57Mc7AkMixA2wO/oaXe0kDmn7bk=|WEvNB7cfFsTcYNQSk2tRgin+mfg= ssh-ed25519 AAAAC3NzaC1lZDI1NTE5AAAAIJXuVwIE9ZFHrqkRqzCToEwBR4V+1YoBZf+7PwQOm9uo
-|1|Gc8JQLe9H1GKkfEpatYPwqaM5u0=|CsQrFpSf02UbF27MlvOQB0enGuQ= ssh-rsa AAAAB3NzaC1yc2EAAAADAQABAAABAQCaRpBbAotScjprZd4DSlGw6FVRobxdo5YX1LLl9yoIhBfXXQIIHvYq3sRnS9GhhOBhoEBcqOZm7jj4GG8TnnANYEAoulR0dfGLAZbftpz95wNaWo9veiA45k8Ihx5fpZ2c0WlJnTZYyz+0+WaL3AY7yz7p1gyfTYOWp7Q4LJcY4kK/tkLnMYSsCTGwMAco2jR9CDdXZGLdAVB4BoZOAEYJ3wUGWCxcFMVgy+X7iQwIkrNyRCBw/BV3EjXqSNjD/XbrsMfuiVhhDgZS7r+u+yQCxqFu60OOLCXU9++UgKy2ICVDP8mBoJW/zKvJ0OOoylt7vSVWp67uiHe7f/0rywN1
-|1|wBajkjvDTSC0NG6PWiSGhwPPhdY=|USSmnu2FmIcv4gzM4t4+3+RoBV8= ecdsa-sha2-nistp256 AAAAE2VjZHNhLXNoYTItbmlzdHAyNTYAAAAIbmlzdHAyNTYAAABBBA8e+6iO+UmorfX7JWKglc4QptEczpe2LG3PidmsS7tDPcUK9Vbn/eyEkY61Us1Zo7rGqrAT3wABOnRpftfg0IA=

ssh/.ssh/ssh/known_hosts.old

@@ -1,4 +0,0 @@
-|1|CIIWBGAPZWh0AC6+VhzGeTCp2zU=|tvDRuKqQI9R5hYflMTFC0UjxSLg= ssh-ed25519 AAAAC3NzaC1lZDI1NTE5AAAAIOMqqnkVzrm0SdG6UOoqKLsabgH5C9okWi0dh2l9GKJl
-|1|2zYwaWz04YT0n3X4DoUJ/GyfvJc=|qEkYdDiBbUaZBIJuJgSjpgAIIcc= ssh-rsa AAAAB3NzaC1yc2EAAAADAQABAAABgQCj7ndNxQowgcQnjshcLrqPEiiphnt+VTTvDP6mHBL9j1aNUkY4Ue1gvwnGLVlOhGeYrnZaMgRK6+PKCUXaDbC7qtbW8gIkhL7aGCsOr/C56SJMy/BCZfxd1nWzAOxSDPgVsmerOBYfNqltV9/hWCqBywINIR+5dIg6JTJ72pcEpEjcYgXkE2YEFXV1JHnsKgbLWNlhScqb2UmyRkQyytRLtL+38TGxkxCflmO+5Z8CSSNY7GidjMIZ7Q4zMjA2n1nGrlTDkzwDCsw+wqFPGQA179cnfGWOWRVruj16z6XyvxvjJwbz0wQZ75XK5tKSb7FNyeIEs4TT4jk+S4dhPeAUC5y+bDYirYgM4GC7uEnztnZyaVWQ7B381AK4Qdrwt51ZqExKbQpTUNn+EjqoTwvqNj4kqx5QUCI0ThS/YkOxJCXmPUWZbhjpCg56i+2aB6CmK2JGhn57K5mj0MNdBXA4/WnwH6XoPWJzK5Nyu2zB3nAZp+S5hpQs+p1vN1/wsjk=
-|1|kyd+2TLRVx5WkeYWt5KZG5xkiRY=|Av44XxYX/tB5AylJYGwe1+aYRH8= ecdsa-sha2-nistp256 AAAAE2VjZHNhLXNoYTItbmlzdHAyNTYAAAAIbmlzdHAyNTYAAABBBEmKSENjQEezOmxkZMy7opKgwFB9nkt5YRrYMjNuG5N87uRgg6CLrbo5wAdT/y6v0mKV0U2w0WZ2YB/++Tpockg=
-|1|57Mc7AkMixA2wO/oaXe0kDmn7bk=|WEvNB7cfFsTcYNQSk2tRgin+mfg= ssh-ed25519 AAAAC3NzaC1lZDI1NTE5AAAAIJXuVwIE9ZFHrqkRqzCToEwBR4V+1YoBZf+7PwQOm9uo

vim/.vim/lua/plugins/bigfile.lua

@@ -1,17 +1,30 @@
 return {
   "LunarVim/bigfile.nvim",
   opts = {
-    filesize = 2,      -- size of the file in MiB, the plugin round file sizes to the closest MiB
-    pattern = { "*" }, -- autocmd pattern or function see <### Overriding the detection of big files>
-    features = {       -- features to disable
+    filesize = 2, -- size of the file in MiB, the plugin round file sizes to the closest MiB
+    pattern = function(bufnr, filesize_mib)
+      -- you can't use `nvim_buf_line_count` because this runs on BufReadPre
+      local file_contents = vim.fn.readfile(vim.api.nvim_buf_get_name(bufnr))
+      local file_lines = #file_contents
+      local filetype = vim.filetype.match({ buf = bufnr })
+      if filetype == "c" or filetype == "cpp" then
+        if file_lines > 1000 then
+          vim.b.codefmt_formatt = "" -- disable codefmt
+          vim.cmd(":FormatDisable") -- disable conform
+          return true
+        end
+      end
+      return filesize_mib > 1
+    end,
+    features = { -- features to disable
       "indent_blankline",
       "illuminate",
       "lsp",
       "treesitter",
-      "syntax",
+      -- "syntax",
       "matchparen",
-      "vimopts",
-      "filetype",
+      -- "vimopts",
+      -- "filetype",
     },
   }
 }

vim/.vim/lua/plugins/signify.lua

@@ -1,58 +1,61 @@
 local use_google = require("utils").use_google
 
-local function setup_mercurial(hg_revision)
-	local git_cmd = "git diff --no-color --no-ext-diff -U0 -- %f"
-	local rcs_cmd = "rcsdiff -U0 %f 2>%n"
-	local svn_cmd = "svn diff --diff-cmd %d -x -U0 -- %f"
-	local hg_diff = hg_revision .. " --color=never config aliases.diff= --nodates -U0 -- %f"
-	local hg_cat = hg_revision .. " -- %f"
-
-	vim.cmd(string.format(
-		[[
-let g:signify_vcs_cmds = {
-      \ 'git':      '%s',
-      \ 'rcs':      '%s',
-      \ 'svn':      '%s',
-      \ 'hg':       'chg diff %s',
-      \ }
-let g:signify_vcs_cmds_diffmode = {
-      \ 'hg':       'chg cat %s',
-      \ }
-  ]],
-		git_cmd,
-		rcs_cmd,
-		svn_cmd,
-		hg_diff,
-		hg_cat
-	))
+local function change_diffbase(hg_revision, git_revision)
+  vim.g.signify_vcs_cmds = {
+    git = "git diff --no-color --diff-algorithm=histogram --no-ext-diff -U0 " .. git_revision .. " -- %f",
+    yadm = 'yadm diff --no-color --no-ext-diff -U0 -- %f',
+    hg = 'chg --config alias.diff=diff diff --color=never --nodates -U0 -- %f',
+    svn = 'svn diff --diff-cmd %d -x -U0 -- %f',
+    bzr = 'bzr diff --using %d --diff-options=-U0 -- %f',
+    darcs = 'darcs diff --no-pause-for-gui --no-unified --diff-opts=-U0 -- %f',
+    fossil = 'fossil diff --unified -c 0 -- %f',
+    cvs = 'cvs diff -U0 -- %f',
+    rcs = 'rcsdiff -U0 %f 2>%n',
+    accurev = 'accurev diff %f -- -U0',
+    tfs = 'tf diff -version=W -noprompt -format=Unified %f'
+  }
+  vim.g.signify_vcs_cmds_diffmode = {
+    git = "git show " .. git_revision .. ":./%f",
+    hg = "chg cat " .. hg_revision .. " -- %f",
+    yadm = 'yadm show HEAD:./%f',
+    svn = 'svn cat %f',
+    bzr = 'bzr cat %f',
+    darcs = 'darcs show contents -- %f',
+    fossil = 'fossil cat %f',
+    cvs = 'cvs up -p -- %f 2>%n',
+    rcs = 'co -q -p %f',
+    accurev = 'accurev cat %f',
+    perforce = 'p4 print %f',
+    tfs = 'tf view -version:W -noprompt %f',
+  }
 end
 
 _G.signify_dtup = function()
-	setup_mercurial('-r ".^"')
-	vim.cmd([[:SignifyEnable]])
-	vim.cmd([[:SignifyRefresh]])
+  change_diffbase('-r ".^"', 'HEAD^')
+  vim.cmd([[:SignifyEnable]])
+  vim.cmd([[:SignifyRefresh]])
 end
 
 _G.signify_normal = function()
-	setup_mercurial("-r .")
-	vim.cmd([[:SignifyEnable]])
-	vim.cmd([[:SignifyRefresh]])
+  change_diffbase("-r .", "")
+  vim.cmd([[:SignifyEnable]])
+  vim.cmd([[:SignifyRefresh]])
 end
 
 _G.signify_dtp4 = function()
-	setup_mercurial("-r p4head")
-	vim.cmd([[:SignifyEnable]])
-	vim.cmd([[:SignifyRefresh]])
+  change_diffbase("-r p4head", "main")
+  vim.cmd([[:SignifyEnable]])
+  vim.cmd([[:SignifyRefresh]])
 end
 
 _G.signify_dtex = function()
-	setup_mercurial("-r exported(.)")
-	vim.cmd([[:SignifyEnable]])
-	vim.cmd([[:SignifyRefresh]])
+  change_diffbase("-r exported(.)", "origin/main")
+  vim.cmd([[:SignifyEnable]])
+  vim.cmd([[:SignifyRefresh]])
 end
 return {
-	"mhinz/vim-signify",
-	event = "VimEnter",
+  "mhinz/vim-signify",
+  event = "VimEnter",
   -- stylua: ignore
   keys = {
     { "]d",          "<plug>(signify-next-hunk)" },
@@ -62,23 +65,24 @@ return {
     { "<leader>sup", ":lua signify_dtup()<CR>" },
     { "<leader>sex", ":lua signify_dtex()<CR>" },
     { "<leader>sp4", ":lua signify_dtp4()<CR>" },
+    { "<leader>sb",  ":lua signify_dtp4()<CR>" },
   },
-	config = function()
-		vim.g.signify_vcs_list = { "hg", "git" }
-		vim.g.signify_disable_by_default = 0
-		-- vim.g.signify_number_highlight = 1
-		vim.g.signify_sign_show_count = 0
-		local s = "▕"
-		vim.g.signify_sign_add = s
-		vim.g.signify_sign_delete = s
-		vim.g.signify_sign_change = s
-		vim.api.nvim_set_hl(0, "SignifySignAdd", { fg = "#9cd9b8" })
-		vim.api.nvim_set_hl(0, "SignifySignChange", { fg = "#849ee3" })
+  config = function()
+    vim.g.signify_vcs_list = { "hg", "git" }
+    vim.g.signify_disable_by_default = 0
+    -- vim.g.signify_number_highlight = 1
+    vim.g.signify_sign_show_count = 0
+    local s = "▕"
+    vim.g.signify_sign_add = s
+    vim.g.signify_sign_delete = s
+    vim.g.signify_sign_change = s
+    vim.api.nvim_set_hl(0, "SignifySignAdd", { fg = "#9cd9b8" })
+    vim.api.nvim_set_hl(0, "SignifySignChange", { fg = "#849ee3" })
 
-		local myred = "#f296a0"
-		vim.api.nvim_set_hl(0, "SignifySignChangeDelete", { fg = myred })
-		vim.api.nvim_set_hl(0, "SignifySignDelete", { fg = myred })
-		vim.api.nvim_set_hl(0, "SignifyLineDelete", { fg = myred })
-		vim.api.nvim_set_hl(0, "SignifySignDeleteDeleteFirstLine", { fg = myred })
-	end,
+    local myred = "#f296a0"
+    vim.api.nvim_set_hl(0, "SignifySignChangeDelete", { fg = myred })
+    vim.api.nvim_set_hl(0, "SignifySignDelete", { fg = myred })
+    vim.api.nvim_set_hl(0, "SignifyLineDelete", { fg = myred })
+    vim.api.nvim_set_hl(0, "SignifySignDeleteDeleteFirstLine", { fg = myred })
+  end,
 }

vim/.vim/lua/plugins/themes-work.lua

@@ -1,97 +1,93 @@
 local use_google = require("utils").use_google
 
 return {
-	{
-		"ful1e5/onedark.nvim",
-		priority = 1000, -- make sure to load this before all the other start plugins
-		lazy = not use_google(), -- make sure we load this during startup if it is your main colorscheme
-		cond = use_google(),
-		config = function()
-			-- require("onedark").setup()
-		end,
-	},
-	{
-		"catppuccin/nvim",
-		name = "catppuccin",
-		priority = 1000, -- make sure to load this before all the other start plugins
-		lazy = not use_google(), -- make sure we load this during startup if it is your main colorscheme
-		cond = use_google(),
-		config = function()
-			vim.g.catppuccin_flavour = "macchiato" -- latte, frappe, macchiato, mocha
-			local colors = require("catppuccin.palettes").get_palette()
+  {
+    "ful1e5/onedark.nvim",
+    priority = 1000,         -- make sure to load this before all the other start plugins
+    lazy = not use_google(), -- make sure we load this during startup if it is your main colorscheme
+    cond = use_google(),
+    config = function()
+      -- require("onedark").setup()
+    end,
+  },
+  {
+    "catppuccin/nvim",
+    name = "catppuccin",
+    priority = 1000,         -- make sure to load this before all the other start plugins
+    lazy = not use_google(), -- make sure we load this during startup if it is your main colorscheme
+    cond = use_google(),
+    config = function()
+      vim.g.catppuccin_flavour = "macchiato" -- latte, frappe, macchiato, mocha
+      local colors = require("catppuccin.palettes").get_palette()
 
-			require("catppuccin").setup({
-				flavour = "mocha",
-				integrations = {
-					cmp = true,
-					-- coc_nvim = false,
-					dashboard = true,
-					-- fern = false,
-					fidget = true,
-					gitgutter = true,
-					gitsigns = true,
-					-- hop = false,
-					illuminate = true,
-					-- leap = false,
-					-- lightspeed = false,
-					-- lsp_saga = false,
-					lsp_trouble = true,
-					illuminate = {
-						enabled = true,
-						-- lsp = false
-					},
-					mason = true,
-					markdown = true,
-					-- neogit = false,
-					-- neotest = false,
-					neotree = true,
-					notify = true,
-					nvimtree = true,
-					-- overseer = false,
-					-- pounce = false,
-					symbols_outline = true,
-					telescope = true,
-					treesitter = true,
-					treesitter_context = true,
-					-- ts_rainbow = false,
-					-- vim_sneak = false,
-					-- vimwiki = false,
-					which_key = true,
-					-- Special integrations, see https://github.com/catppuccin/nvim#special-integrations
-					dap = true,
-					dap_ui = true,
-					indent_blankline = {
-						enabled = true,
-						colored_indent_levels = false,
-					},
-				},
-				native_lsp = {
-					enabled = true,
-					virtual_text = {
-						errors = { "italic" },
-						hints = { "italic" },
-						warnings = { "italic" },
-						information = { "italic" },
-					},
-					underlines = {
-						errors = { "underline" },
-						hints = { "underline" },
-						warnings = { "underline" },
-						information = { "underline" },
-					},
-					inlay_hints = {
-						background = true,
-					},
-				},
-				custom_highlights = {
-					-- Identifier = { fg = colors.lavender },
-					-- Statement = { fg = colors.rosewater },
-					-- Identifier = { fg = colors.sapphire },
-					-- Function = { fg = colors.mauve },
-				},
-			})
+      require("catppuccin").setup({
+        flavour = "mocha",
+        integrations = {
+          cmp = true,
+          -- coc_nvim = false,
+          dashboard = true,
+          -- fern = false,
+          fidget = true,
+          gitgutter = true,
+          gitsigns = true,
+          -- hop = false,
+          illuminate = true,
+          leap = false,
+          -- lightspeed = false,
+          -- lsp_saga = false,
+          lsp_trouble = true,
+          mason = true,
+          markdown = true,
+          -- neogit = false,
+          -- neotest = false,
+          neotree = true,
+          notify = true,
+          nvimtree = true,
+          -- overseer = false,
+          -- pounce = false,
+          symbols_outline = true,
+          telescope = true,
+          treesitter = true,
+          treesitter_context = true,
+          -- ts_rainbow = false,
+          -- vim_sneak = false,
+          -- vimwiki = false,
+          which_key = true,
+          -- Special integrations, see https://github.com/catppuccin/nvim#special-integrations
+          dap = true,
+          dap_ui = true,
+          indent_blankline = {
+            enabled = true,
+            colored_indent_levels = false,
+          },
+        },
+        native_lsp = {
+          enabled = true,
+          virtual_text = {
+            errors = { "italic" },
+            hints = { "italic" },
+            warnings = { "italic" },
+            information = { "italic" },
+          },
+          underlines = {
+            errors = { "underline" },
+            hints = { "underline" },
+            warnings = { "underline" },
+            information = { "underline" },
+          },
+          inlay_hints = {
+            background = true,
+          },
+        },
+        custom_highlights = {
+          -- Identifier = { fg = colors.lavender },
+          -- Statement = { fg = colors.rosewater },
+          -- Identifier = { fg = colors.sapphire },
+          -- Function = { fg = colors.mauve },
+        },
+      })
 
-			vim.api.nvim_command("colorscheme catppuccin")
-		end,
-	},
+      vim.api.nvim_command("colorscheme catppuccin")
+    end,
+  },
 }