exec won't hurt

diff --git a/anchors/ca/lets-encrypt/e1.pem b/anchors/ca/lets-encrypt/e1.pem
deleted file mode 100644 (file)
index 2a19d41..0000000
--- a/anchors/ca/lets-encrypt/e1.pem
+++ /dev/null
@@ -1,17 +0,0 @@
------BEGIN CERTIFICATE-----
-MIICxjCCAk2gAwIBAgIRALO93/inhFu86QOgQTWzSkUwCgYIKoZIzj0EAwMwTzEL
-MAkGA1UEBhMCVVMxKTAnBgNVBAoTIEludGVybmV0IFNlY3VyaXR5IFJlc2VhcmNo
-IEdyb3VwMRUwEwYDVQQDEwxJU1JHIFJvb3QgWDIwHhcNMjAwOTA0MDAwMDAwWhcN
-MjUwOTE1MTYwMDAwWjAyMQswCQYDVQQGEwJVUzEWMBQGA1UEChMNTGV0J3MgRW5j
-cnlwdDELMAkGA1UEAxMCRTEwdjAQBgcqhkjOPQIBBgUrgQQAIgNiAAQkXC2iKv0c
-S6Zdl3MnMayyoGli72XoprDwrEuf/xwLcA/TmC9N/A8AmzfwdAVXMpcuBe8qQyWj
-+240JxP2T35p0wKZXuskR5LBJJvmsSGPwSSB/GjMH2m6WPUZIvd0xhajggEIMIIB
-BDAOBgNVHQ8BAf8EBAMCAYYwHQYDVR0lBBYwFAYIKwYBBQUHAwIGCCsGAQUFBwMB
-MBIGA1UdEwEB/wQIMAYBAf8CAQAwHQYDVR0OBBYEFFrz7Sv8NsI3eblSMOpUb89V
-yy6sMB8GA1UdIwQYMBaAFHxClq7eS0g7+pL4nozPbYupcjeVMDIGCCsGAQUFBwEB
-BCYwJDAiBggrBgEFBQcwAoYWaHR0cDovL3gyLmkubGVuY3Iub3JnLzAnBgNVHR8E
-IDAeMBygGqAYhhZodHRwOi8veDIuYy5sZW5jci5vcmcvMCIGA1UdIAQbMBkwCAYG
-Z4EMAQIBMA0GCysGAQQBgt8TAQEBMAoGCCqGSM49BAMDA2cAMGQCMHt01VITjWH+
-Dbo/AwCd89eYhNlXLr3pD5xcSAQh8suzYHKOl9YST8pE9kLJ03uGqQIwWrGxtO3q
-YJkgsTgDyj2gJrjubi1K9sZmHzOa25JK1fUpE8ZwYii6I4zPPS/Lgul/
------END CERTIFICATE-----

diff --git a/anchors/ca/lets-encrypt/e2.pem b/anchors/ca/lets-encrypt/e2.pem
deleted file mode 100644 (file)
index 0fd9f40..0000000
--- a/anchors/ca/lets-encrypt/e2.pem
+++ /dev/null
@@ -1,17 +0,0 @@
------BEGIN CERTIFICATE-----
-MIICxjCCAkygAwIBAgIQTtI99q9+x/mwxHJv+VEqdzAKBggqhkjOPQQDAzBPMQsw
-CQYDVQQGEwJVUzEpMCcGA1UEChMgSW50ZXJuZXQgU2VjdXJpdHkgUmVzZWFyY2gg
-R3JvdXAxFTATBgNVBAMTDElTUkcgUm9vdCBYMjAeFw0yMDA5MDQwMDAwMDBaFw0y
-NTA5MTUxNjAwMDBaMDIxCzAJBgNVBAYTAlVTMRYwFAYDVQQKEw1MZXQncyBFbmNy
-eXB0MQswCQYDVQQDEwJFMjB2MBAGByqGSM49AgEGBSuBBAAiA2IABCOaLO3lixmN
-YVWex+ZVYOiTLgi0SgNWtU4hufk50VU4Zp/LbBVDxCsnsI7vuf4xp4Cu+ETNggGE
-yBqJ3j8iUwe5Yt/qfSrRf1/D5R58duaJ+IvLRXeASRqEL+VkDXrW3qOCAQgwggEE
-MA4GA1UdDwEB/wQEAwIBhjAdBgNVHSUEFjAUBggrBgEFBQcDAgYIKwYBBQUHAwEw
-EgYDVR0TAQH/BAgwBgEB/wIBADAdBgNVHQ4EFgQUbZkq9U0C6+MRwWC6km+NPS7x
-6kQwHwYDVR0jBBgwFoAUfEKWrt5LSDv6kviejM9ti6lyN5UwMgYIKwYBBQUHAQEE
-JjAkMCIGCCsGAQUFBzAChhZodHRwOi8veDIuaS5sZW5jci5vcmcvMCcGA1UdHwQg
-MB4wHKAaoBiGFmh0dHA6Ly94Mi5jLmxlbmNyLm9yZy8wIgYDVR0gBBswGTAIBgZn
-gQwBAgEwDQYLKwYBBAGC3xMBAQEwCgYIKoZIzj0EAwMDaAAwZQIxAPJCN9qpyDmZ
-tX8K3m8UYQvK51BrXclM6WfrdeZlUBKyhTXUmFAtJw4X6A0x9mQFPAIwJa/No+KQ
-UAM1u34E36neL/Zba7ombkIOchSgx1iVxzqtFWGddgoG+tppRPWhuhhn
------END CERTIFICATE-----

