From c08762eaff8c5b276ec1022da41d98fecc0b792c Mon Sep 17 00:00:00 2001 From: joachimschmidt557 Date: Sat, 7 Nov 2020 18:44:01 +0100 Subject: [PATCH] update --- Makefile | 5 +++++ fish/nix.fish | 6 ++---- gitconfig | 7 +++++++ srcfiles/src | 21 ++++++++++++--------- 4 files changed, 26 insertions(+), 13 deletions(-) create mode 100644 gitconfig diff --git a/Makefile b/Makefile index f700520..ce08b04 100644 --- a/Makefile +++ b/Makefile @@ -22,6 +22,8 @@ srcfile: $(DESTDIR)/src/.srcfile st: $(DESTDIR)/src/st/config.h +gitconfig: $(DESTDIR)/.gitconfig + .PHONY: fish i3 i3status vis Xresources fontconfig srcfile st @@ -41,3 +43,6 @@ $(DESTDIR)$(PREFIX)/i3status/config: $(PWD)/i3status/config $(DESTDIR)/src/.srcfile: $(PWD)/srcfiles/src ln -sf $^ $@ + +$(DESTDIR)/.gitconfig: $(PWD)/gitconfig + ln -sf $^ $@ diff --git a/fish/nix.fish b/fish/nix.fish index 714c2dc..38e9237 100644 --- a/fish/nix.fish +++ b/fish/nix.fish @@ -6,10 +6,8 @@ alias gs='git status' alias gp='git pull' alias gd='git diff' alias gc='git commit' -# alias e='emacs & ; disown' - -# opam configuration -# source /home/joachim/.opam/opam-init/init.fish > /dev/null 2> /dev/null; or true +alias gcm='git checkout master' +alias gfo='git fetch origin' # LS_COLORS set -gx LS_COLORS 'rs=0:di=01;34:ln=01;36:mh=00:pi=40;33:so=01;35:do=01;35:bd=40;33;01:cd=40;33;01:or=40;31;01:mi=00:su=37;41:sg=30;43:ca=30;41:tw=30;42:ow=34;42:st=37;44:ex=01;32:*.tar=01;31:*.tgz=01;31:*.arc=01;31:*.arj=01;31:*.taz=01;31:*.lha=01;31:*.lz4=01;31:*.lzh=01;31:*.lzma=01;31:*.tlz=01;31:*.txz=01;31:*.tzo=01;31:*.t7z=01;31:*.zip=01;31:*.z=01;31:*.dz=01;31:*.gz=01;31:*.lrz=01;31:*.lz=01;31:*.lzo=01;31:*.xz=01;31:*.zst=01;31:*.tzst=01;31:*.bz2=01;31:*.bz=01;31:*.tbz=01;31:*.tbz2=01;31:*.tz=01;31:*.deb=01;31:*.rpm=01;31:*.jar=01;31:*.war=01;31:*.ear=01;31:*.sar=01;31:*.rar=01;31:*.alz=01;31:*.ace=01;31:*.zoo=01;31:*.cpio=01;31:*.7z=01;31:*.rz=01;31:*.cab=01;31:*.wim=01;31:*.swm=01;31:*.dwm=01;31:*.esd=01;31:*.jpg=01;35:*.jpeg=01;35:*.mjpg=01;35:*.mjpeg=01;35:*.gif=01;35:*.bmp=01;35:*.pbm=01;35:*.pgm=01;35:*.ppm=01;35:*.tga=01;35:*.xbm=01;35:*.xpm=01;35:*.tif=01;35:*.tiff=01;35:*.png=01;35:*.svg=01;35:*.svgz=01;35:*.mng=01;35:*.pcx=01;35:*.mov=01;35:*.mpg=01;35:*.mpeg=01;35:*.m2v=01;35:*.mkv=01;35:*.webm=01;35:*.ogm=01;35:*.mp4=01;35:*.m4v=01;35:*.mp4v=01;35:*.vob=01;35:*.qt=01;35:*.nuv=01;35:*.wmv=01;35:*.asf=01;35:*.rm=01;35:*.rmvb=01;35:*.flc=01;35:*.avi=01;35:*.fli=01;35:*.flv=01;35:*.gl=01;35:*.dl=01;35:*.xcf=01;35:*.xwd=01;35:*.yuv=01;35:*.cgm=01;35:*.emf=01;35:*.ogv=01;35:*.ogx=01;35:*.aac=00;36:*.au=00;36:*.flac=00;36:*.m4a=00;36:*.mid=00;36:*.midi=00;36:*.mka=00;36:*.mp3=00;36:*.mpc=00;36:*.ogg=00;36:*.ra=00;36:*.wav=00;36:*.oga=00;36:*.opus=00;36:*.spx=00;36:*.xspf=00;36:' diff --git a/gitconfig b/gitconfig new file mode 100644 index 0000000..ce79a13 --- /dev/null +++ b/gitconfig @@ -0,0 +1,7 @@ +[user] + name = joachimschmidt557 + email = joachim.schmidt557@outlook.com +[pull] + ff = only +[commit] + gpgsign = true diff --git a/srcfiles/src b/srcfiles/src index c7865de..95918b6 100644 --- a/srcfiles/src +++ b/srcfiles/src @@ -66,7 +66,7 @@ git https://git.suckless.org/ubase ubase git https://git.suckless.org/sinit sinit git https://git.suckless.org/surf surf git https://git.suckless.org/st st -git https://git.suckless.org/libzahl libzahl +# git https://git.suckless.org/libzahl libzahl git https://git.suckless.org/slock slock git https://git.suckless.org/slstatus slstatus # git https://github.com/taylorconor/tinytetris tinytetris @@ -77,7 +77,7 @@ git https://github.com/antirez/linenoise linenoise # git https://github.com/Gabriel439/bench bench # git https://github.com/chmln/sd sd # git https://github.com/MirBSD/mksh mksh -git https://github.com/Sweets/hummingbird hummingbird +# git https://github.com/Sweets/hummingbird hummingbird # git https://github.com/octobanana/peaclock peaclock # git https://github.com/baskerville/sxhkd sxhkd # git https://github.com/baskerville/bspwm bspwm @@ -123,6 +123,7 @@ git https://github.com/adsr/mle mle # git https://github.com/godotengine/godot godot git https://github.com/deadpixi/sam sam git https://github.com/ziglang/zig-spec zig-spec +git https://github.com/ziglang/logo zig-logo # git https://github.com/qutebrowser/qutebrowser qutebrowser # git https://github.com/xournalpp/xournalpp xournalpp # git https://github.com/Cyan4973/xxHash xxHash @@ -157,15 +158,15 @@ git https://github.com/martanne/vis vis # git https://github.com/Entalpi/PongC PongC # git https://github.com/dylanaraps/sowm/ sowm # git https://github.com/joelekstrom/terminal-mines terminal-mines -git https://github.com/nextstrain/auspice auspice -git https://github.com/nextstrain/augur augur +# git https://github.com/nextstrain/auspice auspice +# git https://github.com/nextstrain/augur augur # git https://github.com/HoTT/book HoTT-book git https://github.com/jquast/wcwidth wcwidth # git https://github.com/cylgom/ly ly # git https://github.com/Nazgul07/BitCrypt BitCrypt git https://github.com/ifreund/river river git https://github.com/NixOS/nixpkgs nixpkgs -git https://github.com/nixos/nixos-homepage nixos-homepage +# git https://github.com/nixos/nixos-homepage nixos-homepage git https://github.com/antirez/smaz smaz git https://github.com/zigtools/zls zls git https://github.com/MrDiver/ArmSimulator ArmSimulator @@ -174,7 +175,6 @@ git https://github.com/patroclos/PAmix PAmix git https://github.com/Hejsil/zig-clap zig-clap git https://github.com/Hejsil/zig-gc zig-gc git https://github.com/tiehuis/zig-regex zig-regex -git https://github.com/tiehuis/ansiz ansiz # git https://github.com/gernest/semver semver # git https://github.com/vegecode/eazyinput eazyinput git https://github.com/Vexu/routez routez @@ -184,6 +184,7 @@ git https://github.com/taglib/taglib taglib git https://github.com/ziglang/www.ziglang.org www.ziglang.org git https://github.com/prime31/zig-ecs zig-ecs git https://github.com/andrewrk/libsoundio libsoundio +git https://github.com/Luukdegram/apple_pie apple_pie # My own projects git git@github.com:ziglibs/lscolors zig-lscolors @@ -192,6 +193,7 @@ git git@github.com:ziglibs/ansi-term zig-ansi-term git git@github.com:ziglibs/zlm zlm git git@github.com:ziglibs/known-folders known-folders git git@github.com:ziglibs/repository ziglibs-repository +git git@github.com:ziglibs/zgl zgl git git@github.com:joachimschmidt557/zig-walkdir zig-walkdir git git@github.com:joachimschmidt557/zigfd zigfd git git@github.com:joachimschmidt557/nim-lscolors nim-lscolors @@ -205,9 +207,9 @@ git git@gitlab.com:joachimschmidt557/haskell-random haskell-random git git@gitlab.com:joachimschmidt557/racket-random racket-random git git@gitlab.com:joachimschmidt557/zig-random zig-random git git@gitlab.com:joachimschmidt557/python-random python-random -git git@mygitea:joachimschmidt557/etherpad2latex etherpad2latex -git git@mygitea:joachimschmidt557/server server -git git@mygitea:joachimschmidt557/homepage homepage +# git git@mygitea:joachimschmidt557/etherpad2latex etherpad2latex +# git git@mygitea:joachimschmidt557/server server +# git git@mygitea:joachimschmidt557/homepage homepage git git@mygitea:lars-he/Study_Planner Study_Planner git git@github.com:joachimschmidt557/zbase zbase git git@github.com:joachimschmidt557/zed zed @@ -224,5 +226,6 @@ git git@github.com:joachimschmidt557/bsv-mode bsv-mode git git@github.com:joachimschmidt557/tucan-usercss tucan-usercss git git@github.com:joachimschmidt557/src src git git@github.com:joachimschmidt557/chocolatey-packages-manual-automatic chocolatey-packages-manual-automatic +git git@github.com:joachimschmidt557/zig-workshop-ophase2020 zig-workshop-ophase2020 git git@github.com:d120/djangocms djangocms git git@github.com:Mineorbit/DungeonsAndDungeons DungeonsAndDungeons