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

diff --git a/install/basic b/install/basic
index 010574c60046686a326abbbdd48e1bbd195995c4..f7769c4598077ec3364d231a070dd45c9c013710 100644 (file)
--- 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 0d576c316d08a683818eebc9e94935462f9955ea..4405876bdf00143947ff5dc836daef7c2ea4f2ea 100644 (file)
--- 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 be148ee328d1b84267b3625c1caf04473320478f..357d30c846b3af7752db53d4962c883b0d786988 100644 (file)
--- a/stow/nvim/.config/nvim/lua/plugin_mgr.lua
+++ b/stow/nvim/.config/nvim/lua/plugin_mgr.lua
@@ -43,6 +43,11 @@ return require('packer').startup(function(use)
     -- complition stuff
     use { 'hrsh7th/cmp-cmdline' }
 
+    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 e2142bd5b1cd9f595ccf5768843e3b674ffb1e84..06abbd458878cf1671eb63b886da9c91aa31988d 100644 (file)
--- 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 fc0515c226fade9765f0a0f5a6437729d9bcc5a0..2d151737ef401f89d5cd76b620ac46e1a7dbe143 100755 (executable)
--- 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 605f82d96bbc68a36d5b079edb1a97c8eac84c32..d266daae944b33bfc901f1d1723575ab05ea1df4 100644 (file)
--- 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'