diff --git a/anchors/ca/lets-encrypt/r3.pem b/anchors/ca/lets-encrypt/r3.pem
deleted file mode 100644 (file)
index 43b222a..0000000
--- a/anchors/ca/lets-encrypt/r3.pem
+++ /dev/null
@@ -1,30 +0,0 @@
------BEGIN CERTIFICATE-----
-MIIFFjCCAv6gAwIBAgIRAJErCErPDBinU/bWLiWnX1owDQYJKoZIhvcNAQELBQAw
-TzELMAkGA1UEBhMCVVMxKTAnBgNVBAoTIEludGVybmV0IFNlY3VyaXR5IFJlc2Vh
-cmNoIEdyb3VwMRUwEwYDVQQDEwxJU1JHIFJvb3QgWDEwHhcNMjAwOTA0MDAwMDAw
-WhcNMjUwOTE1MTYwMDAwWjAyMQswCQYDVQQGEwJVUzEWMBQGA1UEChMNTGV0J3Mg
-RW5jcnlwdDELMAkGA1UEAxMCUjMwggEiMA0GCSqGSIb3DQEBAQUAA4IBDwAwggEK
-AoIBAQC7AhUozPaglNMPEuyNVZLD+ILxmaZ6QoinXSaqtSu5xUyxr45r+XXIo9cP
-R5QUVTVXjJ6oojkZ9YI8QqlObvU7wy7bjcCwXPNZOOftz2nwWgsbvsCUJCWH+jdx
-sxPnHKzhm+/b5DtFUkWWqcFTzjTIUu61ru2P3mBw4qVUq7ZtDpelQDRrK9O8Zutm
-NHz6a4uPVymZ+DAXXbpyb/uBxa3Shlg9F8fnCbvxK/eG3MHacV3URuPMrSXBiLxg
-Z3Vms/EY96Jc5lP/Ooi2R6X/ExjqmAl3P51T+c8B5fWmcBcUr2Ok/5mzk53cU6cG
-/kiFHaFpriV1uxPMUgP17VGhi9sVAgMBAAGjggEIMIIBBDAOBgNVHQ8BAf8EBAMC
-AYYwHQYDVR0lBBYwFAYIKwYBBQUHAwIGCCsGAQUFBwMBMBIGA1UdEwEB/wQIMAYB
-Af8CAQAwHQYDVR0OBBYEFBQusxe3WFbLrlAJQOYfr52LFMLGMB8GA1UdIwQYMBaA
-FHm0WeZ7tuXkAXOACIjIGlj26ZtuMDIGCCsGAQUFBwEBBCYwJDAiBggrBgEFBQcw
-AoYWaHR0cDovL3gxLmkubGVuY3Iub3JnLzAnBgNVHR8EIDAeMBygGqAYhhZodHRw
-Oi8veDEuYy5sZW5jci5vcmcvMCIGA1UdIAQbMBkwCAYGZ4EMAQIBMA0GCysGAQQB
-gt8TAQEBMA0GCSqGSIb3DQEBCwUAA4ICAQCFyk5HPqP3hUSFvNVneLKYY611TR6W
-PTNlclQtgaDqw+34IL9fzLdwALduO/ZelN7kIJ+m74uyA+eitRY8kc607TkC53wl
-ikfmZW4/RvTZ8M6UK+5UzhK8jCdLuMGYL6KvzXGRSgi3yLgjewQtCPkIVz6D2QQz
-CkcheAmCJ8MqyJu5zlzyZMjAvnnAT45tRAxekrsu94sQ4egdRCnbWSDtY7kh+BIm
-lJNXoB1lBMEKIq4QDUOXoRgffuDghje1WrG9ML+Hbisq/yFOGwXD9RiX8F6sw6W4
-avAuvDszue5L3sz85K+EC4Y/wFVDNvZo4TYXao6Z0f+lQKc0t8DQYzk1OXVu8rp2
-yJMC6alLbBfODALZvYH7n7do1AZls4I9d1P4jnkDrQoxB3UqQ9hVl3LEKQ73xF1O
-yK5GhDDX8oVfGKF5u+decIsH4YaTw7mP3GFxJSqv3+0lUFJoi5Lc5da149p90Ids
-hCExroL1+7mryIkXPeFM5TgO9r0rvZaBFOvV2z0gp35Z0+L4WPlbuEjN/lxPFin+
-HlUjr8gRsI3qfJOQFy/9rKIJR0Y/8Omwt/8oTWgy1mdeHmmjk7j1nYsvC9JSQ6Zv
-MldlTTKB3zhThV1+XWYp6rjd5JW1zbVWEkLNxE7GJThEUG3szgBVGP7pSWTUTsqX
-nLRbwHOoq7hHwg==
------END CERTIFICATE-----

diff --git a/anchors/ca/lets-encrypt/r4.pem b/anchors/ca/lets-encrypt/r4.pem
deleted file mode 100644 (file)
index 578b3bd..0000000
--- a/anchors/ca/lets-encrypt/r4.pem
+++ /dev/null
@@ -1,30 +0,0 @@
------BEGIN CERTIFICATE-----
-MIIFFjCCAv6gAwIBAgIRAIp5IlCr5SxSbO7Pf8lC3WIwDQYJKoZIhvcNAQELBQAw
-TzELMAkGA1UEBhMCVVMxKTAnBgNVBAoTIEludGVybmV0IFNlY3VyaXR5IFJlc2Vh
-cmNoIEdyb3VwMRUwEwYDVQQDEwxJU1JHIFJvb3QgWDEwHhcNMjAwOTA0MDAwMDAw
-WhcNMjUwOTE1MTYwMDAwWjAyMQswCQYDVQQGEwJVUzEWMBQGA1UEChMNTGV0J3Mg
-RW5jcnlwdDELMAkGA1UEAxMCUjQwggEiMA0GCSqGSIb3DQEBAQUAA4IBDwAwggEK
-AoIBAQCzKNx3KdPnkb7ztwoAx/vyVQslImNTNq/pCCDfDa8oPs3Gq1e2naQlGaXS
-Mm1Jpgi5xy+hm5PFIEBrhDEgoo4wYCVg79kaiT8faXGy2uo/c0HEkG9m/X2eWNh3
-z81ZdUTJoQp7nz8bDjpmb7Z1z4vLr53AcMX/0oIKr13N4uichZSk5gA16H5OOYHH
-IYlgd+odlvKLg3tHxG0ywFJ+Ix5FtXHuo+8XwgOpk4nd9Z/buvHa4H6Xh3GBHhqC
-VuQ+fBiiCOUWX6j6qOBIUU0YFKAMo+W2yrO1VRJrcsdafzuM+efZ0Y4STTMzAyrx
-E+FCPMIuWWAubeAHRzNl39Jnyk2FAgMBAAGjggEIMIIBBDAOBgNVHQ8BAf8EBAMC
-AYYwHQYDVR0lBBYwFAYIKwYBBQUHAwIGCCsGAQUFBwMBMBIGA1UdEwEB/wQIMAYB
-Af8CAQAwHQYDVR0OBBYEFDadPuCxQPYnLHy/jZ0xivZUpkYmMB8GA1UdIwQYMBaA
-FHm0WeZ7tuXkAXOACIjIGlj26ZtuMDIGCCsGAQUFBwEBBCYwJDAiBggrBgEFBQcw
-AoYWaHR0cDovL3gxLmkubGVuY3Iub3JnLzAnBgNVHR8EIDAeMBygGqAYhhZodHRw
-Oi8veDEuYy5sZW5jci5vcmcvMCIGA1UdIAQbMBkwCAYGZ4EMAQIBMA0GCysGAQQB
-gt8TAQEBMA0GCSqGSIb3DQEBCwUAA4ICAQCJbu5CalWO+H+Az0lmIG14DXmlYHQE
-k26umjuCyioWs2icOlZznPTcZvbfq02YPHGTCu3ctggVDULJ+fwOxKekzIqeyLNk
-p8dyFwSAr23DYBIVeXDpxHhShvv0MLJzqqDFBTHYe1X5X2Y7oogy+UDJxV2N24/g
-Z8lxG4Vr2/VEfUOrw4Tosl5Z+1uzOdvTyBcxD/E5rGgTLczmulctHy3IMTmdTFr0
-FnU0/HMQoquWQuODhFqzMqNcsdbjANUBwOEQrKI8Sy6+b84kHP7PtO+S4Ik8R2k7
-ZeMlE1JmxBi/PZU860YlwT8/qOYToCHVyDjhv8qutbf2QnUl3SV86th2I1QQE14s
-0y7CdAHcHkw3sAEeYGkwCA74MO+VFtnYbf9B2JBOhyyWb5087rGzitu5MTAW41X9
-DwTeXEg+a24tAeht+Y1MionHUwa4j7FB/trN3Fnb/r90+4P66ZETVIEcjseUSMHO
-w6yqv10/H/dw/8r2EDUincBBX3o9DL3SadqragkKy96HtMiLcqMMGAPm0gti1b6f
-bnvOdr0mrIVIKX5nzOeGZORaYLoSD4C8qvFT7U+Um6DMo36cVDNsPmkF575/s3C2
-CxGiCPQqVxPgfNSh+2CPd2Xv04lNeuw6gG89DlOhHuoFKRlmPnom+gwqhz3ZXMfz
-TfmvjrBokzCICA==
------END CERTIFICATE-----

