Swap window tmux

tmux/.tmux.conf

@@ -116,10 +116,14 @@ bind -n S-Left  previous-window
 bind -n S-Right next-window
 
 # Ctrl-Shift arrow to swap windows
-bind-key -n C-S-Left swap-window -t -1
+bind-key -n C-S-Left swap-window -t -1\; select-window -t -1
-bind-key -n C-S-Right swap-window -t +1
+bind-key -n C-S-Right swap-window -t +1\; select-window -t +1
 
-# loop through current window's panes while zoomed
+# swap window to left or right
+bind-key -r < swap-window -t -1\; select-window -t -1
+bind-key -r > swap-window -t +1\; select-window -t +1
+
+    # loop through current window's panes while zoomed
 bind -r "'" select-pane -t .+1 \;  resize-pane -Z
 bind -r ";" select-pane -t .-1 \;  resize-pane -Z
 

vim/.vim/lua/config/google.lua

@@ -1,43 +0,0 @@
-local M = {}
-function M.config(use)
-    use {
-        'sso://googler@user/piloto/cmp-nvim-ciderlsp',
-        'sso://googler@user/kdark/ciderlsp-nvim',
-        "sso://googler@user/jackcogdill/nvim-figtree",
-    }
-    use {
-        'sso://googler@user/vintharas/telescope-codesearch.nvim',
-        requires = { 'nvim-telescope/telescope.nvim' }
-    }
-    use {
-        'sso://googler@user/aktau/telescope-citc.nvim',
-        requires = { 'nvim-telescope/telescope.nvim' }
-    }
-    use {
-        'sso://googler@user/tylersaunders/telescope-fig.nvim',
-        requires = { 'nvim-telescope/telescope.nvim' }
-    }
-
-    use {
-        'sso://googler@user/chmnchiang/google-comments',
-        -- '/google/src/head/depot/google3/experimental/users/chmnchiang/neovim/google-comments',
-        -- '/google/src/cloud/cnieves/google-comments/google3/experimental/users/chmnchiang/neovim/google-comments',
-        requires = {'rcarriga/nvim-notify', 'nvim-lua/plenary.nvim'},
-        config = [[ require("config.google-comments") ]]
-    }
-
-    use {
-        '/google/src/cloud/cnieves/google-comments/google3/experimental/users/cnieves/neovim/critique',
-        config = [[ require("critique").setup() ]]
-    }
-    use {
-        "sso://googler@user/smwang/hg.nvim",
-        requires =  { "ipod825/libp.nvim" },
-        config = function()
-            require("config.fig")
-            require("hg").setup()
-        end,
-    }
-end
-
-return M

vim/.vim/lua/config/nvim-treesitter.lua

@@ -1,10 +1,10 @@
 require('nvim-treesitter.configs').setup {
--- A list of parser names, or "all"
+    -- A list of parser names, or "all"
--- ensure_installed = { "c", "lua", "vim", "java", "kotlin"},
+    -- ensure_installed = { "c", "lua", "vim", "java", "kotlin"},
-ensure_installed = "all",
+    ensure_installed = "all",
 
--- Install parsers synchronously (only applied to `ensure_installed`)
+    -- Install parsers synchronously (only applied to `ensure_installed`)
-sync_install = false,
+    sync_install = false,
 
     highlight = {
         -- `false` will disable the whole extension

vim/.vim/lua/config/telescope.lua

@@ -39,43 +39,3 @@ require('telescope').setup {
     }
 }
 }
