Compare commits

..

No commits in common. "cdd396ac532c6cc778d0610dc77b4acbd171d1a5" and "d7228bcfb022b29bc2551726de2490b156c7a64e" have entirely different histories.

9 changed files with 61 additions and 55 deletions

View file

@ -11,6 +11,8 @@ host_name=$(cat /proc/sys/kernel/hostname)
if [ "$host_name" = "portalo" ]; then
xrandr --output "$MONITOR_PRIMARY" --mode 2560x1440 --refresh 144
xrandr --output "$MONITOR_SECONDARY" --left-of "$MONITOR_PRIMARY"
#primary="HDMI-A-0"
#secondary="DVI-D-0"
bspc monitor "$MONITOR_PRIMARY" -d web terminal 3 4 5 6 focus
bspc monitor "$MONITOR_SECONDARY" -d side-view voip messenger
@ -22,6 +24,8 @@ if [ "$host_name" = "portalo" ]; then
elif echo "$host_name" | grep -Eq "laptop"; then
xrandr --output "$MONITOR_PRIMARY" --auto
xrandr --output "$MONITOR_SECONDARY" --left-of "$MONITOR_PRIMARY" --auto
#primary="eDP-1"
#secondary="HDMI-2"
bspc monitor "$MONITOR_PRIMARY" -d web terminal 3 4 5 6 focus messenger
bspc monitor "$MONITOR_SECONDARY" -d side-view 10
@ -78,17 +82,13 @@ bspc rule -a 'TeamSpeak 3' desktop='voip' locked='true'
bspc rule -a '*:*:TeamSpeak' desktop='voip'
bspc rule -a 'Alacritty:mail' desktop='voip' locked='true'
bspc rule -a 'Element' desktop='voip' locked='true'
bspc rule -a 'Element (Riot)' desktop='voip' locked='true'
bspc rule -a 'discord' desktop='voip'
bspc rule -a 'Evolution' desktop='messenger'
bspc rule -a 'Signal' desktop='messenger'
bspc rule -a 'Thunderbird:Mail' desktop='messenger' locked='true'
pgrep -x sxhkd > /dev/null || sxhkd &
pgrep -x xcompmgr > /dev/null || xcompmgr -cnfFn -D3 &
"$HOME/.config/polybar/launch.sh" &
"$HOME/.config/bspwm/swallow.py" &

View file

@ -61,14 +61,14 @@
modules-left = bspwm bsp-layout-primary
monitor = ${env:MONITOR_PRIMARY}
monitor = HDMI-A-0
[bar/portalo-secondary]
inherit = bar/portalo-base
modules-left = bspwm bsp-layout-secondary
monitor = ${env:MONITOR_SECONDARY}
monitor = DVI-D-0
tray-position = none
@ -85,12 +85,12 @@
[bar/laptop-primary]
inherit = bar/laptop-base
monitor = ${env:MONITOR_PRIMARY}
monitor = eDP-1
[bar/laptop-secondary]
inherit = bar/laptop-base
monitor = ${env:MONITOR_SECONDARY}
monitor = HDMI-2
tray-position = none
; vim: ft=dosini

View file

@ -15,10 +15,15 @@ def init(c):
gpg_key = '723B78C0BF8D8C721D2C4EEF41E544A54E2533B2'
#c.bind(',Pp', 'spawn --userscript qute-keepassxc --key ABC1234', mode='insert')
c.bind(',p', 'spawn --userscript qute-keepassxc --key ' + gpg_key, mode='normal')
c.bind(',Pu', 'spawn --userscript qute-keepassxc --only-username --key ' + gpg_key, mode='normal')
c.bind(',Pi', 'spawn --userscript qute-keepassxc --only-password --key ' + gpg_key, mode='normal')
c.bind(',Po', 'spawn --userscript qute-keepassxc --only-otp --key ' + gpg_key, mode='normal')
c.bind(',Po', 'spawn --userscript qute-keepassxc --otp --key ' + gpg_key, mode='normal')
#pass_script_default = 'spawn --userscript qute-pass --no-insert-mode --username-target secret --username-pattern "login: (.+)" '
#c.bind(',p', pass_script_default)
#c.bind(',Pu', pass_script_default + '--username-only')
#c.bind(',Pi', pass_script_default + '--password-only')
#c.bind(',Po', pass_script_default + '--otp-only')
c.bind(',q', 'spawn --userscript qr {url}')
c.bind(',Q', 'hint links spawn --userscript qr {hint-url}')

View file

