diff options
| -rwxr-xr-x | Common/nvim/lua/basic.lua | 6 | ||||
| -rw-r--r-- | Common/nvim/lua/plugins-conf.lua | 29 | ||||
| -rwxr-xr-x | Common/nvim/lua/plugins.lua | 88 | ||||
| -rw-r--r-- | linux/tmux.conf | 10 |
4 files changed, 80 insertions, 53 deletions
diff --git a/Common/nvim/lua/basic.lua b/Common/nvim/lua/basic.lua index a5aec23..0e030ec 100755 --- a/Common/nvim/lua/basic.lua +++ b/Common/nvim/lua/basic.lua @@ -33,11 +33,11 @@ vim.api.nvim_create_user_command( VIM User interface --]] --- Set 7 lines to the cursor - when moving vertically using j/k -vim.opt.so = 7 +-- Set 3 lines to the cursor - when moving vertically using j/k +vim.opt.so = 3 -- set WildMenu -vim.opt.wildmenu = true +--vim.opt.wildmenu = true -- Ignore compiled files vim.opt.wildignore = '*.o,*~,*.pyc' diff --git a/Common/nvim/lua/plugins-conf.lua b/Common/nvim/lua/plugins-conf.lua index e2a8f66..0b494a5 100644 --- a/Common/nvim/lua/plugins-conf.lua +++ b/Common/nvim/lua/plugins-conf.lua @@ -1,17 +1,3 @@ --- lualine -require('lualine').setup { - options = { theme = 'onedark' }, - sections = { - lualine_x = {'filetype'}, - lualine_y = {} - }, - tabline = { - lualine_a = {'buffers'}, - lualine_b = {'branch'}, - lualine_z = {'tabs'} - } -} - -- lsp require("nvim-lsp-installer").setup() local lspconfig = require'lspconfig' @@ -46,18 +32,3 @@ lspconfig.intelephense.setup{} lspconfig.cssls.setup{} lspconfig.html.setup{} lspconfig.bashls.setup{} - --- nvim-tree -require("nvim-tree").setup() -map("n", "<F3>", ":NvimTreeToggle<cr>", silentnoremap) - --- TagBar -map("n", "<F2>", ":TagbarToggle<cr>", silentnoremap) - --- gitsigns -require('gitsigns').setup() -map("n", "<leader>s", ":Gitsigns toggle_current_line_blame<cr>", silentnoremap) - --- fzf-lua -map("n", ";", ":FzfLua files<cr>", silentnoremap) - diff --git a/Common/nvim/lua/plugins.lua b/Common/nvim/lua/plugins.lua index 4161b4f..0f7adcd 100755 --- a/Common/nvim/lua/plugins.lua +++ b/Common/nvim/lua/plugins.lua @@ -14,10 +14,75 @@ vim.cmd([[ ]]) return require('packer').startup(function(use) + -- Packer itself :) use 'wbthomason/packer.nvim' - use 'lewis6991/gitsigns.nvim' - --use {'tjdevries/colorbuddy.vim', {'nvim-treesitter/nvim-treesitter', opt = true}} - use 'preservim/tagbar' + + -- GitSigns + use { + 'lewis6991/gitsigns.nvim', + config = function() + require('gitsigns').setup() + map("n", "<leader>s", ":Gitsigns toggle_current_line_blame<cr>", silentnoremap) + end, + } + + -- Lualine (Pretty statusbar and titlebar) + use { + 'nvim-lualine/lualine.nvim', + requires = { 'kyazdani42/nvim-web-devicons', opt = true }, + config = function() + require('lualine').setup { + options = { theme = 'onedark' }, + sections = { + lualine_x = {'filetype'}, + lualine_y = {} + }, + tabline = { + lualine_a = {'buffers'}, + lualine_b = {'branch'}, + lualine_z = {'tabs'} + } + } + end, + } + + -- nvim-tree + use { + 'kyazdani42/nvim-tree.lua', + requires = { 'kyazdani42/nvim-web-devicons' }, + tag = 'nightly', -- optional, updated every week. (see issue #1193) + config = function() + require("nvim-tree").setup() + map("n", "<F3>", ":NvimTreeToggle<cr>", silentnoremap) + end, + } + + -- TagBar + use { + 'preservim/tagbar', + config = function() + map("n", "<F2>", ":TagbarToggle<cr>", silentnoremap) + end, + } + + -- Vim tmux navigator + use 'christoomey/vim-tmux-navigator' + + -- fzf (Fuzzy finder for various things) + use { + 'junegunn/fzf.vim', + requires = { 'kyazdani42/nvim-web-devicons' }, + config = function() + vim.cmd [[ + let g:fzf_layout = { 'down': '40%' } + ]] + map("n", ";", ":Files<cr>", silentnoremap) + map("n", "<leader>;", ":Rg<cr>", silentnoremap) + end, + } + + -- Tpope plugins :) + -- vim-dadbob (run sql directly) use { 'tpope/vim-dadbod', config = function() @@ -39,22 +104,13 @@ return require('packer').startup(function(use) ]] end, } - use { - 'nvim-lualine/lualine.nvim', - requires = { 'kyazdani42/nvim-web-devicons', opt = true } - } - use { - 'kyazdani42/nvim-tree.lua', - requires = { 'kyazdani42/nvim-web-devicons' }, - tag = 'nightly' -- optional, updated every week. (see issue #1193) - } - use 'christoomey/vim-tmux-navigator' - use { - 'ibhagwan/fzf-lua', requires = { 'kyazdani42/nvim-web-devicons' } - } + -- Surround + use { 'tpope/vim-surround' } + -- terryma/vim-multiple-cursors -- preservim/nerdcommenter + -- Lsp things use 'neovim/nvim-lsp' use 'neovim/nvim-lspconfig' --use 'kabouzeid/nvim-lspinstall' diff --git a/linux/tmux.conf b/linux/tmux.conf index f0d4733..683fb66 100644 --- a/linux/tmux.conf +++ b/linux/tmux.conf @@ -6,9 +6,9 @@ set -s escape-time 10 # faster command sequences set -s focus-events on set-option -sa terminal-overrides ',rxvt-256color:RGB' -run-shell "powerline-daemon -q" +#run-shell "powerline-daemon -q" #source "/usr/local/lib/python3.7/site-packages/powerline/bindings/tmux/powerline.conf" -source "/home/jakob/.local/lib/python3.9/site-packages/powerline/bindings/tmux/powerline.conf" +#source "/home/jakob/.local/lib/python3.9/site-packages/powerline/bindings/tmux/powerline.conf" # -- display ------------------------------------------------------------------- set -g base-index 1 @@ -21,7 +21,7 @@ set -g display-time 1000 # slightly longer status messages display time set -g status-interval 10 # redraw status line every 10 seconds -set-option -g default-shell /usr/bin/zsh +#set-option -g default-shell /usr/bin/zsh set-option -g display-panes-active-colour colour33 set-option -g display-panes-colour colour166 @@ -36,8 +36,8 @@ set -g visual-activity off setw -g monitor-activity on set -g visual-activity on -unbind C-b -set -g prefix C-a +#unbind C-b +#set -g prefix C-a bind -n C-M-h resize-pane -L 2 bind -n C-M-j resize-pane -D 2 |