-
-local map = require("utils").map
-
-map('n', '<leader>tb', ":Telescope file_buffers", { desc = '[T]elescope [B]uffers' })
-map('n', '<leader>tf', [[:lua require('telescope.builtin').find_files{ find_command = {'rg', '--files', '--hidden', '-g', '!node_modules/**'} }<cr>]], { desc = '[T]elescope [F]iles' })
-map('n', '<leader>th', require('telescope.builtin').help_tags, { desc = '[T]elescope [H]elp' })
-map('n', '<leader>tw', require('telescope.builtin').grep_string, { desc = '[T]elescope current [W]ord' })
-map('n', '<leader>tg', require('telescope.builtin').live_grep, { desc = '[T]elescope by [G]rep' })
-
-if use_google() then
-    -- These custom mappings let you open telescope-codesearch quickly:
-    map('n', '<C-P>',
-    [[<cmd>lua require('telescope').extensions.codesearch.find_files{}<CR>]],
-    { noremap = true, silent=true }
-    )
-
-    -- Search using codesearch queries.
-    map(
-    "n",
-    "<leader>cs",
-    [[<cmd>lua require('telescope').extensions.codesearch.find_query{}<CR>]],
-    { noremap = true, silent = true }
-    )
-
-    -- Search for the word under cursor.
-    map(
-    "n",
-    "<leader>CS",
-    [[<cmd>lua require('telescope').extensions.codesearch.find_query{default_text_expand='<cword>'}<CR>]],
-    { noremap = true, silent = true }
-    )
-
-    -- Search for text selected in Visual mode.
-    map(
-    "v",
-    "<leader>cs",
-    [[<cmd>lua require('telescope').extensions.codesearch.find_query{}<CR>]],
-    { noremap = true, silent = true }
-    )
-end

vim/.vim/lua/plugins.lua

@@ -1,98 +1,74 @@
-local fn = vim.fn
 local use_google = require("utils").use_google
-local install_path = fn.stdpath('data')..'/site/pack/packer/start/packer.nvim'
+local lazypath = vim.fn.stdpath("data") .. "/lazy/lazy.nvim"
-if fn.empty(fn.glob(install_path)) > 0 then
+if not vim.loop.fs_stat(lazypath) then
-    packer_bootstrap = fn.system({'git', 'clone', '--depth', '1', 'https://github.com/wbthomason/packer.nvim', install_path})
+  vim.fn.system({
-    vim.o.runtimepath = vim.fn.stdpath('data') .. '/site/pack/*/start/*,' .. vim.o.runtimepath
+    "git",
+    "clone",
+    "--filter=blob:none",
+    "https://github.com/folke/lazy.nvim.git",
+    "--branch=stable", -- latest stable release
+    lazypath,
+  })
 end
+vim.opt.rtp:prepend(lazypath)
 
-vim.cmd([[
+-- Example using a list of specs with the default options
-augroup packer_user_config
+vim.g.mapleader = "," -- Make sure to set `mapleader` before lazy so your mappings are correct
-autocmd!
+vim.g.windowswap_map_keys = 0
-autocmd BufWritePost plugins.lua source <afile> | PackerCompile
-augroup end
-]])
 
-require('lspconfig')
+-- require('lspconfig')
 
