mirror of
https://github.com/JanJastrow/.dotfiles.git
synced 2024-11-22 02:29:57 +01:00
Compare commits
No commits in common. "abf51a8ac2d0429edbccc5c1d1a436755276b4c4" and "649ddcfa06798738a19f2f28d87729c5f0d4e0e4" have entirely different histories.
abf51a8ac2
...
649ddcfa06
22
gitconfig
22
gitconfig
@ -1,22 +0,0 @@
|
|||||||
# Custom (default) settings for git
|
|
||||||
[user]
|
|
||||||
name = Jan Jastrow
|
|
||||||
username = jan_j
|
|
||||||
email = mail@jastrow.me
|
|
||||||
[core]
|
|
||||||
fsmonitor = true
|
|
||||||
editor = nano -w
|
|
||||||
[init]
|
|
||||||
defaultBranch = main
|
|
||||||
[alias]
|
|
||||||
br = branch
|
|
||||||
c = commit
|
|
||||||
co = checkout
|
|
||||||
ca = c -a
|
|
||||||
p = pull
|
|
||||||
l = log --all --color --graph --pretty=format:'%Cred%h%Creset %G?%C(yellow)%d%Creset %s %Cgreen(%cr) %C(bold blue)<%an>%Creset' --abbrev-commit # Colorful and easy to read log
|
|
||||||
conflict = diff --name-only --diff-filter=U
|
|
||||||
hash = !git rev-parse HEAD | cut -c 1-8
|
|
||||||
undo = !f() { git reset --hard $(git rev-parse --abbrev-ref HEAD)@{${1-1}}; }; f
|
|
||||||
[branch]
|
|
||||||
sort = -committerdate
|
|
@ -1,18 +1,15 @@
|
|||||||
#!/bin/sh
|
#!/bin/sh
|
||||||
|
|
||||||
if [ ! -x "$(which zsh)" ]; then
|
if [ ! -x "$(which zsh)" ]; then
|
||||||
echo "zsh not found"
|
|
||||||
exit
|
exit
|
||||||
fi
|
fi
|
||||||
|
|
||||||
rm ~/.zshrc
|
rm ~/.zshrc
|
||||||
ln -s ~/.dotfiles/zshrc ~/.zshrc
|
ln -s ~/.dotfiles/zshrc ~/.zshrc
|
||||||
ln -s ~/.dotfiles/tmux/tmux.conf ~/.tmux.conf
|
ln -s ~/.dotfiles/tmux/tmux.conf ~/.tmux.conf
|
||||||
ln -s ~/.dotfiles/gitconfig ~/.gitconfig
|
|
||||||
mkdir ~/.dotfiles/this-machine
|
mkdir ~/.dotfiles/this-machine
|
||||||
touch ~/.dotfiles/this-machine/zsh
|
touch ~/.dotfiles/this-machine/zsh
|
||||||
touch ~/.dotfiles/this-machine/tmux.conf
|
touch ~/.dotfiles/this-machine/tmux.conf
|
||||||
|
|
||||||
sudo chsh -s "$(which zsh)" $USER
|
sudo chsh -s "$(which zsh)" $USER
|
||||||
|
|
||||||
# If private repo is available, add ssh config + hosts
|
# If private repo is available, add ssh config + hosts
|
||||||
@ -26,5 +23,6 @@ fi
|
|||||||
# Remove old bash files
|
# Remove old bash files
|
||||||
rm ~/.bashrc
|
rm ~/.bashrc
|
||||||
rm ~/.bash_logout
|
rm ~/.bash_logout
|
||||||
|
rm ~/.bash_history
|
||||||
|
|
||||||
zsh
|
zsh
|
||||||
|
Loading…
Reference in New Issue
Block a user