From fac383b9c2a0379dcb1c107f5959577aa52c4599 Mon Sep 17 00:00:00 2001 From: Ian Kelling Date: Tue, 8 Sep 2020 15:43:03 -0400 Subject: [PATCH] terminal ssh stuff --- brc | 47 ++++++++++------ brc2 | 56 +++++++++++++------ distro-end | 12 ++++ sl/.ianketiona/.bashrc | 1 - sl/.ianketiona/.emacs.d | 1 - sl/.ianketiona/.inputrc | 1 - sl/.ianketiona/brc | 1 - sl/.ianketiona/err | 1 - sl/.ianketiona/info | 1 - sl/.ianketiona/lib-src | 1 - sl/.ianketiona/lisp | 1 - sl/.ianketiona/ll-function | 1 - sl/.ianketiona/package-manager-abstractions | 1 - sl/.ianketiona/path-add-function | 1 - sl/.iankflidas/.bashrc | 1 - sl/.iankflidas/.emacs.d | 1 - sl/.iankflidas/.inputrc | 1 - sl/.iankflidas/brc | 1 - sl/.iankflidas/err | 1 - sl/.iankflidas/info | 1 - sl/.iankflidas/lib-src | 1 - sl/.iankflidas/lisp | 1 - sl/.iankflidas/ll-function | 1 - sl/.iankflidas/package-manager-abstractions | 1 - sl/.iankflidas/path-add-function | 1 - sl/rsync-excludes | 17 ------ sl/rsync-filter | 26 +++++++++ .../.local/share/kxmlgui5/konsole/README.ian | 4 +- .../share/kxmlgui5/konsole/sessionui.rc | 12 ++-- 29 files changed, 115 insertions(+), 81 deletions(-) delete mode 120000 sl/.ianketiona/.bashrc delete mode 120000 sl/.ianketiona/.emacs.d delete mode 120000 sl/.ianketiona/.inputrc delete mode 120000 sl/.ianketiona/brc delete mode 120000 sl/.ianketiona/err delete mode 120000 sl/.ianketiona/info delete mode 120000 sl/.ianketiona/lib-src delete mode 120000 sl/.ianketiona/lisp delete mode 120000 sl/.ianketiona/ll-function delete mode 120000 sl/.ianketiona/package-manager-abstractions delete mode 120000 sl/.ianketiona/path-add-function delete mode 120000 sl/.iankflidas/.bashrc delete mode 120000 sl/.iankflidas/.emacs.d delete mode 120000 sl/.iankflidas/.inputrc delete mode 120000 sl/.iankflidas/brc delete mode 120000 sl/.iankflidas/err delete mode 120000 sl/.iankflidas/info delete mode 120000 sl/.iankflidas/lib-src delete mode 120000 sl/.iankflidas/lisp delete mode 120000 sl/.iankflidas/ll-function delete mode 120000 sl/.iankflidas/package-manager-abstractions delete mode 120000 sl/.iankflidas/path-add-function delete mode 100644 sl/rsync-excludes create mode 100644 sl/rsync-filter diff --git a/brc b/brc index 76bcf1d..1e6bfb3 100644 --- a/brc +++ b/brc @@ -185,21 +185,20 @@ export SYSTEMD_LESS=$LESS export NNN_COLORS=2136 -export SL_FILES_DIR=/b/ds/sl/basic/.iank +export SL_FILES_DIR=/b/ds/sl/.iank export SL_INFO_DIR=/p/sshinfo -export SL_RSYNC_ARGS="--exclude-from=/b/ds/sl/rsync-excludes" # * include files if [[ -s $bashrc_dir/path-add-function ]]; then source $bashrc_dir/path-add-function - if [[ $SSH_CLIENT && -e $bashrc_dir/src/emacs ]]; then - path-add "$bashrc_dir/lib-src" "$bashrc_dir/src" - if [[ ! -e ~/.emacs.d ]]; then - # todo: patch emacs so it will look elsewhere. this is kinda sad: - # https://emacs.stackexchange.com/questions/4253/how-to-start-emacs-with-a-custom-user-emacs-directory - ln -sf $bashrc_dir/.emacs.d ~ + if [[ $SSH_CLIENT ]]; then + if [[ -d /home/iank/.iank/e/e ]]; then + export EMACSDIR=/home/iank/.iank/e/e + fi + if [[ $EMACSDIR ]]; then + path-add "$EMACSDIR/lib-src" "$EMACSDIR/src" fi fi fi @@ -706,17 +705,29 @@ and works in older versions of git which did not have that." g() { - local $narg + # todo: patch emacs so it will look elsewhere. this is kinda sad: + # https://emacs.stackexchange.com/questions/4253/how-to-start-emacs-with-a-custom-user-emacs-directory + + local args if [[ $DISPLAY ]]; then - narg=-n + args=-n fi - if pgrep -u $EUID emacsclient && (( $# )); then - emacsclient -a "" $narg "$@" + + if ! pgrep -u $EUID emacsclient || (( $# == 0 )); then + args+=" -c" + fi + if [[ $EMACSDIR ]]; then + EHOME=$HOME HOME=$EMACSDIR m emacsclient -a "" $args "$@" else - emacsclient -a "" $narg -c "$@" + m emacsclient -a "" $args "$@" fi } +# force terminal verion +gn() { + g -n "$@" +} + gh() { # i got an error, gh not found when doing a pull request, it seems like it wants itself in it\'s path. local _oldpath="$PATH" @@ -1262,10 +1273,10 @@ sl() { sl_test_hook="$2" shift ;; - --sl_rsync_args) - sl_rsync_args="$2" - shift - ;; + --sl-rsync-args) + sl_rsync_args="$2" + shift + ;; *) break ;; @@ -1338,7 +1349,7 @@ sl() { extra_info="${tmp:1}" fi if [[ $sl_test_hook ]]; then - $sl_test_hook "$extra_info" + RSYNC_RSH="ssh ${args[*]}" $sl_test_hook "$extra_info" "$remote" fi if $haveinfo && [[ $type == b ]]; then diff --git a/brc2 b/brc2 index 322a869..ded7720 100644 --- a/brc2 +++ b/brc2 @@ -40,30 +40,50 @@ source /a/bin/log-quiet/logq-function # * functions -export SL_TEST_CMD=". /etc/os-release ; echo \${VERSION//[^a-zA-Z0-9]/}" -export SL_TEST_HOOK=slemacs - slemacs() { - local arg + local arg rtime v arg="$1" - case $arg in - 90Etiona) - export SL_FILES_DIR=/b/ds/sl/.ianketiona - ;; - 80Flidas) - export SL_FILES_DIR=/b/ds/sl/.iankflidas - ;; - *) - export SL_FILES_DIR=/b/ds/sl/.iank - ;; - esac + remote="$2" + if [[ $arg == [89]0Etiona* ]]; then + v=${arg::1} + rtime=${arg#*Etiona} # remote time + if [[ ! $rtime ]]; then + rtime=0 + fi + dir=/a/opt/emacs-trisquel${v}-nox/.iank + ltime=$(stat -c%Y $dir/e/e/.emacs.d/init.el) + if (( ltime > rtime )); then + m rsync -rptL --delete --filter=". /b/ds/sl/rsync-filter" $dir "$remote":/home/iank + fi + fi } -slb() { # sl basic - export SL_FILES_DIR=/b/ds/sl/.iank - sl --sl-test-cmd "" --sl-test-hook "" --sl_rsync_args "" "$@" +sle() { # sl emacs + local f=/home/iank/.emacs.d/init.el + sl --sl-test-cmd ". /etc/os-release ; printf %s \${VERSION//[^a-zA-Z0-9]/}; test -e $f && stat -c%Y $f" --sl-test-hook slemacs "$@" } +# Run this manually after .emacs.d changes. Otherwise, to check if +# files changed with find takes 90ms. sl normally only adds 25ms. We +# could cut it down to 10ms if we put things on a btrfs filesystem and +# looked for changes there, or used some inotify thing, but that seems +# like too much work. +egh() { # emacs gnuhope + RSYNC_RSH=ssh m rsync -rptL --delete --filter=". /b/ds/sl/rsync-filter" /a/opt/emacs-trisquel9-nox/.iank lists2d.fsf.org:.ianktrisquel_9 + RSYNC_RSH=ssh m rsync -rptL --delete --filter=". /b/ds/sl/rsync-filter" /a/opt/emacs-trisquel8-nox/.iank lists2d.fsf.org:/home/iank +} +ekw() { + local shell="bash -s" + if [[ $HOSTNAME != kw ]]; then + shell="ssh kw.office.fsf.org" + bbk -m /a -t kw + fi + $shell <<'EOF' +sudo mkdir /root/.ianktrisquel_9 +sudo rsync -rptL --delete --filter=". /b/ds/sl/rsync-filter" /a/opt/emacs-trisquel9-nox/.iank /root/.ianktrisquel_9 +rsync -rptL --delete --filter=". /b/ds/sl/rsync-filter" /a/opt/emacs-trisquel8-nox/.iank /home/iank +EOF +} mkschroot() { distro=$1 diff --git a/distro-end b/distro-end index 6de67d8..f18d810 100755 --- a/distro-end +++ b/distro-end @@ -1620,6 +1620,18 @@ EOF fi +if [[ $HOSTNAME == kw ]]; then + # hosts 1-199. 200+ are dynamic, avoid those + tu /etc/exports <<'EOF' +/root/.ianktrisquel_9/.iank/e/e 192.168.0.0/25(rw,no_root_squash,async,no_subtree_check) 192.168.0.128/26(rw,no_root_squash,async,no_subtree_check) 192.168.0.192/29(rw,no_root_squash,async,no_subtree_check) +/home/iank/.iank/e/e 192.168.0.0/25(rw,no_root_squash,async,no_subtree_check) 192.168.0.128/26(rw,no_root_squash,async,no_subtree_check) 192.168.0.192/29(rw,no_root_squash,async,no_subtree_check) +EOF + ekw + sgo nfs-server + sudo exportfs -rav +fi + + # if I was going to create a persistent vm, i might do it like this: # variant=something # from: virt-install --os-variant list # s virt-install --noautoconsole --graphics spice,listen=0.0.0.0 \ diff --git a/sl/.ianketiona/.bashrc b/sl/.ianketiona/.bashrc deleted file mode 120000 index 4cd008b..0000000 --- a/sl/.ianketiona/.bashrc +++ /dev/null @@ -1 +0,0 @@ -../../.bashrc \ No newline at end of file diff --git a/sl/.ianketiona/.emacs.d b/sl/.ianketiona/.emacs.d deleted file mode 120000 index 2288841..0000000 --- a/sl/.ianketiona/.emacs.d +++ /dev/null @@ -1 +0,0 @@ -/home/iank/.emacs.d \ No newline at end of file diff --git a/sl/.ianketiona/.inputrc b/sl/.ianketiona/.inputrc deleted file mode 120000 index 22cd52b..0000000 --- a/sl/.ianketiona/.inputrc +++ /dev/null @@ -1 +0,0 @@ -../../.inputrc \ No newline at end of file diff --git a/sl/.ianketiona/brc b/sl/.ianketiona/brc deleted file mode 120000 index 7a3ce73..0000000 --- a/sl/.ianketiona/brc +++ /dev/null @@ -1 +0,0 @@ -../../brc \ No newline at end of file diff --git a/sl/.ianketiona/err b/sl/.ianketiona/err deleted file mode 120000 index c877367..0000000 --- a/sl/.ianketiona/err +++ /dev/null @@ -1 +0,0 @@ -/a/bin/errhandle/err \ No newline at end of file diff --git a/sl/.ianketiona/info b/sl/.ianketiona/info deleted file mode 120000 index df7daa8..0000000 --- a/sl/.ianketiona/info +++ /dev/null @@ -1 +0,0 @@ -/a/opt/emacs-trisqueletiona-nox/info \ No newline at end of file diff --git a/sl/.ianketiona/lib-src b/sl/.ianketiona/lib-src deleted file mode 120000 index ac271ba..0000000 --- a/sl/.ianketiona/lib-src +++ /dev/null @@ -1 +0,0 @@ -/a/opt/emacs-trisqueletiona-nox/lib-src \ No newline at end of file diff --git a/sl/.ianketiona/lisp b/sl/.ianketiona/lisp deleted file mode 120000 index 5cab39d..0000000 --- a/sl/.ianketiona/lisp +++ /dev/null @@ -1 +0,0 @@ -/a/opt/emacs-trisqueletiona-nox/lisp \ No newline at end of file diff --git a/sl/.ianketiona/ll-function b/sl/.ianketiona/ll-function deleted file mode 120000 index 2633506..0000000 --- a/sl/.ianketiona/ll-function +++ /dev/null @@ -1 +0,0 @@ -/a/bin/small-misc-bash/ll-function \ No newline at end of file diff --git a/sl/.ianketiona/package-manager-abstractions b/sl/.ianketiona/package-manager-abstractions deleted file mode 120000 index 5e2f60f..0000000 --- a/sl/.ianketiona/package-manager-abstractions +++ /dev/null @@ -1 +0,0 @@ -/a/bin/distro-functions/src/package-manager-abstractions \ No newline at end of file diff --git a/sl/.ianketiona/path-add-function b/sl/.ianketiona/path-add-function deleted file mode 120000 index e5050c8..0000000 --- a/sl/.ianketiona/path-add-function +++ /dev/null @@ -1 +0,0 @@ -../../path-add-function \ No newline at end of file diff --git a/sl/.iankflidas/.bashrc b/sl/.iankflidas/.bashrc deleted file mode 120000 index 4cd008b..0000000 --- a/sl/.iankflidas/.bashrc +++ /dev/null @@ -1 +0,0 @@ -../../.bashrc \ No newline at end of file diff --git a/sl/.iankflidas/.emacs.d b/sl/.iankflidas/.emacs.d deleted file mode 120000 index 2288841..0000000 --- a/sl/.iankflidas/.emacs.d +++ /dev/null @@ -1 +0,0 @@ -/home/iank/.emacs.d \ No newline at end of file diff --git a/sl/.iankflidas/.inputrc b/sl/.iankflidas/.inputrc deleted file mode 120000 index 22cd52b..0000000 --- a/sl/.iankflidas/.inputrc +++ /dev/null @@ -1 +0,0 @@ -../../.inputrc \ No newline at end of file diff --git a/sl/.iankflidas/brc b/sl/.iankflidas/brc deleted file mode 120000 index 7a3ce73..0000000 --- a/sl/.iankflidas/brc +++ /dev/null @@ -1 +0,0 @@ -../../brc \ No newline at end of file diff --git a/sl/.iankflidas/err b/sl/.iankflidas/err deleted file mode 120000 index c877367..0000000 --- a/sl/.iankflidas/err +++ /dev/null @@ -1 +0,0 @@ -/a/bin/errhandle/err \ No newline at end of file diff --git a/sl/.iankflidas/info b/sl/.iankflidas/info deleted file mode 120000 index 0525e96..0000000 --- a/sl/.iankflidas/info +++ /dev/null @@ -1 +0,0 @@ -/a/opt/emacs-trisquelflidas-nox/info \ No newline at end of file diff --git a/sl/.iankflidas/lib-src b/sl/.iankflidas/lib-src deleted file mode 120000 index fb57d92..0000000 --- a/sl/.iankflidas/lib-src +++ /dev/null @@ -1 +0,0 @@ -/a/opt/emacs-trisquelflidas-nox/lib-src \ No newline at end of file diff --git a/sl/.iankflidas/lisp b/sl/.iankflidas/lisp deleted file mode 120000 index 445e5d8..0000000 --- a/sl/.iankflidas/lisp +++ /dev/null @@ -1 +0,0 @@ -/a/opt/emacs-trisquelflidas-nox/lisp \ No newline at end of file diff --git a/sl/.iankflidas/ll-function b/sl/.iankflidas/ll-function deleted file mode 120000 index 2633506..0000000 --- a/sl/.iankflidas/ll-function +++ /dev/null @@ -1 +0,0 @@ -/a/bin/small-misc-bash/ll-function \ No newline at end of file diff --git a/sl/.iankflidas/package-manager-abstractions b/sl/.iankflidas/package-manager-abstractions deleted file mode 120000 index 5e2f60f..0000000 --- a/sl/.iankflidas/package-manager-abstractions +++ /dev/null @@ -1 +0,0 @@ -/a/bin/distro-functions/src/package-manager-abstractions \ No newline at end of file diff --git a/sl/.iankflidas/path-add-function b/sl/.iankflidas/path-add-function deleted file mode 120000 index e5050c8..0000000 --- a/sl/.iankflidas/path-add-function +++ /dev/null @@ -1 +0,0 @@ -../../path-add-function \ No newline at end of file diff --git a/sl/rsync-excludes b/sl/rsync-excludes deleted file mode 100644 index ab05ba7..0000000 --- a/sl/rsync-excludes +++ /dev/null @@ -1,17 +0,0 @@ -/.iank*/.emacs.d/.ido.last -/.iank*/.emacs.d/.savehist -/.iank*/.emacs.d/.smex-items -/.iank*/.emacs.d/ac-comphist.dat -/.iank*/.emacs.d/auto-save-list -/.iank*/.emacs.d/org-clock-save.el -/.iank*/.emacs.d/recentf* -/.iank*/.emacs.d/session.* -/.iank*/.emacs.d/tramp -/.iank*/.emacs.d/auto-save-list -/.iank*/.emacs.d/%backup%~ -/.iank*/.emacs.d/network-security.data -/.iank*/.emacs.d/elpa/gnupg/S.gpg-agent -/.iank*/.emacs.d/url -/.iank*/.emacs.d/.org-id-locations -/.iank*/.emacs.d/eshell -/.iank*/.emacs.d/bbdb diff --git a/sl/rsync-filter b/sl/rsync-filter new file mode 100644 index 0000000..db1cb51 --- /dev/null +++ b/sl/rsync-filter @@ -0,0 +1,26 @@ +- /.iank/e/e/.emacs.d/.ido.last +- /.iank/e/e/.emacs.d/.savehist +- /.iank/e/e/.emacs.d/.smex-items +- /.iank/e/e/.emacs.d/ac-comphist.dat +- /.iank/e/e/.emacs.d/auto-save-list +- /.iank/e/e/.emacs.d/org-clock-save.el +- /.iank/e/e/.emacs.d/recentf* +- /.iank/e/e/.emacs.d/session.* +- /.iank/e/e/.emacs.d/tramp +- /.iank/e/e/.emacs.d/auto-save-list +- /.iank/e/e/.emacs.d/%backup%~ +- /.iank/e/e/.emacs.d/network-security.data +- /.iank/e/e/.emacs.d/elpa/gnupg/S.gpg-agent +- /.iank/e/e/.emacs.d/url +- /.iank/e/e/.emacs.d/.org-id-locations +- /.iank/e/e/.emacs.d/eshell +- /.iank/e/e/.emacs.d/bbdb ++ /.iank/e/e/lisp/*** ++ /.iank/e/e/lib-src/*** ++ /.iank/e/e/info/*** ++ /.iank/e/e/etc/*** ++ /.iank/e/e/.emacs.d/*** ++ /.iank/e/e/src ++ /.iank/e/e/src/emacs ++ /.iank/e/e/src/emacs.pdmp +- /.iank/e/e/** diff --git a/subdir_files/.local/share/kxmlgui5/konsole/README.ian b/subdir_files/.local/share/kxmlgui5/konsole/README.ian index c206592..2d156cd 100644 --- a/subdir_files/.local/share/kxmlgui5/konsole/README.ian +++ b/subdir_files/.local/share/kxmlgui5/konsole/README.ian @@ -1,3 +1,5 @@ sessionui.rc is the result of starting konsole with no profile, and setting the following keybinds: open file manager with ctrl-shift-2. -no shortcut for next tab and previous tab and view next container. +no shortcut for next tab and previous tab and view next container + +Later in konsole i removed the keybind for ctrl-alt-s, but its as if it saved somewhere other than the file itself. diff --git a/subdir_files/.local/share/kxmlgui5/konsole/sessionui.rc b/subdir_files/.local/share/kxmlgui5/konsole/sessionui.rc index 079fdef..1a8d337 100644 --- a/subdir_files/.local/share/kxmlgui5/konsole/sessionui.rc +++ b/subdir_files/.local/share/kxmlgui5/konsole/sessionui.rc @@ -1,5 +1,5 @@ - + @@ -56,9 +56,11 @@ - - - - + + + + + + -- 2.30.2