From a7406bc6bb0021cd76e0448c086b5c6f8f28beac Mon Sep 17 00:00:00 2001 From: joachimschmidt557 Date: Fri, 22 Oct 2021 14:46:04 +0200 Subject: [PATCH] update --- fish/nix.fish | 2 +- gitconfig | 5 +++++ srcfiles/src | 6 +++++- 3 files changed, 11 insertions(+), 2 deletions(-) diff --git a/fish/nix.fish b/fish/nix.fish index 831687a..b90606e 100644 --- a/fish/nix.fish +++ b/fish/nix.fish @@ -6,7 +6,7 @@ alias gs='git status' alias gp='git pull' alias gd='git diff' alias gc='git commit' -alias gcm='git checkout master || git checkout main' +alias gsm='git switch master || git switch main || git switch trunk' alias gfo='git fetch origin' alias e='emacs' alias v='vis' diff --git a/gitconfig b/gitconfig index f94d6bb..14f7d54 100644 --- a/gitconfig +++ b/gitconfig @@ -8,3 +8,8 @@ gpgsign = true [init] defaultBranch = trunk +[filter "lfs"] + clean = git-lfs clean -- %f + smudge = git-lfs smudge -- %f + process = git-lfs filter-process + required = true diff --git a/srcfiles/src b/srcfiles/src index c73c30c..398c7b0 100644 --- a/srcfiles/src +++ b/srcfiles/src @@ -62,7 +62,7 @@ git https://github.com/ziglang/zig zig # git https://github.com/coq/coq coq # git https://github.com/agraef/pure-lang pure-lang # git https://github.com/wren-lang/wren wren -# git https://github.com/golang/go go +git https://github.com/golang/go go # Utilities - git repositories # git https://github.com/sharkdp/fd fd @@ -199,6 +199,7 @@ git https://github.com/taglib/taglib taglib 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 +git https://github.com/alacritty/alacritty alacritty # git https://github.com/alacritty/vte vte # git https://github.com/alacritty/urlocator urlocator git https://github.com/obsproject/obs-studio obs-studio @@ -244,7 +245,10 @@ git https://gitlab.com/simple-nixos-mailserver/nixos-mailserver nixos-mailserver git https://github.com/nektro/zigmod zigmod git https://git.sr.ht/~emersion/vaapi-decoder vaapi-decoder git https://github.com/kristoff-it/zig-doctest zig-doctest +git https://github.com/kristoff-it/zig-okredis zig-okredis +git https://github.com/kristoff-it/bork bork git https://git.tuxfamily.org/chrony/chrony.git chrony +git https://github.com/hspak/brightnessztl brightnessztl # My own projects git git@github.com:ziglibs/lscolors zig-lscolors