@ -72,6 +72,7 @@ ZSH_CUSTOM=$ZDOTDIR/custom
# Example format: plugins=(rails git textmate ruby lighthouse)
# Add wisely, as too many plugins slow down shell startup.
plugins=(
'cargo'
'colored-man-pages'
'copydir'
'copyfile'
@ -85,7 +86,7 @@ plugins=(
'httpie'
'jump'
'laravel5'
'rust'
'rustup'
'safe-paste'
'sudo'
'vi-mode'

View file

@ -20,8 +20,8 @@ sleep 1
systemctl --user start pulseaudio
sleep 1
alsa_out -d hw:PCH -j "Speaker" -c 2 &
#alsa_out -d "hdmi:CARD=HDMI,DEV=5" -j "Speaker" -c 2 &
#alsa_out -d hw:PCH -j "Speaker" -c 2 &
alsa_out -d "hdmi:CARD=HDMI,DEV=5" -j "Speaker" -c 2 &
sleep 1
jack_connect "PulseAudio JACK Sink":front-left Speaker:playback_1

View file

@ -135,8 +135,8 @@ c_thirdpersonshoulderaimdist "120.0"
c_thirdpersonshoulderdist "40.0"
c_thirdpersonshoulderheight "5.0"
c_thirdpersonshoulderoffset "20.0"
cachedvalue_count_partybrowser "1641591565"
cachedvalue_count_teammates "1641766156"
cachedvalue_count_partybrowser "1639081232"
cachedvalue_count_teammates "1639262219"
cam_collision "1"
cam_idealdelta "4.0"
cam_idealdist "150"
@ -166,7 +166,7 @@ cl_chatfilter_version "1"
cl_chatfilters "63"
cl_clanid "39516960"
cl_cmdrate "64"
cl_color "0"
cl_color "1"
cl_compass_enabled "1"
cl_crosshair_drawoutline "1"
cl_crosshair_dynamic_maxdist_splitratio "0.900000"
@ -184,11 +184,11 @@ cl_crosshaircolor_b "0.000000"
cl_crosshaircolor_g "255.000000"
cl_crosshaircolor_r "0.000000"
cl_crosshairdot "0"
cl_crosshairgap "0.027166"
cl_crosshairgap "-0.011713"
cl_crosshairgap_useweaponvalue "0"
cl_crosshairsize "1.524270"
cl_crosshairsize "1.990824"
cl_crosshairstyle "4"
cl_crosshairthickness "0.100000"
cl_crosshairthickness "0.510039"
cl_crosshairusealpha "1"
cl_debugrumble "0"
cl_detail_avoid_force "0.4"
@ -280,7 +280,7 @@ cl_showloadout "1"
cl_showpluginmessages2 "0"
cl_sniper_delay_unscope "0"
cl_spec_follow_grenade_key "0"
cl_spec_mode "4"
cl_spec_mode "6"
cl_tablet_mapmode "2"
cl_teamid_overhead_mode "2"
cl_teammate_colors_show "1"
@ -360,7 +360,7 @@ joystick "1"
joystick_force_disabled "1"
joystick_force_disabled_set_from_options "1"
key_bind_version "5"
lobby_default_privacy_bits2 "0"
lobby_default_privacy_bits2 "1"
lockMoveControllerRet "0"
lookspring "0"
lookstrafe "0"
@ -420,7 +420,7 @@ password "CB1FED3C80B40C63D23DEEC81651D4029AACBFE621D3565F509895038A9BB2FB"
play_distance "1"
player_botdifflast_s "2"
player_competitive_maplist_2v2_10_1_8B1DA40F "mg_de_vertigo,mg_de_inferno,mg_de_overpass"
player_competitive_maplist_8_10_1_62D24D31 "mg_lobby_mapveto"
player_competitive_maplist_8_10_1_62D24D31 "mg_de_mirage,mg_de_inferno,mg_de_overpass,mg_de_nuke,mg_cs_office"
player_nevershow_communityservermessage "0"
player_survival_list_10_1_13 "mg_dz_blacksite,mg_dz_sirocco,mg_dz_county"
player_teamplayedlast "2"
@ -490,7 +490,7 @@ sv_logsdir "logs"
sv_noclipaccelerate "5"
sv_noclipspeed "5"
sv_pvsskipanimation "1"
sv_skyname "newcache"
sv_skyname "nukeblank"
sv_specaccelerate "5"
sv_specnoclip "1"
sv_specspeed "3"
@ -516,32 +516,32 @@ ui_deepstats_toplevel_mode "0"
ui_inventorysettings_recently_acknowledged ""
ui_mainmenu_bkgnd_movie_53A07E69 "county"
ui_nearbylobbies_filter3 "competitive"
ui_news_last_read_link "https://blog.counter-strike.net/index.php/2021/12/36687/"
ui_playsettings_custom_preset "mg_de_mirage,mg_de_inferno,mg_de_overpass,mg_de_train,mg_de_cache"
ui_news_last_read_link "https://blog.counter-strike.net/index.php/2021/11/36451/"
ui_playsettings_custom_preset "mg_de_vertigo,mg_de_inferno,mg_de_overpass,mg_de_train"
ui_playsettings_directchallengekey ""
ui_playsettings_flags_listen_casual "0"
ui_playsettings_flags_listen_competitive "48"
ui_playsettings_flags_listen_competitive "0"
ui_playsettings_flags_listen_cooperative "0"
ui_playsettings_flags_listen_deathmatch "0"
ui_playsettings_flags_listen_scrimcomp2v2 "0"
ui_playsettings_flags_listen_skirmish "0"
ui_playsettings_flags_listen_survival "0"
ui_playsettings_flags_official_casual "0"
ui_playsettings_flags_official_competitive "16"
ui_playsettings_flags_official_competitive "32"
ui_playsettings_flags_official_cooperative "0"
ui_playsettings_flags_official_deathmatch "32"
ui_playsettings_flags_official_scrimcomp2v2 "0"
ui_playsettings_flags_official_skirmish "0"
ui_playsettings_flags_official_survival "0"
ui_playsettings_maps_listen_casual "mg_de_mirage"
ui_playsettings_maps_listen_competitive "mg_de_mirage"
ui_playsettings_maps_listen_competitive "mg_de_overpass"
ui_playsettings_maps_listen_deathmatch "random_classic"
ui_playsettings_maps_listen_scrimcomp2v2 "mg_de_inferno"
ui_playsettings_maps_listen_skirmish "mg_skirmish_flyingscoutsman"
ui_playsettings_maps_official_casual "mg_casualsigma"
ui_playsettings_maps_official_deathmatch "mg_casualsigma"
ui_playsettings_maps_workshop "@workshop/308490450/xhair_v3"
ui_playsettings_mode_listen "competitive"
ui_playsettings_mode_listen "casual"
ui_playsettings_mode_official_v20 "competitive"
ui_playsettings_prime "1"
ui_playsettings_survival_solo "0"

View file

@ -1,27 +1,25 @@
"config"
"VideoConfig"
{
"setting.csm_quality_level" "0"
"setting.mat_software_aa_strength" "1"
"VendorID" "4098"
"DeviceID" "26591"
"setting.fullscreen" "1"
"setting.nowindowborder" "1"
"setting.aspectratiomode" "1"
"setting.mat_vsync" "0"
"setting.mat_triplebuffered" "0"
"setting.mat_monitorgamma" "2.200000"
"setting.mat_queue_mode" "-1"
"setting.mat_motion_blur_enabled" "0"
"setting.gpu_mem_level" "0"
"setting.cpu_level" "0"
"setting.gpu_level" "0"
"setting.mat_antialias" "0"
"setting.mat_aaquality" "0"
"setting.mat_forceaniso" "0"
"setting.cpu_level" "0"
"setting.videoconfig_version" "1"
"setting.defaultres" "2560"
"setting.defaultresheight" "1440"
"setting.mat_vsync" "0"
"setting.mat_triplebuffered" "0"
"setting.mat_grain_scale_override" "-1.000000"
"setting.gpu_mem_level" "0"
"setting.mem_level" "3"
"setting.mat_queue_mode" "-1"
"setting.csm_quality_level" "0"
"setting.mat_software_aa_strength" "0"
"setting.mat_motion_blur_enabled" "0"
"setting.mat_texturestreaming" "0"
"setting.r_player_visibility_mode" "1"
"setauto.mat_enable_uber_shaders" "1"
"setting.mat_texturestreaming" "0"
"setting.defaultres" "2560"
"setting.defaultresheight" "1440"
"setting.aspectratiomode" "0"
"setting.fullscreen" "1"
"setting.nowindowborder" "1"
}

View file

@ -2,8 +2,8 @@
{
"setting.csm_quality_level" "3"
"setting.mat_software_aa_strength" "1"
"VendorID" "4098"
"DeviceID" "26591"
"VendorID" "1"
"DeviceID" "1"
"setting.fullscreen" "0"
"setting.nowindowborder" "1"
"setting.aspectratiomode" "1"

View file

@ -1,5 +1,6 @@
. $HOME/.config/environment
xcompmgr -cnfFn -D3 &
numlockx on
setxkbmap de
@ -51,6 +52,8 @@ _autostart_apps()
parcellite &
solaar --window hide &
sxhkd &
conky --daemonize --config="$HOME/.config/conky/clock.conf"
conky --daemonize --config="$HOME/.config/conky/system.conf"
conky --daemonize --config="$HOME/.config/conky/archlinux-updates.conf"
@ -72,6 +75,8 @@ _autostart_apps()
qutebrowser &
mopidy &
(pass notes/keepass | head -n 1 | keepassxc --pw-stdin ~/sync/passwords.kdbx) &
}
_autostart()
@ -82,9 +87,6 @@ _autostart()
### wait for internet
wait_for_service "network-online.target"
pass x
(pass notes/keepass | head -n 1 | keepassxc --pw-stdin ~/sync/passwords.kdbx) &
_autostart_apps &
_autostart_workspace_voip &
_autostart_workspace_messenger &