diff --git a/bat/config b/bat/config new file mode 100644 index 0000000..1bdc785 --- /dev/null +++ b/bat/config @@ -0,0 +1,28 @@ +# This is `bat`s configuration file. Each line either contains a comment or +# a command-line option that you want to pass to `bat` by default. You can +# run `bat --help` to get a list of all possible configuration options. + +# Specify desired highlighting theme (e.g. "TwoDark"). Run `bat --list-themes` +# for a list of all available themes +--theme="OneHalfLight" + +# same as full, unless the output is piped. +--style="auto" + +# Enable this to use italic text on the terminal. This is not supported on all +# terminal emulators (like tmux, by default): +--italic-text=always + +# Uncomment the following line to disable automatic paging: +#--paging=never + +# Uncomment the following line if you are using less version >= 551 and want to +# enable mouse scrolling support in `bat` when running inside tmux. This might +# disable text selection, unless you press shift. +#--pager="less --RAW-CONTROL-CHARS --quit-if-one-screen --mouse" + +# Syntax mappings: map a certain filename pattern to a language. +# Example 1: use the C++ syntax for Arduino .ino files +# Example 2: Use ".gitignore"-style highlighting for ".ignore" files +#--map-syntax "*.ino:C++" +#--map-syntax ".ignore:Git Ignore" diff --git a/git/gitconfig b/git/gitconfig index 51c90f1..68fdfb5 100644 --- a/git/gitconfig +++ b/git/gitconfig @@ -1,14 +1,19 @@ [user] - name = Tine Jozelj - email = tine@tjo.space - #signingkey = 3818B74E3830D7CF + name = Tine Jozelj + email = tine@tjo.space + #signingkey = 3818B74E3830D7CF + [commit] - #gpgsign = true + #gpgsign = true [init] - defaultBranch = main + defaultBranch = main + [filter "lfs"] - smudge = git-lfs smudge -- %f - process = git-lfs filter-process - required = true - clean = git-lfs clean -- %f + smudge = git-lfs smudge -- %f + process = git-lfs filter-process + required = true + clean = git-lfs clean -- %f + +[diff] + external = difft diff --git a/install.sh b/install.sh index 71b8154..8aba3c9 100755 --- a/install.sh +++ b/install.sh @@ -15,6 +15,21 @@ workspace_link() { ln -s $REPO_DIR/$1 $HOME_DIR/$2 || true } +echo "== manjaro packages" +if cat /etc/lsb-release | grep Manjaro > /dev/null +then + sudo pacman -Syu + sudo pacman -S \ + git \ + bat \ + difftastic \ + vim \ + zsh \ + tmux \ + starship \ + nodejs +fi + echo "== zplug" curl -sL --proto-redir -all,https https://raw.githubusercontent.com/zplug/installer/master/installer.zsh | zsh || true @@ -57,6 +72,10 @@ workspace_link alacritty/alacritty.yml .alacritty.yml workspace_backup .config/kitty/kitty.conf workspace_link kitty/kitty.conf .config/kitty/kitty.conf +# BAT +workspace_backup .config/bat/config +workspace_link bat/config .config/bat/config + # VIM workspace_backup .vimrc workspace_link vim/vimrc .vimrc