From: Ruben Beltran del Rio Date: Sat, 4 Mar 2023 00:17:58 +0000 (+0100) Subject: Add arch support, update X settings X-Git-Url: https://git.r.bdr.sh/rbdr/dotfiles/commitdiff_plain/ad7a214d01c42b9c784e5d2b79466ec25f56bd22?hp=8503727ab086d3e81f90abb7734b18c584ac08fd Add arch support, update X settings --- diff --git a/Xdefaults b/Xdefaults index 3a71a21..79a02b8 100644 --- a/Xdefaults +++ b/Xdefaults @@ -1,7 +1,7 @@ ! --------------------------- ! URxvt ! --------------------------- -Xft.dpi: 96 +Xft.dpi: 140 Xft.antialias: false Xft.rgba: rgb Xft.hinting: true @@ -23,10 +23,10 @@ URxvt.transparent: false ! fonts URxvt.allow_bold: false -*.font: xft:Input Mono:style=Light:pixelsize=11 -*.boldFont: xft:Input Mono:style=Medium:pixelsize=11 -*.italicFont: xft:Input Mono:style=Light Italic:pixelsize=11 -*.boldItalicFont: xft:Input Mono:style=Medium Italic:pixelsize=11 +*.font: xft:Input Mono:style=Light:size=11 +*.boldFont: xft:Input Mono:style=Medium:size=11 +*.italicFont: xft:Input Mono:style=Light Italic:size=11 +*.boldItalicFont: xft:Input Mono:style=Medium Italic:size=11 ! scrollbar URxvt.scrollbarStyle: rxvt diff --git a/config/i3/config b/config/i3/config index 73cbf12..22790fe 100644 --- a/config/i3/config +++ b/config/i3/config @@ -13,7 +13,7 @@ set $mod Mod1 # Font for window titles. Will also be used by the bar unless a different font # is used in the bar {} block below. -font pango:Input Mono Light 8 +font pango:Input Mono Light 11 # This font is widely installed, provides lots of unicode glyphs, right-to-left # text rendering and scalability on retina/hidpi displays (thanks to pango). diff --git a/provision b/provision index 60a5201..baac03b 100755 --- a/provision +++ b/provision @@ -5,18 +5,25 @@ if [[ -z "$1" ]]; then else if command -v brew &> /dev/null; then command_name="brew" + install_command="install" else if command -v apt &> /dev/null; then command_name="apt" + install_command="install" else - echo "Error: No valid package manager. Make sure brew or apt are available." - exit 1 + if command -v pacman &> /dev/null; then + command_name="pacman" + install_command="-Sy" + else + echo "Error: No valid package manager. Make sure brew or apt are available." + exit 1 + fi fi fi file="./provisioning/${command_name}_$1" if [[ -f $file ]]; then echo "Provisioning $1 with $command_name" - cat ./provisioning/${command_name}_$1 | xargs ${command_name} install + cat ./provisioning/${command_name}_$1 | xargs ${command_name} ${install_command} else echo "No provisioning recipe for $1 with $command_name" exit 1 diff --git a/provisioning/pacman_essential b/provisioning/pacman_essential new file mode 100644 index 0000000..7825a5e --- /dev/null +++ b/provisioning/pacman_essential @@ -0,0 +1,21 @@ +--noconfirm +rxvt-unicode +i3-wm +i3status +dmenu +bat +curl +fd +exa +fzf +gnupg +htop +ripgrep +rsync +tmux +tree +neovim +wget +zsh +inetutils +z diff --git a/runcoms/zshrc b/runcoms/zshrc index ea7d522..808616a 100644 --- a/runcoms/zshrc +++ b/runcoms/zshrc @@ -88,12 +88,20 @@ fi if [[ -s "/opt/homebrew/bin/brew" ]]; then . /opt/homebrew/etc/profile.d/z.sh else - . /usr/local/etc/profile.d/z.sh + if [[ -s "/usr/share/z/z.sh" ]]; then + . /usr/share/z/z.sh + else + . /usr/local/etc/profile.d/z.sh + fi fi # ASDF if ! command -v brew &> /dev/null; then - . $HOME/.asdf/asdf.sh + if [[ -s "/opt/asdf-vm/asdf.sh" ]]; then + . /opt/asdf-vm/asdf.sh + else + . $HOME/.asdf/asdf.sh + fi else . $(brew --prefix asdf)/asdf.sh fi