diff --git a/.config/bspwm/bspwmrc b/.config/bspwm/bspwmrc index 02ba275..5190379 100755 --- a/.config/bspwm/bspwmrc +++ b/.config/bspwm/bspwmrc @@ -12,12 +12,12 @@ picom -b bspc monitor -d I II III IV V VI VII bspc config border_width 2 -bspc config window_gap 8 -bspc config top_padding -8 +bspc config window_gap 10 +bspc config top_padding -10 bspc config split_ratio 0.52 -bspc config borderless_monocle true -bspc config gapless_monocle true +bspc config borderless_monocle false +bspc config gapless_monocle false bspc config focused_border_color '#92971a' diff --git a/.config/picom/picom.conf b/.config/picom/picom.conf index ea3003a..ac79d2a 100644 --- a/.config/picom/picom.conf +++ b/.config/picom/picom.conf @@ -7,8 +7,6 @@ shadow-radius = 14 fading = true fade-delta = 5 -inactive-opacity = 0.85 - blur-background = true blur-kern = "11x11gaussian" @@ -17,4 +15,5 @@ vsync = true wintypes: { dock = { shadow = false; }; + utility = { shadow = false; }; }; diff --git a/.config/polybar/config b/.config/polybar/config index cae5cc8..de6c39d 100644 --- a/.config/polybar/config +++ b/.config/polybar/config @@ -30,7 +30,7 @@ alert = #cc241d [bar/m-bar] ;monitor = ${env:MONITOR:HDMI-1} width = 100% -height = 25 +height = 26 ;offset-x = 1% ;offset-y = 1% radius = 0.0 @@ -42,24 +42,24 @@ foreground = ${colors.foreground} line-size = 3 line-color = #f00 -border-size = 8 +border-size = 10 border-color = #00000000 padding-left = 0 padding-right = 0 module-margin-left = 0 -module-margin-right = 1 +module-margin-right = 2 -font-0 = JetBrains Mono:pixelsize=10;1 -font-1 = JetBrains Mono:pixelsize=8;0 -font-2 = JetBrains Mono:pixelsize=10;1 +font-0 = IBM Plex Sans:size=10;3 +font-1 = JetBrains Mono:size=10;3 +#font-2 = JetBrains Mono:pixelsize=10;1 #font-1 = unifont:fontformat=truetype:size=8:antialias=false;0 #font-2 = siji:pixelsize=10;1 modules-left = bspwm modules-center = xwindow -modules-right = pulseaudio filesystem xkeyboard cpu memory eth date powermenu +modules-right = pulseaudio cpu memory filesystem eth date xkeyboard powermenu tray-position = right tray-padding = 2 @@ -107,6 +107,7 @@ mount-0 = / mount-1 = /home label-mounted = %{F#458588}%mountpoint%%{F-}: %percentage_used%% +label-mounted-underline = ${colors.primary} label-unmounted = %mountpoint% not mounted label-unmounted-foreground = ${colors.foreground-alt} @@ -116,18 +117,19 @@ type = internal/bspwm label-focused = %index% label-focused-background = ${colors.background-alt} label-focused-underline= ${colors.primary} -label-focused-padding = 2 +label-focused-padding = 6 label-occupied = %index% -label-occupied-padding = 2 +label-occupied-underline= ${colors.secondary} +label-occupied-padding = 4 label-urgent = %index%! label-urgent-background = ${colors.alert} -label-urgent-padding = 2 +label-urgent-padding = 4 label-empty = %index% label-empty-foreground = ${colors.foreground-alt} -label-empty-padding = 2 +label-empty-padding = 4 ; Separator in between workspaces ; label-separator = | diff --git a/.config/sxhkd/sxhkdrc b/.config/sxhkd/sxhkdrc index a1bedd7..81f0006 100644 --- a/.config/sxhkd/sxhkdrc +++ b/.config/sxhkd/sxhkdrc @@ -8,7 +8,7 @@ super + Return # browser super + shift + Return - firefox + qutebrowser # program launcher super + @space diff --git a/.config/xfce4/xfconf/xfce-perchannel-xml/xfce4-panel.xml b/.config/xfce4/xfconf/xfce-perchannel-xml/xfce4-panel.xml deleted file mode 100644 index 2e37873..0000000 --- a/.config/xfce4/xfconf/xfce-perchannel-xml/xfce4-panel.xml +++ /dev/null @@ -1,70 +0,0 @@ - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - diff --git a/install_arch b/install_arch index 5c6f4fa..ae92459 100755 --- a/install_arch +++ b/install_arch @@ -88,7 +88,6 @@ end function add_lvm2_mkinitcpio_hook -a is_encrypt log 'Adding lvm2 mkinitcpio hook' - install lvm2 set -l hooks 'lvm2' if test -n "$is_encrypt" @@ -96,7 +95,9 @@ function add_lvm2_mkinitcpio_hook -a is_encrypt end sed -i "s/modconf block filesystems/modconf block $hooks filesystems/" /etc/mkinitcpio.conf - mkinitcpio -P + + log 'Installing lvm2' + install lvm2 end diff --git a/oomox-arc-gruvbox.tar.xz b/oomox-arc-gruvbox.tar.xz new file mode 100644 index 0000000..b6dec03 Binary files /dev/null and b/oomox-arc-gruvbox.tar.xz differ diff --git a/provision_linux b/provision_linux index f03c472..4014a61 100755 --- a/provision_linux +++ b/provision_linux @@ -43,6 +43,7 @@ function provision_terminal_env -d 'Install base terminal utilities and sync con log 'Installing base terminal utilities' install_pkgs + or return $status log 'Setting m\'s default shell to fish' sudo chsh -s /usr/bin/fish m @@ -52,8 +53,8 @@ function provision_terminal_env -d 'Install base terminal utilities and sync con log 'Installing asdf-vm' git clone https://github.com/asdf-vm/asdf.git ~/.asdf - cd ~/.asdf - git checkout (git describe --abbrev=0 --tags) + and cd ~/.asdf + and git checkout (git describe --abbrev=0 --tags) end function provision_desktop_env -d 'Install base desktop utilities and configure theme' @@ -89,37 +90,49 @@ function provision_desktop_env -d 'Install base desktop utilities and configure log 'Installing base desktop environment utilities' install_pkgs + or return $status log 'Setting xinitrc' echo 'exec bspwm' >~/.xinitrc - log 'Installing Nordic theme' - mkdir _tmp_nordic; and cd ./_tmp_nordic - wget -q -O nordic.tar.xz https://github.com/EliverLara/Nordic/releases/download/v1.9.0/Nordic.tar.xz - tar -xf ./nordic.tar.xz - mkdir ~/.themes - mv ./Nordic/ ~/.themes/ - cd ..; and rm -r ./_tmp_nordic + log 'Installing arc-gruvbox theme' + mkdir -p ~/.themes + xzcat ./oomox-arc-gruvbox.tar.xz | tar --extract --directory=$HOME/.themes if test $distro = debian log 'Installing JetBrains Mono font manually' - mkdir _tmp_fonts; and cd ./_tmp_fonts + + set -l cwd (pwd) + set -l tmp_dir (mktemp --directory) + + cd $tmp_dir + wget -q https://github.com/JetBrains/JetBrainsMono/releases/download/v2.002/JetBrainsMono-2.002.zip - unzip JetBrainsMono-2.002.zip >/dev/null - mkdir -p ~/.local/share/fonts/truetype/JetBrainsMono - cp ./ttf/*.ttf ~/.local/share/fonts/truetype/JetBrainsMono/ - cd ..; and rm -r ./_tmp_fonts + and unzip -q JetBrainsMono-2.002.zip + and mkdir -p ~/.local/share/fonts/truetype/JetBrainsMono + and cp ./ttf/*.ttf ~/.local/share/fonts/truetype/JetBrainsMono/ + + cd $cwd + rm -r $tmp_dir end if test $distro = arch - log 'Installing polybar from AUR' - install_pkgs --needed base-devel + log 'Installing pikaur from AUR' - git clone https://aur.archlinux.org/polybar.git _tmp_polybar - and ./_tmp_polybar - makepkg --syncdeps --install --clean --noconfirm - cd .. - rm -rf ./_tmp_polybar + install_pkgs --needed base-devel + + set -l cwd (pwd) + set -l tmp_dir (mktemp --directory) + + git clone https://aur.archlinux.org/pikaur.git $tmp_dir + and cd $tmp_dir + and makepkg --clean --install --rmdeps --syncdeps --noconfirm + + and log 'Installing polybar from AUR' + and pikaur --sync --noconfirm polybar + + cd $cwd + rm -rf $tmp_dir end log 'Setting gtk theme' @@ -127,7 +140,7 @@ function provision_desktop_env -d 'Install base desktop utilities and configure echo " [Settings] gtk-icon-theme-name = Adwaita -gtk-theme-name = Nordic +gtk-theme-name = oomox-arc-gruvbox gtk-font-name = IBM Plex Sans 11" >~/.config/gtk-3.0/settings.ini end @@ -136,6 +149,7 @@ function provision_m_net -d 'Install syncthing and keepassxc' install_pkgs \ keepassxc \ syncthing + or return $status log 'Enabling syncthing service' sudo systemctl enable syncthing@m.service @@ -148,12 +162,14 @@ end function provision_vagrant -d 'Provision vagrant with libvirt' install_libvirt + or return $status log 'Installing vagrant and libvirt plugin' set -l arch_pkgs vagrant set -l debian_pkgs vagrant-libvirt install_pkgs + or return $status vagrant plugin install vagrant-libvirt end @@ -191,9 +207,11 @@ end function install_pkgs -S switch $distro case arch - sudo pacman --sync --refresh --noconfirm $arch_pkgs $argv + sudo pacman --sync --refresh --sysupgrade --noconfirm + sudo pacman --sync --noconfirm $arch_pkgs $argv case debian sudo apt-get update >/dev/null 2>&1 + sudo apt-get upgrade --yes sudo apt-get install --yes $debian_pkgs $argv end end diff --git a/sync b/sync index d811f4f..2e0772a 100755 --- a/sync +++ b/sync @@ -3,13 +3,14 @@ function main argparse 'd/desktop' 'g/git' -- $argv set -l start_dir (pwd) + set -l tmp_dir (mktemp --directory 2>/dev/null; or mktemp -d -t 'dotfiles') set -l cwd (string match -r '\w+$' $start_dir) set -l uname (uname) log 'Syncing shell environment configurations' set_color grey - setup_tmp_space $cwd + setup_tmp_space $cwd $tmp_dir sync_terminal_env @@ -69,7 +70,6 @@ function sync_desktop_env rsync -aP ./.config/bspwm ~/.config/ rsync -aP ./.config/sxhkd ~/.config/ rsync -aP ./.config/picom ~/.config/ - rsync -aP ./.config/xfce4 ~/.config/ rsync -aP ./.config/qutebrowser ~/.config/ rsync -aP ./.config/polybar ~/.config/ rsync -aP ./.ideavimrc ~/