diff --git a/anchors/ca/ru/ТЦИ.pem b/anchors/ca/ru/ТЦИ.pem
index 57c450346c187156b6e797dadb6d549927abe448..f5fd207227eef5167db53b2dc7a963b7884bca97 100644 (file)
--- a/anchors/ca/ru/ТЦИ.pem
+++ b/anchors/ca/ru/ТЦИ.pem
@@ -10,3 +10,15 @@ qGSM49BAMCA0gAMEUCIDKjKPoaZrqtljmuy60G1PYINvR3A1eL
 OzT4RfhGBTrBAiEAhJL7IeLDbo2eZAIp4zioaIpo1hVyXkABNb
 npOTQ9KPs=
 -----END CERTIFICATE-----
 OzT4RfhGBTrBAiEAhJL7IeLDbo2eZAIp4zioaIpo1hVyXkABNb
 npOTQ9KPs=
 -----END CERTIFICATE-----

+-----BEGIN CERTIFICATE-----
+MIIBXTCCAQigAwIBAgIMAt6twN4AjBl4PHrWMAwGCCqFAwcBAQ
+MCBQAwGzEZMBcGA1UEAwwQVENJIEdPU1QgUk9PVCBBMTAeFw0y
+MjAzMzAwOTMzMThaFw0zMjAzMzAwOTMzMThaMBsxGTAXBgNVBA
+MMEFRDSSBHT1NUIFJPT1QgQTEwZjAfBggqhQMHAQEBATATBgcq
+hQMCAiMBBggqhQMHAQECAgNDAARASiE+O1G5yX8JjIS0RmQ2Im
+2FKd0RhbOtdjaoAivB3ywbHLGb6deQBRd/MwLP2IrfIZcVb4QP
+5PSYolD/Iu+ExaMjMCEwDgYDVR0PAQH/BAQDAgGGMA8GA1UdEw
+EB/wQFMAMBAf8wDAYIKoUDBwEBAwIFAANBAOi6Dn7pxa/SSbV6
+PsfROEKzsBnX6GGggo9wOELuZKfDYdy88/92yr2Aali+fEje63
+XqhHoZExE0CNLoncM3ARc=
+-----END CERTIFICATE-----

diff --git a/bin/bin/gen-asn b/bin/bin/gen-asn
new file mode 100755 (executable)
index 0000000..5f25e46
--- /dev/null
+++ b/bin/bin/gen-asn
@@ -0,0 +1,6 @@
+#!/usr/bin/env perl
+
+my $start = 4200000000;
+my $end = 4294967294;
+print $start + int(rand($end - $start));
+print "\n";

diff --git a/bin/bin/my-cleanup b/bin/bin/my-cleanup
index 925e9c49619e8afe8f46a8c2b1a7783bd1eed722..b27d884290480782e92011106618a195c5021b35 100755 (executable)
--- a/bin/bin/my-cleanup
+++ b/bin/bin/my-cleanup
@@ -5,6 +5,7 @@ rm -fr \
     ~/.cache ~/.config ~/.local* ~/.thumbnails \
     ~/.w3m \
     ~/.java \
     ~/.cache ~/.config ~/.local* ~/.thumbnails \
     ~/.w3m \
     ~/.java \

+    ~/.gnome \

     ~/.pylint.d \
     ~/.viminfo \
     ~/.Trash \
     ~/.pylint.d \
     ~/.viminfo \
     ~/.Trash \