-require('packer').startup(function(use)
+require("lazy").setup({
-    -- Packer can manage itself
+  "folke/which-key.nvim",
-    use 'wbthomason/packer.nvim'
+  { "folke/neoconf.nvim", cmd = "Neoconf" },
-    use 'lewis6991/impatient.nvim'
+  "folke/neodev.nvim",
-    use 'dstein64/vim-startuptime'
-    use 'will133/vim-dirdiff'
 
-    -- use {
+    'lewis6991/impatient.nvim',
-    --     'google/vim-glaive',
+    'dstein64/vim-startuptime',
-    --     after  =  {
+    'will133/vim-dirdiff',
-    --         'google/vim-maktaba',
-    --     }
-    --     -- disable = use_google(),
-    --     -- cond = not use_google(),
-    -- }
-    -- use {
-    --     'google/vim-maktaba',
-    --     -- disable = use_google(),
-    --     -- cond = not use_google(),
-    -- }
-    -- use {
-    --     'flwyd/vim-imp',
-    --     disable = use_google(),
-    --     -- cond = not use_google(),
-    --     after  =  {
-    --         'google/vim-maktaba',
-    --         'google/vim-glaive',
-    --     }
-    -- }
 
-    use {
+    {
-        'nvim-treesitter/nvim-treesitter',
+        "nvim-treesitter/nvim-treesitter",
-        run = ':TSUpdate',
+        build = ":TSUpdate",
-        config = [[ require("config.nvim-treesitter") ]]
+        config = function() require("config.nvim-treesitter") end
-    }
+    },
 
-    -- Unless you are still migrating, remove the deprecated commands from v1.x
+    {
-    vim.cmd([[ let g:neo_tree_remove_legacy_commands = 1 ]])
-
-    use {
       "nvim-neo-tree/neo-tree.nvim",
-        branch = "v2.x",
+        config = function() require("config.neotree") end,
-        config = [[ require("config.neotree") ]],
+        dependencies = {
-        requires = {
           "nvim-lua/plenary.nvim",
-          "nvim-tree/nvim-web-devicons", -- not strictly required, but recommended
+          -- "nvim-tree/nvim-web-devicons", -- not strictly required, but recommended
           "MunifTanjim/nui.nvim",
         }
-      }
+  },
 
     -- Undo tree
-    use {
+    {
         'mbbill/undotree',
         cmd = 'UndotreeToggle',
-        config = [[vim.g.undotree_SetFocusWhenToggle = 1]],
+        config = function() vim.g.undotree_SetFocusWhenToggle = 1 end,
-    }
+    },
 
-    use 'nvim-lua/plenary.nvim'
+    'nvim-lua/plenary.nvim',
-    use {
+    {
         'renerocksai/telekasten.nvim',
-        config = [[ require("config.telekasten") ]]
+        config = function()  require("config.telekasten") end
-    }
+    },
-    use 'renerocksai/calendar-vim'
+    'renerocksai/calendar-vim',
 
-    use 'google/vim-searchindex'
+    'google/vim-searchindex',
-    use { 'ray-x/go.nvim',ft='go' }
+    { 'ray-x/go.nvim',ft='go' },
-    use { 'ray-x/guihua.lua',ft='go' }
+    { 'ray-x/guihua.lua',ft='go' },
 
     -- Pretty symbols
-    use 'kyazdani42/nvim-web-devicons'
+    'kyazdani42/nvim-web-devicons',
-
-    use({"L3MON4D3/LuaSnip", tag = "v<CurrentMajor>.*"})
 
     -- Completion and linting
-    use 'neovim/nvim-lspconfig'
+    'neovim/nvim-lspconfig',
-    use {
+    {
         'hrsh7th/nvim-cmp',
-        requires = {
+        dependencies = {
             'onsails/lspkind.nvim',
             'hrsh7th/cmp-nvim-lsp',
             'hrsh7th/cmp-buffer',
@@ -105,113 +81,202 @@ require('packer').startup(function(use)
             'hrsh7th/cmp-path',
             'hrsh7th/cmp-vsnip',
             'ray-x/cmp-treesitter',
-            { 'saadparwaiz1/cmp_luasnip', after = {'LuaSnip'} },
         },
-        config = [[ require("config.lsp") ]],
+        config = function() require("config.lsp") end,
-    }
+    },
-    use {
+    {
         "tzachar/cmp-tabnine", run = "./install.sh",
         event = 'InsertEnter',
         cond = not use_google(),
-    }
+    },
-    use { 'ErichDonGubler/lsp_lines.nvim', config = [[ require("lsp_lines").setup() ]] }
+    { 'ErichDonGubler/lsp_lines.nvim', config = function()  require("lsp_lines").setup()  end },
-    use {
+    {
         "williamboman/mason.nvim",
         "williamboman/mason-lspconfig.nvim",
         'VonHeikemen/lsp-zero.nvim',
-    }
+    },
-    use {
+    {
         'jose-elias-alvarez/null-ls.nvim',
-        config = [[ require("config.null-ls") ]],
+        config = function()  require("config.null-ls")  end,
-    }
+    },
 
-    use {
+     {
-        'nvim-telescope/telescope.nvim',
+    'nvim-telescope/telescope.nvim',
-        branch = '0.1.x',
+    cmd = 'Telescope',
-        config = [[ require("config.telescope") ]]
+    config = function()
+      require('telescope').setup {
+        pickers = {
+          buffers = {
+            sort_lastused = true,
+          },
+        },
+      }
+    end,
+    dependencies = {
+      'nvim-lua/plenary.nvim',
+    },
+    event = { "BufReadPost", "BufNewFile" },
+    keys = {
+      {
+        '<leader>tf',
+        function()
+          require('telescope.builtin').find_files{ find_command = {'rg', '--files', '--hidden', '-g', '!node_modules/**'} }
+        end,
+        desc = 'Telescope Files',
+        remap = false,
+        unique = true,
+      },
+      {
+        '<leader>th',
+        function()
+          require('telescope.builtin').help_tags{}
+        end,
+        desc = 'Telescope Help',
+        remap = false,
+        unique = true,
+      },
+      {
+        '<leader>tw',
+        function()
+          require('telescope.builtin').grep_string{}
+        end,
+        desc = 'Telescope Word',
+        remap = false,
+        unique = true,
+      },
+      {
+        '<leader>tg',
+        function()
+          require('telescope.builtin').live_grep{}
+        end,
+        desc = 'Telescope Grep',
+        remap = false,
+        unique = true,
+      },
+      {
+        '<leader>cs',
+        function()
+            require('telescope').extensions.codesearch.find_query{}
+        end,
+        desc = 'Telescope Codesearch',
+        remap = false,
+        unique = true,
+      },
+      {
+        '<leader>CS',
+        function()
+            require('telescope').extensions.codesearch.find_query{default_text_expand='<cword>'}
+        end,
+        desc = 'Telescope Codesearch',
+        remap = false,
+        unique = true,
+      },
+      {
+        '<leader>CS',
+        function()
+            require('telescope').extensions.codesearch.find_query{}
+        end,
+        desc = 'Telescope Codesearch',
+        remap = false,
+        unique = true,
+        mode = "v",
+      },
+
+      { "<leader>tm", "<cmd>:Telescope citc modified<CR>" },
+      { "<leader>tb", "<cmd>Telescope file_browser<CR>" },
+    { '<leader>fs', function() require('telescope').extensions.fig.status{} end },
+    { '<leader>fx', function() require('telescope').extensions.fig.xl{} end },
+    { '<leader>fw', function() require('telescope').extensions.fig.status{whatsout=true} end },
     }
-    use 'nvim-telescope/telescope-file-browser.nvim'
+  },
+
+  {
+    'nvim-telescope/telescope-file-browser.nvim',
+    dependencies = {'nvim-telescope/telescope.nvim'}
+    },
 
     -- Rust
-    use {
+    {
         'saecki/crates.nvim',
         ft = 'rust',
         tag = 'v0.3.0',
-        requires = { 'nvim-lua/plenary.nvim' },
+        dependencies = { 'nvim-lua/plenary.nvim' },
-        config = [[ require('crates').setup() ]]
+        config = function()  require('crates').setup() end
-    }
+    },
-    use {'simrat39/rust-tools.nvim', ft = 'rust'}
+    {'simrat39/rust-tools.nvim', ft = 'rust'},
 
-    use {
+    {
         'folke/trouble.nvim',
-        config = [[ require("config.trouble") ]]
+        config = function()  require("config.trouble") end
-    }
+    },
 
-    use {
+    {
         'ThePrimeagen/refactoring.nvim',
-         requires = {
+         dependencies = {
             {"nvim-lua/plenary.nvim"},
             {"nvim-treesitter/nvim-treesitter"}
         },
-        config = [[ require("config.refactoring") ]]
+        config = function()  require("config.refactoring") end
-    }
+    },
-    use 'apalmer1377/factorus'
+    'apalmer1377/factorus',
 
-    use 'hrsh7th/vim-vsnip'
+    'hrsh7th/vim-vsnip',
-    use 'kosayoda/nvim-lightbulb'
+    'kosayoda/nvim-lightbulb',
-    use {'andymass/vim-matchup', event = 'VimEnter'}
+    {'andymass/vim-matchup', event = 'VimEnter'},
 
-    use 'jghauser/mkdir.nvim'
+    'jghauser/mkdir.nvim',
-    use { 'simrat39/symbols-outline.nvim', config = [[ require("config.symbols-outline")]]  }
+    { 'simrat39/symbols-outline.nvim', config = function()  require("config.symbols-outline") end  },
-    use { 'petertriho/nvim-scrollbar', config = [[ require("scrollbar").setup()]] }
+    { 'petertriho/nvim-scrollbar', config = function()  require("scrollbar").setup() end },
 
-    use {
+    {
         'rmagatti/auto-session',
+        lazy = false,
         config = function()
             require("auto-session").setup {
                 log_level = "error",
                 auto_session_suppress_dirs = { "~/", "~/Downloads", "/", os.getenv("HOME")},
             }
         end
-    }
+    },
 
 
-    use {
+    {
         "ipod825/libp.nvim",
         config = function()
             require("libp").setup()
         end,
-    }
+    },
 
-    use 'nvim-lua/lsp-status.nvim'
+    'nvim-lua/lsp-status.nvim',
-    use {
+    {
         'nvim-lualine/lualine.nvim',
-        config = [[ require("config.lualine") ]]
+        lazy = false,
-    }
+        config = function()  require("config.lualine") end
-    use {
+    },
+    {
         'rcarriga/nvim-notify',
-        config = [[require("config.notify")]]
+        config = function() require("config.notify") end
-    }
+    },
 
     -- Git
-    use {
+    {
         {
             'lewis6991/gitsigns.nvim',
-            requires = 'nvim-lua/plenary.nvim',
+            dependencies = 'nvim-lua/plenary.nvim',
             event = 'User ActuallyEditing',
         },
         {
             'akinsho/git-conflict.nvim',
             tag = '*',
-            config = [[ require('git-conflict').setup() ]],
+            config = function() require('git-conflict').setup()  end,
         },
         { 'rhysd/conflict-marker.vim' }
-    }
+    },
 
-    -- use { "catppuccin/nvim", as = "catppuccin" }
+    -- { "catppuccin/nvim", as = "catppuccin" }
-    use { "catppuccin/nvim", as = "catppuccin", config = [[ require("config.catppuccin") ]]}
+    { "catppuccin/nvim", as = "catppuccin", lazy=false, config = function()  require("config.catppuccin")  end},
     -- Tmux
-    use {
+    {
         'preservim/vimux',
         'tmux-plugins/vim-tmux',
         'christoomey/vim-tmux-navigator',
@@ -219,70 +284,108 @@ require('packer').startup(function(use)
         'tmux-plugins/vim-tmux-focus-events',
         'jabirali/vim-tmux-yank',
         'skywind3000/asyncrun.vim',
-    }
+    },
-    use {
+    {
         'ojroques/nvim-osc52',
-        config = [[ require("config.oscyank") ]]
+        config = function()  require("config.oscyank") end
-    }
+    },
 
     -- mine
-    use {
+    {
         'squk/java-syntax.vim', ft='java'
-    }
+    },
 
-    use {
+    {
         "folke/which-key.nvim",
-        config = [[ require("config.whichkey") ]]
+        config = function()  require("config.whichkey") end
-    }
+    },
 
-    use 'ntpeters/vim-better-whitespace'
+    'ntpeters/vim-better-whitespace',
-    use 'junegunn/fzf.vim'
+    'junegunn/fzf.vim',
-    use { 'junegunn/fzf', run = ":call fzf#install()" }
+    { 'junegunn/fzf', run = ":call fzf#install()" },
 
-    vim.opt.rtp:append(os.getenv("HOME") .. "/.fzf")
+    'nathanaelkane/vim-indent-guides',
+    'tversteeg/registers.nvim',
+    'jremmen/vim-ripgrep',
 
-    use 'nathanaelkane/vim-indent-guides'
+    { 'udalov/kotlin-vim', ft='kotin' },
-    use 'tversteeg/registers.nvim'
+    'wesQ3/vim-windowswap',
+    'tpope/vim-surround',
+    'scrooloose/nerdcommenter',
 
-    use 'jremmen/vim-ripgrep'
+    { 'vim-scripts/vcscommand.vim' },
-
+    {
-    use { 'udalov/kotlin-vim', ft='kotin' }
-
-    use {
-        'wesQ3/vim-windowswap',
-        setup = [[ vim.g.windowswap_map_keys = 0 ]]
-    }
-
-    use 'tpope/vim-surround'
-    use 'scrooloose/nerdcommenter'
-
-    use { 'vim-scripts/vcscommand.vim' }
-    use {
         'mhinz/vim-signify',
-        config= [[require('config.signify')]]
+        config= function() require('config.signify') end
-    }
+    },
 
-    use {
+    {
         'j-hui/fidget.nvim',
-        config = [[ require("fidget").setup() ]]
+        config = function()  require("fidget").setup() end
-    }
+    },
-    use {
+    {
         "iamcco/markdown-preview.nvim",
         run = "cd app && npm install",
         setup = function() vim.g.mkdp_filetypes = { "markdown" } end,
         ft = { "markdown" }
-    }
+    },
 
-    if use_google() then
+    -- Google Plugins
-        require 'config.google'.config(use)
+    {
-    end
+        url = 'sso://googler@user/piloto/cmp-nvim-ciderlsp',
+        enabled = use_google(),
+    },
+    {
+        url = 'sso://googler@user/kdark/ciderlsp-nvim',
+        enabled = use_google(),
+    },
+    {
+        url = "sso://googler@user/jackcogdill/nvim-figtree",
+        enabled = use_google(),
+    },
+    {
+        url = 'sso://googler@user/vintharas/telescope-codesearch.nvim',
+        enabled = use_google(),
+        dependencies = { 'nvim-telescope/telescope.nvim' }
+    },
+    {
+        url = 'sso://googler@user/aktau/telescope-citc.nvim',
+        enabled = use_google(),
+        dependencies = { 'nvim-telescope/telescope.nvim' }
+    },
+    {
+        url = 'sso://googler@user/tylersaunders/telescope-fig.nvim',
+        enabled = use_google(),
+        dependencies = { 'nvim-telescope/telescope.nvim' }
+    },
 
-    -- Automatically set up your configuration after cloning packer.nvim
+    {
-    -- Put this at the end after all plugins
+        url = 'sso://googler@user/chmnchiang/google-comments',
-    if packer_bootstrap then
+        -- '/google/src/head/depot/google3/experimental/users/chmnchiang/neovim/google-comments',
-        require('packer').sync()
+        -- '/google/src/cloud/cnieves/google-comments/google3/experimental/users/chmnchiang/neovim/google-comments',
-    end
+        dependencies = {'rcarriga/nvim-notify', 'nvim-lua/plenary.nvim'},
-end)
+        enabled = use_google(),
+        config = function()  require("config.google-comments") end
+    },
+   --  {
+   --      dir = '/google/src/cloud/cnieves/google-comments/google3/experimental/users/cnieves/neovim/critique',
+   --      enabled = use_google(),
+   --      config = function()  require("critique").setup() end,
+   --  },
+    {
+        url = "sso://googler@user/smwang/hg.nvim",
+        dependencies =  { "ipod825/libp.nvim" },
+        enabled = use_google(),
+        config = function()
+            require("config.fig")
+            require("hg").setup()
+        end,
+    },
+},
+{
+  defaults = {
+    lazy = true, -- should plugins be lazy-loaded?
+}})
 
 -- CiderLSP
 vim.opt.completeopt = { "menu", "menuone", "noselect" }

vim/.vim/prefs/google.vim

@@ -178,4 +178,3 @@ nmap <leader>yb :let @+ = join(blaze#GetTargets(), ' ')<cr>
 
 Glug corpweb
 nnoremap <leader>csw :CorpWebCsFile<cr>
-

vim/.vimrc

@@ -79,11 +79,6 @@ set omnifunc= completeopt=menuone,noinsert,noselect
 
 set updatetime=100
 
-lua require('impatient')
-" Enable profiling data
-" lua require'impatient'.enable_profile()
-
-
 if filereadable(expand("~/.vimrc.local"))
   source ~/.vimrc.local
 endif