.bin/autoinstall

@@ -1,15 +1,25 @@
 #!/usr/bin/env sh
 
 _autoinstall_base () {
-	_autoinstall_file "https://raw.githubusercontent.com/junegunn/vim-plug/master/plug.vim" \
-		"$HOME/.config/vim/autoload/plug.vim" \
-		&& [ -x "$(command -v vim)" ] && yes | vim +'PlugInstall --sync' +qa --not-a-term
+	plug_path="$HOME/.config/vim/autoload/plug.vim"
+	if [ ! -f "$plug_path" ]
+	then
+		_autoinstall_file "https://raw.githubusercontent.com/junegunn/vim-plug/master/plug.vim" "$plug_path"
+		[ -x "$(command -v vim)" ] && yes | vim +'PlugInstall --sync' +qa --not-a-term
+	fi
 
-	_autoinstall_git "https://github.com/AstroNvim/AstroNvim" "$HOME/.config/nvim" \
-		&& [ -x "$(command -v nvim)" ] && nvim --headless -c 'autocmd User PackerComplete quitall' -c 'PackerSync'
+	nvim_dir="$HOME/.config/nvim"
+	if [ ! -d "$nvim_dir" ]
+	then
+		_autoinstall_git "https://github.com/AstroNvim/AstroNvim" "$nvim_dir"
+		[ -x "$(command -v nvim)" ] && nvim --headless -c 'autocmd User PackerComplete quitall' -c 'PackerSync'
+	fi
 
-	[ ! -x "$(command -v starship)" ] \
-		&& curl -sS "https://starship.rs/install.sh" | BIN_DIR="$HOME/.local/bin" FORCE=1 sh
+	if [ ! -x "$(command -v starship)" ]
+	then
+		mkdir -p "$HOME/.local/bin"
+		curl -sS "https://starship.rs/install.sh" | BIN_DIR="$HOME/.local/bin" FORCE=1 sh
+	fi
 
 	_autoinstall_env "$WAKATIME_HOME/.wakatime.cfg"
 

.config/bspwm/bspwmrc

@@ -13,41 +13,43 @@ bspc config presel_feedback_color "#6272a4"
 host_name=$(cat /proc/sys/kernel/hostname)
 mode=$(cat /tmp/bspwm_mode)
 
-primary="${MONITOR_PRIMARY:-primary}"
-secondary="${MONITOR_SECONDARY:-secondary}"
-
 if [ "$host_name" = "portalo" ]; then
     if [ "$mode" = "presenter" ]; then
-        xrandr --output "$primary" --mode 2560x1440 --refresh 144
-        xrandr --output "$secondary" --auto --left-of "$primary"
+        xrandr --output "$MONITOR_PRIMARY" --mode 2560x1440 --refresh 144
+        xrandr --output "$MONITOR_SECONDARY" --auto --left-of "$MONITOR_PRIMARY"
 
         pkill xcompmgr;
-        bspc monitor "$primary" -d web terminal 3 4 5 6 focus voip messenger presenter1
-        bspc monitor "$secondary" -d presenter2
+        bspc monitor "$MONITOR_PRIMARY" -d web terminal 3 4 5 6 focus voip messenger presenter1
+        bspc monitor "$MONITOR_SECONDARY" -d presenter2
     elif [ "$mode" = "single" ]; then
-        xrandr --output "$secondary" --off
-        bspc monitor "$primary" -d web terminal 3 4 5 6 focus side-view voip messenger
+        xrandr --output "$MONITOR_SECONDARY" --off
+        bspc monitor "$MONITOR_PRIMARY" -d web terminal 3 4 5 6 focus side-view voip messenger
     else 
-        xrandr --output "$primary" --mode 2560x1440 --refresh 144
-        xrandr --output "$secondary" --auto --left-of "$primary"
+        xrandr --output "$MONITOR_PRIMARY" --mode 2560x1440 --refresh 144
+        xrandr --output "$MONITOR_SECONDARY" --auto --left-of "$MONITOR_PRIMARY"
 
-        bspc monitor "$primary" -d web terminal 3 4 5 6 focus
-        bspc monitor "$secondary" -d side-view voip messenger
+        bspc monitor "$MONITOR_PRIMARY" -d web terminal 3 4 5 6 focus
+        bspc monitor "$MONITOR_SECONDARY" -d side-view voip messenger
     fi
 
-#elif echo "$host_name" | grep -Eq "laptop"; then
-else
-    xrandr --output "$primary" --auto
-    xrandr --output "$secondary" --left-of "$primary" --auto
-
-    bspc monitor "$primary" -d web terminal 3 4 5 6 focus messenger
-    bspc monitor "$secondary" -d side-view 10
-
-fi
-
-bspc wm -O "$primary" "$secondary"
+    bspc wm -O "$MONITOR_PRIMARY" "$MONITOR_SECONDARY"
     sleep 1
-bspc wm -O "$primary" "$secondary"
+    bspc wm -O "$MONITOR_PRIMARY" "$MONITOR_SECONDARY"
+
+elif echo "$host_name" | grep -Eq "laptop"; then
+    xrandr --output "$MONITOR_PRIMARY" --auto
+    xrandr --output "$MONITOR_SECONDARY" --left-of "$MONITOR_PRIMARY" --auto
+
+    bspc monitor "$MONITOR_PRIMARY" -d web terminal 3 4 5 6 focus messenger
+    bspc monitor "$MONITOR_SECONDARY" -d side-view 10
+
+    bspc wm -O "$MONITOR_PRIMARY" "$MONITOR_SECONDARY"
+    sleep 1
+    bspc wm -O "$MONITOR_PRIMARY" "$MONITOR_SECONDARY"
+
+else
+    bspc monitor primary -d web terminal 3 4 5 6 7 8 9 focus
+fi
 
 bspc wm --adopt-orphans
 

.config/nixpkgs/home.nix

@@ -0,0 +1 @@
+/home/tobias/.config/nixpkgs/portalo-tobias.nix

.config/nixpkgs/portable-tobias.nix

@@ -1 +0,0 @@
-portalo-tobias.nix

.config/nixpkgs/portalo-tobias.nix

@@ -1,11 +0,0 @@
-{ config, pkgs, ... }:
-
-{
-  home.username = "tobias";
-  home.homeDirectory = "/home/tobias";
-
-  imports = [
-    ./common.nix
-    ./graphical.nix
-  ];
-}

.config/polybar/custom.ini

@@ -12,7 +12,7 @@
 
 [module/check-arch-updates]
     type = custom/script
-    exec = wc -l $HOME/.cache/archlinux-updates.txt 2>/dev/null | sed 's/^0$//'
+    exec = cat $HOME/.cache/archlinux-updates.txt | wc -l | sed 's/^0$//'
     interval = 30
 
     format-prefix = " "
@@ -26,7 +26,7 @@
 
 [module/bsp-layout]
     type = custom/script
-    exec = bsp-layout get $(bspc query -D --names -d focused) | sed -E 's/^(-|tiled)$//m'
+    exec = bsp-layout get $(bspc query -D --names -d focused)
     interval = 0.1
 
     format-prefix = " "
@@ -40,11 +40,11 @@
 
 [module/bsp-layout-primary]
     inherit = module/bsp-layout
-    exec = bsp-layout get $(bspc query -D --names -d ${MONITOR_PRIMARY}:focused) | sed -E 's/^(-|tiled)$//m'
+    exec = bsp-layout get $(bspc query -D --names -d ${MONITOR_PRIMARY}:focused)
 
 [module/bsp-layout-secondary]
     inherit = module/bsp-layout
-    exec = bsp-layout get $(bspc query -D --names -d ${MONITOR_SECONDARY}:focused) | sed -E 's/^(-|tiled)$//m'
+    exec = bsp-layout get $(bspc query -D --names -d ${MONITOR_SECONDARY}:focused)
 
 [module/openweather]
     type = custom/script

.config/polybar/launch.sh

@@ -16,7 +16,5 @@ elif [[ $host_name == *"laptop"* ]]; then
     polybar laptop-primary &
     polybar laptop-secondary &
 else
-    #polybar base &
-    polybar laptop-primary &
-    polybar laptop-secondary &
+    polybar base &
 fi

.config/polybar/scripts/openweather.sh

@@ -1,6 +1,6 @@
 #!/usr/bin/env sh
 
-. "$HOME/.config/environment"
+. "$HOME/.config/environment.local"
 
 get_icon() {
     case $1 in