diff --git a/bin/bin/my-ps2pdf b/bin/bin/my-ps2pdf
index 5510c186e3354894c75f94ca3e1df2464cead614..01e37bd7e9f393d01786161003d61715ae7df66f 100755 (executable)
--- a/bin/bin/my-ps2pdf
+++ b/bin/bin/my-ps2pdf
@@ -15,7 +15,7 @@ opts=(
     -dPDFSETTINGS=/default
     -dPDFA=1
     -dCompatibilityLevel=1.4
     -dPDFSETTINGS=/default
     -dPDFA=1
     -dCompatibilityLevel=1.4

-    -dPDFACompatibilityPolicy=3 # that will skip some errors about XMP
+    -sPDFACompatibilityPolicy=3 # that will skip some errors about XMP

     -dAutoRotatePages=/None
     -dOptimize=true
     -sColorConversionStrategy=RGB # advised for PDF/A
     -dAutoRotatePages=/None
     -dOptimize=true
     -sColorConversionStrategy=RGB # advised for PDF/A


@@ -38,8 +38,9 @@ exiftool $1.pdf | while read l ; do
 done
 for i ({1..${#toremove}}) toremove[$i]=-${toremove[$i]}=
 exiftool -zip -overwrite_original -quiet \
 done
 for i ({1..${#toremove}}) toremove[$i]=-${toremove[$i]}=
 exiftool -zip -overwrite_original -quiet \

-    -tagsFromFile $1 -Producer\>Creator \
-    ${=toremove} $1.pdf
+    -tagsFromFile $1 -Creator\<Producer $1.pdf
+exiftool -zip -overwrite_original -quiet \
+    -tagsFromFile $1 -Producer\>Creator ${=toremove} $1.pdf

 [[ -z $LINEARIZE ]] || LINEARIZE=--linearize
 qpdf $LINEARIZE --compress-streams=y $1.pdf $1.pdf.pdf
 mv $1.pdf.pdf $1.pdf
 [[ -z $LINEARIZE ]] || LINEARIZE=--linearize
 qpdf $LINEARIZE --compress-streams=y $1.pdf $1.pdf.pdf
 mv $1.pdf.pdf $1.pdf

diff --git a/bin/bin/transcribe b/bin/bin/transcribe
new file mode 100755 (executable)
index 0000000..fd3c43a
--- /dev/null
+++ b/bin/bin/transcribe
@@ -0,0 +1,15 @@
+#!/usr/bin/env zsh
+
+setopt ERR_EXIT
+root=$0:h
+lang=$1
+file=$2
+shift
+shift
+exec whisper.cpp \
+    --no-prints \
+    --print-colors \
+    --model $HOME/work/bass/build/distfiles/ggml-large-v2.bin \
+    --threads ${JOBS:-8} \
+    --language $lang \
+    --file $file $@

diff --git a/bin/bin/www b/bin/bin/www
new file mode 100755 (executable)
index 0000000..86d9102
--- /dev/null
+++ b/bin/bin/www
@@ -0,0 +1,20 @@
+#!/bin/sh
+
+[ -e /tmp/stargrave-flags/WG ] && [ -n "$1" ] && exec xom "$1" &
+
+term() {
+    DISPLAY=:0 CMD="tmux attach-session -t www" CMDTITLE="Terminal9" $HOME/bin/dwm-term &
+}
+
+if tmux has-session -t www 2> /dev/null ; then
+    attached=`tmux list-sessions -F "#{session_attached}" -f "#{==:#{session_name},www}"`
+    [ "$attached" != "0" ] || {
+        term &
+        sleep 0.5
+    }
+    tmux new-window -t www "lynx $@"
+else
+    tmux new-session -d -s www "sleep 0.5 ; lynx $@"
+    tmux set-option -t www default-command lynx
+    term &
+fi

diff --git a/bin/bin/zsnap b/bin/bin/zsnap
index 7bab829040cc9ebee6e6cea2a32ac62d5ec2171b..207f8202a53898aa9d72b02729c2ba41dc4abf70 100755 (executable)
--- a/bin/bin/zsnap
+++ b/bin/bin/zsnap
@@ -21,7 +21,7 @@ mk_fifo() {
     }
 }
 
     }
 }
 

-enccmd=(~stargrave/bin/age -R /home/stargrave/.age/general.pub)
+enccmd=(~stargrave/env/local/bin/age -R /home/stargrave/.age/general.pub)

 
 [[ $# -ge 2 ]] || usage
 
 
 [[ $# -ge 2 ]] || usage
 

diff --git a/git/.gitconfig b/git/.gitconfig
index bd6ae59d020f01b03701a0fc4c2ae9c87f1da6c0..fdfcc019eca4dfc6dfdc9f25b01d6e7f857a6df9 100644 (file)
--- a/git/.gitconfig
+++ b/git/.gitconfig
@@ -3,6 +3,7 @@
 [advice]
        pushUpdateRejected = false
        detachedHead = false
 [advice]
        pushUpdateRejected = false
        detachedHead = false

+       addIgnoredFile = false

 [alias]
        wt = worktree
        unchanged = update-index --assume-unchanged
 [alias]
        wt = worktree
        unchanged = update-index --assume-unchanged


@@ -48,8 +49,6 @@
        autocorrect = never
 [init]
        defaultBranch = master
        autocorrect = never
 [init]
        defaultBranch = master

-[format]
-       useAutoBase = true

 [safe]
        directory = *
 [includeIf "gitdir:~/work/stc/"]
 [safe]
        directory = *
 [includeIf "gitdir:~/work/stc/"]

diff --git a/gnupg/.gnupg/gpg-agent.conf b/gnupg/.gnupg/gpg-agent.conf
index 22164027286363002786a8c21f88dfb4b57bd689..e5a309f7dc87802bc998522aa4ab2749e2e01fe6 100644 (file)
--- a/gnupg/.gnupg/gpg-agent.conf
+++ b/gnupg/.gnupg/gpg-agent.conf
@@ -1,2 +1,2 @@
-pinentry-program /home/stargrave/local/bin/pinentry-curses
+pinentry-program /home/stargrave/env/local/bin/pinentry-curses

 default-cache-ttl 14400
 default-cache-ttl 14400

diff --git a/img/bin/my-exifrm b/img/bin/my-exifrm
index 32005d870e5beac89d4b1fe9f9a034766c893bc5..8e79185f4cbfd072846a9e05f25459ed53279921 100755 (executable)
--- a/img/bin/my-exifrm
+++ b/img/bin/my-exifrm
@@ -1,3 +1,3 @@
 #!/bin/sh
 
 #!/bin/sh
 

-exiftool -all= -TagsFromFile @ -ColorSpaceTags -overwrite_original "$1"
+exec exiftool -all= -TagsFromFile @ -ColorSpaceTags -overwrite_original "$1"

diff --git a/img/bin/my-transcode-jpg b/img/bin/my-transcode-jpg
index bf4863daf8e5b48763bbda22e2fd3ad44a1ad4aa..2f299a95c5e2b6cb05debf1214dfd4263c37f1ea 100755 (executable)
--- a/img/bin/my-transcode-jpg
+++ b/img/bin/my-transcode-jpg
@@ -2,7 +2,9 @@
 
 tmp=`mktemp`
 trap "rm -f $tmp $tmp.jpg" HUP PIPE INT QUIT TERM EXIT
 
 tmp=`mktemp`
 trap "rm -f $tmp $tmp.jpg" HUP PIPE INT QUIT TERM EXIT

-jpegtran -optimize -progressive -perfect -copy all "$1" > $tmp.jpg
-cjxl $tmp.jpg "${1%.*}.jxl" --distance=0 --effort=9 --brotli_effort=11 --lossless_jpeg=1
-[ -s "${1%.*}.jxl" ]
-touch -r "$1" "${1%.*}.jxl"
+src="$1"
+shift
+jpegtran -optimize -progressive -perfect -copy all "$src" >$tmp.jpg
+cjxl $tmp.jpg "${src%.*}.jxl" $@ --distance=0 --effort=9 --brotli_effort=11 --lossless_jpeg=1
+[ -s "${src%.*}.jxl" ]
+touch -r "$src" "${src%.*}.jxl"

diff --git a/links/bin/xom b/links/bin/xom
index 57d4f5cd0cf046726ed4a50b0cdfc94ebed7afd8..3c8168c842ec46aaea8dd7391ba8a13c51594de5 100755 (executable)
--- a/links/bin/xom
+++ b/links/bin/xom
@@ -10,9 +10,12 @@ if [ $# -gt 1 ] ; then
     pep) url="https://www.python.org/dev/peps/pep-0$@/" ;;
     py) url="https://pypi.org/project/$@/" ;;
     rfc) url="https://datatracker.ietf.org/doc/html/rfc$@" ;;
     pep) url="https://www.python.org/dev/peps/pep-0$@/" ;;
     py) url="https://pypi.org/project/$@/" ;;
     rfc) url="https://datatracker.ietf.org/doc/html/rfc$@" ;;

-    s) url="https://html.duckduckgo.com/html?q=$@" ;;
+    s) url="https://search.brave.com/search?q=$@" ;;

     we) url="https://en.wikipedia.org/wiki/$@" ;;
     wr) url="https://ru.wikipedia.org/wiki/$@" ;;
     esac
 fi
     we) url="https://en.wikipedia.org/wiki/$@" ;;
     wr) url="https://ru.wikipedia.org/wiki/$@" ;;
     esac
 fi

-exec links -g "$url"
+[ -e /tmp/stargrave-flags/HI ] || {
+    fonts="-menu-font-size 16 -html-user-font-size 20"
+}
+exec links -g $fonts "$url"

