From b32fa96788332d5a1b01ecfac398cabff6001117 Mon Sep 17 00:00:00 2001 From: Rahsheen Porter Date: Wed, 23 Nov 2022 10:46:56 -0500 Subject: [PATCH] fzf and aliases --- .config/nvim/after/plugin/telescope.lua | 16 ++++++++++++++++ .config/nvim/lua/rahcodes/packer.lua | 9 ++++++++- .config/nvim/plugin/packer_compiled.lua | 16 +++++++++++----- .zshrc | 6 ++++++ 4 files changed, 41 insertions(+), 6 deletions(-) create mode 100644 .config/nvim/after/plugin/telescope.lua diff --git a/.config/nvim/after/plugin/telescope.lua b/.config/nvim/after/plugin/telescope.lua new file mode 100644 index 00000000..f14b0b82 --- /dev/null +++ b/.config/nvim/after/plugin/telescope.lua @@ -0,0 +1,16 @@ +local actions = require("telescope.actions") +local telescope = require("telescope") + +telescope.setup({ + extensions = { + fzf = { + fuzzy = true, -- false will only do exact matching + override_generic_sorter = true, -- override the generic sorter + override_file_sorter = true, -- override the file sorter + case_mode = "smart_case", -- or "ignore_case" or "respect_case" + -- the default case_mode is "smart_case" + }, + }, +}) + +telescope.load_extension("fzf") diff --git a/.config/nvim/lua/rahcodes/packer.lua b/.config/nvim/lua/rahcodes/packer.lua index 0d068fde..ce702e6a 100644 --- a/.config/nvim/lua/rahcodes/packer.lua +++ b/.config/nvim/lua/rahcodes/packer.lua @@ -19,8 +19,15 @@ return require("packer").startup(function(use) use({ "nvim-telescope/telescope.nvim", tag = "0.1.0", - requires = { { "nvim-lua/plenary.nvim" } }, + requires = { + "nvim-lua/plenary.nvim", + { "nvim-telescope/telescope-fzf-native.nvim", run = "make" }, + }, + wants = { + "telescope-fzf-native.nvim", + }, }) + use({ "nvim-telescope/telescope-fzf-native.nvim", run = "make" }) use({ "nvim-treesitter/nvim-treesitter", run = function() diff --git a/.config/nvim/plugin/packer_compiled.lua b/.config/nvim/plugin/packer_compiled.lua index 2d72f36d..4ecd151a 100644 --- a/.config/nvim/plugin/packer_compiled.lua +++ b/.config/nvim/plugin/packer_compiled.lua @@ -182,10 +182,16 @@ _G.packer_plugins = { path = "/home/striderz/.local/share/nvim/site/pack/packer/start/symbols-outline.nvim", url = "https://github.com/simrat39/symbols-outline.nvim" }, + ["telescope-fzf-native.nvim"] = { + loaded = true, + path = "/home/striderz/.local/share/nvim/site/pack/packer/start/telescope-fzf-native.nvim", + url = "https://github.com/nvim-telescope/telescope-fzf-native.nvim" + }, ["telescope.nvim"] = { loaded = true, path = "/home/striderz/.local/share/nvim/site/pack/packer/start/telescope.nvim", - url = "https://github.com/nvim-telescope/telescope.nvim" + url = "https://github.com/nvim-telescope/telescope.nvim", + wants = { "telescope-fzf-native.nvim" } }, ["tokyonight.nvim"] = { loaded = true, @@ -211,6 +217,10 @@ _G.packer_plugins = { } time([[Defining packer_plugins]], 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) -- Config for: gitsigns.nvim 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") @@ -219,10 +229,6 @@ time([[Config for gitsigns.nvim]], false) time([[Config for trouble.nvim]], true) try_loadstring("\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", "config", "trouble.nvim") time([[Config for trouble.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 diff --git a/.zshrc b/.zshrc index 8f1548fd..72a80205 100644 --- a/.zshrc +++ b/.zshrc @@ -11,6 +11,8 @@ fi alias config="/usr/bin/git --git-dir=$HOME/.cfg/ --work-tree=$HOME" alias vimconfig="GIT_DIR=$HOME/.cfg GIT_WORK_TREE=$HOME nvim" +alias asdfg="setxkbmap -option ctrl:nocaps dvorak" +alias aoeu="setxkbmap -option ctrl:nocaps us" # set PATH so it includes user's private bin if it exists if [ -d "$HOME/bin" ] ; then @@ -22,6 +24,10 @@ if [ -d "$HOME/.local/bin" ] ; then PATH="$HOME/.local/bin:$PATH" fi +export ANDROID_SDK_ROOT=$HOME/Android/Sdk +PATH=$PATH:$ANDROID_SDK_ROOT/emulator +PATH=$PATH:$ANDROID_SDK_ROOT/platform-tools + export PATH if [ ! -f $HOME/antigen/antigen.zsh ]; then