.bin/.e

@@ -4,7 +4,6 @@ declare -A mapper=(
 	[".e"]="$HOME/.bin/.e"
 	["alacritty"]="$HOME/.config/alacritty/alacritty.yml"
 	["astronvim"]="$HOME/.config/astronvim/lua/user/init.lua"
-	["autostart"]="$HOME/.bin/autostart-manage"
 	["bash"]="$HOME/.bashrc"
 	["bspwm"]="$HOME/.config/bspwm/bspwmrc"
 	["environment"]="$HOME/.config/environment"

.bin/archlinux-update

@@ -10,28 +10,18 @@ else
 fi
 
 
-printf "\n=== REMOVE UNUSED PACKAGES ==========================================\n"
+echo "==================================================================="
 
 # shellcheck disable=SC2046
 sudo pacman -Rns --noconfirm $(pacman -Qtdq)
 
-printf "\n=== FLATPAK UPDATE ==================================================\n"
+if sudo checkservices; then
-
+    echo "CHECKSERVICES SUCCEDEED"
-flatpak update -y
-
-printf "\n=== RUN PACDIFF =====================================================\n"
-
-if sudo pacdiff; then
-    echo "PACDIFF SUCCEDEED"
 else
-    echo "PACDIFF FAILED"
+    echo "CHECKSERVICES FAILED"
     exit 1
 fi
-#if sudo checkservices; then
-#    echo "CHECKSERVICES SUCCEDEED"
-#else
-#    echo "CHECKSERVICES FAILED"
-#    exit 1
-#fi
 
-printf "\n\n\n\n=== DONE ============================================================\n"
+echo ""
+
+flatpak update -y

.bin/autostart-manage

@@ -1,38 +1,44 @@
-#!/usr/bin/env nix-shell
+#!/usr/bin/env bash
-#!nix-shell -i bash -p dasel hostname
-# shellcheck shell=bash
 
-_systemctl () {
+base_dir="$HOME/.config/systemd/user/"
-	systemctl --user "${@:2}" "autostart@$1.service"
+
+_filename () {
+	echo "autostart-$1.service"
 }
 
-_dasel () {
+_systemctl () {
-	dasel -f "$HOME/.config/autostart.toml" -r toml "${@}"
+	systemctl --user "${@:2}" "$(_filename "$1")"
 }
 
 _list () {
-	part_root='all().filter(not(equal(type(),object))).key()'
+	systemctl --user list-unit-files \
-	part_host='all().filter(equal(type(),object)).all().key()'
+		| grep "autostart-" \
-	arg="merge($part_host,$part_root).all()"
+		| awk '{print $1}' \
-	_dasel "$arg" \
+		| sed -e 's/^autostart-//' -e 's/.service$//'
-		| sort \
-		| uniq
-	#systemctl --user list-unit-files \
-	#	| grep "autostart-" \
-	#	| awk '{print $1}' \
-	#	| sed -e 's/^autostart-//' -e 's/.service$//'
 }
 
 _echo_table () {
+	printf "Unit\tFilename\tEnabled\tActive\n"
 	for unit in "$@"
 	do
-		printf "%s\t%s\t%s\n" \
+		printf "%s\t%s\t%s\t%s\n" \
 			"$unit" \
+			"$(_filename "$unit")" \
 			"$(_systemctl "$unit" is-enabled)" \
 			"$(_systemctl "$unit" is-active)"
 	done
 }
 
+_autostart_manage_add () {
+	cat <<EOF >"$base_dir$(_filename "$1")"
+[Unit]
+Description=$1
+
+[Service]
+ExecStart=/bin/sh -c '. \$HOME/.profile && $2'
+EOF
+}
+
 _autostart_manage_list () {
 	_list
 }
@@ -44,7 +50,7 @@ _autostart_manage_info () {
 		autostart_units+=("$line")
 	done < <(_list)
 
-	_echo_table "${autostart_units[@]}" | column -t -s$'\t' --table-columns 'Unit,Enabled?,Active?'
+	_echo_table "${autostart_units[@]}" | column -t -s$'\t'
 }
 
 _autostart_manage_enable_all () {
@@ -60,26 +66,8 @@ _autostart_manage_enable_all () {
 	done
 }
 
-_get_autostart_cmd () {
+_autostart_manage_rm () {
-	selector_base="all()"
+	rm "$base_dir$(_filename "$1")"
-	selector_host="all().filter(equal(type(),object)).filter(equal(key(),$(hostname))).all()"
-	selector_entry="filter(not(equal(type(),object))).filter(equal(key(),$1))"
-	cmd=$(_dasel "$selector_base.$selector_entry")
-	cmd_local=$(_dasel "$selector_host.$selector_entry")
-
-	if [ -n "$cmd_local" ]; then
-		if [ "$cmd_local" = "false" ]; then
-			cmd=""
-		else
-			cmd="$cmd_local"
-		fi
-	fi
-	echo "$cmd"
-}
-
-_autostart_manage_exec () {
-	cmd=$(_get_autostart_cmd "$1")
-	bash -c "$cmd"
 }
 
 _autostart_run_xorg () {
@@ -90,11 +78,11 @@ _autostart_run_xorg () {
 	"$HOME/.config/bspwm/focus-voip.py" &
 
 	numlockx on
-	xsetroot -cursor_name left_ptr
+
 	xrdb "$HOME/.Xresources"
 
-	#pkill sxhkd; sxhkd &
+	pgrep -x sxhkd > /dev/null || sxhkd &
-	#pgrep -x xcompmgr > /dev/null || xcompmgr -cnfFn -D3 &
+	pgrep -x xcompmgr > /dev/null || xcompmgr -cnfFn -D3 &
 
 
 	start-audio pipewire
@@ -113,7 +101,11 @@ _autostart_run_xorg () {
 case $1 in
 	list)		_autostart_manage_list ;;
 	info)		_autostart_manage_info ;;
+	add)		_autostart_manage_add "$2" "$3" ;;
+	rm)			_autostart_manage_rm "$2" ;;
 	enable-all)	_autostart_manage_enable_all "$2" ;;
+	show)		_systemctl "$2" cat ;;
+	edit)		_systemctl "$2" edit --full ;;
 	enable)		_systemctl "$2" add-wants autostart.target ;;
 	disable)	_systemctl "$2" disable ;;
 	restart)	_systemctl "${2:-*}" restart;;
