mg/dotfiles
1
0
Fork 0
Code Issues Pull requests Projects Releases Wiki Activity

O

Browse source 
Merge branch 'master' of https://git.mgrote.net/mg/dotfiles
This commit is contained in:
Michael Grote 2021-06-01 19:42:07 +02:00
commit 93baef8095
4 changed files with 126 additions and 134 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

1
.bash_aliases
View file

@ -23,6 +23,7 @@ alias mkae="make"
alias amke="make"
alias maek="make"
alias sduo="sudo"
alias suso="sudo"
alias sdou="sudo"
alias sodu="sudo"
alias susdo="sudo"

50
.tmux.conf
View file

@ -1,32 +1,32 @@
set-option -g set-titles on # Automatically set window title
set-option -g status-position top # position the status bar at top of screen
set-option -g monitor-activity off # Deaktiviere "Markierung" aktiver Fenster
set-option -g renumber-windows on # Automatische Neu-Nummerierung der Fenster aktivieren; Beispielsweise nach dem Schlie +++ßen eines Fensters
set-option -g base-index 1 # Nummerierung der Fenster und Teilfenster jeweils mit beginnen
set -g pane-base-index 1
set-option -g status-right "T:%H:%M | U:#(whoami) | H:#(hostname -f)" # Statuszeile - rechts
set-option -g set-titles on # Automatically set window title
set-option -g status-position top # position the status bar at top of screen
set-option -g monitor-activity off # Deaktiviere "Markierung" aktiver Fenster
set-option -g renumber-windows on # Automatische Neu-Nummerierung der Fenster aktivieren; Beispielsweise nach dem Schlie +++ßen eines Fensters
set-option -g base-index 1 # Nummerierung der Fenster und Teilfenster jeweils mit 1 beginnen
set -g pane-base-index 1 # Nummerierung der Fenster und Teilfenster jeweils mit 1 beginnen
set-option -g status-right "T:%H:%M | U:#(whoami) | H:#(hostname -f)" # Statuszeile - rechts
set -g status-right-length 100
set-option -gw aggressive-resize on
set -g default-terminal screen-256color # Farb-Optionen für Shell-Fenster
set -g history-limit 10000 # Anzahl an History-Einträgen auf 100erhöhen
set -g mouse on # Maus-Unterstützung aktivieren
#set -g window-style 'fg=colour247,bg=colour236' # dunkelt inaktive Panes ab
#set -g window-active-style 'fg=colour250,bg=black' # hebt die aktive Pane ab
set -g history-limit 10000 # Anzahl an History-Einträgen auf 100erhöhen
set -g mouse on # Maus-Unterstützung aktivieren
#set -g window-style 'fg=colour247,bg=colour236' # dunkelt inaktive Panes ab
#set -g window-active-style 'fg=colour250,bg=black' # hebt die aktive Pane ab
setw -g window-status-current-format '#{pane_current_command}' # Deaktiviert die Kennzeichnung des aktiven Fensters mit Nummer
setw -g window-status-format '#{pane_current_command}' # Deaktiviert die Kennzeichnung des letzten Fensters mit -
setw -g window-status-current-format '#{pane_current_command}' # Deaktiviert die Kennzeichnung des aktiven Fensters mit Nummer
setw -g window-status-format '#{pane_current_command}' # Deaktiviert die Kennzeichnung des letzten Fensters mit -
set-window-option -g clock-mode-style 24 # Uhrzeit auf 24h Format
set-window-option -g pane-base-index 1 # Nummerierung der Fenster und Teilfenster jeweils mit 1 beginnen:
set-window-option -g automatic-rename on # Automatically set window title
#set-window-option -g window-status-separator " | " # Separator zwischen Windows in der Statusleiste
set-window-option -g clock-mode-style 24 # Uhrzeit auf 24h Format
set-window-option -g pane-base-index 1 # Nummerierung der Fenster und Teilfenster jeweils mit 1 beginnen:
set-window-option -g automatic-rename on # Automatically set window title
#set-window-option -g window-status-separator " | " # Separator zwischen Windows in der Statusleiste
#------------ Buttons ------------#
bind k select-pane -U # Wechsle Fenster mit vim keybindings
bind j select-pane -D # Wechsle Fenster mit vim keybindings
bind h select-pane -L # Wechsle Fenster mit vim keybindings
bind l select-pane -R # Wechsle Fenster mit vim keybindings
unbind '"' # alte Tastenkombination deaktivieren
unbind % # alte Tastenkombination deaktivieren
bind | split-window -h # Vertikal splitten
bind - split-window -v # Horizontal splitten
bind k select-pane -U # Wechsle Fenster mit vim keybindings
bind j select-pane -D # Wechsle Fenster mit vim keybindings
bind h select-pane -L # Wechsle Fenster mit vim keybindings
bind l select-pane -R # Wechsle Fenster mit vim keybindings
unbind '"' # alte Tastenkombination deaktivieren
unbind % # alte Tastenkombination deaktivieren
bind | split-window -h # Vertikal splitten
bind - split-window -v # Horizontal splitten

