diff --git a/.gitattributes b/.gitattributes index 1bd46d0..82bee25 100644 --- a/.gitattributes +++ b/.gitattributes @@ -1,26 +1,26 @@ # Normalize line endings for text files # https://www.git-scm.com/docs/gitattributes#_end_of_line_conversion -* text=auto eol=lf linguist-detectable -doctoc.txt text diff=markdown eol=lf linguist-detectable linguist-language=markdown +* text=auto eol=lf linguist-detectable +doctoc.txt text diff=markdown eol=lf linguist-detectable linguist-language=markdown # Unlikely to be ran under Windows, Linux line endings *.{sh,bash,zsh} text diff=bash eol=lf -*.bibtex text diff=bibtex eol=lf -*.css text diff=css eol=lf -*.html text diff=html eol=lf -*.{md,markdown} text diff=markdown eol=lf -*.tex text diff=tex eol=lf +*.bibtex text diff=bibtex eol=lf +*.css text diff=css eol=lf +*.html text diff=html eol=lf +*.{md,markdown} text diff=markdown eol=lf +*.tex text diff=tex eol=lf # While this repository doesn't currently have anything for Windows, I may # use this for reference # https://rehansaeed.com/gitattributes-best-practices/#line-endings -*.{reg,[rR][eE][gG]} text eol=crlf -*.{bat,[bB][aA][tT]} text eol=crlf -*.{ahk,[aA][hH][kK]} text eol=crlf +*.{reg,[rR][eE][gG]} text eol=crlf +*.{bat,[bB][aA][tT]} text eol=crlf +*.{ahk,[aA][hH][kK]} text eol=crlf # LFS with(/out) locking https://github.com/git-lfs/git-lfs/wiki/File-Locking -*.png filter=lfs diff=lfs merge=lfs -text lockable -*.pdf filter=lfs diff=lfs merge=lfs -text lockable -*.jpg filter=lfs diff=lfs merge=lfs -text lockable -*.jpeg filter=lfs diff=lfs merge=lfs -text lockable +*.png filter=lfs diff=lfs merge=lfs -text lockable +*.pdf filter=lfs diff=lfs merge=lfs -text lockable +*.jpg filter=lfs diff=lfs merge=lfs -text lockable +*.jpeg filter=lfs diff=lfs merge=lfs -text lockable diff --git a/DNS/blocklist.ublockorigin.txt b/DNS/blocklist.ublockorigin.txt index 1adcd10..8a70dbb 100644 --- a/DNS/blocklist.ublockorigin.txt +++ b/DNS/blocklist.ublockorigin.txt @@ -10,4 +10,4 @@ !*$font,third-party -! HINT: Add `,badfilter` to end of any rule to override it. \ No newline at end of file +! HINT: Add `,badfilter` to end of any rule to override it. diff --git a/gayming/playstation2/CHT/install-cht.bash b/gayming/playstation2/CHT/install-cht.bash index 2160c12..a85f5e0 100755 --- a/gayming/playstation2/CHT/install-cht.bash +++ b/gayming/playstation2/CHT/install-cht.bash @@ -5,7 +5,7 @@ CHTDIR=~/PS2/CHT mkdir -p $CHTDIR for chtfile in *.cht; do - cat $chtfile >$CHTDIR/$chtfile + cat $chtfile > $CHTDIR/$chtfile done chmod -R 777 $CHTDIR diff --git a/gayming/playstation2/backup-ops2l-vmc.bash b/gayming/playstation2/backup-ops2l-vmc.bash index a992135..2461e0d 100755 --- a/gayming/playstation2/backup-ops2l-vmc.bash +++ b/gayming/playstation2/backup-ops2l-vmc.bash @@ -18,9 +18,9 @@ chmod -R 777 $VMCDIR chmod -R 777 $BACKUPDIR # If duperemove is installed, perform FS based deduplication of backups -if hash duperemove 2>/dev/null; then - # recursive, dedupe, human-readable, hashfile is like ddrescue mapfile - duperemove -rdh --hashfile=$BACKUPDIR/duperemove.hashfile $BACKUPDIR/ +if hash duperemove 2> /dev/null; then + # recursive, dedupe, human-readable, hashfile is like ddrescue mapfile + duperemove -rdh --hashfile=$BACKUPDIR/duperemove.hashfile $BACKUPDIR/ fi # Curiosity, show the space used diff --git a/irc/matterbridge/matterbridge-example.toml b/irc/matterbridge/matterbridge-example.toml index 4c4e536..22a0715 100644 --- a/irc/matterbridge/matterbridge-example.toml +++ b/irc/matterbridge/matterbridge-example.toml @@ -3,194 +3,194 @@ # probably just confuses networks without RELAYMSG and at least Kiwi pings # on @nick. Labels can be shorter than protocol names (more descriptive in # case of IRC and are ircCamelCase for benefit of IRC bots) -RemoteNickFormat="@{NOPINGNICK}/{LABEL}: " -IgnoreFailureOnStart=true -MessageSplit=true -MediaDownloadPath="/var/www/html/matterbridge" -MediaServerDownload="https://etro.mikaela.info/matterbridge" -MediaDownloadSize=20000000 -MediaDownloadBlacklist=[".html$",".htm$"] -replacemessages=[ ["@room","@rööm"], ["@online","@önline"] ] -EditSuffix=" ✏️" -MessageClipped="…" -UseLocalAvatar=["irc"] +RemoteNickFormat = "@{NOPINGNICK}/{LABEL}: " +IgnoreFailureOnStart = true +MessageSplit = true +MediaDownloadPath = "/var/www/html/matterbridge" +MediaServerDownload = "https://etro.mikaela.info/matterbridge" +MediaDownloadSize = 20000000 +MediaDownloadBlacklist = [".html$", ".htm$"] +replacemessages = [["@room", "@rööm"], ["@online", "@önline"]] +EditSuffix = " ✏️" +MessageClipped = "…" +UseLocalAvatar = ["irc"] # This refers to https://ergo.chat/about [irc.localergo] -Nick="T4" +Nick = "T4" # Normal client would specify @freeformClientID, but with matterbridge that # could result to flood from integrated bouncer -NickServNick="T4" -NickServPassword="" -Server="localhost:6667" -UseTLS=false -UseSASL=true -Label="ircEtro" -Charset="utf8" +NickServNick = "T4" +NickServPassword = "" +Server = "localhost:6667" +UseTLS = false +UseSASL = true +Label = "ircEtro" +Charset = "utf8" # sends join/quit/part from the integrated bouncer -IgnoreNicks="HistServ" -RunCommands=["OPER T4 MI-ne-DIRAS-do-AL-vin", "MODE T4 -iw+BET"] +IgnoreNicks = "HistServ" +RunCommands = ["OPER T4 MI-ne-DIRAS-do-AL-vin", "MODE T4 -iw+BET"] # Requires the bot to be chanop, spoofs sender -UseRelayMsg=true -RemoteNickFormat="{NICK}/{LABEL}" +UseRelayMsg = true +RemoteNickFormat = "{NICK}/{LABEL}" [irc.freenode] -Nick="T4" -NickServNick="T4" -NickServPassword="" -Server="chat.ipv6.freenode.net:6697" -UseTLS=true -UseSASL=true -SkipTLSVerify=false -Label="ircFn" -Charset="utf8" -RunCommands=["MODE T4 -iw+gQR"] +Nick = "T4" +NickServNick = "T4" +NickServPassword = "" +Server = "chat.ipv6.freenode.net:6697" +UseTLS = true +UseSASL = true +SkipTLSVerify = false +Label = "ircFn" +Charset = "utf8" +RunCommands = ["MODE T4 -iw+gQR"] [irc.liberachat] -Nick="T4" -NickServNick="T4" -NickServPassword="" -Server="irc.libera.chat:6697" -UseTLS=true -UseSASL=true -SkipTLSVerify=false -Label="ircLc" -Charset="utf8" -RunCommands=["MODE T4 -iw+gQR"] +Nick = "T4" +NickServNick = "T4" +NickServPassword = "" +Server = "irc.libera.chat:6697" +UseTLS = true +UseSASL = true +SkipTLSVerify = false +Label = "ircLc" +Charset = "utf8" +RunCommands = ["MODE T4 -iw+gQR"] [matrix.matrixexample] -Server="https://matrix.example.org" -MxID="@yournick.matterbridge:example.org" +Server = "https://matrix.example.org" +MxID = "@yournick.matterbridge:example.org" # Above the clear cache & reload button. DON'T LOG OUT or it will be invalid. # If leaked, login and remove the session from "Infosec & Privacy" -Token="MEOW-MEOW_CHOCO-CHOW" +Token = "MEOW-MEOW_CHOCO-CHOW" # Otherwise collision risk with UseUserName=true -NoHomeServerSuffix=false +NoHomeServerSuffix = false # The Matrix logo "[m]" easens hitting up Discord maximum length so it's # better to only have a single char label with the full MXID -Label="m" +Label = "m" # Use Matrix ID instead of display name to avoid messages getting lost due # to Ergo and Matterbridge disagreeing on invalid characters (e.g. LGBT* flag) # https://github.com/ergochat/ergo/issues/1441 -UseUserName=true +UseUserName = true # Send everything as is, don't "cleverly" convert into HTML/Markdown which # would break #channels (-> markdown h1 tag), mathematical equatons etc. # The IRC equivalent would be `StripMarkdown`, but I consider it as # more harmful than good -HTMLDisable=true +HTMLDisable = true [mattermost.mattermostexample] -Server="mattermost.example.org:443" -Team="awesometeam" -Token="abcdef123456" -PrefixMessagesWithNick=true -Label="Mm" +Server = "mattermost.example.org:443" +Team = "awesometeam" +Token = "abcdef123456" +PrefixMessagesWithNick = true +Label = "Mm" # mattermost.example.org is presumably behind a remote proxy that # suppresses non standards headers and thus breaks usual version check? # https://github.com/42wim/matterbridge/wiki/Settings#skipversioncheck -SkipVersionCheck=true +SkipVersionCheck = true [discord.discordexample] -Token="nope" -Server="123456789" +Token = "nope" +Server = "123456789" # When these are True, pinging from other platforms breaks -UseUsername=false -UseDiscriminator=false -Label="D" +UseUsername = false +UseDiscriminator = false +Label = "D" # Discord has webhooks so trailing space isn't required. Looks same as Ergo except has avatar -RemoteNickFormat="{NICK}/{LABEL}" +RemoteNickFormat = "{NICK}/{LABEL}" # Allow mentioning users and roles, not everyone etc. -AllowMention=["user","role"] +AllowMention = ["user", "role"] [telegram.telegrambot] -Token="nopenopenope" -Label="T" -QuoteLengthLimit=60 -MediaConvertWebPToPNG=false +Token = "nopenopenope" +Label = "T" +QuoteLengthLimit = 60 +MediaConvertWebPToPNG = false # Convert .tgs.webp (animated stickers) to webp #MediaConvertTgs="webp" # https://github.com/telegramdesktop/tdesktop/issues/6959 + Matrix homeservers become clickable links polluting links -RemoteNickFormat="@{NICK}/{LABEL}: " -MessageFormat="HTMLNick" -DisableWebPagePreview=true +RemoteNickFormat = "@{NICK}/{LABEL}: " +MessageFormat = "HTMLNick" +DisableWebPagePreview = true [xmpp.example] -Server="example.net:5222" -Jid="matterbridge@example.net" -Password="nonono" -Muc="conference.example.net" -Nick="M" -Label="xmpp" +Server = "example.net:5222" +Jid = "matterbridge@example.net" +Password = "nonono" +Muc = "conference.example.net" +Nick = "M" +Label = "xmpp" [[gateway]] -name="redactedchanone" -enable=false +name = "redactedchanone" +enable = false - [[gateway.inout]] - account="irc.freenode" - channel="#redactedchanone" +[[gateway.inout]] +account = "irc.freenode" +channel = "#redactedchanone" - [[gateway.inout]] - account="irc.liberachat" - channel="#redactedchanone" +[[gateway.inout]] +account = "irc.liberachat" +channel = "#redactedchanone" [[gateway]] -name="secretchan" -enable=true +name = "secretchan" +enable = true - [[gateway.inout]] - account="irc.freenode" - channel="##secretchan+" +[[gateway.inout]] +account = "irc.freenode" +channel = "##secretchan+" - [[gateway.inout]] - account="irc.liberachat" - channel="##secretchan+" +[[gateway.inout]] +account = "irc.liberachat" +channel = "##secretchan+" - [[gateway.inout]] - account="irc.localergo" - channel="#secretchan+" +[[gateway.inout]] +account = "irc.localergo" +channel = "#secretchan+" [[gateway]] -name="test" -enable="true" +name = "test" +enable = "true" - [[gateway.inout]] - account="irc.localergo" - channel="#test" +[[gateway.inout]] +account = "irc.localergo" +channel = "#test" - [[gateway.inout]] - account="irc.liberachat" - channel="#test" +[[gateway.inout]] +account = "irc.liberachat" +channel = "#test" - [[gateway.inout]] - account="irc.freenode" - channel="#test" +[[gateway.inout]] +account = "irc.freenode" +channel = "#test" - [[gateway.inout]] - account="discord.discordexample" - # Get it by enabling developer mode from Discord settings and - # right-clicking the channel name - channel="ID:121212123124618" - [gateway.inout.options] - WebhookURL="https://discordapp.com/api/webhooks/..." +[[gateway.inout]] +account = "discord.discordexample" +# Get it by enabling developer mode from Discord settings and +# right-clicking the channel name +channel = "ID:121212123124618" +[gateway.inout.options] +WebhookURL = "https://discordapp.com/api/webhooks/..." - [[gateway.inout]] - account="telegram.telegrambot" - # Get it by adding the bot to a group runtime and /chatId - channel="-1001199999999" +[[gateway.inout]] +account = "telegram.telegrambot" +# Get it by adding the bot to a group runtime and /chatId +channel = "-1001199999999" - [[gateway.inout]] - account="mattermost.mattermostexample" - channel="test" +[[gateway.inout]] +account = "mattermost.mattermostexample" +channel = "test" - [[gateway.inout]] - account="matrix.matrixexample" - # Invite the bot account to a room and it will accept invite on start, - # alternatively use a room alias (but the server it refers to will need - # to be online). If using internal ID, remember to update it when - # performing /upgraderoom - channel="!roomInternalIDFromAdvancedRoomSettings:example.org" +[[gateway.inout]] +account = "matrix.matrixexample" +# Invite the bot account to a room and it will accept invite on start, +# alternatively use a room alias (but the server it refers to will need +# to be online). If using internal ID, remember to update it when +# performing /upgraderoom +channel = "!roomInternalIDFromAdvancedRoomSettings:example.org" - [[gateway.inout]] - account="xmpp.example" - channel="test" +[[gateway.inout]] +account = "xmpp.example" +channel = "test" diff --git a/irc/piraatit/entrymsg.bash b/irc/piraatit/entrymsg.bash index 57bda1e..2635f89 100755 --- a/irc/piraatit/entrymsg.bash +++ b/irc/piraatit/entrymsg.bash @@ -7,12 +7,12 @@ declare -a arr=("#aaltopiraatit" "#akateemisetpiraatit" "#aktiivit" "#antikupla" "#grafiikka" "#hallituskokous" "#hame" "#helsinki" "#hepihalko" "#kaakko" "#keski-suomi" "#likakaivo" "#mediaseuranta" "#messi" "#Mikaela" "#pinu" "#pinu-hallitus" "#pinuhalko" "#pinu_hallitus" "#piraatit" "#piraattinuoret" "#piraattipuolue" "#piraattivpn" "#pirkanmaa" "#politiikka" "#ppfi-chanacs-abuse" "#puoluehallitus" "#puoluekokous" "#puoluetoimisto" "#purje" "#satakunta" "#sateenkaaripiraatit" "#savo-karjala" "#sivusto" "#syotteet" "#test" "#toiminta" "#tulevaisuus" "#uusimaa" "#vaaliteltta" "#vaasa" "#varainhankinta" "#varsinais-suomi" "#verkkopalvelut") for i in "${arr[@]}"; do - echo "/msg ChanServ set $i ENTRYMSG Lähettämällä viestin kanavalle suostut nimimerkkisi ja viestisi julkaisemiseen, sekä Telegrammiin ja Discordiin lähettämiseksi. Se tieto on https://telegram.org/privacy ja https://discordapp.com/privacy alaista sieltäen liittyvät datan tallennuskäytännöt." + echo "/msg ChanServ set $i ENTRYMSG Lähettämällä viestin kanavalle suostut nimimerkkisi ja viestisi julkaisemiseen, sekä Telegrammiin ja Discordiin lähettämiseksi. Se tieto on https://telegram.org/privacy ja https://discordapp.com/privacy alaista sieltäen liittyvät datan tallennuskäytännöt." done # English speaking channels declare -a arr=("#ppfi" "#ypfi") for i in "${arr[@]}"; do - echo "/msg ChanServ set $i ENTRYMSG By sending messages to this channel you consent to your nick and message being published and transmitted to Telegram and Discord. That information is subject to https://telegram.org/privacy and https://discordapp.com/privacy including relevant data retention policies." + echo "/msg ChanServ set $i ENTRYMSG By sending messages to this channel you consent to your nick and message being published and transmitted to Telegram and Discord. That information is subject to https://telegram.org/privacy and https://discordapp.com/privacy including relevant data retention policies." done diff --git a/irc/piraatit/keeptopic.bash b/irc/piraatit/keeptopic.bash index 1976072..4965998 100755 --- a/irc/piraatit/keeptopic.bash +++ b/irc/piraatit/keeptopic.bash @@ -7,12 +7,12 @@ declare -a arr=("#aaltopiraatit" "#akateemisetpiraatit" "#aktiivit" "#antikupla" "#grafiikka" "#hallituskokous" "#hame" "#helsinki" "#hepihalko" "#kaakko" "#keski-suomi" "#likakaivo" "#mediaseuranta" "#messi" "#Mikaela" "#pinu" "#pinu-hallitus" "#pinuhalko" "#pinu_hallitus" "#piraatit" "#piraattinuoret" "#piraattipuolue" "#piraattivpn" "#pirkanmaa" "#politiikka" "#ppfi-chanacs-abuse" "#puoluehallitus" "#puoluekokous" "#puoluetoimisto" "#purje" "#satakunta" "#sateenkaaripiraatit" "#savo-karjala" "#sivusto" "#syotteet" "#test" "#toiminta" "#tulevaisuus" "#uusimaa" "#vaaliteltta" "#vaasa" "#varainhankinta" "#varsinais-suomi" "#verkkopalvelut") for i in "${arr[@]}"; do - echo "/msg ChanServ set $i KEEPTOPIC ON" + echo "/msg ChanServ set $i KEEPTOPIC ON" done # English speaking channels declare -a arr=("#ppfi" "#ypfi") for i in "${arr[@]}"; do - echo "/msg ChanServ set $i KEEPTOPIC ON" + echo "/msg ChanServ set $i KEEPTOPIC ON" done diff --git a/irc/piraatit/messi.bash b/irc/piraatit/messi.bash index 9a6f923..2a9cf2b 100755 --- a/irc/piraatit/messi.bash +++ b/irc/piraatit/messi.bash @@ -6,8 +6,8 @@ declare -a arr=("janneone" "mbrsk" "mielipuoli" "nyos" "usvi" "vhautaka" "yaambo ## now loop through the above array for i in "${arr[@]}"; do - echo "/msg GroupServ invite !ppfi-aktiivit $i" - # or do whatever with individual element of the array + echo "/msg GroupServ invite !ppfi-aktiivit $i" + # or do whatever with individual element of the array done # You can access them using echo "${arr[0]}", "${arr[1]}" also diff --git a/irc/piraatit/piraattibotit.bash b/irc/piraatit/piraattibotit.bash index 45a9a19..201cc46 100755 --- a/irc/piraatit/piraattibotit.bash +++ b/irc/piraatit/piraattibotit.bash @@ -6,8 +6,8 @@ declare -a arr=("#aaltopiraatit" "#grafiikka" "#hallituskokous" "#hame" "#helsin ## now loop through the above array for i in "${arr[@]}"; do - echo "/msg ChanServ flags $i !piraattibotit VOP" - # or do whatever with individual element of the array + echo "/msg ChanServ flags $i !piraattibotit VOP" + # or do whatever with individual element of the array done # You can access them using echo "${arr[0]}", "${arr[1]}" also diff --git a/irc/piraatit/registered.bash b/irc/piraatit/registered.bash index 51f178e..561eae2 100755 --- a/irc/piraatit/registered.bash +++ b/irc/piraatit/registered.bash @@ -6,14 +6,14 @@ declare -a arr=("#aaltopiraatit" "#grafiikka" "#hame" "#helsinki" "#hepihalko" " ## now loop through the above array for i in "${arr[@]}"; do - echo "/msg ChanServ flags $i \$registered +VA" - # or do whatever with individual element of the array + echo "/msg ChanServ flags $i \$registered +VA" + # or do whatever with individual element of the array done ## now loop through the above array for i in "${arr[@]}"; do - echo "/msg ChanServ flags $i *!*@gateway/bridge/matrix/diasp.in +VA" - # or do whatever with individual element of the array + echo "/msg ChanServ flags $i *!*@gateway/bridge/matrix/diasp.in +VA" + # or do whatever with individual element of the array done # You can access them using echo "${arr[0]}", "${arr[1]}" also diff --git a/irc/piraatit/undo-registered.bash b/irc/piraatit/undo-registered.bash index 733e38e..9763b4c 100755 --- a/irc/piraatit/undo-registered.bash +++ b/irc/piraatit/undo-registered.bash @@ -6,14 +6,14 @@ declare -a arr=("#aaltopiraatit" "#grafiikka" "#hame" "#helsinki" "#hepihalko" " ## now loop through the above array for i in "${arr[@]}"; do - echo "/msg ChanServ flags $i \$registered -VA" - # or do whatever with individual element of the array + echo "/msg ChanServ flags $i \$registered -VA" + # or do whatever with individual element of the array done ## now loop through the above array for i in "${arr[@]}"; do - echo "/msg ChanServ flags $i *!*@gateway/bridge/matrix/diasp.in -VA" - # or do whatever with individual element of the array + echo "/msg ChanServ flags $i *!*@gateway/bridge/matrix/diasp.in -VA" + # or do whatever with individual element of the array done # You can access them using echo "${arr[0]}", "${arr[1]}" also diff --git a/liferea/feedlist.opml.xml b/liferea/feedlist.opml.xml index ae7df78..826eda7 100644 --- a/liferea/feedlist.opml.xml +++ b/liferea/feedlist.opml.xml @@ -1,100 +1,558 @@ - + Liferea Feed List Export - - + + - - + + - - - - - - - + + + + + + + - - - - - - - - - - + + + + + + + + + + - - + + - - - + + + - - - - - - - - - - + + + + + + + + + + - - - + + + - - - - - - - - - + + + + + + + + + - - + + - - + + - - + + - + - - - - + + + + - - - - - + + + + + - - - + + + - - - + + + diff --git a/vcard/generate-qr.bash b/vcard/generate-qr.bash index 88dc097..8170d65 100755 --- a/vcard/generate-qr.bash +++ b/vcard/generate-qr.bash @@ -3,12 +3,12 @@ # loop through all vcard files for vcard in *.vcard; do - if [ -f "$vcard" ]; then - # -l H - high error correction - # -t utf8 - output to terminal - # -r - read file - # -o output file - qrencode -l H -t utf8 -r $vcard - qrencode -l H -o $vcard.png -r $vcard - fi + if [ -f "$vcard" ]; then + # -l H - high error correction + # -t utf8 - output to terminal + # -r - read file + # -o output file + qrencode -l H -t utf8 -r $vcard + qrencode -l H -o $vcard.png -r $vcard + fi done