@@ -122,6 +114,5 @@ case $1 in
 	stop)		_systemctl "${2:-*}" stop ;;
 	run)		systemctl --user start autostart.target ;;
 	run-xorg)	_autostart_run_xorg ;;
-	exec)		_autostart_manage_exec "$2" ;;
 	*)			echo "'$1' is not valid" ;;
 esac

.bin/menu-shutdown

@@ -1,6 +1,6 @@
 #!/bin/sh
 
-action=$(printf "shutdown\nreboot\nlogout\nautostart" | $DMENU)
+action=$(printf "shutdown\nreboot\nlogout\nautostart" | $MENU)
 
 case "$action" in
 	shutdown)	systemctl poweroff -i ;;

.bin/screenshot

@@ -2,8 +2,8 @@
 
 rclone_remote="s3-serguzim-me:public/screenshots"
 screenshot_host="https://s3.serguzim.me/public/screenshots"
-path="/tmp/screenshot.webp"
+path="/tmp/screenshot.png"
-file="$(date '+%F_%H-%M-%S').webp"
+file="$(date '+%F_%H-%M-%S').png"
 
 clip_image()
 {

.config/astronvim/lua/user/init.lua

@@ -28,11 +28,7 @@ local config = {
 		default_theme = function(highlights) -- or a function that returns one
 			local C = require "default_theme.colors"
 
-			highlights.Normal = {
+			highlights.Normal = { fg = C.fg, bg = C.bg }
-				fg = C.fg,
-				bg = C.bg,
-				ctermbg = None
-			}
 			return highlights
 		end,
 	},
@@ -57,10 +53,6 @@ local config = {
 	-- Configure plugins
 	plugins = {
 		-- All other entries override the setup() call for default plugins
-		indent_blankline = {
-			show_current_context = true,
-			show_current_context_start = false,
-		},
 		notify = {
 			background_colour = "#000000"
 		},

.config/astronvim/lua/user/plugins/init.lua

@@ -7,4 +7,13 @@ return {
 
 	-- Eye-Candy
 	{ "dracula/vim" },
+	{
+		"lukas-reineke/indent-blankline.nvim",
+		config = function()
+			require("indent_blankline").setup({
+					show_current_context = true,
+					show_current_context_start = true,
+				})
+		end,
+	},
 }

.config/autostart.toml

@@ -1,23 +0,0 @@
-conky-clock = 'conky --config="$HOME/.config/conky/clock.conf"'
-conky-system = 'conky --config="$HOME/.config/conky/system.conf"'
-discord = 'flatpak run com.discordapp.Discord'
-dunst = 'dunst'
-element = 'flatpak run im.riot.Riot'
-kdeconnect = '$HOME/.nix-profile/libexec/kdeconnectd'
-parcellite = 'parcellite'
-qutebrowser = 'qutebrowser'
-spotify = 'spotifyd --no-daemon'
-sxhkd = 'sxhkd'
-syncthing = 'syncthing -no-browser'
-teamspeak = 'flatpak run com.teamspeak.TeamSpeak -nosingleinstance'
-xcompmgr = 'xcompmgr -cnfFn -D3'
-
-[portalo]
-ckb-next = 'ckb-next --background'
-conky-archlinux-updates = 'conky --config="$HOME/.config/conky/archlinux-updates.conf"'
-polkit = '/usr/lib/polkit-gnome/polkit-gnome-authentication-agent-1'
-qbittorrent = 'flatpak run org.qbittorrent.qBittorrent'
-signal = 'flatpak run org.signal.Signal'
-solaar = 'solaar --window hide'
-steam = 'flatpak run com.valvesoftware.Steam -silent'
-thunderbird = 'thunderbird'

.config/environment

@@ -23,7 +23,6 @@ export BEMENU_OPTS="--tb '#6272a4'\
  --scf '#ff79c6'\
  --list 25 --ignorecase -p ''"
 
-export DMENU="bemenu"
 export DOCKER_BUILDKIT=1
 export DRONE_SERVER='https://ci.serguzim.me'
 
@@ -43,6 +42,7 @@ export MAILCAPS="$XDG_CONFIG_HOME/mailcap/mailcaprc"
 _makeflags=$(grep -c ^processor /proc/cpuinfo)
 export MAKEFLAGS="-j$_makeflags"
 export MARKPATH="$XDG_CONFIG_HOME/zsh/jump_marks"
+export MENU="bemenu"
 
 _whoami=$(whoami)
 export NIX_PATH="$HOME/.nix-defexpr/channels:/nix/var/nix/profiles/per-user/$_whoami/channels${NIX_PATH:+:$NIX_PATH}"
@@ -58,8 +58,7 @@ export PATH="$HOME/.local/bin:$HOME/.bin:$PATH"
 export PATH="$GOPATH/bin:$HOME/.cargo/bin:$HOME/.local/share/JetBrains/Toolbox/scripts:$PATH"
 export PS1='\$ '
 
-#export QT_QPA_PLATFORM="wayland;xcb"
+export QT_QPA_PLATFORM="wayland;xcb"
-export QT_QPA_PLATFORM="xcb"
 export QT_QPA_PLATFORMTHEME="qt5ct"
 
 #export SDL_VIDEODRIVER="wayland"
@@ -82,8 +81,6 @@ export ZSH="$ZDOTDIR/oh-my-zsh"
 [ -x "$(command -v moar)" ] && export MANPAGER="moar"
 [ -x "$(command -v moar)" ] && export PAGER="moar"
 
-[ -x "$(command -v gpgconf)" ] && export SSH_AUTH_SOCK=$(gpgconf --list-dirs agent-ssh-socket)
-
 [ -x "$(command -v home-manager)" ] \
 	&& [ -x "$(command -v nix)" ] \
 	&& [ -f "$HOME/.nix-profile/etc/profile.d/hm-session-vars.sh" ] \

.config/git/ignore

@@ -19,7 +19,6 @@
 
 # Javascript
 /node_modules/
-.npmrc
 
 # PHP
 /vendor/

.config/nixpkgs/common.nix

@@ -11,17 +11,12 @@
     git # git
     gitflow # tool for git workflow
     git-lfs # git support for large files
-    #git-secret # tool for secrets in git (gpg based)
     jq # tool for JSON
     moar # moar is less
     nix-direnv # allow better nix and direnv integration
-    neovim # alternative to vim
-    libnotify # allows sending notifications
-    lsof # who uses that drive/directory
     openssh # ssh client and server
     pass # password-store
     playerctl # control media players
-    p7zip # tool to extract 7z archives
     rclone # tool for remote storages
     restic # backup tool
     ripgrep # grep-alternative
@@ -32,7 +27,6 @@
     tokei # project-language statistics
     unzip # unzip
     vimHugeX # vim with clipboard support
-    xdg-user-dirs # tool manage user directories
     yq # tool for YAML
     yt-dlp # tool to download videos from the internet
     zip # zip
@@ -52,6 +46,4 @@
   programs.home-manager.enable = true;
 
   targets.genericLinux.enable = true;
-
-  nixpkgs.config.allowUnfree = true;
 }

.config/nixpkgs/graphical.nix

@@ -12,25 +12,17 @@
     dunst # notification-daemon
     feh # image viewer and wallpaper-tool
     flameshot # screenshot tool
-    gspell # spell highlighting for gtk applications
     helvum # Pipewire GUI
     j4-dmenu-desktop # collects .desktop files for a menu
-    keepassxc # password manager
-    libsForQt5.kdeconnect-kde # tool to connect a phone to the computer
     parcellite # clipboard-manager
     pavucontrol # Pulseaudio GUI
     polybar # desktop bar
-    #python310Packages.adblock # pylib for adblocking in qutebrowser
-    #python310Packages.pynacl # pylib for qutebrowser-keepassxc support
-    #(qutebrowser.override { enableWideVine = true; }) # vim-like browser
     solaar # Logitech tool
     sxhkd # hotkey daemon
     #vagrant # tool for automated virtual machines
     #virtualbox # tool for virtual machines
     xclip # clipboard CLI for X
-    xcompmgr # compositor for X
     xfce.thunar # file manager
     xfce.tumbler # thumbnail tool
-    xorg.xsetroot # tool to set x background stuff
   ];
 }

