From b30fccb9fe16c28a7a0fca9d12de03eb710e7f63 Mon Sep 17 00:00:00 2001 From: Dym Sohin Date: Wed, 13 Mar 2024 12:25:37 +0100 Subject: [PATCH] fix xkb scripts losing alt-meta swap etc --- @reboot.sh | 25 ++++++++++++------- _install.sh | 11 +++----- _installs/go.sh | 22 ++++++++++------ _installs/nodejs.sh | 2 +- _installs/rust.sh | 4 ++- _installs/tauri.sh | 3 +-- doublecmd/session.ini | 2 +- kb/.xkb | 21 ---------------- kb/jp-translit-hiro.sh | 3 +++ kb/jp-translit-kana.sh | 3 +++ kb/ru-translit-mac.sh | 3 +++ kb/us-mac.sh | 3 +++ oh-my-zsh/.fehbg | 2 +- oh-my-zsh/.profile | 8 +++--- oh-my-zsh/.zshrc | 3 +++ sublime-text/Package Control.sublime-settings | 1 + 16 files changed, 61 insertions(+), 55 deletions(-) delete mode 100755 kb/.xkb diff --git a/@reboot.sh b/@reboot.sh index 9930c9f..50c0985 100755 --- a/@reboot.sh +++ b/@reboot.sh @@ -1,15 +1,22 @@ #!/bin/sh -# ~/.xsession 2>&1 & +# ~/.xsession >/dev/null 2>&1 & -imwheel 2>&1 & -nfancurve 2>&1 & -copyq 2>&1 & +imwheel >/dev/null 2>&1 & +nfancurve >/dev/null 2>&1 & +copyq >/dev/null 2>&1 & -sleep 5 && \ - sshfs infra:/ /Servers/infra -C 2>&1 & +sleep 5 \ + && 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 && \ -sudo mount 192.168.0.222:/nfs/Public /Data 2>&1 & -# sudo mount 169.254.186.28:/nfs/Public /Data 2>&1 & +# sleep 5 \ +# && sudo mount 192.168.0.222:/nfs/Public /Data \ +# >/dev/null 2>&1 & + +# sudo mount 169.254.186.28:/nfs/Public /Data >/dev/null 2>&1 & diff --git a/_install.sh b/_install.sh index 94655f5..15efe8c 100755 --- a/_install.sh +++ b/_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 diff --git a/_installs/go.sh b/_installs/go.sh index e07e005..381e9bc 100755 --- a/_installs/go.sh +++ b/_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/*' -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 +wget -c "https://go.dev/dl/go$VER.linux-amd64.tar.gz" +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 diff --git a/_installs/nodejs.sh b/_installs/nodejs.sh index 95adda8..a0f14cd 100755 --- a/_installs/nodejs.sh +++ b/_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' \ diff --git a/_installs/rust.sh b/_installs/rust.sh index 5eba5de..ee772b7 100755 --- a/_installs/rust.sh +++ b/_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 diff --git a/_installs/tauri.sh b/_installs/tauri.sh index 88b627c..5f459a6 100755 --- a/_installs/tauri.sh +++ b/_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 \ diff --git a/doublecmd/session.ini b/doublecmd/session.ini index 5f20c8c..f9907b3 100644 --- a/doublecmd/session.ini +++ b/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 diff --git a/kb/.xkb b/kb/.xkb deleted file mode 100755 index 36f5232..0000000 --- a/kb/.xkb +++ /dev/null @@ -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 diff --git a/kb/jp-translit-hiro.sh b/kb/jp-translit-hiro.sh index 46045c1..e16570e 100755 --- a/kb/jp-translit-hiro.sh +++ b/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 diff --git a/kb/jp-translit-kana.sh b/kb/jp-translit-kana.sh index 77779b3..657e608 100755 --- a/kb/jp-translit-kana.sh +++ b/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 diff --git a/kb/ru-translit-mac.sh b/kb/ru-translit-mac.sh index 44f5706..ff10dab 100755 --- a/kb/ru-translit-mac.sh +++ b/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 diff --git a/kb/us-mac.sh b/kb/us-mac.sh index ea2e81f..19b4cb3 100755 --- a/kb/us-mac.sh +++ b/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 diff --git a/oh-my-zsh/.fehbg b/oh-my-zsh/.fehbg index 47d1149..f3108e2 100755 --- a/oh-my-zsh/.fehbg +++ b/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' diff --git a/oh-my-zsh/.profile b/oh-my-zsh/.profile index 12ac2e8..e1d42bf 100755 --- a/oh-my-zsh/.profile +++ b/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; fi # added by Nix installer +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 diff --git a/oh-my-zsh/.zshrc b/oh-my-zsh/.zshrc index 70fd9f7..7cc4112 100755 --- a/oh-my-zsh/.zshrc +++ b/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 diff --git a/sublime-text/Package Control.sublime-settings b/sublime-text/Package Control.sublime-settings index 68bb341..8e09b67 100644 --- a/sublime-text/Package Control.sublime-settings +++ b/sublime-text/Package Control.sublime-settings @@ -20,6 +20,7 @@ "Pretty JSON", "Svelte", "TOML", + "Zig Language", "ZSH", ], }