diff --git a/lynx/.lynx_jumps.html b/lynx/.lynx_jumps.html
index 95d897f1ae9eedc01879a126aad63eeaeabb905e..432b8613fa11e476de1bee6cb2ab90f1609a5f91 100644 (file)
--- a/lynx/.lynx_jumps.html
+++ b/lynx/.lynx_jumps.html
@@ -9,7 +9,7 @@
 <dt>pep<dd><a href="https://www.python.org/dev/peps/pep-0%s/">PEP</a></dd>
 <dt>py<dd><a href="https://pypi.org/project/%s/">PyPI</a></dd>
 <dt>rfc<dd><a href="https://datatracker.ietf.org/doc/html/rfc%s">RFC</a></dd>
 <dt>pep<dd><a href="https://www.python.org/dev/peps/pep-0%s/">PEP</a></dd>
 <dt>py<dd><a href="https://pypi.org/project/%s/">PyPI</a></dd>
 <dt>rfc<dd><a href="https://datatracker.ietf.org/doc/html/rfc%s">RFC</a></dd>

-<dt>s<dd><a href="https://html.duckduckgo.com/html?q=%s">DuckDuckGo</a></dd>
+<dt>s<dd><a href="https://search.brave.com/search?q=%s">Brave</a></dd>

 <dt>we<dd><a href="https://en.wikipedia.org/wiki/%s">WikiEN</a></dd>
 <dt>wr<dd><a href="https://ru.wikipedia.org/wiki/%s">WikiRU</a></dd>
 </dl>
 <dt>we<dd><a href="https://en.wikipedia.org/wiki/%s">WikiEN</a></dd>
 <dt>wr<dd><a href="https://ru.wikipedia.org/wiki/%s">WikiRU</a></dd>
 </dl>

diff --git a/lynx/.mailcap b/lynx/.mailcap
index 7e4cdc5b6a9cf394d4e2f92f2a7f4083480b934d..b4aeb9202cf5a2d1f74a7a6159a637596b155349 100644 (file)
--- a/lynx/.mailcap
+++ b/lynx/.mailcap
@@ -2,20 +2,20 @@ application/epub+zip; zat '%s'; test=test -n "$DISPLAY"
 application/pdf; zat '%s'; test=test -n "$DISPLAY"
 application/vnd.gnupg.wks; gpg-wks-client -v --read --send; needsterminal; description=WKS message
 application/x-perl; pod2text --color '%s' | less; needsterminal
 application/pdf; zat '%s'; test=test -n "$DISPLAY"
 application/vnd.gnupg.wks; gpg-wks-client -v --read --send; needsterminal; description=WKS message
 application/x-perl; pod2text --color '%s' | less; needsterminal

-image/gif; sxiv '%s'; test=test -n "$DISPLAY"
-image/jpeg; sxiv '%s'; test=test -n "$DISPLAY"
-image/jxl; sxiv '%s'; test=test -n "$DISPLAY"
-image/png; sxiv '%s'; test=test -n "$DISPLAY"
-image/tiff; sxiv '%s'; test=test -n "$DISPLAY"
-image/webp; sxiv '%s'; test=test -n "$DISPLAY"
+image/gif; nsxiv '%s'; test=test -n "$DISPLAY"
+image/jpeg; nsxiv '%s'; test=test -n "$DISPLAY"
+image/jxl; nsxiv '%s'; test=test -n "$DISPLAY"
+image/png; nsxiv '%s'; test=test -n "$DISPLAY"
+image/tiff; nsxiv '%s'; test=test -n "$DISPLAY"
+image/webp; nsxiv '%s'; test=test -n "$DISPLAY"

 image/x-djvu; zat '%s'; test=test -n "$DISPLAY"
 image/x-djvu; zat '%s'; test=test -n "$DISPLAY"

-image/x-portable-anymap; sxiv '%s'; test=test -n "$DISPLAY"
-image/x-portable-arbitrarymap; sxiv '%s'; test=test -n "$DISPLAY"
-image/x-portable-bitmap; sxiv '%s'; test=test -n "$DISPLAY"
-image/x-portable-floatmap; sxiv '%s'; test=test -n "$DISPLAY"
-image/x-portable-graymap; sxiv '%s'; test=test -n "$DISPLAY"
-image/x-portable-pixmap; sxiv '%s'; test=test -n "$DISPLAY"
-image/x-xpixmap; sxiv '%s'; test=test -n "$DISPLAY"
+image/x-portable-anymap; nsxiv '%s'; test=test -n "$DISPLAY"
+image/x-portable-arbitrarymap; nsxiv '%s'; test=test -n "$DISPLAY"
+image/x-portable-bitmap; nsxiv '%s'; test=test -n "$DISPLAY"
+image/x-portable-floatmap; nsxiv '%s'; test=test -n "$DISPLAY"
+image/x-portable-graymap; nsxiv '%s'; test=test -n "$DISPLAY"
+image/x-portable-pixmap; nsxiv '%s'; test=test -n "$DISPLAY"
+image/x-xpixmap; nsxiv '%s'; test=test -n "$DISPLAY"

 text/html; lynx -noreferer -partial -assume_charset=%{charset} -dump %s; copiousoutput; nametemplate=%s.html
 text/info; info '%s'; needsterminal
 text/plain; less '%s'; needsterminal
 text/html; lynx -noreferer -partial -assume_charset=%{charset} -dump %s; copiousoutput; nametemplate=%s.html
 text/info; info '%s'; needsterminal
 text/plain; less '%s'; needsterminal

diff --git a/mpv/.mpv/config b/mpv/.mpv/config
index b50b600100cd93c8c4fd2501c11dd8b7f464b70b..0b8c924dfd6392e1d1472b6328f8d17d176ceb25 100644 (file)
--- a/mpv/.mpv/config
+++ b/mpv/.mpv/config
@@ -4,6 +4,8 @@ cache-secs=60
 display-tags=*
 gapless-audio=yes
 autosync=30
 display-tags=*
 gapless-audio=yes
 autosync=30

+cache-on-disk=no
+gpu-shader-cache=no

 audio-channels=2
 hwdec=vaapi
 hwdec-codecs=h264,hevc,vp8,vp9,mpeg2video,vc1
 audio-channels=2
 hwdec=vaapi
 hwdec-codecs=h264,hevc,vp8,vp9,mpeg2video,vc1

diff --git a/recoll/.zsh/env/005recoll.zsh b/recoll/.zsh/env/005recoll.zsh
index 11c8af1226a2a80038e74e6e377d576598f37f91..d259cc92f3b5f5380259b7cb6bb8a6893c760359 100644 (file)
--- a/recoll/.zsh/env/005recoll.zsh
+++ b/recoll/.zsh/env/005recoll.zsh
@@ -1 +1 @@
-export RECOLL_DATADIR=~/local/stow/recoll/share/recoll
+export RECOLL_DATADIR=~/env/local/share/recoll