.config/sxhkd/sxhkdrc

@@ -8,7 +8,7 @@ super + Return
 
 # program launcher
 super + d
-	j4-dmenu-desktop --dmenu="$DMENU"
+	j4-dmenu-desktop --dmenu="$MENU"
     #LANG=C rofi -show
 
 # make sxhkd reload its configuration files:

.var/app/com.valvesoftware.Steam/.local/share/Steam/userdata/124058718/730/local/cfg/config.cfg

@@ -157,8 +157,8 @@ c_thirdpersonshoulderaimdist "120.0"
 c_thirdpersonshoulderdist "40.0"
 c_thirdpersonshoulderheight "5.0"
 c_thirdpersonshoulderoffset "20.0"
-cachedvalue_count_partybrowser "1673119755"
+cachedvalue_count_partybrowser "1662756622"
-cachedvalue_count_teammates "1673119749"
+cachedvalue_count_teammates "1662756624"
 cam_collision "1"
 cam_idealdelta "4.0"
 cam_idealdist "150"
@@ -452,11 +452,11 @@ option_speed_method "0"
 password "CB1FED3C80B40C63D23DEEC81651D4029AACBFE621D3565F509895038A9BB2FB"
 play_distance "1"
 player_botdifflast_s "2"
-player_competitive_maplist_2v2_10_0_E8C782EC "mg_de_train,mg_de_lake,mg_de_inferno,mg_de_shortnuke,mg_de_vertigo,mg_de_boyard,mg_de_chalice,mg_de_shortdust,mg_de_overpass,mg_de_cbble"
+player_competitive_maplist_2v2_10_0_E75D3568 "mg_de_train,mg_de_lake,mg_de_inferno,mg_de_shortnuke,mg_de_vertigo,mg_de_prime,mg_de_blagai,mg_de_shortdust,mg_de_overpass,mg_de_cbble"
-player_competitive_maplist_8_10_0_C9C8D674 "mg_de_ancient,mg_de_inferno,mg_de_nuke,mg_de_vertigo,mg_de_mirage,mg_de_anubis,mg_de_overpass,mg_de_dust2,mg_de_train,mg_cs_office,mg_de_cache,mg_de_tuscan,mg_lobby_mapveto,mg_cs_agency"
+player_competitive_maplist_8_10_0_34A40040 "mg_de_mirage,mg_de_inferno,mg_de_overpass,mg_de_train,mg_de_cache"
 player_nevershow_communityservermessage "0"
 player_survival_list_10_0_303 "mg_dz_blacksite,mg_dz_sirocco,mg_dz_vineyard,mg_dz_ember"
