Use latest telescope.nvim w/ <C-w> fixe

flake.lock

@@ -23,11 +23,11 @@
     "flake-compat": {
       "flake": false,
       "locked": {
-        "lastModified": 1627913399,
-        "narHash": "sha256-hY8g6H2KFL8ownSiFeMOjwPC8P0ueXpCVEbxgda3pko=",
+        "lastModified": 1641205782,
+        "narHash": "sha256-4jY7RCWUoZ9cKD8co0/4tFARpWB+57+r1bLLvXNJliY=",
         "owner": "edolstra",
         "repo": "flake-compat",
-        "rev": "12c64ca55c1014cdc1b16ed5a804aa8576601ff2",
+        "rev": "b7547d3eed6f32d06102ead8991ec52ab0a4f1a7",
         "type": "github"
       },
       "original": {
@@ -58,11 +58,11 @@
         ]
       },
       "locked": {
-        "lastModified": 1641121012,
-        "narHash": "sha256-svaOMxNMQgFHjcxdmLojOxTxfqSENtnO+S3kb+npIwY=",
+        "lastModified": 1641459437,
+        "narHash": "sha256-z0IOcc6LLbVhyri/aTyWzRqJs3p1pBK9idOiMwCWiqs=",
         "owner": "nix-community",
         "repo": "home-manager",
-        "rev": "8e7a10602d1eb1d242c9d3f9b822203d5751a8c6",
+        "rev": "c751aeb19e84a0a777f36fd5ea73482a066bb406",
         "type": "github"
       },
       "original": {
@@ -78,11 +78,11 @@
       },
       "locked": {
         "dir": "contrib",
-        "lastModified": 1641106516,
-        "narHash": "sha256-zx9GDn7rXvqvrQaRiop7Xx8qqSt3FPppVcShmneSqHs=",
+        "lastModified": 1641414078,
+        "narHash": "sha256-jUt4yGclE0627CxsaSlgGr8LH+Ek9dSpCHACv917N5c=",
         "owner": "neovim",
         "repo": "neovim",
-        "rev": "e42c9065972f93e4666fbd8e06fc56333e9e5d24",
+        "rev": "09d270bcea5f81a0772e387244cc841e280a5339",
         "type": "github"
       },
       "original": {
@@ -99,11 +99,11 @@
         "nixpkgs": "nixpkgs_2"
       },
       "locked": {
-        "lastModified": 1641111239,
-        "narHash": "sha256-w1jUAuVmImMQGhaUY8dNVAxE4SNULI32RqyRX6DXzBo=",
+        "lastModified": 1641456891,
+        "narHash": "sha256-OXtbN9CkI0qpFIqBDA/GsIlM3qEEtMuPJANrYzj0Q34=",
         "owner": "nix-community",
         "repo": "neovim-nightly-overlay",
-        "rev": "5906176ea9464d9a33c229b124fd713584bcfa57",
+        "rev": "cc577df89d0e968470b48f84a2b05bd13d1b7ecc",
         "type": "github"
       },
       "original": {
@@ -130,11 +130,11 @@
     },
     "nixpkgs": {
       "locked": {
-        "lastModified": 1640959792,
-        "narHash": "sha256-zYSR//06FU2TDOpKKj0Hkff6unsxk3NwwNFuB1loU6E=",
+        "lastModified": 1641230035,
+        "narHash": "sha256-hFyqihERaTbLxCOlugy/rpp22VLtLh8SPRnA2uu3F/8=",
         "owner": "nixos",
         "repo": "nixpkgs",
-        "rev": "59bfda72480496f32787cec8c557182738b1bd3f",
+        "rev": "78cd22c1b8604de423546cd49bfe264b786eca13",
         "type": "github"
       },
       "original": {
@@ -146,11 +146,11 @@
     },
     "nixpkgs_2": {
       "locked": {
-        "lastModified": 1640871638,
-        "narHash": "sha256-ty6sGnJUQEkCd43At5U3DRQZD7rPARz5VginSW6hZ3k=",
+        "lastModified": 1641230035,
+        "narHash": "sha256-hFyqihERaTbLxCOlugy/rpp22VLtLh8SPRnA2uu3F/8=",
         "owner": "nixos",
         "repo": "nixpkgs",
-        "rev": "5b091d4fbe3b7b7493c3b46fe0842e4b30ea24b3",
+        "rev": "78cd22c1b8604de423546cd49bfe264b786eca13",
         "type": "github"
       },
       "original": {
@@ -162,11 +162,11 @@
     },
     "nixpkgs_3": {
       "locked": {
-        "lastModified": 1640959792,
-        "narHash": "sha256-zYSR//06FU2TDOpKKj0Hkff6unsxk3NwwNFuB1loU6E=",
+        "lastModified": 1641230035,
+        "narHash": "sha256-hFyqihERaTbLxCOlugy/rpp22VLtLh8SPRnA2uu3F/8=",
         "owner": "NixOS",
         "repo": "nixpkgs",
-        "rev": "59bfda72480496f32787cec8c557182738b1bd3f",
+        "rev": "78cd22c1b8604de423546cd49bfe264b786eca13",
         "type": "github"
       },
       "original": {

home/default.nix

@@ -1,16 +1,6 @@
 { lib, pkgs, ... }:
 
 let
-  vim-prettier = pkgs.vimUtils.buildVimPlugin {
-    name = "vim-prettier";
-    nativeBuildInputs = with pkgs; [ lua53Packages.luacheck ];
-    src = pkgs.fetchFromGitHub {
-      owner = "prettier";
-      repo = "vim-prettier";
-      rev = "0.2.7";
-      sha256 = "sha256-FDeyGH5OPAYV7zePCfDujsj+nGd5AFnqySPStJYEY2E=";
-    };
-  };
   hound-nvim = pkgs.vimUtils.buildVimPlugin {
     name = "hound-nvim";
     nativeBuildInputs = with pkgs; [ lua53Packages.luacheck stylua ];
@@ -374,7 +364,6 @@ in
         git-blame-nvim
         gitlinker-nvim
         gruvbox-nvim
-        hound-nvim
         lualine-nvim
         nvim-lspconfig
         nvim-tree-lua
@@ -384,8 +373,7 @@ in
         packer-nvim
         plenary-nvim
         supertab
-        telescope-nvim
-        telescope-fzy-native-nvim
+        /* telescope-fzy-native-nvim */ # remove until latest fixes are pulled in
         trouble-nvim
         vim-commentary
         vim-markdown

home/nvim/lua/init.lua

@@ -24,7 +24,6 @@ vim.opt.scrolloff = 3
 vim.opt.shell = "bash"
 vim.opt.shiftround = false
 vim.opt.shiftwidth = 2
-vim.opt.shiftwidth = 2
 vim.opt.shortmess = vim.opt.shortmess + "A"
 vim.opt.shortmess = vim.opt.shortmess + "I"
 vim.opt.shortmess = vim.opt.shortmess + "O"
@@ -46,7 +45,6 @@ vim.opt.splitright = true
 vim.opt.swapfile = false
 vim.opt.switchbuf = "usetab"
 vim.opt.tabstop = 2
-vim.opt.tabstop = 2
 vim.opt.termguicolors = true
 vim.opt.wildmenu = true
 
@@ -137,6 +135,7 @@ vim.cmd([[autocmd BufWritePre *.nix lua vim.lsp.buf.formatting_sync()]])
 require("packer").startup(function()
 	use({ "ms-jpq/coq_nvim", branch = "coq" }) -- main one
 	use({ "ms-jpq/coq.artifacts", branch = "artifacts" }) -- 9000+ Snippets
+	use({ "nvim-telescope/telescope.nvim", branch = "master" })
 end)
 
 -------------------------------------------------------------------------------
@@ -249,16 +248,6 @@ vim.api.nvim_set_keymap("n", "<leader>xl", "<cmd>Trouble loclist<cr>", { silent
 vim.api.nvim_set_keymap("n", "<leader>xq", "<cmd>Trouble quickfix<cr>", { silent = true, noremap = true })
 vim.api.nvim_set_keymap("n", "gR", "<cmd>Trouble lsp_references<cr>", { silent = true, noremap = true })
 
--- hound.nvim
-require("hound").setup({
-	hound_base_url = "http://hound", -- Rely on Tailscale's MagicDNS
-	hound_port = 6080, -- the port hound is running on
-	search_results_buffer = "tabnew", -- how to open the search results (vsplit, split, tabnew)
-	display_file_match_urls = true, -- whether or not urls should be displayed alongside file matches
-	hound_url_pattern = "https://github.com/{repo}/blob/{revision}/{path}", -- the format of the url displayed for file matches
-})
-vim.api.nvim_set_keymap("n", "<leader>hs", ":Hound", { silent = true, noremap = true })
-
 -- vim-markdown
 vim.g.vim_markdown_override_foldtext = 0
 vim.g.vim_markdown_no_default_key_mappings = 1
@@ -273,18 +262,6 @@ vim.g["prettier#autoformat"] = 1
 -- git-blame
 vim.g.gitblame_enabled = 0
 
--- telescope
-require "telescope".setup {
-  defaults = {
-    mappings = {
-      i = {
-        ["<C-w>"] = function()
-          vim.cmd [[normal! bcw]]
-        end,
-      },
-    },
-  }
-}
 vim.api.nvim_set_keymap("n", "<leader>ff", "<cmd>Telescope find_files find_command=rg,--ignore,--hidden,--files,-g,!.git prompt_prefix=🔍<cr>", { silent = true, noremap = true })
 vim.api.nvim_set_keymap("n", "<leader>fg", "<cmd>Telescope live_grep<cr>", { silent = true, noremap = true })
 

modules/overlays/default.nix

@@ -10,7 +10,4 @@ final: prev: {
   vpngate = prev.callPackage ./vpngate { };
   yar = prev.callPackage ./yar { };
 
-  # overrides
-  neovim = prev.pkgs.neovim-nightly;
-
 }