diff --git a/recoll/recoll/man/recoll.conf b/recoll/recoll/man/recoll.conf
index 25213e8e41d2c2473070ce6b0266b7550f49f559..5cacb7f31560d4bb1d5f903c9be630b240cceeee 100644 (file)
--- a/recoll/recoll/man/recoll.conf
+++ b/recoll/recoll/man/recoll.conf
@@ -1,7 +1,6 @@
 idxflushmb = 512
 followLinks = 1
 topdirs = \
 idxflushmb = 512
 followLinks = 1
 topdirs = \

-       /usr/local/lib/perl5/5.32/perl/man \

        /usr/local/lib/perl5/site_perl/man \
        /usr/share/openssl/man \
        /usr/local/share/man \
        /usr/local/lib/perl5/site_perl/man \
        /usr/share/openssl/man \
        /usr/local/share/man \


@@ -9,5 +8,6 @@ topdirs = \
        /usr/share/man \
        /usr/local/share/info \
        /usr/local/info \
        /usr/share/man \
        /usr/local/share/info \
        /usr/local/info \

-       ~/local/share/man \
-       ~/local/share/info
+       ~/env/local/share/man \
+       ~/env/local/lib/perl5/5.32/perl/man \
+       ~/env/local/share/info

diff --git a/update b/update
index 16814d3c8da29f718ce1e796ef54ecebe15983d4..87cae808dc30641fed443a508dcb0800e304b4de 100755 (executable)
--- a/update
+++ b/update
@@ -1,3 +1,3 @@
-#!/bin/sh
+#!/bin/sh -e

 
 

-stow -t $HOME -R $1
+exec stow -t $HOME -R $1

diff --git a/vim/.vim/ftplugin/mutt/autos.vim b/vim/.vim/ftplugin/mutt/autos.vim
index 7708164c8ab0434425de52adc5d1c2541c741f88..1290bbf651dd6a3864353fce904d2dc56f3d4c06 100644 (file)
--- a/vim/.vim/ftplugin/mutt/autos.vim
+++ b/vim/.vim/ftplugin/mutt/autos.vim
@@ -3,4 +3,5 @@ mutt#KillSignature()
 set textwidth=72
 set commentstring=>%s
 set syntax=mail
 set textwidth=72
 set commentstring=>%s
 set syntax=mail

+set nocursorcolumn

 silent :%substitute /^> */>/e | set nohlsearch
 silent :%substitute /^> */>/e | set nohlsearch

diff --git a/vim/.vim/pack/stargrave/start/zshfe/autoload/zshfe.vim b/vim/.vim/pack/stargrave/start/zshfe/autoload/zshfe.vim
deleted file mode 100644 (file)
index bb94dd6..0000000
--- a/vim/.vim/pack/stargrave/start/zshfe/autoload/zshfe.vim
+++ /dev/null
@@ -1,7 +0,0 @@
-vim9script
-
-export def Do(query: string, opencmd: string)
-    silent var result = systemlist(g:zshfe_path .. " " .. query)
-    if len(result) == 0 | return | endif
-    execute opencmd .. " " .. result[0][: -2]
-enddef

diff --git a/vim/.vim/pack/stargrave/start/zshfe/plugin/zshfe.vim b/vim/.vim/pack/stargrave/start/zshfe/plugin/zshfe.vim
deleted file mode 100644 (file)
index cb05d99..0000000
--- a/vim/.vim/pack/stargrave/start/zshfe/plugin/zshfe.vim
+++ /dev/null
@@ -1,18 +0,0 @@
-vim9script
-
-# zsh file completion caller
-# Maintainer: Sergey Matveev <stargrave@stargrave.org>
-# License: GNU General Public License version 3 of the License or later
-
-if exists("*zshfe#Do") | finish | endif
-if !exists("g:zshfe_path")
-    g:zshfe_path = expand("<sfile>:p:h") .. "/zshfe.zsh"
-endif
-
-command! -nargs=1 Fe call zshfe#Do(<f-args>, "edit")
-command! -nargs=1 Fsp call zshfe#Do(<f-args>, "split")
-command! -nargs=1 Fvs call zshfe#Do(<f-args>, "vsplit")
-
-nmap <Leader>e :Fe 
-nmap <Leader><space> :Fsp 
-nmap <Leader>v :Fvs 

diff --git a/vim/.vim/pack/stargrave/start/zshfe/plugin/zshfe.zsh b/vim/.vim/pack/stargrave/start/zshfe/plugin/zshfe.zsh
deleted file mode 100755 (executable)
index 9222054..0000000
--- a/vim/.vim/pack/stargrave/start/zshfe/plugin/zshfe.zsh
+++ /dev/null
@@ -1,8 +0,0 @@
-#!/usr/bin/env zsh
-
-setopt ERR_EXIT
-zmodload zsh/zpty
-zpty zshfe zsh
-zpty -w zshfe "print ZSHFE $*"$'\t EFHSZ\nexit\n'
-zpty -r zshfe zshfe "*exit"
-print -- $zshfe | sed -n "s/^ZSHFE \(.*\) EFHSZ/\1/p"

diff --git a/vim/.vim/plugin/netrw.vim b/vim/.vim/plugin/netrw.vim
index 9b71a8d6afe587a30327e32c3284efc4037950e8..6799cfcc4b0d42092f1ba323fdb00a1899e92f20 100644 (file)
--- a/vim/.vim/plugin/netrw.vim
+++ b/vim/.vim/plugin/netrw.vim
@@ -4,6 +4,8 @@ g:loaded_mein_netrw = 1
 
 g:netrw_banner = 0
 g:netrw_bufsettings = "noma nomod nowrap ro nobl"
 
 g:netrw_banner = 0
 g:netrw_bufsettings = "noma nomod nowrap ro nobl"

+g:netrw_liststyle = 1
+g:netrw_timefmt = "%F %T"

 
 def g:WinClose(islocal: number): string
     close
 
 def g:WinClose(islocal: number): string
     close

diff --git a/wish/.wishrc b/wish/.wishrc
new file mode 100644 (file)
index 0000000..6b3dc14
--- /dev/null
+++ b/wish/.wishrc
@@ -0,0 +1,6 @@
+if {[file exists /tmp/stargrave-flags/HI]} {
+    font create myDefaultFont -family Go -size 12
+    option add *font myDefaultFont
+    tk scaling [expr {163 / 72.0}]
+}
+tk_setPalette grey

diff --git a/x/.Xresources b/x/.Xresources
index 00f07a8971b1907faa71116131ac573d5c43e937..aec20aa2172b6c851ba1eba32789e84f123e95c4 100644 (file)
--- a/x/.Xresources
+++ b/x/.Xresources
@@ -1,4 +1,3 @@
-Xft.dpi: 96

 Xft.hinting: true
 Xft.antialias: true
 Xft.autohint: false
 Xft.hinting: true
 Xft.antialias: true
 Xft.autohint: false

diff --git a/x/.xinitrc b/x/.xinitrc
index 4717bbb7284a628ae6ac9a84aa82a317f5c8acd3..23d135479fecd9e120d08b21aea7992aaad798e6 100755 (executable)
--- a/x/.xinitrc
+++ b/x/.xinitrc
@@ -1,10 +1,13 @@
 #!/bin/zsh
 
 xsetroot -solid \#222222
 #!/bin/zsh
 
 xsetroot -solid \#222222