-player_teamplayedlast "2"
+player_teamplayedlast "3"
 player_wargames_list2_10_0_E04 "mg_skirmish_flyingscoutsman,mg_skirmish_armsrace,mg_skirmish_demolition,mg_skirmish_retakes"
 r_drawmodelstatsoverlaymax "1.5"
 r_drawmodelstatsoverlaymin "0.1"
@@ -494,7 +494,7 @@ snd_menumusic_volume "0.031492"
 snd_mix_async "1"
 snd_mix_async_onetime_reset "1"
 snd_mixahead "0.025"
-snd_music_selection "1"
+snd_music_selection "2"
 snd_music_volume_onetime_reset_2 "1"
 snd_musicvolume_multiplier_inoverlay "0.100000"
 snd_mute_losefocus "0"
@@ -527,7 +527,7 @@ sv_logsdir "logs"
 sv_noclipaccelerate "5"
 sv_noclipspeed "5"
 sv_pvsskipanimation "1"
-sv_skyname "sky_cs15_daylight03_hdr"
+sv_skyname "sky_dust"
 sv_specaccelerate "5"
 sv_specnoclip "1"
 sv_specspeed "3"
@@ -553,7 +553,7 @@ ui_deepstats_toplevel_mode "240"
 ui_inventorysettings_recently_acknowledged ""
 ui_mainmenu_bkgnd_movie_CC4ECB9 "anubis"
 ui_nearbylobbies_filter3 "competitive"
