Fix monitor configs

.bashrc

@@ -88,7 +88,7 @@ source "$OSH/oh-my-bash.sh"
 HISTCONTROL=ignoreboth
 export SAVEHIST=1000000
 export HISTSIZE=1000000
-export HISTFILE="$HOME/.cache/bash_history"
+export HISTFILE="$XDG_STATE_HOME/bash_history"
 shopt -s histappend
 shopt -s checkwinsize
 

.bin/host-mode##hostname.portalo

@@ -3,14 +3,11 @@
 modes="monitor-std
 monitor-single
 monitor-single-sec
-monitor-fhd
 zellij"
 
 portalo_mode_monitor () {
     echo "Loading portalo monitor layout ${1:-std}"
-    yadm config --unset-all local.class monitor-single
-    yadm config --unset-all local.class monitor-single-sec
-    yadm config --unset-all local.class monitor-fhd
+    yadm config --unset-all local.class monitor-*
 
     if [ -n "$1" ]; then
         yadm config --add local.class "$1"
@@ -33,10 +30,8 @@ else
 fi
 
 case $mode in
-    "monitor-std")          portalo_mode_monitor ;;
-    "monitor-single")       portalo_mode_monitor "$mode" ;;
-    "monitor-single-sec")   portalo_mode_monitor "$mode" ;;
-    "monitor-fhd")          portalo_mode_monitor "$mode" ;;
+    "monitor-std")  portalo_mode_monitor ;;
+    "monitor-"*)    portalo_mode_monitor "$mode" ;;
     "zellij")       portalo_mode_zellij ;;
     *)              echo "'$mode' is not a valid mode (single, std)" ;;
 esac

.config/aliasrc

@@ -68,6 +68,7 @@ alias watch='watch -c'
 alias wget='wget -c'
 
 alias xdebug='XDEBUG_CONFIG="remote_host=127.0.0.1 remote_port=9003"'
+alias xo='xdg-open'
 
 ### conditionals
 

.config/env.d/10-paths

@@ -12,4 +12,4 @@ export PATH="$GOPATH/bin:$HOME/.cargo/bin:$PATH"
 # add tool paths
 export PATH="$HOME/.local/share/JetBrains/Toolbox/scripts:$PATH"
 # add nix paths
-export PATH="/home/serguzim/.nix-profile/bin:/nix/var/nix/profiles/default/bin:$PATH"
+export PATH="$HOME/.nix-profile/bin:/nix/var/nix/profiles/default/bin:$PATH"

.config/environment

@@ -7,11 +7,13 @@ set -a
 
 export XDG_CONFIG_HOME="${XDG_CONFIG_HOME:-$HOME/.config}"
 export XDG_CACHE_HOME="${XDG_DATA_HOME:-$HOME/.local/share}"
+export XDG_STATE_HOME="${XDG_STATE_HOME:-$HOME/.local/state}"
 
 . "$XDG_CONFIG_HOME/locale.conf"
 set +a
 
 export AUTOSTART_DISPLAY=''
+export ANSIBLE_HOME="$XDG_DATA_HOME/ansible"
 
 export BASH_COMPLETION_USER_DIR="$XDG_DATA_HOME/bash-completion"
 export BEMENU_OPTS="--tb '#6272a4'\
@@ -31,9 +33,12 @@ export BEMENU_OPTS="--tb '#6272a4'\
  --no-overlap\
  -P '>' -p ''"
 
+export CARGO_HOME="$XDG_DATA_HOME/cargo"
+
 export DFT_DISPLAY="side-by-side-show-both"
 export DMENU="bemenu"
 export DOCKER_BUILDKIT=1
+export DOCKER_CONFIG="$XDG_CONFIG_HOME/docker"
 
 export EDITOR="$(which vim)"
 
@@ -49,6 +54,10 @@ export NPM_CONFIG_USERCONFIG="$XDG_CONFIG_HOME/npmrc"
 export QT_QPA_PLATFORMTHEME="qt5ct"
 
 export PASSWORD_STORE_ENABLE_EXTENSIONS=true
+export PSQL_HISTORY="$XDG_STATE_HOME/psql_history"
+export PYTHON_HISTORY="$XDG_STATE_HOME/python_history"
+
+export RUSTUP_HOME="$XDG_DATA_HOME/rustup"
 
 export STCONFDIR="$XDG_CONFIG_HOME/syncthing"
 export STDATADIR="$XDG_DATA_HOME/syncthing"

.config/hypr/host.conf##hostname.portalo,class.monitor-fhd

@@ -1,7 +0,0 @@
-$mon1 = DP-1
-$mon2 = HDMI-A-1
-
-monitor = $mon1,1920x1080@144,1920x0,auto
-monitor = $mon2,1920x1080@60,0x0,auto
-
-source = ~/.config/hypr/lib/7_3_ws_layout.conf

.config/hypr/host.conf##hostname.portalo,class.monitor-single

@@ -3,6 +3,7 @@ $mon2 = HDMI-A-1
 $mon = $mon1
 
 monitor = $mon1,2560x1440@144,0x0,auto
+monitor = $mon1,1920x1080@60,0x0,auto
 monitor = $mon2,disable
 
 source = ~/.config/hypr/lib/single_mon.conf

.config/hypr/host.conf##hostname.portalo,default

@@ -1,7 +1,7 @@
 $mon1 = DP-1
 $mon2 = HDMI-A-1
 
-monitor = $mon1,2560x1440@144,1920x0,auto
+monitor = $mon1,1920x1080@60,1920x0,auto
 monitor = $mon2,1920x1080@60,0x0,auto
 
 source = ~/.config/hypr/lib/7_3_ws_layout.conf

.config/qutebrowser/config.py

@@ -10,6 +10,6 @@ try:
 except:
     pass
 
-import socket
-if socket.gethostname() == 'portalo':
-    c.zoom.default = 125
+#import socket
+#if socket.gethostname() == 'portalo':
+#    c.zoom.default = 125

.config/user-dirs.dirs

@@ -10,3 +10,4 @@ XDG_CONFIG_HOME="$HOME/.config"
 XDG_CONFIG_DIR="$HOME/.config"
 XDG_CACHE_DIR="$HOME/.cache"
 XDG_DATA_HOME="$HOME/.local/share"
+XDG_STATE_HOME="$HOME/.local/state"

.config/zsh/.zshrc

@@ -120,7 +120,7 @@ export MARKPATH="$HOME/.config/zsh/jump_marks"
 setopt HIST_IGNORE_DUPS
 export SAVEHIST=1000000
 export HISTSIZE=1000000
-export HISTFILE="$HOME/.cache/zsh_history"
+export HISTFILE="$XDG_STATE_HOME/zsh_history"
 
 source "$plugin_path/zsh-syntax-highlighting.sh"