add alias to vim homedir and git remaps

2 years ago · 2184d0d904
parent 38bb8948a6
commit 2184d0d904
4 changed files with 51 additions and 26 deletions
--- a/.config/nvim/lua/rahcodes/packer.lua
+++ b/.config/nvim/lua/rahcodes/packer.lua
@ -61,6 +61,7 @@ return require("packer").startup(function(use)
 	})

 	use("tpope/vim-fugitive")
+	use("tpope/vim-rhubarb")

 	use({
 		"folke/trouble.nvim",
--- a/.config/nvim/lua/rahcodes/remap.lua
+++ b/.config/nvim/lua/rahcodes/remap.lua
@ -7,7 +7,8 @@ local nmap = Remap.nmap
 nnoremap("<leader>pv", "<cmd>Ex<CR>")
 local builtin = require("telescope.builtin")
 vim.keymap.set("n", "<leader>ff", builtin.find_files, {})
-vim.keymap.set("n", "<leader>fg", builtin.live_grep, {})
+vim.keymap.set("n", "<leader>/", builtin.live_grep, {})
+vim.keymap.set("n", "<leader>*", builtin.grep_string, {})
 vim.keymap.set("n", "<leader>fb", builtin.buffers, {})
 vim.keymap.set("n", "<leader>fh", builtin.help_tags, {})

@ -25,6 +26,8 @@ nnoremap("<leader>ga", ":G add %:p<CR><CR>")
 nnoremap("<leader>gc", ":G commit -v -q<CR>")
 nnoremap("<leader>gt", ":G commit -v -q %:p<CR>")
 nnoremap("<leader>gca", ":G commit --amend --no-edit<CR>")
+nnoremap("<leader>gff", ":G ff<CR>")
+nnoremap("<leader>gfo", ":G fetch origin<CR>")
 nnoremap("<leader>gd", ":Gdiff<CR>")
 nnoremap("<leader>ge", ":Gedit<CR>")
 nnoremap("<leader>gr", ":Gread<CR>")
--- a/.config/nvim/plugin/packer_compiled.lua
+++ b/.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 = "/home/striderz/.cache/nvim/packer_hererocks/2.1.0-beta3/share/lua/5.1/?.lua;/home/striderz/.cache/nvim/packer_hererocks/2.1.0-beta3/share/lua/5.1/?/init.lua;/home/striderz/.cache/nvim/packer_hererocks/2.1.0-beta3/lib/luarocks/rocks-5.1/?.lua;/home/striderz/.cache/nvim/packer_hererocks/2.1.0-beta3/lib/luarocks/rocks-5.1/?/init.lua"
-local install_cpath_pattern = "/home/striderz/.cache/nvim/packer_hererocks/2.1.0-beta3/lib/lua/5.1/?.so"
+local package_path_str = "/Users/rahsheen.porter/.cache/nvim/packer_hererocks/2.1.0-beta3/share/lua/5.1/?.lua;/Users/rahsheen.porter/.cache/nvim/packer_hererocks/2.1.0-beta3/share/lua/5.1/?/init.lua;/Users/rahsheen.porter/.cache/nvim/packer_hererocks/2.1.0-beta3/lib/luarocks/rocks-5.1/?.lua;/Users/rahsheen.porter/.cache/nvim/packer_hererocks/2.1.0-beta3/lib/luarocks/rocks-5.1/?/init.lua"
+local install_cpath_pattern = "/Users/rahsheen.porter/.cache/nvim/packer_hererocks/2.1.0-beta3/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
@ -76,121 +76,137 @@ time([[Defining packer_plugins]], true)
 _G.packer_plugins = {
  LuaSnip = {
    loaded = true,
-    path = "/home/striderz/.local/share/nvim/site/pack/packer/start/LuaSnip",
+    path = "/Users/rahsheen.porter/.local/share/nvim/site/pack/packer/start/LuaSnip",
    url = "https://github.com/L3MON4D3/LuaSnip"
  },
  ["cmp-buffer"] = {
    loaded = true,
-    path = "/home/striderz/.local/share/nvim/site/pack/packer/start/cmp-buffer",
+    path = "/Users/rahsheen.porter/.local/share/nvim/site/pack/packer/start/cmp-buffer",
    url = "https://github.com/hrsh7th/cmp-buffer"
  },
  ["cmp-nvim-lsp"] = {
    loaded = true,
-    path = "/home/striderz/.local/share/nvim/site/pack/packer/start/cmp-nvim-lsp",
+    path = "/Users/rahsheen.porter/.local/share/nvim/site/pack/packer/start/cmp-nvim-lsp",
    url = "https://github.com/hrsh7th/cmp-nvim-lsp"
  },
  cmp_luasnip = {
    loaded = true,
-    path = "/home/striderz/.local/share/nvim/site/pack/packer/start/cmp_luasnip",
+    path = "/Users/rahsheen.porter/.local/share/nvim/site/pack/packer/start/cmp_luasnip",
    url = "https://github.com/saadparwaiz1/cmp_luasnip"
  },
  ["gitsigns.nvim"] = {
    config = { "\27LJ\2\n6\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\rgitsigns\frequire\0" },
    loaded = true,
-    path = "/home/striderz/.local/share/nvim/site/pack/packer/start/gitsigns.nvim",
+    path = "/Users/rahsheen.porter/.local/share/nvim/site/pack/packer/start/gitsigns.nvim",
    url = "https://github.com/lewis6991/gitsigns.nvim"
  },
  ["lsp_extensions.nvim"] = {
    loaded = true,
-    path = "/home/striderz/.local/share/nvim/site/pack/packer/start/lsp_extensions.nvim",
+    path = "/Users/rahsheen.porter/.local/share/nvim/site/pack/packer/start/lsp_extensions.nvim",
    url = "https://github.com/nvim-lua/lsp_extensions.nvim"
  },
  ["lspkind-nvim"] = {
    loaded = true,
-    path = "/home/striderz/.local/share/nvim/site/pack/packer/start/lspkind-nvim",
+    path = "/Users/rahsheen.porter/.local/share/nvim/site/pack/packer/start/lspkind-nvim",
    url = "https://github.com/onsails/lspkind-nvim"
  },
  ["lspsaga.nvim"] = {
    loaded = true,
-    path = "/home/striderz/.local/share/nvim/site/pack/packer/start/lspsaga.nvim",
+    path = "/Users/rahsheen.porter/.local/share/nvim/site/pack/packer/start/lspsaga.nvim",
    url = "https://github.com/glepnir/lspsaga.nvim"
  },
  ["lualine.nvim"] = {
    loaded = true,
-    path = "/home/striderz/.local/share/nvim/site/pack/packer/start/lualine.nvim",
+    path = "/Users/rahsheen.porter/.local/share/nvim/site/pack/packer/start/lualine.nvim",
    url = "https://github.com/nvim-lualine/lualine.nvim"
  },
  ["mason-lspconfig.nvim"] = {
    loaded = true,
-    path = "/home/striderz/.local/share/nvim/site/pack/packer/start/mason-lspconfig.nvim",
+    path = "/Users/rahsheen.porter/.local/share/nvim/site/pack/packer/start/mason-lspconfig.nvim",
    url = "https://github.com/williamboman/mason-lspconfig.nvim"
  },
  ["mason-null-ls.nvim"] = {
    loaded = true,
-    path = "/home/striderz/.local/share/nvim/site/pack/packer/start/mason-null-ls.nvim",
+    path = "/Users/rahsheen.porter/.local/share/nvim/site/pack/packer/start/mason-null-ls.nvim",
    url = "https://github.com/jayp0521/mason-null-ls.nvim"
  },
  ["mason.nvim"] = {
    loaded = true,
-    path = "/home/striderz/.local/share/nvim/site/pack/packer/start/mason.nvim",
+    path = "/Users/rahsheen.porter/.local/share/nvim/site/pack/packer/start/mason.nvim",
    url = "https://github.com/williamboman/mason.nvim"
  },
  ["null-ls.nvim"] = {
    loaded = true,
-    path = "/home/striderz/.local/share/nvim/site/pack/packer/start/null-ls.nvim",
+    path = "/Users/rahsheen.porter/.local/share/nvim/site/pack/packer/start/null-ls.nvim",
    url = "https://github.com/jose-elias-alvarez/null-ls.nvim"
  },
  ["nvim-cmp"] = {
    loaded = true,
-    path = "/home/striderz/.local/share/nvim/site/pack/packer/start/nvim-cmp",
+    path = "/Users/rahsheen.porter/.local/share/nvim/site/pack/packer/start/nvim-cmp",
    url = "https://github.com/hrsh7th/nvim-cmp"
  },
  ["nvim-lspconfig"] = {
    loaded = true,
-    path = "/home/striderz/.local/share/nvim/site/pack/packer/start/nvim-lspconfig",
+    path = "/Users/rahsheen.porter/.local/share/nvim/site/pack/packer/start/nvim-lspconfig",
    url = "https://github.com/neovim/nvim-lspconfig"
  },
+  ["nvim-surround"] = {
+    config = { "\27LJ\2\n?\0\0\3\0\3\0\a6\0\0\0'\2\1\0B\0\2\0029\0\2\0004\2\0\0B\0\2\1K\0\1\0\nsetup\18nvim-surround\frequire\0" },
+    loaded = true,
+    path = "/Users/rahsheen.porter/.local/share/nvim/site/pack/packer/start/nvim-surround",
+    url = "https://github.com/kylechui/nvim-surround"
+  },
  ["nvim-treesitter"] = {
    loaded = true,
-    path = "/home/striderz/.local/share/nvim/site/pack/packer/start/nvim-treesitter",
+    path = "/Users/rahsheen.porter/.local/share/nvim/site/pack/packer/start/nvim-treesitter",
    url = "https://github.com/nvim-treesitter/nvim-treesitter"
  },
  ["nvim-web-devicons"] = {
    loaded = false,
    needs_bufread = false,
-    path = "/home/striderz/.local/share/nvim/site/pack/packer/opt/nvim-web-devicons",
+    path = "/Users/rahsheen.porter/.local/share/nvim/site/pack/packer/opt/nvim-web-devicons",
    url = "https://github.com/nvim-tree/nvim-web-devicons"
  },
  ["packer.nvim"] = {
    loaded = true,
-    path = "/home/striderz/.local/share/nvim/site/pack/packer/start/packer.nvim",
+    path = "/Users/rahsheen.porter/.local/share/nvim/site/pack/packer/start/packer.nvim",
    url = "https://github.com/wbthomason/packer.nvim"
  },
  ["plenary.nvim"] = {
    loaded = true,
-    path = "/home/striderz/.local/share/nvim/site/pack/packer/start/plenary.nvim",
+    path = "/Users/rahsheen.porter/.local/share/nvim/site/pack/packer/start/plenary.nvim",
    url = "https://github.com/nvim-lua/plenary.nvim"
  },
  ["symbols-outline.nvim"] = {
    loaded = true,
-    path = "/home/striderz/.local/share/nvim/site/pack/packer/start/symbols-outline.nvim",
+    path = "/Users/rahsheen.porter/.local/share/nvim/site/pack/packer/start/symbols-outline.nvim",
    url = "https://github.com/simrat39/symbols-outline.nvim"
  },
  ["telescope.nvim"] = {
    loaded = true,
-    path = "/home/striderz/.local/share/nvim/site/pack/packer/start/telescope.nvim",
+    path = "/Users/rahsheen.porter/.local/share/nvim/site/pack/packer/start/telescope.nvim",
    url = "https://github.com/nvim-telescope/telescope.nvim"
  },
  ["tokyonight.nvim"] = {
    loaded = true,
-    path = "/home/striderz/.local/share/nvim/site/pack/packer/start/tokyonight.nvim",
+    path = "/Users/rahsheen.porter/.local/share/nvim/site/pack/packer/start/tokyonight.nvim",
    url = "https://github.com/folke/tokyonight.nvim"
  },
  ["trouble.nvim"] = {
    config = { "\27LJ\2\n9\0\0\3\0\3\0\a6\0\0\0'\2\1\0B\0\2\0029\0\2\0004\2\0\0B\0\2\1K\0\1\0\nsetup\ftrouble\frequire\0" },
    loaded = true,
-    path = "/home/striderz/.local/share/nvim/site/pack/packer/start/trouble.nvim",
+    path = "/Users/rahsheen.porter/.local/share/nvim/site/pack/packer/start/trouble.nvim",
    url = "https://github.com/folke/trouble.nvim"
+  },
+  ["vim-fugitive"] = {
+    loaded = true,
+    path = "/Users/rahsheen.porter/.local/share/nvim/site/pack/packer/start/vim-fugitive",
+    url = "https://github.com/tpope/vim-fugitive"
+  },
+  ["vim-rhubarb"] = {
+    loaded = true,
+    path = "/Users/rahsheen.porter/.local/share/nvim/site/pack/packer/start/vim-rhubarb",
+    url = "https://github.com/tpope/vim-rhubarb"
  }
 }

@ -203,6 +219,10 @@ time([[Config for trouble.nvim]], false)
 time([[Config for gitsigns.nvim]], true)
 try_loadstring("\27LJ\2\n6\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\rgitsigns\frequire\0", "config", "gitsigns.nvim")
 time([[Config for gitsigns.nvim]], false)
+-- Config for: nvim-surround
+time([[Config for nvim-surround]], true)
+try_loadstring("\27LJ\2\n?\0\0\3\0\3\0\a6\0\0\0'\2\1\0B\0\2\0029\0\2\0004\2\0\0B\0\2\1K\0\1\0\nsetup\18nvim-surround\frequire\0", "config", "nvim-surround")
+time([[Config for nvim-surround]], false)

 _G._packer.inside_compile = false
 if _G._packer.needs_bufread == true then
--- a/.zshrc
+++ b/.zshrc
@ -10,6 +10,7 @@ else
 fi

 alias config="/usr/bin/git --git-dir=$HOME/.cfg/ --work-tree=$HOME"
+alias vimconfig="GIT_DIR=$HOME/.cfg GIT_WORK_TREE=$HOME nvim"

 # set PATH so it includes user's private bin if it exists
 if [ -d "$HOME/bin" ] ; then