-ui_news_last_read_link "https://blog.counter-strike.net/index.php/2022/12/40596/"
+ui_news_last_read_link "https://blog.counter-strike.net/index.php/2022/08/39324/"
 ui_playsettings_custom_preset "mg_de_mirage,mg_de_inferno,mg_de_overpass,mg_de_ancient,mg_de_train,mg_de_cache"
 ui_playsettings_directchallengekey "ATRYH-RQPC-SF3DP-J43J"
 ui_playsettings_flags_listen_casual "0"

.var/app/com.valvesoftware.Steam/.local/share/Steam/userdata/124058718/730/local/cfg/video.txt

@@ -1,27 +1,25 @@
-"config"
+"VideoConfig"
 {
-	"setting.csm_quality_level"		"1"
+	"setting.cpu_level"		"0"
-	"setting.mat_software_aa_strength"		"1"
-	"VendorID"		"1"
-	"DeviceID"		"1"
-	"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.gpu_level"		"0"
 	"setting.mat_antialias"		"0"
 	"setting.mat_aaquality"		"0"
 	"setting.mat_forceaniso"		"0"
-	"setting.cpu_level"		"0"
+	"setting.mat_vsync"		"0"
-	"setting.videoconfig_version"		"1"
+	"setting.mat_triplebuffered"		"0"
-	"setting.defaultres"		"2560"
+	"setting.mat_grain_scale_override"		"-1.000000"
-	"setting.defaultresheight"		"1440"
+	"setting.gpu_mem_level"		"0"
+	"setting.mem_level"		"3"
+	"setting.mat_queue_mode"		"-1"
+	"setting.csm_quality_level"		"1"
+	"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"
 }

.var/app/com.valvesoftware.Steam/.local/share/Steam/userdata/124058718/730/local/cfg/videodefaults.txt

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