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 b98f5ca..35dce5c 100644 Binary files a/vim/.vim/spell/de.utf-8.add.spl and b/vim/.vim/spell/de.utf-8.add.spl differ 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