From: Tobias Sachs <rpi6-git-2314-ts@ctsachs.de>
Date: Sat, 3 Dec 2022 12:49:43 +0000 (+0100)
Subject: Merge branch 'main' of ssh://src.twobees.de/git/dotfiles
X-Git-Url: https://src.twobees.de/?a=commitdiff_plain;h=85d1d2fc3c742d71d3c85ff7eff676636cfbaa31;hp=c270463643e054142579b13289b7300a15de76b5;p=dotfiles.git

Merge branch 'main' of ssh://src.twobees.de/git/dotfiles
---

diff --git a/install/basic b/install/basic
index 010574c..f7769c4 100644
--- a/install/basic
+++ b/install/basic
@@ -6,3 +6,4 @@ fzf
 neovim
 stow
 silversearger-ag
+ripgrep
diff --git a/stow/nvim/.config/nvim/lua/mappings.lua b/stow/nvim/.config/nvim/lua/mappings.lua
index 0d576c3..4405876 100644
--- a/stow/nvim/.config/nvim/lua/mappings.lua
+++ b/stow/nvim/.config/nvim/lua/mappings.lua
@@ -68,3 +68,10 @@ vim.keymap.set('n', "<Leader>r", function ()
     print ('config reloaded!')
 end
 )
+
+-- telescope
+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>fb', builtin.buffers, {})
+vim.keymap.set('n', '<leader>fh', builtin.help_tags, {})
diff --git a/stow/nvim/.config/nvim/lua/plugin_mgr.lua b/stow/nvim/.config/nvim/lua/plugin_mgr.lua
index 319fda1..f69eee5 100644
--- a/stow/nvim/.config/nvim/lua/plugin_mgr.lua
+++ b/stow/nvim/.config/nvim/lua/plugin_mgr.lua
@@ -32,6 +32,11 @@ return require('packer').startup(function(use)
     use { 'hrsh7th/cmp-cmdline' }
     use { 'hrsh7th/nvim-cmp' }
 
+    use {
+        'nvim-telescope/telescope.nvim', branch = '0.1.x',
+        requires = { {'nvim-lua/plenary.nvim'} }
+    }
+
     -- Automatically set up configuration after cloning packer.nvim
     if packer_bootstrap then
         require('packer').sync()
diff --git a/stow/nvim/.config/nvim/lua/set.lua b/stow/nvim/.config/nvim/lua/set.lua
index e2142bd..06abbd4 100644
--- a/stow/nvim/.config/nvim/lua/set.lua
+++ b/stow/nvim/.config/nvim/lua/set.lua
@@ -50,3 +50,12 @@ augroup qs_colors
     autocmd ColorScheme * highlight QuickScopeSecondary guifg='#5fffff' gui=underline ctermfg=81 cterm=underline
 augroup END
 ]]
+
+vim.cmd [[
+augroup jumplast
+    autocmd BufReadPost *
+          \ if line("'\"") >= 1 && line("'\"") <= line("$") && &ft !~# 'commit'
+          \ |   exe "normal! g`\""
+          \ | endif
+augroup END
+]]
diff --git a/stow/tmux/.tmux.conf b/stow/tmux/.tmux.conf
index fc0515c..2d15173 100755
--- a/stow/tmux/.tmux.conf
+++ b/stow/tmux/.tmux.conf
@@ -1,10 +1,5 @@
 set -g mouse on
 set -g history-limit 10000
-#set -g default-terminal "screen-256color"
-#set -g default-terminal "xterm"
-
-set -g default-terminal "tmux-256color"
-#set-option -ga terminal-overrides ",256col:Tc"
 
 # use vimmode
 setw -g mode-keys vi
diff --git a/stow/zsh/.zshrc b/stow/zsh/.zshrc
index 605f82d..d266daa 100644
--- a/stow/zsh/.zshrc
+++ b/stow/zsh/.zshrc
@@ -97,6 +97,7 @@ else
     export EDITOR=vim
 fi
 
+alias nvim=$EDITOR
 alias vi=$EDITOR
 alias vim=$EDITOR
 alias ll='ls -lah'