-xset b off

 setxkbmap -rules xorg -layout us,ru -option grp:caps_toggle,grp_led:caps
 xrdb ~/.Xresources
 xmodmap ~/.Xmodmap
 ~/work/godwmstat/godwmstat -xsetroot &
 rm -f ~/.ssh/agent ; ssh-agent -a $SSH_AUTH_SOCK
 setxkbmap -rules xorg -layout us,ru -option grp:caps_toggle,grp_led:caps
 xrdb ~/.Xresources
 xmodmap ~/.Xmodmap
 ~/work/godwmstat/godwmstat -xsetroot &
 rm -f ~/.ssh/agent ; ssh-agent -a $SSH_AUTH_SOCK

+if [[ -e /tmp/stargrave-flags/HI ]] ; then
+    xset m 4 1
+    ( sleep 60 ; xsetroot -xcf /usr/local/share/icons/redglass/cursors/left_ptr 32 ) &
+fi

 exec ~/src/suckless/dwm/dwm
 exec ~/src/suckless/dwm/dwm

diff --git a/x/bin/dwm-menu b/x/bin/dwm-menu
index 5f650a154e434d33dc49c645a750a995ba714609..98c04ff077c14fd089f4d30add090d3ed7f381a4 100755 (executable)
--- a/x/bin/dwm-menu
+++ b/x/bin/dwm-menu
@@ -4,7 +4,7 @@ DMENU=/home/stargrave/src/suckless/dmenu/dmenu
 STEST=/home/stargrave/src/suckless/dmenu/stest
 
 cache=/tmp/.dmenu_cache
 STEST=/home/stargrave/src/suckless/dmenu/stest
 
 cache=/tmp/.dmenu_cache

