From 737e6e137496d54671ab38e742608d946cf926f6 Mon Sep 17 00:00:00 2001 From: TuDatTr Date: Sun, 26 Jan 2020 00:08:10 +0100 Subject: [PATCH] Added vim-go and removed urxvt tabbing --- .gitmodules | 3 + README.org | 1 - config/.Xdefaults | 7 +- config/.local/share/ranger/bookmarks | 2 +- vim/.vim/autoload/pathogen.vim | 264 +++++++++++++++++++++++++++ vim/.vim/ftplugin/go.vim | 15 +- vim/.vim/pack/plugins/start/vim-go | 1 + vim/.vim/spell/de.utf-8.add | 9 + vim/.vim/spell/de.utf-8.add.spl | Bin 10393 -> 10472 bytes zsh/.zshrc | 2 +- 10 files changed, 293 insertions(+), 11 deletions(-) create mode 100644 .gitmodules create mode 100644 vim/.vim/autoload/pathogen.vim create mode 160000 vim/.vim/pack/plugins/start/vim-go diff --git a/.gitmodules b/.gitmodules new file mode 100644 index 0000000..01d11df --- /dev/null +++ b/.gitmodules @@ -0,0 +1,3 @@ +[submodule "vim/.vim/pack/plugins/start/vim-go"] + path = vim/.vim/pack/plugins/start/vim-go + url = https://github.com/fatih/vim-go/ diff --git a/README.org b/README.org index 90695c3..21026d6 100644 --- a/README.org +++ b/README.org @@ -68,7 +68,6 @@ Config file is =.emacs.d/config.org= *** Font setup Stolen from [[https://github.com/powerline/fonts][here]]. #+BEGIN_SRC sh -git clone # clone git clone https://github.com/powerline/fonts.git --depth=1 # install cd fonts diff --git a/config/.Xdefaults b/config/.Xdefaults index b24415c..e6a7007 100644 --- a/config/.Xdefaults +++ b/config/.Xdefaults @@ -1,20 +1,17 @@ ! urxvt ! Fonts -urxvt*font: xft:Hack Nerd Font Mono:style=Regular:size=11:hinting=full, xft:DejaVu Sans Mono for Powerline:size=11, xtf:Noto Color Emoji:style=Regular:size=11 +urxvt*font: xft:Hack Nerd Font Mono:style=Regular:size=11:hinting=full, xft:DejaVu Sans Mono for Powerline:size=11 ! Behavior urxvt*scrollBar: false ! Plugins -URxvt.perl-ext: default,matcher,resize-font,tabbed,keyboard-select +URxvt.perl-ext: default,matcher,resize-font,keyboard-select ! Matcher URxvt.url-launcher: /usr/bin/xdg-open URxvt.matcher.button: 1 -! Tabs -URxvt.tabbed.new-button: false - ! Keyboard-select URxvt.keysym.M-Escape: perl:keyboard-select:activate URxvt.keyboard-select.clipboard: true diff --git a/config/.local/share/ranger/bookmarks b/config/.local/share/ranger/bookmarks index 8c5f873..7f26635 100644 --- a/config/.local/share/ranger/bookmarks +++ b/config/.local/share/ranger/bookmarks @@ -9,4 +9,4 @@ t:/home/tuan/Templates w:/home/tuan/workspace_l/Projects k:/home/tuan/Documents/Fachschaft/Berufungskomission q:/home/tuan/.nextcloud/Quick Drop -':/home/tuan/.go/src/github.com/tudattr/favorites_api/requirements +':/home/tuan diff --git a/vim/.vim/autoload/pathogen.vim b/vim/.vim/autoload/pathogen.vim new file mode 100644 index 0000000..3582fbf --- /dev/null +++ b/vim/.vim/autoload/pathogen.vim @@ -0,0 +1,264 @@ +" pathogen.vim - path option manipulation +" Maintainer: Tim Pope +" Version: 2.4 + +" Install in ~/.vim/autoload (or ~\vimfiles\autoload). +" +" For management of individually installed plugins in ~/.vim/bundle (or +" ~\vimfiles\bundle), adding `execute pathogen#infect()` to the top of your +" .vimrc is the only other setup necessary. +" +" The API is documented inline below. + +if exists("g:loaded_pathogen") || &cp + finish +endif +let g:loaded_pathogen = 1 + +" Point of entry for basic default usage. Give a relative path to invoke +" pathogen#interpose() or an absolute path to invoke pathogen#surround(). +" Curly braces are expanded with pathogen#expand(): "bundle/{}" finds all +" subdirectories inside "bundle" inside all directories in the runtime path. +" If no arguments are given, defaults "bundle/{}", and also "pack/{}/start/{}" +" on versions of Vim without native package support. +function! pathogen#infect(...) abort + if a:0 + let paths = filter(reverse(copy(a:000)), 'type(v:val) == type("")') + else + let paths = ['bundle/{}', 'pack/{}/start/{}'] + endif + if has('packages') + call filter(paths, 'v:val !~# "^pack/[^/]*/start/[^/]*$"') + endif + let static = '^\%([$~\\/]\|\w:[\\/]\)[^{}*]*$' + for path in filter(copy(paths), 'v:val =~# static') + call pathogen#surround(path) + endfor + for path in filter(copy(paths), 'v:val !~# static') + if path =~# '^\%([$~\\/]\|\w:[\\/]\)' + call pathogen#surround(path) + else + call pathogen#interpose(path) + endif + endfor + call pathogen#cycle_filetype() + if pathogen#is_disabled($MYVIMRC) + return 'finish' + endif + return '' +endfunction + +" Split a path into a list. +function! pathogen#split(path) abort + if type(a:path) == type([]) | return a:path | endif + if empty(a:path) | return [] | endif + let split = split(a:path,'\\\@]','\\&','') + endif +endfunction + +" Like findfile(), but hardcoded to use the runtimepath. +function! pathogen#runtime_findfile(file,count) abort + let rtp = pathogen#join(1,pathogen#split(&rtp)) + let file = findfile(a:file,rtp,a:count) + if file ==# '' + return '' + else + return fnamemodify(file,':p') + endif +endfunction + +" vim:set et sw=2 foldmethod=expr foldexpr=getline(v\:lnum)=~'^\"\ Section\:'?'>1'\:getline(v\:lnum)=~#'^fu'?'a1'\:getline(v\:lnum)=~#'^endf'?'s1'\:'=': diff --git a/vim/.vim/ftplugin/go.vim b/vim/.vim/ftplugin/go.vim index cfa390c..152825e 100644 --- a/vim/.vim/ftplugin/go.vim +++ b/vim/.vim/ftplugin/go.vim @@ -1,9 +1,18 @@ +" Basics +set autoindent noexpandtab tabstop=4 shiftwidth=4 " Shortcuts imap ;main package mainimport ("fmt")func main() {}O " Compiling -map :!clear; go run % -map :!clear; go build %; ./%< -map :!clear; go test & detatch +map :GoImport +map :!clear:GoRun +map :!clear:GoBuild +map :!clear:GoTest +map :!clear:GoTestFunc +map :!clear:GoDebugStart +nnoremap gd :GoDef +nnoremap :GoDoc + + map :!clear; GOOS=windows GOARCH=386 go build -o %<.exe % diff --git a/vim/.vim/pack/plugins/start/vim-go b/vim/.vim/pack/plugins/start/vim-go new file mode 160000 index 0000000..be73eeb --- /dev/null +++ b/vim/.vim/pack/plugins/start/vim-go @@ -0,0 +1 @@ +Subproject commit be73eeb6321f44cec74252ea8e2b2f046516e5ca diff --git a/vim/.vim/spell/de.utf-8.add b/vim/.vim/spell/de.utf-8.add index dd70cfb..fc47748 100644 --- a/vim/.vim/spell/de.utf-8.add +++ b/vim/.vim/spell/de.utf-8.add @@ -817,3 +817,12 @@ Gremienplätze #a #S #b +Regularia +Wahlmodalitäten +Fachschaftsvollversammlung +LuDis +Zulassungsordnung +Networking +#eitereführen +#orran +Miera diff --git a/vim/.vim/spell/de.utf-8.add.spl b/vim/.vim/spell/de.utf-8.add.spl index b98f5caed90a33d0645c0b2a2e4c16c773ab5be1..35dce5cde9f0fbd4492431d1c910c527380b80ba 100644 GIT binary patch delta 2015 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 M={8lp%@FeMUwG%@~ diff --git a/zsh/.zshrc b/zsh/.zshrc index cafcd91..86fc05d 100644 --- a/zsh/.zshrc +++ b/zsh/.zshrc @@ -1,6 +1,6 @@ # Paths export ZSH="/home/tuan/.oh-my-zsh" -export PATH="$PATH:$HOME/go/bin:$HOME/.local/bin:$HOME/.cargo/bin:$HOME/.dotnet/tools" +export PATH="$PATH:$HOME/.go/bin:$HOME/.local/bin:$HOME/.cargo/bin:$HOME/.dotnet/tools" export DOTNET_CLI_TELEMETRY_OPTOUT=1 export DOTNET_ROOT=/opt/dotnet