Compare commits

...

3 Commits

Author SHA1 Message Date
Jan Jastrow
abf51a8ac2 Add a couple of settings 2024-06-23 00:56:57 +02:00
Jan Jastrow
f2163c761d Merge branch 'main' of github.com:JanJastrow/.dotfiles 2024-06-23 00:24:27 +02:00
Jan Jastrow
d78a4f114c add gitconfig to repo 2024-06-23 00:24:06 +02:00
2 changed files with 25 additions and 1 deletions

22
gitconfig Normal file
View File

@ -0,0 +1,22 @@
# 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

View File

@ -1,15 +1,18 @@
#!/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
@ -23,6 +26,5 @@ fi
# Remove old bash files # Remove old bash files
rm ~/.bashrc rm ~/.bashrc
rm ~/.bash_logout rm ~/.bash_logout
rm ~/.bash_history
zsh zsh