209
.vimrc
View file

@ -1,6 +1,3 @@
" leader key
:let mapleader = ","
" Vundle
set nocompatible
filetype off
@ -8,20 +5,20 @@ filetype off
set rtp+=~/.vim/bundle/Vundle.vim
" Download plug-ins to the ~/.vim/plugged/ directory
call vundle#begin('~/.vim/plugged')
" Let Vundle manage Vundle
Plugin 'VundleVim/Vundle.vim' "muss immer der erste eintrag sein
" Let Vundle manage Vundle; muss immer der erste eintrag sein
Plugin 'VundleVim/Vundle.vim'
Plugin 'nestorsalceda/vim-strip-trailing-whitespaces'
" entferne trailing whitespaces
Plugin 'itchyny/lightline.vim'
" statusline
Plugin 'sheerun/vim-polyglot'
"languagepack
" languagepack
Plugin 'Xuyuanp/nerdtree-git-plugin'
" nerdtree plugin, markiere datein mit git symbolen
" nerdtree plugin, markiere dateien mit git symbolen
Plugin 'jeetsukumaran/vim-buffergator'
" bufgfer wechseln
" buffer wechseln
Plugin 'mhinz/vim-signify'
" change icons neben zeilennummerierung
" change icons neben der zeilennummerierung
Plugin 'ctrlpvim/ctrlp.vim'
" fuzzy finder
Plugin 'lifepillar/vim-solarized8'
@ -33,94 +30,14 @@ Plugin 'tpope/vim-fugitive'
Plugin 'jiangmiao/auto-pairs'
" autovervollständigung symbole wie klammern
Plugin 'preservim/nerdtree'
" dateiobrowser
" dateibrowser
Plugin 'unkiwii/vim-nerdtree-sync'
" springe in nerdtree zur geöffneten datei
Plugin 'jreybert/vimagit'
"git integration
"
"
" Install:
" vim +PluginInstall +qall
" oder
" :PluginInstall
" git integration
call vundle#end()
"
" auto-pairs
let g:AutoPairsShortcutToggle = '<C-P>'
" Toogle Auto-Pairs mit Strg+P
" zur Autovervollständigung von Klammern
"
" lightline/statusline
set laststatus=2
let g:lightline = {
\ 'colorscheme': 'wombat',
\ 'active': {
\ 'left': [ [ 'mode', 'paste' ],
\ [ 'gitbranch', 'readonly', 'filename', 'modified' ] ]
\ },
\ 'component_function': {
\ 'gitbranch': 'FugitiveHead'
\ },
\ }
" NERDtree + nerdtree-sync
"https://github.com/preservim/nerdtree
let NERDTreeShowHidden = 1 " Show hidden files
let NERDTreeShowLineNumbers = 0 " Hide line numbers
let NERDTreeMinimalMenu = 1 " Use the minimal menu (m)
let NERDTreeWinSize = 31 " Set panel width to 31 columns
nmap <F2> :NERDTreeToggle<CR> " ruft NERDtree mit F2 auf
" Start NERDTree when Vim is started without file arguments.
autocmd StdinReadPre * let s:std_in=1
autocmd VimEnter * if argc() == 0 && !exists('s:std_in') | NERDTree | endif
let g:nerdtree_sync_cursorline = 1 " highlight the file in tree
" open the existing NERDTree on each new tab.
"autocmd BufWinEnter * silent NERDTreeMirror
"
" exit Vim if NERDTree is the only window left.
autocmd BufEnter * if tabpagenr('$') == 1 && winnr('$') == 1 && exists('b:NERDTree') && b:NERDTree.isTabTree() |
\ quit | endif
"
" buffers
" https://joshldavis.com/2014/04/05/vim-tab-madness-buffers-vs-tabs/
"
" This allows buffers to be hidden if you've modified a buffer.
" " This is almost a must if you wish to use buffers in this way.
set hidden
"
" To open a new empty buffer
" This replaces :tabnew which I used to bind to this mapping
nmap <C-t> :enew<cr>
"
"" Move to the next buffer
nmap <C-l> :bnext<CR>
" Move to the previous buffer
nmap <C-h> :bprevious<CR>
"
" Close the current buffer and move to the previous one
" This replicates the idea of closing a tab
nmap <C-q> :bp <BAR> bd #<CR>
"
" nerdtree-git-plugin
let g:NERDTreeGitStatusIndicatorMapCustom = {
\ 'Modified' :'*',
\ 'Staged' :'+',
\ 'Untracked' :'',
\ 'Renamed' :'*',
\ 'Unmerged' :'',
\ 'Deleted' :'-',
\ 'Dirty' :'',
\ 'Ignored' :'',
\ 'Clean' :'',
\ 'Unknown' :'?',
\ }
"
"
" indentLine
" fügt vertikale Striche bei Einrückungen ein
filetype plugin indent on
"
" allgemeine Optionen
set showcmd
set showbreak=+++
@ -141,21 +58,97 @@ set softtabstop=4
set ruler
set undolevels=1000
set backspace=indent,eol,start
set nu " Enable line numbers
syntax on " Enable syntax highlighting
set tabstop=4 " How many columns of whitespace a \t is worth
set shiftwidth=4 " How many columns of whitespace a level of indentation is worth
set expandtab " Use spaces when tabbing
set incsearch " Enable incremental search
set hlsearch " Enable highlight search
set termwinsize=12x0 " Set terminal size
set splitbelow " Always split below
set mouse=a " Enable mouse drag on window splits
"
set nu " Enable line numbers
syntax on " Enable syntax highlighting
set tabstop=4 " How many columns of whitespace a \t is worth
set shiftwidth=4 " How many columns of whitespace a level of indentation is worth
set expandtab " Use spaces when tabbing
set incsearch " Enable incremental search
set hlsearch " Enable highlight search
set termwinsize=12x0 " Set terminal size
set splitbelow " Always split below
set mouse=a " Enable mouse drag on window splits
set clipboard=unnamedplus " https://unix.stackexchange.com/questions/12535/how-to-copy-text-from-vim-to-an-external-program
" Keybindings"
:let mapleader = ","
" auto-pairs
let g:AutoPairsShortcutToggle = '<C-P>'
" lightline/statusline
set laststatus=2
let g:lightline = {
\ 'colorscheme': 'wombat',
\ 'active': {
\ 'left': [ [ 'mode', 'paste' ],
\ [ 'gitbranch', 'readonly', 'filename', 'modified' ] ]
\ },
\ 'component_function': {
\ 'gitbranch': 'FugitiveHead'
\ },
\ }
" NERDtree + nerdtree-sync
" https://github.com/preservim/nerdtree
let NERDTreeShowHidden = 1 " Show hidden files
let NERDTreeShowLineNumbers = 0 " Hide line numbers
let NERDTreeMinimalMenu = 1 " Use the minimal menu (m)
let NERDTreeWinSize = 31 " Set panel width to 31 columns
nmap <F2> :NERDTreeToggle<CR> " ruft NERDtree mit F2 auf
" Start NERDTree when Vim is started without file arguments.
autocmd StdinReadPre * let s:std_in=1
autocmd VimEnter * if argc() == 0 && !exists('s:std_in') | NERDTree | endif
let g:nerdtree_sync_cursorline = 1 " highlight the file in tree
" exit Vim if NERDTree is the only window left.
autocmd BufEnter * if tabpagenr('$') == 1 && winnr('$') == 1 && exists('b:NERDTree') && b:NERDTree.isTabTree() |
\ quit | endif
" buffergator
" https://joshldavis.com/2014/04/05/vim-tab-madness-buffers-vs-tabs/
" This allows buffers to be hidden if you've modified a buffer.
" " This is almost a must if you wish to use buffers in this way.
set hidden
" To open a new empty buffer
nmap <C-t> :enew<cr>
" Move to the next buffer
nmap <C-l> :bnext<CR>
" Move to the previous buffer
nmap <C-h> :bprevious<CR>
" Close the current buffer and move to the previous one
" This replicates the idea of closing a tab
nmap <C-q> :bp <BAR> bd #<CR>
" nerdtree-git-plugin
let g:NERDTreeGitStatusIndicatorMapCustom = {
\ 'Modified' :'*',
\ 'Staged' :'+',
\ 'Untracked' :'',
\ 'Renamed' :'*',
\ 'Unmerged' :'',
\ 'Deleted' :'-',
\ 'Dirty' :'',
\ 'Ignored' :'',
\ 'Clean' :'',
\ 'Unknown' :'?',
\ }
" indentLine
" fügt vertikale Striche bei Einrückungen ein
filetype plugin indent on
" aussehen
set background=dark " dark or light
colorscheme solarized8 " Your favorite color scheme's name
"
" ripgrep und ctrlp
" sudo apt install ripgrep(rg)
if executable('rg')
@ -170,19 +163,17 @@ let g:ctrlp_custom_ignore = '\v[\/]\.(git|hg|svn)$'
"https://jeffkreeftmeijer.com/vim-number/
set number relativenumber
augroup numbertoggle
autocmd!
autocmd BufEnter,FocusGained,InsertLeave * set relativenumber
autocmd BufLeave,FocusLost,InsertEnter * set norelativenumber
augroup END
" vimagit
" https://github.com/jreybert/vimagit#mappings
nmap <Leader>m :Magit<cr>
" toggle linenumbers
nmap <Leader>c :set norelativenumber!<CR>:set nonu!<CR>
" VON vim NACH xxx kopieren
" https://unix.stackexchange.com/questions/12535/how-to-copy-text-from-vim-to-an-external-program
set clipboard=unnamedplus

0
tmux
View file