From: Jannik ZANDER Date: Mon, 2 Dec 2019 18:57:53 +0000 (+0100) Subject: Move repository X-Git-Url: https://git.zndr.dk/?a=commitdiff_plain;h=299fe86a411444aca764056a9a29bf568eb9165a;p=dotfiles.git Move repository --- diff --git a/.bash_aliases b/.bash_aliases index 2fd48cd..850d45b 100644 --- a/.bash_aliases +++ b/.bash_aliases @@ -37,8 +37,7 @@ alias reboot='sudo /sbin/reboot' alias poweroff='sudo /sbin/poweroff' alias halt='sudo /sbin/halt' alias shutdown='sudo /sbin/shutdown' -alias apt-get='sudo apt-get' -alias update='sudo apt-get update && sudo apt-get upgrade' +alias update='sudo apt update && sudo apt upgrade -y' # My shortcuts alias c='clear' @@ -50,8 +49,7 @@ alias open='xdg-open &>/dev/null' alias info='info --vi-keys' alias ag='ag --path-to-ignore=$HOME/.ignore --skip-vcs-ignores' alias rg='rg --path-separator="//"' -alias dotfiles='git --git-dir=$HOME/.dotfiles --work-tree=$HOME' -alias dit='dotfiles' +alias got='git --git-dir=$HOME/.dotfiles --work-tree=$HOME' alias sudo='sudo ' alias wget='wget -c' diff --git a/.config/git/config b/.config/git/config index 3101f7d..2cfaf34 100644 --- a/.config/git/config +++ b/.config/git/config @@ -1,3 +1,6 @@ +[user] + name = Jannik ZANDER + email = jannik@zndr.dk [core] editor = vim pager = less diff --git a/.config/mimeapps.list b/.config/mimeapps.list index bc41b66..6a98b8b 100644 --- a/.config/mimeapps.list +++ b/.config/mimeapps.list @@ -260,3 +260,4 @@ application/x-extension-xht=userapp-Firefox-0UV8TZ.desktop; application/x-debian-package=gdebi.desktop; application/x-cd-image=gnome-disk-image-writer.desktop;gnome-disk-image-mounter.desktop; text/plain=code.desktop; +application/zip=org.gnome.FileRoller.desktop; diff --git a/.ssh/config b/.ssh/config index 34764f9..e6aec86 100644 --- a/.ssh/config +++ b/.ssh/config @@ -1,13 +1,18 @@ # default for all -IdentityFile ~/.ssh/id_rsa +IdentityFile ~/.ssh/windy.key # override as per host Host silver HostName 192.168.1.100 - User jaz - IdentityFile ~/.ssh/jaza.key -Host windy zndr zndr.dk git.zndr.dk +Host windy HostName 192.168.1.101 + +Host git.zndr.dk + Hostname zndr.dk User git - IdentityFile ~/.ssh/zndr.key + PreferredAuthentications publickey + IdentityFile ~/.ssh/windy.key + +Host zndr.dk + User jaz diff --git a/README.md b/README.md index 74bd589..25d7efc 100644 --- a/README.md +++ b/README.md @@ -2,7 +2,7 @@ 1) First download 'dotfiles.sh' -> $ git archive --remote=git@jaza.me:jaz/dotfiles.git master bin/dotfiles.sh | tar -x --strip-components 1 +> $ git archive --remote=git@git.zndr.dk:jannik/dotfiles.git master bin/dotfiles.sh | tar -x --strip-components 1 2) Next execute it with diff --git a/bin/dotfiles.sh b/bin/dotfiles.sh index e9476e2..6c87654 100755 --- a/bin/dotfiles.sh +++ b/bin/dotfiles.sh @@ -1,15 +1,15 @@ #!/usr/bin/env bash -# Define dit (dotfiles-git) function -function dit() +# Define got (git-dotfiles) function +function got() { - git --git-dir=$HOME/.dotfiles --work-tree=$HOME "$@" + got --git-dir=$HOME/.dotfiles --work-tree=$HOME "$@" } # Initial setup dit init dit config --local status.showUntrackedFiles no -dit remote add origin git@jaza.me:jaz/dotfiles.git +dit remote add origin git@git/git.zndr.dk:jannik/dotfiles.git dit fetch dit reset --hard origin/master dit branch -u origin/master