wip

arch-root/install.sh

@@ -20,13 +20,14 @@ PACKAGES=(
 	git zip # storage 
 	bc xxd # data processing
 	gnupg pass pass-otp pwgen # crypt
-	imv mpv imagemagick gimp # media
+	imv mpv ffmpeg imagemagick gimp # media
 	aichat libqalculate translate-shell  # utils
 	libreoffice-still  # docs
 
 	qutebrowser qt6-wayland # web browsing
 	hugo miniserve # web utils
 	neomutt telegram-desktop # communication
+	transmission-cli # torrents
 	
 	greetd sway swaybg swayidle # desktop basic
 	alacritty wmenu i3blocks mako libnotify # terminals, ui

arch-user/bin/archiso/make.sh

@@ -2,8 +2,8 @@
 set -e
 
 sudo rm -rf /tmp/archiso-work /tmp/archiso-out
-cd ~/know/archiso
+cd ~/dev
-sudo mkarchiso -v -w /tmp/archiso-work -o /tmp/archiso-out "profile-$1"
+sudo mkarchiso -v -w /tmp/archiso-work -o /tmp/archiso-out ~/dev/archiso-"$1"
 iso=(/tmp/archiso-out/*)
 sudo dd if="$iso" of="$2" status=progress bs=4M
 sudo rm -rf /tmp/archiso-work /tmp/archiso-out

arch-user/bin/backup

@@ -43,67 +43,15 @@ remote_close() {
 	echo close done
 }
 
-declare -A repos
+push_homedir() {
-add_repos_local() {
-	while IFS=  read -r -d $'\0'; do
-		repo_path="$REPLY"
-		[ ! -f "$repo_path/HEAD" ] && continue
-		repo_path="$(realpath "$(dirname "$repo_path")")"
-    	repos["$repo_path"]=1
-	done < <(find "$@" -type d -name .git -print0)
-}
 	
-add_repos_remote() {
-	cd "$1"
-	while IFS=  read -r -d $'\0'; do
-		repo_path="$REPLY"
-		[ ! -f "$repo_path/HEAD" ] && continue
-		repo_path="/$(dirname "$repo_path")"
-		[[ ! " $(groups) " == *" $(echo "$repo_path" | cut -d'/' -f3) "* ]] && continue
-    	repos["$repo_path"]=1
-	done < <(find "home" -type d -name '*.git' -print0 2>/dev/null)
 }
 
-sync_one() {
-	local_path="$1"
-	remote_path="$2$1/$(basename "$1").git"
-	echo "$local_path <-> $remote_path"
-	remote_url="file:///$remote_path"
-	if [ ! -d "$local_path" ]; then
-		mkdir -p "$(dirname "$local_path")"
-		git clone "$remote_url" "$local_path"
-	else
-		cd "$local_path"
-		git add .
-		git diff-index --quiet HEAD || git commit -m autocommit || true
-		if [ ! -d "$remote_path" ]; then
-			mkdir -p "$(dirname "$remote_path")"
-			git clone --bare "file:///$1" "$remote_path"
-		else
-			git pull "$remote_url"
-			git push "$remote_url"
-		fi
-	fi
-}
-
-sync_repos() {
-	for i in "${!repos[@]}"; do
-		sync_one "$i" "$1"
-		sync -f "$1"
-	done
-}
-
-if [[ "$1" = "open" ]]; then
-	remote_open
-	exit 0
-fi
-
 remote_open
-add_repos_remote	"$data_mnt"
+
 for g in $(groups); do
-	[ -d "/home/$g/dev" ] && add_repos_local "/home/$g/dev" -maxdepth 2
+
-	[ -d "/home/$g/know" ] && add_repos_local "/home/$g/know" -maxdepth 2
 done
-sync_repos "$data_mnt"
+
 remote_close
 echo ALL OK

arch-user/bin/ffmpeg/add-subtitles.sh

@@ -0,0 +1,21 @@
+#!/bin/bash
+
+if [ $# -ne 3 ]; then
+    echo "Usage: $0 <video_file> <subtitle_file> <output_file>"
+    exit 1
+fi
+if [ ! -f "$1" ]; then
+    echo "Error: Video file '$1' not found"
+    exit 1
+fi
+if [ ! -f "$2" ]; then
+    echo "Error: Subtitle file '$2' not found"
+    exit 1
+fi
+
+ext="${3##*.}"
+if [ "$ext" = "mp4" ]; then
+    ffmpeg -i "$1" -i "$2" -c copy -c:s mov_text "$3"
+else
+    ffmpeg -i "$1" -i "$2" -c copy "$3"
+fi

arch-user/config/alacritty/alacritty.toml.tmpl

@@ -1,3 +1,6 @@
+[general]
+live_config_reload = false
+
 [bell]
 animation = "EaseOutExpo"
 duration = 0

arch-user/config/bash/bashrc

@@ -4,7 +4,7 @@
 
 shopt -s autocd
 
-stty intr ^K
+stty intr ^N
 
 alias ssh='wssh'
 alias sudo='wsudo'

arch-user/config/readline/inputrc

@@ -14,55 +14,35 @@ set keymap vi-insert
 "\C-f":forward-char
 "\eb":backward-word
 "\ef":forward-word
+"\C-k": kill-line
+"\C-u": unix-line-discard
 #################################
 
-##### remap - colemak-dh #######
+##### remap - colemak-dh ########
 
 # n -> h
-set keymap vi-insert
-"\C-n":backward-delete-char
 set keymap vi-command
-"n":backward-char
+"n": backward-char
-"\C-n":backward-char
+# e -> j
-# e -> k (reverse swap)
-set keymap vi-insert
-"\C-e":"\C-j"
 set keymap vi-command
-"e":previous-history
+"e": previous-history
-"\C-e":kill-line
+# i -> k
-# i -> j (reverse swap)
-#set keymap vi-insert
-# "\C-i":accept-line # ascii code conflicts with tab
 set keymap vi-command
-"i":next-history
+"i": next-history
-# "\C-i":accept-line # ascii code conflicts with tab
 # o -> l
 set keymap vi-command
-"o":forward-char
+"o": forward-char 
-"\C-o":clear-screen
 
 # k -> n
-#set keymap vi-insert
-#"\C-k":menu-complete # bound to intr, use tab
 set keymap vi-command
-"k":vi-search-again
+"k": vi-search-again
-"K":vi-search-again
-"\C-k":next-history
 # j -> e
-set keymap vi-insert
-"\C-j":self-insert
 set keymap vi-command
-"j":vi-end-word
+"j": vi-end-word
-"J":vi-end-word
 # l -> i
-set keymap vi-insert
-"\C-l":complete
 set keymap vi-command
-"l":vi-insertion-mode
+"l": vi-insertion-mode
-"L":vi-insert-beg
 # h -> o
-set keymap vi-insert
-"\C-h":operate-and-get-next
 
 #################################
 

arch-user/config/sway/config.tmpl

@@ -46,6 +46,7 @@ bar {
 ###########################################
 
 ################ inputs ####################
+mouse_warping  container
 input "type:keyboard" {
 	xkb_layout us(yurmak),ru(yurmak)
 	repeat_rate 50

arch-user/config/vim/vimrc.tmpl

@@ -58,7 +58,7 @@ autocmd VimEnter * highlight SignColumn ctermbg=none
 highlight Title			term=bold ctermfg=4 gui=bold 
 highlight Special		term=bold ctermfg=4 
 highlight PreProc		term=underline ctermfg=4
-highlight Underlined	term=underline cterm=underline ctermfg=4 gui=underline
+highlight Underlined	term=underline cterm=underline ctermfg=4
 " fg  blue (4 or 12) -> magenta (5)
 highlight SpecialKey     term=bold ctermfg=5
 highlight Directory      term=bold ctermfg=5
@@ -70,7 +70,8 @@ highlight NonText        term=bold ctermfg=5 gui=bold
 highlight DiffDelete     term=bold ctermfg=5 ctermbg=14 gui=bold
 highlight Changed        ctermfg=5
 " bg
-highlight SpellCap		cterm=underline ctermfg=9  ctermbg=none gui=undercurl
+highlight SpellBad		term=bold ctermfg=0 ctermbg=9
+highlight Search 		term=bold ctermfg=0 ctermbg=11
 "###########################################
 
 "############## file-specific ###############

arch-user/config/workspace-compat/bashrc

@@ -1,5 +1,5 @@
 [ -f ~/.bashrc ] && . ~/.bashrc
-stty intr ^K
+stty intr ^N
 alias ssh='wssh'
 alias sudo='wsudo'
 su() {