fix xkb scripts losing alt-meta swap etc

@reboot.sh

@@ -1,15 +1,22 @@
 #!/bin/sh
 
-# ~/.xsession  2>&1  &
+# ~/.xsession  >/dev/null 2>&1 &
 
-imwheel  2>&1  &
+imwheel    >/dev/null 2>&1 &
-nfancurve  2>&1  &
+nfancurve  >/dev/null 2>&1 &
-copyq  2>&1  &
+copyq      >/dev/null 2>&1 &
 
-sleep 5 && \
+sleep 5 \
-  sshfs infra:/ /Servers/infra -C  2>&1  &
+  && sshfs infra:/ /Servers/infra -C \
+  >/dev/null 2>&1 &
+
+sleep 5 \
+  && sshfs sites:/ /Servers/sites -C \
+  >/dev/null 2>&1 &
 
 ## already done in /etc/fstab
-sleep 5 && \
+# sleep 5 \
-sudo mount 192.168.0.222:/nfs/Public  /Data   2>&1  &
+#   && sudo mount 192.168.0.222:/nfs/Public  /Data \
-# sudo mount 169.254.186.28:/nfs/Public  /Data   2>&1  &
+#   >/dev/null 2>&1 &
+
+# sudo mount 169.254.186.28:/nfs/Public  /Data   >/dev/null 2>&1 &

_install.sh

@@ -23,15 +23,11 @@ sudo apt install -y \
   nano ffmpeg lynx feh \
   imagemagick graphicsmagick ghostscript \
   jpegoptim pngcrush pngquant \
-  usrmerge net-tools rdfind ripgrep
+  usrmerge net-tools rdfind ripgrep \
+  sshfs sqlite3 archivemount
   # fonts-font-awesome \
 
 
-# desktop
-sudo apt install -y \
-  numlockx sshfs
-
-
 # GUI Apps
 sudo apt install -y \
   vlc \
@@ -43,7 +39,8 @@ sudo apt install -y \
   kcharselect \
   kid3 \
   gnumeric \
-  xdotool
+  xdotool \
+  numlockx
 
 
 sudo systemctl disable rsyslog

_installs/go.sh

@@ -1,13 +1,19 @@
 #!/bin/sh
-
-
 # install go
 
-wget -c 'https://go.dev/dl/go1.19.4.linux-amd64.tar.gz'
+VER='1.22.1'
 