-export PATH=$HOME/bin:$HOME/local/bin:/usr/local/bin:/usr/bin:/bin:/usr/games:
+export PATH=$HOME/env/local/bin:$HOME/bin:$HOME/local/bin:/usr/local/bin:/usr/bin:/bin:/usr/games:

 (
        IFS=:
        if $STEST -dqr -n "$cache" $PATH; then
 (
        IFS=:
        if $STEST -dqr -n "$cache" $PATH; then

diff --git a/x/bin/dwm-term b/x/bin/dwm-term
index 3e9e63b954746cc03a1b7b75c10e7527207c37e1..46991bc6289f3ab8d3e866e46ae0f560daab2f2a 100755 (executable)
--- a/x/bin/dwm-term
+++ b/x/bin/dwm-term
@@ -2,5 +2,5 @@
 
 [ -n "$CMD" ] || CMD=tmux
 [ -z "$CMDTITLE" ] || CMDTITLE="-t $CMDTITLE"
 
 [ -n "$CMD" ] || CMD=tmux
 [ -z "$CMDTITLE" ] || CMDTITLE="-t $CMDTITLE"

-
-exec $HOME/bin/st $@ $CMDTITLE -e $CMD 2>/dev/null
+[ -e /tmp/stargrave-flags/HI ] && font_size=15 || font_size=13
+exec $HOME/bin/st -f "Go Mono:size=${font_size}:antialias=true" $@ $CMDTITLE -e $CMD 2>/dev/null

diff --git a/x/bin/dwm-term-session b/x/bin/dwm-term-session
index 2c70ac52d84f1c7cf2420eddad248852b61c3f63..e0fd53d7c6acab4bab21118526fb1660e0bea2eb 100755 (executable)
--- a/x/bin/dwm-term-session
+++ b/x/bin/dwm-term-session
@@ -1,3 +1,3 @@
-#!/bin/sh
+#!/bin/sh -e

 
 CMD="tmux attach-session -t $@" $HOME/bin/dwm-term &
 
 CMD="tmux attach-session -t $@" $HOME/bin/dwm-term &

diff --git a/x/bin/mylock b/x/bin/mylock
index e123f5bcceb65038b1156ad7ba4a10a3d56a858d..57b1e1e8772a6a97727c626951e87989cc797542 100755 (executable)
--- a/x/bin/mylock
+++ b/x/bin/mylock
@@ -1,6 +1,6 @@
 #!/bin/sh
 
 #!/bin/sh
 

-xset dpms force off
+[ -e /tmp/stargrave-flags/HI ] || xset dpms force off

 gpgconf --reload gpg-agent
 SSH_AUTH_SOCK=$HOME/.ssh/agent ssh-add -D
 slock
 gpgconf --reload gpg-agent
 SSH_AUTH_SOCK=$HOME/.ssh/agent ssh-add -D
 slock

diff --git a/x/bin/start-im b/x/bin/start-im
index 69727aea90bbfda58907a0ef01cb9ea5a6507e08..af2d919daa3ce065a129e5fd1c09427b1507f707 100755 (executable)
--- a/x/bin/start-im
+++ b/x/bin/start-im
@@ -1,3 +1,3 @@
-#!/bin/sh
+#!/bin/sh -e

 
 

-st -t Terminal8 -e sh -c "cd /home/stargrave/secure/mmc ; /home/stargrave/work/mmc/cmd/start" 2>/dev/null &
+st -t Terminal8 -e sh -c "cd /home/stargrave/secure/mmc ; envdir env /home/stargrave/work/mmc/cmd/start" 2>/dev/null &

diff --git a/x/bin/start-x b/x/bin/start-x
index ca17aa25ff3e6b4b55a93611c001b6a4004fc128..cf889aa80e7cdd9cc9aadae52f9cc6f404ec7f6a 100755 (executable)
--- a/x/bin/start-x
+++ b/x/bin/start-x
@@ -1,4 +1,4 @@
 #!/bin/sh
 
 rm .serverauth.* .Xauthority*
 #!/bin/sh
 
 rm .serverauth.* .Xauthority*

-exec startx
+exec startx $@

diff --git a/x/bin/start-x-hidpi b/x/bin/start-x-hidpi
new file mode 100755 (executable)
index 0000000..461753e
--- /dev/null
+++ b/x/bin/start-x-hidpi
@@ -0,0 +1,5 @@
+#!/bin/sh
+
+mkdir -p /tmp/stargrave-flags
+touch /tmp/stargrave-flags/HI
+exec start-x -- -dpi 163

diff --git a/zathura/.zathurarc b/zathura/.zathurarc
index 39be0c17d603c6f3d0b7a91e204dd4ce2c0d6bb7..65235733f6f5c720942333c71fc511d7302744d1 100644 (file)
--- a/zathura/.zathurarc
+++ b/zathura/.zathurarc
@@ -1,2 +1,3 @@
 set sandbox strict
 set dbus-service false
 set sandbox strict
 set dbus-service false

+set font "monospace normal 20"

diff --git a/zathura/.zsh/rc/010zathurarc.zsh b/zathura/.zsh/rc/010zathurarc.zsh
new file mode 100644 (file)
index 0000000..a5bc5f8
--- /dev/null
+++ b/zathura/.zsh/rc/010zathurarc.zsh
@@ -0,0 +1,4 @@
+[[ -d $XDG_CONFIG_HOME/zathura ]] || {
+    mkdir -p $XDG_CONFIG_HOME/zathura
+    ln -fs ~/.zathurarc $XDG_CONFIG_HOME/zathura/zathurarc
+}

diff --git a/zathura/bin/zat b/zathura/bin/zat
index f12a71841cfd2f2ca7fc646f6c23d5455ce961cf..c2ccc410f1b1d8b5bdcc2033aa22d1b97ee7cc0c 100755 (executable)
--- a/zathura/bin/zat
+++ b/zathura/bin/zat
@@ -2,7 +2,9 @@
 
 export PATH=$HOME/local/bin:$PATH
 export XDG_DATA_DIRS=$HOME/local
 
 export PATH=$HOME/local/bin:$PATH
 export XDG_DATA_DIRS=$HOME/local

+export XDG_CONFIG_HOME=/tmp/stargrave-xdg

 export LD_LIBRARY_PATH=$HOME/local/lib:$LD_LIBRARY_PATH
 export LD_LIBRARY_PATH=$HOME/local/lib:$LD_LIBRARY_PATH

+export LD_PRELOAD=$(realpath $HOME/env/local/lib/libjpeg.so)

 winid=`start-tabbed.sh zathura -c`
 zathura -e $winid "$1"
 rm -f zathura.core
 winid=`start-tabbed.sh zathura -c`
 zathura -e $winid "$1"
 rm -f zathura.core

diff --git a/zsh/.zsh/aliases/sxiv b/zsh/.zsh/aliases/sxiv
new file mode 100644 (file)
index 0000000..3844f60
--- /dev/null
+++ b/zsh/.zsh/aliases/sxiv
@@ -0,0 +1 @@
+alias sxiv=nsxiv

diff --git a/zsh/.zsh/env/005irc.zsh b/zsh/.zsh/env/005irc.zsh
index e107faeb87341dba7c6cf0dbe726a13b8edb486a..743e10cde91fa9e7bcd76c55409866e6fa50ddde 100644 (file)
--- a/zsh/.zsh/env/005irc.zsh
+++ b/zsh/.zsh/env/005irc.zsh
@@ -1,3 +1,2 @@
 export IRCNAME="Sergey Matveev"
 export IRCNICK="stargrave"
 export IRCNAME="Sergey Matveev"
 export IRCNICK="stargrave"

-export MMC_ENTRYPOINT=mm.rnd.stcnet.ru

diff --git a/zsh/.zsh/env/005paths.zsh b/zsh/.zsh/env/005paths.zsh
index 4ad8fddf5b8bf7bf650a770da87b48dce8f4361d..d6c5e001d57b9d3c41a6c78a6cc96eb2ea2f1eeb 100644 (file)
--- a/zsh/.zsh/env/005paths.zsh
+++ b/zsh/.zsh/env/005paths.zsh
@@ -1,7 +1,5 @@
-path=(~/bin ~/local/bin /usr/local/bin /usr/local/sbin /usr/bin /usr/sbin /bin /sbin)
+path=(~/local/bin ~/bin /usr/local/bin /usr/local/sbin /usr/bin /usr/sbin /bin /sbin)

 manpath=(
 manpath=(

-    ~/local/share/man
-    /usr/local/lib/perl5/5.26/perl/man

     /usr/local/lib/perl5/site_perl/man
     /usr/share/openssl/man
     /usr/local/share/man
     /usr/local/lib/perl5/site_perl/man
     /usr/share/openssl/man
     /usr/local/share/man


@@ -9,10 +7,10 @@ manpath=(
     /usr/share/man
 )
 export -TU INFOPATH infopath
     /usr/share/man
 )
 export -TU INFOPATH infopath

-infopath=(~/local/share/info /usr/local/share/info /usr/local/info)
+infopath=(/usr/local/share/info /usr/local/info)

 
 export -TU PKG_CONFIG_PATH pkg_config_path
 
 export -TU PKG_CONFIG_PATH pkg_config_path

-pkg_config_path=(~/local/lib/pkgconfig ~/local/libdata/pkgconfig)
+pkg_config_path=(/usr/local/libdata/pkgconfig /usr/libdata/pkgconfig)

 
 export -TU LD_LIBRARY_PATH ld_library_path
 
 export -TU LD_LIBRARY_PATH ld_library_path

-ld_library_path=(~/local/lib)
+ld_library_path=()

diff --git a/zsh/.zsh/env/010c.zsh b/zsh/.zsh/env/010c.zsh
index c6dd0e97303d5a3e2d757c8854148ffc6613283e..2b949402d7f90318721e5ff7a04477cca3306740 100644 (file)
--- a/zsh/.zsh/env/010c.zsh
+++ b/zsh/.zsh/env/010c.zsh
@@ -1,8 +1,8 @@
 export -TU CFLAGS cflags " "
 export -TU CFLAGS cflags " "

-cflags=(-I$HOME/local/include -I/usr/local/include -I/usr/local/include/PCSC)
+cflags=(-I/usr/local/include -I/usr/local/include/PCSC)

 
 export -TU LDFLAGS ldflags " "
 
 export -TU LDFLAGS ldflags " "

-ldflags=(-L$HOME/local/lib -L/usr/local/lib)
+ldflags=(-L/usr/local/lib)

 
 export -TU CXXFLAGS cxxflags " "
 cxxflags=($cflags)
 
 export -TU CXXFLAGS cxxflags " "
 cxxflags=($cflags)

diff --git a/zsh/.zshenv b/zsh/.zshenv
index c6e3576973304693de410cd9bb522c5526e40afd..2fae170c6687a605f42157aabb16d7a4f26c7b9f 100644 (file)
--- a/zsh/.zshenv
+++ b/zsh/.zshenv
@@ -8,7 +8,7 @@ export SSH_AUTH_SOCK=~/.ssh/agent
 export MAILDIR=~/mail
 export DBUS_SESSION_BUS_ADDRESS=disabled:
 export MYSQL_HISTFILE=/tmp/.mysql_history
 export MAILDIR=~/mail
 export DBUS_SESSION_BUS_ADDRESS=disabled:
 export MYSQL_HISTFILE=/tmp/.mysql_history

-export SHARNESS_TEST_SRCDIR=~/local/stow/sharness/share/sharness
+export SHARNESS_TEST_SRCDIR=~/env/local/share/sharness

 export FZF_DEFAULT_OPTS="--color=16 --info=inline"
 export AUTOENV_AUTH_FILE=~/.zsh/autoenv-auth
 export TIMEFMT="user:%U sys:%S mem:%K/%M io:%I/%O %*E %P"
 export FZF_DEFAULT_OPTS="--color=16 --info=inline"
 export AUTOENV_AUTH_FILE=~/.zsh/autoenv-auth
 export TIMEFMT="user:%U sys:%S mem:%K/%M io:%I/%O %*E %P"