diff --git a/Backup/.Backup_HD.sh b/Backup/.Backup_HD.sh index 704781f..05c0c95 100755 --- a/Backup/.Backup_HD.sh +++ b/Backup/.Backup_HD.sh @@ -54,7 +54,7 @@ function checkBackup() { function pruneBackup() { echo -e "${blue} `date +%r` - Prune old backups...${reset}" - borg prune --keep-weekly=12 --keep-monthly=24 --keep-yearly=3 $1 + borg prune --keep-weekly=4 --keep-monthly=12 --keep-yearly=2 $1 } @@ -82,9 +82,10 @@ read timeout=30 echo -n "Mounting Backup_$ActiveDisk" +mount $HDPath device=$(mount | grep "Backup_$ActiveDisk" | cut -d " " -f1) while [[ "$device" != *"/dev/"* ]]; do - [[ $timeout -lt 1 ]] && echo -e "\e[97m Timeout!\e[39m" && break + [[ $timeout -lt 1 ]] && echo -e "\e[97m Timeout!\e[39m" && exit 1 (( timeout-- )) echo -n "." sleep 1s diff --git a/Backup/runBackup.sh b/Backup/runBackup.sh index 9082576..6bac646 100755 --- a/Backup/runBackup.sh +++ b/Backup/runBackup.sh @@ -1,2 +1,3 @@ #!/bin/sh /bin/terminator -m -T BACKUP -x sudo systemd-inhibit bash /home/bruno/Apps/linuxShortcuts/Backup/.Backup_HD.sh & + diff --git a/KDE/OXO.sh b/KDE/OXO.sh index 8c9c0fd..2620cbe 100755 --- a/KDE/OXO.sh +++ b/KDE/OXO.sh @@ -1,20 +1,28 @@ -#!/bin/sh +#!/bin/bash + +# Goes back to Main if tomatoshell is not running + +[ $(pgrep -f 'OXO.sh' | wc -l) -gt 2 ] && exit sleep 30s + while [ 1 = 1 ]; do sleep 30s - if [ `kactivities-cli --current-activity | grep "Main" | wc -l` -gt 0 ]; then + # If activity is not OXO, exit + if [ `kactivities-cli --current-activity | grep "OXO" | wc -l` = 0 ]; then exit 0 fi - tomato=`ps -aux | grep tomatoshell | wc -l` - # If there are less than 2 instances of tomato, it means it is just grep and not tomato itself - if [ $tomato -lt 2 ]; then - kactivities-cli --set-current-activity `kactivities-cli --list-activities | grep "Main" | cut -d' ' -f2` - notify-send --icon=`kactivities-cli --list-activities | grep "OXO" | cut -d' ' -f4` -a "OXO Innovation" "Start a pomodoro to Work" + if [ ! $(pgrep -f /usr/local/bin/pdshell) ]; then + beep + echo "Start a pomodoro to work" | festival --tts & + notify-send --icon=$(getIconFromKDEactivity OXO) -a "OXO Innovation" "Start a pomodoro to Work" + sleep 2s + kactivities-cli --set-current-activity $(kactivities-cli --list-activities | grep "Main" | cut -d' ' -f2) fi done +# /bin/terminator -m -T Pomodoro -x tomatoshell --oxo # kactivities-cli --stop-activity `kactivities-cli --list-activities | grep "Main" | cut -d' ' -f2` # notify-send --icon=`kactivities-cli --list-activities | grep "OXO" | cut -d' ' -f4` -a "OXO Innovation" "Main profile closed" diff --git a/KDE/lockOXO.sh b/KDE/lockOXO.sh index a85de0b..4de2bbe 100755 --- a/KDE/lockOXO.sh +++ b/KDE/lockOXO.sh @@ -1,10 +1,18 @@ -#!/bin/sh -sleep 5s -while [ 1 = 1 ]; do +#!/bin/bash + +# Goes back to OXO acitivity when working + +[ $(pgrep -f 'lockOXO.sh' | wc -l) -gt 2 ] && exit 0 +sleep 20s + +while true; do current=`kactivities-cli --current-activity | grep "Main"` if [[ $current ]]; then - kactivities-cli --stop-activity `kactivities-cli --list-activities | grep "Main" | cut -d' ' -f2` - notify-send --icon=`kactivities-cli --list-activities | grep "OXO" | cut -d' ' -f4` -a "OXO Innovation" "Main profile closed" + beep + echo "Closing activity..." | festival --tts & + notify-send --icon=$(getIconFromKDEactivity OXO) -a "OXO Innovation" "Closing main screen..." + sleep 2s + kactivities-cli --set-current-activity `kactivities-cli --list-activities | grep "OXO" | cut -d' ' -f2` fi - sleep 20s + sleep 30s done diff --git a/KDE/meeting.sh b/KDE/meeting.sh new file mode 100755 index 0000000..96ad0ee --- /dev/null +++ b/KDE/meeting.sh @@ -0,0 +1,9 @@ +#!/bin/sh +sleep 2s +[ -z $* ] && /home/bruno/Apps/linuxShortcuts/music/csound --analog +killall OXO.sh >/dev/null +killall lockOXO.sh >/dev/null +tomatos=`ps aux | grep tomatoshell | awk '{ print $11 " " $12 " " $13 " " $14 }'` +for tomato in tomatos; do + pkill --signal SIGINT -f "$tomato" +done diff --git a/Pacman/updateRepositories.sh b/Pacman/updateRepositories.sh index 4e68bbc..bf20504 100755 --- a/Pacman/updateRepositories.sh +++ b/Pacman/updateRepositories.sh @@ -9,18 +9,12 @@ function s() { sudo $* } -s -v -bold "Pacman-mirrors --continent" -s "pacman-mirrors --continent" 2>/dev/null -# s "pacman-mirrors -c Brazil" 2>/dev/null -s "reflector -l 30 -f 10 --save /etc/pacman.d/mirrorlist" 2>/dev/null - # From now on, exit when any command fails set -e s -v bold "Updating..." -yay -Syu --sudoloop --answerclean none --answerdiff all --answerupgrade all --noremovemake --nobatchinstall --cleanafter +nice --adjustment=19 ionice -c 3 yay -Syu --sudoloop --answerclean none --answerdiff all --answerupgrade all --noremovemake --norebuild --noredownload --nobatchinstall --cleanafter bold "Cleaning stuff..." s -v diff --git a/Screen/desktop.sh b/Screen/desktop.sh index 9a5f6ae..37c9353 100755 --- a/Screen/desktop.sh +++ b/Screen/desktop.sh @@ -1,3 +1,6 @@ #!/bin/sh xrandr --output HDMI-1 --mode 1920x1080 xrandr --output HDMI-2 --mode 1920x1080 +sleep 3 +/bin/numlockx on +/home/bruno/Apps/linuxShortcuts/start-oxo.sh organize diff --git a/Screen/new_laptop.sh b/Screen/new_laptop.sh index 6444fb6..3fa80d7 100755 --- a/Screen/new_laptop.sh +++ b/Screen/new_laptop.sh @@ -3,3 +3,9 @@ setxkbmap -model abnt2 -layout br -variant ,abnt2 xrandr --output HDMI-1 --mode 1280x720 #Max resolution monitor can do that fits blackout xrandr --output HDMI-1 --mode 1366x768 #Max resolution monitor can do that fits blackout xrandr --output HDMI-2 --mode 1366x768 + +win_list=$(wmctrl -x -l | grep -i "OXO|" | awk '{print $1}' ) +for win in "${win_list[@]}" +do + wmctrl -r "$win" -i -b add,maximized_vert,maximized_horz +done diff --git a/Services/backup-contabo.sh b/Services/backup-contabo.sh index e713cb3..183078f 100755 --- a/Services/backup-contabo.sh +++ b/Services/backup-contabo.sh @@ -15,7 +15,7 @@ sleep 60 /bin/rsync --archive --backup --exclude "files/nextcloud*" --rsh=ssh backupContabo:/home/bruno/backups/* $CONTABO_BACKUP_PATH # Backup Gitea -/bin/rsync --archive --backup --rsh=ssh bkpgitea:~/ttt/* ~/Backups/gitea/ +/bin/rsync --archive --backup --rsh=ssh gitea:/home/brunofontes/ttt/ ~/Backups/gitea/ # Backup OXO Files /bin/rsync --archive --backup --rsh=ssh oxo:~/public_html ~/Backups/OXOwebsite/ diff --git a/Services/backup-gitea.sh b/Services/backup-gitea.sh new file mode 100755 index 0000000..17448f6 --- /dev/null +++ b/Services/backup-gitea.sh @@ -0,0 +1,5 @@ +#!/usr/bin/env bash +cd /home/brunofontes/ttt/ +sudo -u git GITEA_WORK_DIR=/var/lib/gitea/ /usr/local/bin/gitea dump -c /etc/gitea/app.ini +chown brunofontes:brunofontes *.zip +find ./ -type f -name "*.zip" -mtime +2 -delete diff --git a/Services/bruno-network-manager.service b/Services/bruno-network-manager.service index eb75b05..f46e3be 100644 --- a/Services/bruno-network-manager.service +++ b/Services/bruno-network-manager.service @@ -1,6 +1,7 @@ [Unit] Description=Manages Dongle Wifi, DNS and VPN After=network-online.target +OnFailure=logErrors@%n.service [Service] Type=oneshot diff --git a/Services/logErrors@.service b/Services/logErrors@.service index 68a257a..626ca5a 100755 --- a/Services/logErrors@.service +++ b/Services/logErrors@.service @@ -3,4 +3,5 @@ Description=Log Systemd errors on my %i script on home [Service] ExecStart=/home/bruno/Apps/linuxShortcuts/Services/logError.sh %i +ExecStart=/usr/bin/curl -d "Michelle: fail to run %i" ntfy.sh/bft #ExecStart=/bin/systemctl status --full %i >> /home/bruno/.log_error diff --git a/Services/mbsync.service b/Services/mbsync.service index 8aa13d6..176b59d 100644 --- a/Services/mbsync.service +++ b/Services/mbsync.service @@ -1,5 +1,6 @@ [Unit] Description=Mailbox synchronization service +OnFailure=logErrors@%n.service [Service] Type=oneshot diff --git a/Services/pihole.service b/Services/pihole.service new file mode 100644 index 0000000..d395933 --- /dev/null +++ b/Services/pihole.service @@ -0,0 +1,12 @@ +[Unit] +Description=pihole +Requires=docker.service multi-user.target +After=docker.service network-online.target dhcpd.service + +[Service] +WorkingDirectory=/home/bruno/Apps/piholeDocker +ExecStart=/usr/local/bin/docker-compose up +# ExecStop=/usr/local/bin/docker-compose down + +[Install] +WantedBy=multi-user.target diff --git a/Services/sshrc b/Services/sshrc new file mode 100644 index 0000000..1f14711 --- /dev/null +++ b/Services/sshrc @@ -0,0 +1,3 @@ +ip=`echo $SSH_CONNECTION | cut -d " " -f 1` +logger -t ssh-wrapper $USER login from $ip +/usr/bin/curl -d "Contabo: user $USER just logged in from $ip." ntfy.sh/bft >/dev/null diff --git a/browser.sh b/browser.sh index 2f2d966..a1ed2d2 100755 --- a/browser.sh +++ b/browser.sh @@ -2,7 +2,12 @@ activity=`kactivities-cli --current-activity | cut -d" " -f3` if [[ $1 =~ .*youtube\.com.* ]]; then - /bin/freetube "$*" >/dev/null 2>&1 & + mpv "$*" >/dev/null 2>&1 & + exit +fi + +if [[ $1 =~ .*youtu\.be.* ]]; then + mpv "$*" >/dev/null 2>&1 & exit fi @@ -13,7 +18,7 @@ if [[ $1 =~ .*\&incognitottt$ ]]; then [[ $activity == "Main" ]] && /bin/firefox --private-window "$url" >/dev/null 2>&1 & [[ $activity == "Videos" ]] && /bin/firefox --private-window "$url" >/dev/null 2>&1 & else - [[ $activity == "OXO" ]] && /bin/brave "$1" >/dev/null 2>&1 & + [[ $activity == "OXO" ]] && /bin/firefox -P OXO "$1" >/dev/null 2>&1 & [[ $activity == "Development" ]] && /home/bruno/Apps/firefox/firefox-bin "$1" >/dev/null 2>&1 & [[ $activity == "Main" ]] && /bin/firefox "$1" >/dev/null 2>&1 & [[ $activity == "Videos" ]] && /bin/firefox "$1" >/dev/null 2>&1 & diff --git a/start-dashboard b/start-dashboard index 47845ae..0c01af7 100755 --- a/start-dashboard +++ b/start-dashboard @@ -23,38 +23,46 @@ tmux send -t dashboard:0.2 $'btop\n' tmux send -t dashboard:0.1 $'clear\n' tmux send -t dashboard:0.1 $'ikhal\n' -# 1 - Tut +# 1 - Tut - Fosstodon tmux new-window -t dashboard sleep 1 -tmux send -t dashboard:1.0 $'tut\n' -tmux rename-window -t dashboard:1 tut +tmux send -t dashboard:1.0 $'tut --user brunofontes@fosstodon.org\n' +tmux rename-window -t dashboard:1 "tut - Fosstodon" tmux setw monitor-activity -t dashboard:1 -# 2 - GoMuks +# 2 - Tut - Mastodon Social tmux new-window -t dashboard sleep 1 -tmux send -t dashboard:2.0 $'gomuks\n' -tmux rename-window -t dashboard:2 gomuks +tmux send -t dashboard:2.0 $'tut --user brunofontes@mastodon.social\n' +tmux rename-window -t dashboard:2 "tut - MastodonSocial" +tmux setw monitor-activity -t dashboard:2 -# 3 - NeoMutt +# 3 - GoMuks tmux new-window -t dashboard sleep 1 -tmux send -t dashboard:3.0 $'sleep 120 && neomutt\n' -tmux rename-window -t dashboard:3 neomutt +tmux send -t dashboard:3.0 $'gomuks\n' +tmux rename-window -t dashboard:3 gomuks -# 4 - Joplin +# 4 - NeoMutt tmux new-window -t dashboard sleep 1 -tmux send -t dashboard:4.0 $'joplin\n' -tmux rename-window -t dashboard:4 joplin +tmux send -t dashboard:4.0 $'neomutt\n' +tmux rename-window -t dashboard:4 neomutt + +# 5 - Joplin +tmux new-window -t dashboard +sleep 1 +tmux send -t dashboard:5.0 $'joplin\n' +tmux rename-window -t dashboard:5 joplin # Weechat keeps connecting and disconnecting and I am not reading the messages # so it was just creating noise in the chat rooms -5 - Weechat +6 - Weechat tmux new-window -t dashboard -tmux send -t dashboard:5.0 $'sleep 120; ssh contabo screen -DRS weechat\n' -tmux rename-window -t dashboard:5 weechat +tmux send -t dashboard:6.0 $'weechat\n' +#tmux send -t dashboard:6.0 $'sleep 120; ssh contabo screen -DRS weechat\n' +tmux rename-window -t dashboard:6 weechat # Back to Dashboard tmux select-window -t dashboard:0 diff --git a/start-dev.sh b/start-dev.sh new file mode 100755 index 0000000..7fdabd0 --- /dev/null +++ b/start-dev.sh @@ -0,0 +1,13 @@ +#!/bin/sh +kactivities-cli --set-current-activity `kactivities-cli --list-activities | grep "Development" | cut -d' ' -f2` +/bin/terminator --title "DEV" -x "cd ~/development; tmux new -t \"DEV\"" & +/bin/qutebrowser &>/dev/null & +sleep 4 + +TERMINATOR="0,1988,61,1760,880" +QUTE="0,90,78,1715,900" +wmctrl -r "DEV" -F -b remove,maximized_vert,maximized_horz +wmctrl -r "qutebrowser" -b remove,maximized_vert,maximized_horz +sleep 1 +wmctrl -r "DEV" -F -e $TERMINATOR +wmctrl -r "qutebrowser" -e $QUTE diff --git a/start-firefox.sh b/start-firefox.sh new file mode 100755 index 0000000..9f6ee6c --- /dev/null +++ b/start-firefox.sh @@ -0,0 +1,43 @@ +#!/bin/sh + +isFirefoxRunning=$(pgrep --exact "firefox" -a | grep -v "OXO") +if [ -z $isFirefoxRunning ] +then + echo "Starting Firefox..." + /usr/lib/firefox/firefox >/dev/null 2>&1 & + notify-send "Opening Firefox, please wait..." + sleep 20 +fi + +mainFirefox=$(wmctrl -l | grep -v "TickTick" | grep -v "OXO|" | awk '/Firefox/ { print $1 }') +TickTickFirefox=$(wmctrl -l | grep "TickTick" | grep -v "OXO|" | awk '/Firefox/ { print $1 }') +echo "Main Firefox window id: $mainFirefox" +echo " TickTick FF window id: $TickTickFirefox" + +if [ -z $mainFirefox ] +then + notify-send "Firefox not found" + exit 1 +fi + +if [ -z $TickTickFirefox ] +then + notify-send "Firefox not found" + exit 1 +fi + +sleep 1 + +# MONITOR +TOP_LEFT_MONITOR="0,1935,0,570,973" +TOP_RIGHT_MONITOR="0,2560,0,1280,1046" +TOP_LEFT_MONITOR_BORDER="0,1935,15,570,973" +TOP_RIGHT_MONITOR_BORDER="0,2540,15,1265,973" + +wmctrl -i -r "$mainFirefox" -b remove,maximized_vert,maximized_horz +wmctrl -i -r "$TickTickFirefox" -b remove,maximized_vert,maximized_horz + +sleep 1 + +wmctrl -i -r "$TickTickFirefox" -e $TOP_LEFT_MONITOR_BORDER +wmctrl -i -r "$mainFirefox" -e $TOP_RIGHT_MONITOR_BORDER diff --git a/start-oxo.sh b/start-oxo.sh index 573ac0f..cd35f43 100755 --- a/start-oxo.sh +++ b/start-oxo.sh @@ -1,3 +1,48 @@ #!/bin/sh -/bin/teams >/dev/null 2>&1 & -/usr/lib/firefox/firefox -P OXO >/dev/null 2>&1 & + +# start apps if no parameter is sent +if [ -z $1 ] +then + /bin/teams >/dev/null 2>&1 & + /usr/lib/firefox/firefox -P OXO >/dev/null 2>&1 & + /bin/terminator --title "Pomodoro" -x tmux new -t "Pomodoro" &>/dev/null & + sleep 2 + kactivities-cli --set-current-activity `kactivities-cli --list-activities | grep "Main" | cut -d' ' -f2` + sleep 120 +fi + +# TV +TOP_LEFT_TV="0,0,20,616,1016" +TOP_RIGHT_TV="0,640,20,1255,1016" +TOP_LEFT_TV_BORDER="0,15,35,570,330" +TOP_RIGHT_TV_BORDER="0,620,35,1265,993" + +# MONITOR +TOP_LEFT_MONITOR="0,1935,0,570,973" +TOP_RIGHT_MONITOR="0,2560,0,1280,1046" +TOP_LEFT_MONITOR_BORDER="0,1935,15,570,973" +TOP_RIGHT_MONITOR_BORDER="0,2540,15,1265,973" + +mainFirefox=$(wmctrl -l | grep -v "TickTick" | grep "OXO|" | awk '/Firefox/ { print $1 }') +ticktickFirefox=$(wmctrl -l | grep "TickTick" | grep "OXO|" | awk '/Firefox/ { print $1 }') +wmctrl -i -r "$ticktickFirefox" -b remove,maximized_vert,maximized_horz +wmctrl -i -r "$mainFirefox" -b remove,maximized_vert,maximized_horz +wmctrl -r "Pomodoro" -F -b remove,maximized_vert,maximized_horz +wmctrl -r "OXO|Plunet BusinessManager — Mozilla Firefox" -F -b remove,maximized_vert,maximized_horz + +sleep 1 + +wmctrl -r "$ticktickFirefox" -e $TOP_LEFT_MONITOR_BORDER +wmctrl -r "$mainFirefox" -e $TOP_RIGHT_MONITOR_BORDER +wmctrl -r "Pomodoro" -F -e $TOP_LEFT_TV_BORDER +wmctrl -r "OXO|Plunet BusinessManager — Mozilla Firefox" -F -e $TOP_RIGHT_TV_BORDER + +xdotool search "(.*) Microsoft Teams" windowminimize + +if [ -z $1 ] +then + sleep 2 + kactivities-cli --set-current-activity `kactivities-cli --list-activities | grep "OXO" | cut -d' ' -f2` + tmux send -t Pomodoro $'echo "Press enter to start\!"; read; pdshell\n' & + echo "OXO Activity prepared. You can start working" | festival --tts & +fi diff --git a/startup.sh b/startup.sh new file mode 100755 index 0000000..60b9a29 --- /dev/null +++ b/startup.sh @@ -0,0 +1,10 @@ +#!/bin/sh +/usr/bin/nextcloud --background & +sleep 5 +/home/bruno/Apps/linuxShortcuts/start-dashboard & +sleep 5 +/home/bruno/Apps/remoteControl/start-remotecontrol.sh & +sleep 5 +/home/bruno/.local/bin/obs-virtWebcam & +sleep 5 +DISPLAY=0 firefox diff --git a/stop-dev.sh b/stop-dev.sh new file mode 100755 index 0000000..fbd4a60 --- /dev/null +++ b/stop-dev.sh @@ -0,0 +1,4 @@ +#!/bin/bash +tmux kill-session -t DEV +pkill qutebrowser +kactivities-cli --stop-activity `kactivities-cli --list-activities | grep "Development" | cut -d' ' -f2` diff --git a/stop-oxo.sh b/stop-oxo.sh new file mode 100755 index 0000000..3c88766 --- /dev/null +++ b/stop-oxo.sh @@ -0,0 +1,5 @@ +#!/bin/bash +tmux kill-session -t Pomodoro +pkill "/usr/lib/firefox/firefox -P OXO" +pkill teams +kactivities-cli --stop-activity `kactivities-cli --list-activities | grep "OXO" | cut -d' ' -f2` diff --git a/tags b/tags new file mode 100644 index 0000000..456acd2 --- /dev/null +++ b/tags @@ -0,0 +1,192 @@ +!_TAG_FILE_FORMAT 2 /extended format; --format=1 will not append ;" to lines/ +!_TAG_FILE_SORTED 1 /0=unsorted, 1=sorted, 2=foldcase/ +!_TAG_OUTPUT_EXCMD mixed /number, pattern, mixed, or combineV2/ +!_TAG_OUTPUT_FILESEP slash /slash or backslash/ +!_TAG_OUTPUT_MODE u-ctags /u-ctags or e-ctags/ +!_TAG_PATTERN_LENGTH_LIMIT 96 /0 for no limit/ +!_TAG_PROC_CWD /home/bruno/Apps/linuxShortcuts/ // +!_TAG_PROGRAM_AUTHOR Universal Ctags Team // +!_TAG_PROGRAM_NAME Universal Ctags /Derived from Exuberant Ctags/ +!_TAG_PROGRAM_URL https://ctags.io/ /official site/ +!_TAG_PROGRAM_VERSION 5.9.0 /p5.9.20210905.0/ +AccuracySec Services/minecraft-hour.timer /^AccuracySec=1s$/;" k section:Timer +After Services/after-wakeup.service /^After=suspend.target$/;" k section:Unit +After Services/bruno-network-manager.service /^After=network-online.target$/;" k section:Unit +After Services/roothints.service /^After=network.target$/;" k section:Unit +After Services/testDNS.service /^After=network-online.target$/;" k section:Unit +Before Services/before-sleep.service /^Before=sleep.target$/;" k section:Unit +Description Services/after-wakeup.service /^Description=Bruno Fontes script after wakeup$/;" k section:Unit +Description Services/backup-contabo.service /^Description=Backup contabo daily$/;" k section:Unit +Description Services/backup-contabo.timer /^Description=Backup contabo daily$/;" k section:Unit +Description Services/backup-joplin.service /^Description=Backup joplin weekly$/;" k section:Unit +Description Services/backup-joplin.timer /^Description=Backup joplin weekly$/;" k section:Unit +Description Services/before-sleep.service /^Description=Bruno Fontes script before sleep$/;" k section:Unit +Description Services/bruno-network-manager.service /^Description=Manages Dongle Wifi, DNS and VPN$/;" k section:Unit +Description Services/logErrors@.service /^Description=Log Systemd errors on my %i script on home$/;" k section:Unit +Description Services/mbsync.service /^Description=Mailbox synchronization service$/;" k section:Unit +Description Services/mbsync.timer /^Description=Mailbox synchronization timer$/;" k section:Unit +Description Services/minecraft-hour.service /^Description=Minecraft Informa a Hora Certa$/;" k section:Unit +Description Services/minecraft-hour.timer /^Description=Minecraft Informa a Hora Certa$/;" k section:Unit +Description Services/minecraft-stop.service /^Description=Properly shutdown Minecraft before PC shutdown$/;" k section:Unit +Description Services/roothints.service /^Description=Update root hints for unbound$/;" k section:Unit +Description Services/roothints.timer /^Description=Run root.hints monthly$/;" k section:Unit +Description Services/run-media-bruno-Multimedia.mount /^Description=Mount Multimedia out of fstab$/;" k section:Unit +Description Services/testDNS.service /^Description=Test and fix DNS update with wrong time$/;" k section:Unit +Description Services/updateRootHints.service /^Description=Run update DNS root hints montly$/;" k section:Unit +Description Services/updateRootHints.timer /^Description=Run update DNS root hints montly$/;" k section:Unit +Description Services/xpra@.service /^Description=xpra display$/;" k section:Unit +Egnyte README.md /^## Egnyte$/;" s chapter:linuxShortcuts +Environment Services/before-sleep.service /^Environment=DISPLAY=:0$/;" k section:Service +EnvironmentFile Services/backup-contabo.service /^EnvironmentFile=\/home\/bruno\/Apps\/linuxShortcuts\/Services\/backup-contabo.env$/;" k section:Service +EnvironmentFile Services/xpra@.service /^EnvironmentFile=\/etc\/conf.d\/xpra$/;" k section:Service +ExecStart Services/after-wakeup.service /^ExecStart=\/bin\/sh \/home\/bruno\/Apps\/linuxShortcuts\/Services\/afterWakeUp.sh$/;" k section:Service +ExecStart Services/backup-contabo.service /^ExecStart=\/home\/bruno\/Backups\/Contabo\/backup-contabo.sh$/;" k section:Service +ExecStart Services/backup-joplin.service /^ExecStart=\/home\/bruno\/Apps\/linuxShortcuts\/Services\/backup-joplin.sh$/;" k section:Service +ExecStart Services/before-sleep.service /^ExecStart=echo ""$/;" k section:Service +ExecStart Services/bruno-network-manager.service /^ExecStart=\/bin\/bash \/home\/bruno\/Apps\/linuxShortcuts\/Services\/bruno-network-manager.sh$/;" k section:Service +ExecStart Services/logErrors@.service /^ExecStart=\/home\/bruno\/Apps\/linuxShortcuts\/Services\/logError.sh %i$/;" k section:Service +ExecStart Services/logErrors@.service /^ExecStart=\/usr\/bin\/curl -d "Michelle: fail to run %i" ntfy.sh\/bft$/;" k section:Service +ExecStart Services/mbsync.service /^ExecStart=\/usr\/bin\/mbsync -Va$/;" k section:Service +ExecStart Services/minecraft-hour.service /^ExecStart=\/bin\/sh \/home\/bruno\/Apps\/linuxShortcuts\/Services\/minecraft-hour.sh$/;" k section:Service +ExecStart Services/roothints.service /^ExecStart=\/usr\/bin\/curl -o \/etc\/unbound\/root.hints https:\/\/www.internic.net\/domain\/nam/;" k section:Service +ExecStart Services/testDNS.service /^ExecStart = \/bin\/bash \/home\/bruno\/Apps\/linuxShortcuts\/Services\/fixDNS.sh$/;" k section:Service +ExecStart Services/updateRootHints.service /^ExecStart = \/bin\/bash \/home\/bruno\/Apps\/linuxShortcuts\/Services\/roothints.sh$/;" k section:Service +ExecStart Services/xpra@.service /^ExecStart=\/usr\/bin\/xpra --no-daemon start ${%i}$/;" k section:Service +ExecStartPost Services/mbsync.service /^ExecStartPost=\/home\/bruno\/dotfiles\/mutt\/notmuch-hook.sh$/;" k section:Service +ExecStop Services/minecraft-stop.service /^ExecStop=\/bin\/sh \/home\/bruno\/Apps\/Minecraft\/stopServers.sh$/;" k section:Service +Install Services/after-wakeup.service /^[Install]$/;" s +Install Services/backup-contabo.timer /^[Install]$/;" s +Install Services/backup-joplin.timer /^[Install]$/;" s +Install Services/before-sleep.service /^[Install]$/;" s +Install Services/bruno-network-manager.service /^[Install]$/;" s +Install Services/mbsync.timer /^[Install]$/;" s +Install Services/minecraft-hour.timer /^[Install]$/;" s +Install Services/minecraft-stop.service /^[Install]$/;" s +Install Services/roothints.timer /^[Install]$/;" s +Install Services/run-media-bruno-Multimedia.mount /^[Install]$/;" s +Install Services/testDNS.service /^[Install]$/;" s +Install Services/updateRootHints.timer /^[Install]$/;" s +Install Services/xpra@.service /^[Install]$/;" s +Mount Services/run-media-bruno-Multimedia.mount /^[Mount]$/;" s +OnBootSec Services/mbsync.timer /^OnBootSec=2m$/;" k section:Timer +OnCalendar Services/backup-contabo.timer /^OnCalendar=*-*-* 10:15:00$/;" k section:Timer +OnCalendar Services/backup-joplin.timer /^OnCalendar=Thu *-*-* 10:10:00$/;" k section:Timer +OnCalendar Services/minecraft-hour.timer /^OnCalendar=*-*-* *:0,15,30,45:00$/;" k section:Timer +OnCalendar Services/roothints.timer /^OnCalendar=monthly$/;" k section:Timer +OnCalendar Services/updateRootHints.timer /^OnCalendar=monthly$/;" k section:Timer +OnFailure Services/after-wakeup.service /^OnFailure=logErrors@%n.service$/;" k section:Unit +OnFailure Services/backup-contabo.service /^OnFailure=logErrors@%n.service$/;" k section:Unit +OnFailure Services/backup-joplin.service /^OnFailure=logErrors@%n.service$/;" k section:Unit +OnFailure Services/before-sleep.service /^OnFailure=logErrors@%n.service$/;" k section:Unit +OnFailure Services/minecraft-hour.service /^OnFailure=logErrors@%n.service$/;" k section:Unit +OnFailure Services/minecraft-stop.service /^OnFailure=logErrors@%n.service$/;" k section:Unit +OnFailure Services/roothints.service /^OnFailure=logErrors@%n.service$/;" k section:Unit +OnFailure Services/testDNS.service /^OnFailure=logErrors@%n.service$/;" k section:Unit +OnFailure Services/updateRootHints.service /^OnFailure=logErrors@%n.service$/;" k section:Unit +OnUnitActiveSec Services/mbsync.timer /^OnUnitActiveSec=5m$/;" k section:Timer +Options Services/run-media-bruno-Multimedia.mount /^Options=defaults$/;" k section:Mount +Pacman README.md /^## Pacman$/;" s chapter:linuxShortcuts +Persistent Services/backup-contabo.timer /^Persistent=true$/;" k section:Timer +Persistent Services/backup-joplin.timer /^Persistent=true$/;" k section:Timer +Persistent Services/roothints.timer /^Persistent=true$/;" k section:Timer +Persistent Services/updateRootHints.timer /^Persistent=true$/;" k section:Timer +RemainAfterExit Services/minecraft-stop.service /^RemainAfterExit=true$/;" k section:Service +Requires Services/minecraft-hour.timer /^Requires=minecraft-hour.service$/;" k section:Unit +SSH README.md /^## SSH$/;" s chapter:linuxShortcuts +Service Services/after-wakeup.service /^[Service]$/;" s +Service Services/backup-contabo.service /^[Service]$/;" s +Service Services/backup-joplin.service /^[Service]$/;" s +Service Services/before-sleep.service /^[Service]$/;" s +Service Services/bruno-network-manager.service /^[Service]$/;" s +Service Services/logErrors@.service /^[Service]$/;" s +Service Services/mbsync.service /^[Service]$/;" s +Service Services/minecraft-hour.service /^[Service]$/;" s +Service Services/minecraft-stop.service /^[Service]$/;" s +Service Services/roothints.service /^[Service]$/;" s +Service Services/testDNS.service /^[Service]$/;" s +Service Services/updateRootHints.service /^[Service]$/;" s +Service Services/xpra@.service /^[Service]$/;" s +Services README.md /^## Services$/;" s chapter:linuxShortcuts +Timer Services/backup-contabo.timer /^[Timer]$/;" s +Timer Services/backup-joplin.timer /^[Timer]$/;" s +Timer Services/mbsync.timer /^[Timer]$/;" s +Timer Services/minecraft-hour.timer /^[Timer]$/;" s +Timer Services/roothints.timer /^[Timer]$/;" s +Timer Services/updateRootHints.timer /^[Timer]$/;" s +Type Services/after-wakeup.service /^Type=simple$/;" k section:Service +Type Services/before-sleep.service /^Type=oneshot$/;" k section:Service +Type Services/bruno-network-manager.service /^Type=oneshot$/;" k section:Service +Type Services/mbsync.service /^Type=oneshot$/;" k section:Service +Type Services/minecraft-stop.service /^Type=oneshot$/;" k section:Service +Type Services/run-media-bruno-Multimedia.mount /^Type=ntfs$/;" k section:Mount +Type Services/testDNS.service /^Type=oneshot$/;" k section:Service +Type Services/updateRootHints.service /^Type=oneshot$/;" k section:Service +Type Services/xpra@.service /^Type=simple$/;" k section:Service +Unit Services/after-wakeup.service /^[Unit]$/;" s +Unit Services/backup-contabo.service /^[Unit]$/;" s +Unit Services/backup-contabo.timer /^[Unit]$/;" s +Unit Services/backup-joplin.service /^[Unit]$/;" s +Unit Services/backup-joplin.timer /^[Unit]$/;" s +Unit Services/before-sleep.service /^[Unit]$/;" s +Unit Services/bruno-network-manager.service /^[Unit]$/;" s +Unit Services/logErrors@.service /^[Unit]$/;" s +Unit Services/mbsync.service /^[Unit]$/;" s +Unit Services/mbsync.timer /^Unit=mbsync.service$/;" k section:Timer +Unit Services/mbsync.timer /^[Unit]$/;" s +Unit Services/minecraft-hour.service /^[Unit]$/;" s +Unit Services/minecraft-hour.timer /^Unit=minecraft-hour.service$/;" k section:Timer +Unit Services/minecraft-hour.timer /^[Unit]$/;" s +Unit Services/minecraft-stop.service /^[Unit]$/;" s +Unit Services/roothints.service /^[Unit]$/;" s +Unit Services/roothints.timer /^[Unit]$/;" s +Unit Services/run-media-bruno-Multimedia.mount /^[Unit]$/;" s +Unit Services/testDNS.service /^[Unit]$/;" s +Unit Services/updateRootHints.service /^[Unit]$/;" s +Unit Services/updateRootHints.timer /^[Unit]$/;" s +Unit Services/xpra@.service /^[Unit]$/;" s +User Services/backup-contabo.service /^User=bruno$/;" k section:Service +User Services/backup-joplin.service /^User=bruno$/;" k section:Service +User Services/minecraft-hour.service /^User=bruno$/;" k section:Service +User Services/minecraft-stop.service /^User=bruno$/;" k section:Service +User Services/xpra@.service /^User=%i$/;" k section:Service +WakeSystem Services/backup-contabo.timer /^WakeSystem=true$/;" k section:Timer +WakeSystem Services/backup-joplin.timer /^WakeSystem=true$/;" k section:Timer +WantedBy Services/after-wakeup.service /^WantedBy=suspend.target$/;" k section:Install +WantedBy Services/backup-contabo.timer /^WantedBy=timers.target$/;" k section:Install +WantedBy Services/backup-joplin.timer /^WantedBy=timers.target$/;" k section:Install +WantedBy Services/before-sleep.service /^WantedBy=sleep.target$/;" k section:Install +WantedBy Services/bruno-network-manager.service /^WantedBy=network-online.target$/;" k section:Install +WantedBy Services/mbsync.timer /^WantedBy=timers.target$/;" k section:Install +WantedBy Services/minecraft-hour.timer /^WantedBy=timers.target$/;" k section:Install +WantedBy Services/minecraft-stop.service /^WantedBy=multi-user.target$/;" k section:Install +WantedBy Services/roothints.timer /^WantedBy=timers.target$/;" k section:Install +WantedBy Services/run-media-bruno-Multimedia.mount /^WantedBy=multi-user.target$/;" k section:Install +WantedBy Services/testDNS.service /^WantedBy=multi-user.target$/;" k section:Install +WantedBy Services/updateRootHints.timer /^WantedBy=timers.target$/;" k section:Install +WantedBy Services/xpra@.service /^WantedBy=multi-user.target$/;" k section:Install +Wants Services/testDNS.service /^Wants=network-online.target$/;" k section:Unit +What Services/run-media-bruno-Multimedia.mount /^What=\/dev\/disk\/by-label\/Multimedia$/;" k section:Mount +Where Services/run-media-bruno-Multimedia.mount /^Where=\/run\/media\/bruno\/Multimedia$/;" k section:Mount +apt-get README.md /^## apt-get$/;" s chapter:linuxShortcuts +aur README.md /^### aur$/;" S section:linuxShortcuts""Pacman +backup Backup/.Backup_HD.sh /^function backup () {$/;" f +backupNoCompression Backup/.Backup_HD.sh /^function backupNoCompression () {$/;" f +bold Pacman/updateRepositories.sh /^function bold() {$/;" f +check-ssh-identity.sh README.md /^### check-ssh-identity.sh$/;" S section:linuxShortcuts""SSH +checkBackup Backup/.Backup_HD.sh /^function checkBackup() {$/;" f +isDNSWorking Services/fixDNS.sh /^function isDNSWorking() {$/;" f +linuxShortcuts README.md /^# linuxShortcuts$/;" c +pathToEgnyte.sh README.md /^### pathToEgnyte.sh$/;" S section:linuxShortcuts""Egnyte +prepareFolder Backup/.Backup_HD.sh /^function prepareFolder() {$/;" f +pruneBackup Backup/.Backup_HD.sh /^function pruneBackup() {$/;" f +run Services/minecraft-hour.sh /^alias run='screen -S Minecraft -X'$/;" a +run Services/minecraft-server-public.sh /^alias run='screen -S MinecraftPublic -X'$/;" a +run-media-bruno-Multimedia.mount README.md /^### run-media-bruno-Multimedia.mount$/;" S section:linuxShortcuts""Services +runAllWorlds Services/minecraft-hour.sh /^alias runAllWorlds='run at "#" stuff'$/;" a +runAllWorlds Services/minecraft-server-public.sh /^alias runAllWorlds='run at "#" stuff'$/;" a +runCreative Services/minecraft-hour.sh /^alias runCreative='run at Creative stuff'$/;" a +runPublic Services/minecraft-hour.sh /^alias runPublic='screen -S MncftPublic -X at Server stuff'$/;" a +runSurvival Services/minecraft-hour.sh /^alias runSurvival='run at Survival stuff'$/;" a +s Pacman/updateRepositories.sh /^function s() {$/;" f +update.sh README.md /^### update.sh$/;" S section:linuxShortcuts""apt-get +updateRepositories.sh README.md /^### updateRepositories.sh$/;" S section:linuxShortcuts""Pacman diff --git a/tailPihole.sh b/tailPihole.sh new file mode 100755 index 0000000..9540395 --- /dev/null +++ b/tailPihole.sh @@ -0,0 +1,3 @@ +#!/bin/sh +cd /home/bruno/Apps/piholeDocker +docker-compose exec pihole tail -f /var/log/pihole.log | awk '/from/ { printf("%s %2s %s %40s %s\n", $1, $2, $3, $6, $8 ) }'