-sudo rm -rf '/Apps/go--app/*'
+wget -c "https://go.dev/dl/go$VER.linux-amd64.tar.gz"
-tar -C '/Apps/go--app' -xzf 'go1.19.4.linux-amd64.tar.gz'
-rm 'go1.19.4.linux-amd64.tar.gz'
-sudo chown $USER:$USER -R '/usr/local/go'
-sudo ln -s /usr/local/go/bin/* /Apps/ --force
 
+rm -rf /Apps/go--app
+mkdir -p /Apps/go--app
+
+tar -xzf "go$VER.linux-amd64.tar.gz" \
+	  -C "/Apps/go--app"
+
+mv /Apps/go--app/go/* '/Apps/go--app/'
+chown $USER:$USER -R "/Apps/go--app"
+ln -s /Apps/go--app/bin/* /Apps/ --force
+
+rm "go$VER.linux-amd64.tar.gz"
+rm -rf /Apps/go--app/go

_installs/nodejs.sh

@@ -12,7 +12,7 @@ sudo rm -rf /usr/share/npm
 sudo rm -rf /usr/share/nodejs
 
 
-VER='v20.9.0'
+VER='v20.11.1'
 
 # install node + npm
 wget -O 'node.xz' \

_installs/rust.sh

@@ -44,4 +44,6 @@ env LIBSSH2_SYS_USE_PKG_CONFIG='' \
 cargo install \
   xh bat exa fd-find \
   broot jql sd \
-  xargo
+  xargo \
+  cargo-cache \
+  gitui

_installs/tauri.sh

@@ -1,4 +1,4 @@
-#!/usr/bin/zsh
+#!/bin/sh
 
 
 # install via npm
@@ -14,7 +14,6 @@ npm i --save-dev \
 
 # base
 sudo apt update -y
-sudo apt update
 sudo apt install -y \
     build-essential \
     curl \

doublecmd/session.ini

@@ -121,7 +121,7 @@ lsvwFile_Columns.Item2_Width=1540
 
 [TfrmFindDlg(3840x2160)]
 TfrmFindDlg_Height=2160
-TfrmFindDlg_Left=3840
+TfrmFindDlg_Left=1920
 TfrmFindDlg_Top=0
 TfrmFindDlg_Width=1920
 TfrmFindDlg_WindowState=wsNormal

kb/.xkb

@@ -1,21 +0,0 @@
-#!/bin/sh
-
-# ±
-
-# keyboard settings
-setxkbmap  -option  caps:none
-setxkbmap  -option  altwin:swap_alt_win
-setxkbmap  -option  lv3:ralt_switch
-setxkbmap  us  -variant  mac
-
-numlockx  off
-
-# xset  s  off
-# xset  s  noblank
-xset  b  off
-xset  -dpms
-
-# xrdb  -merge  /etc/X11/xinit/.Xresources
-xrdb  -merge  ~/.Xresources
-# xmodmap  /etc/X11/xinit/.Xmodmap
-xmodmap  ~/.Xmodmap

kb/jp-translit-hiro.sh

@@ -1,5 +1,8 @@
 #!/bin/sh
 
+setxkbmap  -option  caps:none
+setxkbmap  -option  altwin:swap_alt_win
+setxkbmap  -option  lv3:ralt_switch
 setxkbmap jp -variant mozc
 
 numlockx  off

kb/jp-translit-kana.sh

@@ -1,5 +1,8 @@
 #!/bin/sh
 
+setxkbmap  -option  caps:none
+setxkbmap  -option  altwin:swap_alt_win
+setxkbmap  -option  lv3:ralt_switch
 setxkbmap jp -variant kana
 
 numlockx  off

kb/ru-translit-mac.sh

@@ -1,5 +1,8 @@
 #!/bin/sh
 
+setxkbmap  -option  caps:none
+setxkbmap  -option  altwin:swap_alt_win
+setxkbmap  -option  lv3:ralt_switch
 setxkbmap -layout 'ru,us' -variant 'phonetic_mac,mac'
 
 numlockx  off

kb/us-mac.sh

@@ -1,5 +1,8 @@
 #!/bin/sh
 
+setxkbmap  -option  caps:none
+setxkbmap  -option  altwin:swap_alt_win
+setxkbmap  -option  lv3:ralt_switch
 setxkbmap us -variant mac
 
 numlockx  off

oh-my-zsh/.fehbg

@@ -1,2 +1,2 @@
 #!/bin/sh
-feh --no-fehbg --bg-fill '/Img/2023/12/blob-on-green_20231223212830.png'
+feh --no-fehbg --bg-fill '/My/graphics/grid-cells/desktop-7x13-dots.png'

oh-my-zsh/.profile

@@ -16,10 +16,10 @@ export QT_AUTO_SCREEN_SCALE_FACTOR=1
 export TERMINAL=`which alacritty`
 export EDITOR=`which sublime_text`
 
-export PATH="/Apps:/usr/sbin:/usr/bin:/home/dym/.local/bin:/usr/bin:/usr/local/bin:/Data/Apps_and/platform-tools:$PATH"
+export PATH="/home/dym/.nix-profile/bin:/Apps:/usr/sbin:/usr/bin:/home/dym/.local/bin:/usr/bin:/usr/local/bin:/Data/Apps_and/platform-tools:/usr/local/sbin:/usr/local/bin"
 
 export XDG_CONFIG_HOME="/home/dym/.config"
 
-. "$HOME/.cargo/env"
+if [ -e /home/dym/.nix-profile/etc/profile.d/nix.sh ]; then
-
+	. /home/dym/.nix-profile/etc/profile.d/nix.sh
-if [ -e /home/dym/.nix-profile/etc/profile.d/nix.sh ]; then . /home/dym/.nix-profile/etc/profile.d/nix.sh; fi # added by Nix installer
+fi # added by Nix installer

oh-my-zsh/.zshrc

@@ -33,6 +33,7 @@ alias md='mkdir'
 alias ll='l -T'
 alias ls='ls -alhgAF --group-directories-first'
 alias d='du -ch --max-depth=1'
+alias gm='/usr/bin/gm'
 
 alias i='sudo apt-get install -y'
 alias un='sudo apt-get remove -y'
@@ -74,3 +75,5 @@ export PATH="$BUN_INSTALL/bin:$PATH"
 export DENO_INSTALL="/home/dym/.deno"
 export PATH="$DENO_INSTALL/bin:$PATH"
 
+
+if [ -e /home/dym/.nix-profile/etc/profile.d/nix.sh ]; then . /home/dym/.nix-profile/etc/profile.d/nix.sh; fi # added by Nix installer

sublime-text/Package Control.sublime-settings

@@ -20,6 +20,7 @@
 		"Pretty JSON",
 		"Svelte",
 		"TOML",
+		"Zig Language",
 		"ZSH",
 	],
 }