README.org

@@ -102,10 +102,9 @@
      - [ ] add LUKS Nuke support https://www.kali.org/tutorials/nuke-kali-linux-luks/
      - [ ] OPTIONAL add PowerShell https://www.kali.org/tutorials/installing-powershell-on-kali-linux/
 
-** TODO [0/5]
+** TODO [0/4]
 
    - [ ] explain setup, ideas, practises
    - [ ] add HOWTO
    - [ ] seperate sources.list setup for server/desktop/laptop
-   - [ ] Check new bootable USB solution: https://ventoy.net/en/index.html
    - [ ] move to ansible for easier modularization of setup

etc/systemd/system/backup-wd2tb.service

@@ -1,10 +0,0 @@
-[Unit]
-Description=My auto backup to WD Passport
-Requires=media-wdpassport2tb.mount
-After=media-wdpassport2tb.mount
-
-[Service]
-ExecStart=/home/fschl/dotfiles/scripts/show_local_backup.sh
-
-[Install]
-WantedBy=media-wdpassport2tb.mount

etc/systemd/system/syncthing-resume.service

@@ -1,11 +0,0 @@
-[Unit]
-Description=Restart Syncthing after resume
-Documentation=man:syncthing(1)
-After=sleep.target
-
-[Service]
-Type=oneshot
-ExecStart=-/usr/bin/pkill -HUP -x syncthing
-
-[Install]
-WantedBy=sleep.target

etc/systemd/system/syncthing@.service

@@ -1,24 +0,0 @@
-[Unit]
-Description=Syncthing - Open Source Continuous File Synchronization for %I
-Documentation=man:syncthing(1)
-After=network.target
-StartLimitIntervalSec=60
-StartLimitBurst=4
-
-[Service]
-User=%i
-ExecStart=/usr/bin/syncthing serve --no-browser --no-restart --logflags=0
-Restart=on-failure
-RestartSec=1
-SuccessExitStatus=3 4
-RestartForceExitStatus=3 4
-
-# Hardening
-ProtectSystem=full
-PrivateTmp=true
-SystemCallArchitectures=native
-MemoryDenyWriteExecute=true
-NoNewPrivileges=true
-
-[Install]
-WantedBy=multi-user.target

scripts/install.sh

@@ -190,56 +190,6 @@ install_latex() {
         --no-install-recommends
 }
 
-install_workstation_apps() {
-    
-    DEBIAN_FRONTEND=noninteractive
-
-    # TODO add non-free to apt/sources.list
-    apt update
-    apt install -y \
-        alsa-utils \
-        aspell \
-        aspell-de \
-        aspell-en \
-        cups-browsed \
-        emacs \
-        firefox-esr \
-        firmware-iwlwifi \
-        firmware-linux-nonfree \
-        firmware-realtek \
-        fonts-font-awesome \
-        fonts-noto \
-        fonts-noto-cjk \
-        gimp \
-        keepassxc \
-        libnotify-bin \
-        libnotify-dev \
-        libreoffice-calc \
-        libreoffice-impress \
-        libreoffice-l10n-de \
-        libreoffice-l10n-en-gb \
-        libreoffice-writer \
-        ntfs-3g \
-        nmap \
-        pulseaudio \
-        slim \
-        thunderbird \
-        thunderbird-l10n-de \
-        thunderbird-l10n-en-gb \
-        vlc \
-        --no-install-recommends
-
-    TARGET="/home/$USERNAME/.emacs.d"
-    git clone https://github.com/syl20bnr/spacemacs "${TARGET}"
-    #    rm -rf "${TARGET}"/private/snippets
-    #    git clone https://github.com/AndreaCrotti/yasnippet-snippets "${TARGET}"/private/yas-snippets
-    #    ln -s "${TARGET}"/private/yas-snips/snippets "${TARGET}"/private/snippets/
-}
-
-install_sway() {
-    echo ".... TODO ;-) ..."
-}
-
 install_i3() {
     echo "update and installing i3wm and some tools..."
 
@@ -256,25 +206,52 @@ install_i3() {
     DEBIAN_FRONTEND=noninteractive
 
     # TODO add non-free to apt/sources.list
+
     apt update
     apt install -y \
+        alsa-utils \
+        aspell \
+        aspell-de \
+        aspell-en \
+        cups-browsed \
+        emacs \
         feh \
+        firefox-esr \
+        firmware-iwlwifi \
+        firmware-linux-nonfree \
+        firmware-realtek \
+        fonts-font-awesome \
+        fonts-noto \
+        fonts-noto-cjk \
         fswebcam \
+        gimp \
         i3 \
         i3lock \
         i3lock-fancy \
         i3status \
+        keepassxc \
         libnotify-bin \
         libnotify-dev \
+        libreoffice-calc \
+        libreoffice-impress \
+        libreoffice-l10n-de \
+        libreoffice-l10n-en-gb \
+        libreoffice-writer \
         network-manager-gnome \
         network-manager-vpnc \
         network-manager-vpnc-gnome \
         notify-osd \
+        ntfs-3g \
+        nmap \
+        pulseaudio \
         remmina \
         rxvt-unicode-256color \
         scrot \
         shotwell \
         slim \
+        thunderbird \
+        thunderbird-l10n-de \
+        thunderbird-l10n-en-gb \
         vlc \
         xorg \
         --no-install-recommends
@@ -285,12 +262,6 @@ install_i3() {
     Exec=/usr/lib/notification-daemon/notification-daemon
 EOF
 
-    echo "... setting capslock to control"
-    sed -i "s/^XKBOPTIONS=.*/XKBOPTIONS=\"ctrl:nocaps\"/" /etc/default/keyboard
-
-}
-
-install_syncthing() {
     # install Syncthing via https://apt.syncthing.net/
     # Add the release PGP keys:
     curl -s https://syncthing.net/release-key.txt | sudo apt-key add -
@@ -309,14 +280,16 @@ install_syncthing() {
     apt autoclean
     apt clean
 
-    echo "enable and start the syncthing per-user service for ${USERNAME}"
+    TARGET="/home/$USERNAME/.emacs.d"
-    cp ../etc/systemd/system/syncth* /etc/systemd/system/
+    git clone https://github.com/syl20bnr/spacemacs "${TARGET}"
-    user=${USERNAME}
+#    rm -rf "${TARGET}"/private/snippets
-    sudo systemctl daemon-reload
+#    git clone https://github.com/AndreaCrotti/yasnippet-snippets "${TARGET}"/private/yas-snippets
-    sudo systemctl enable syncthing@${USERNAME}
+#    ln -s "${TARGET}"/private/yas-snips/snippets "${TARGET}"/private/snippets/
-    sudo systemctl start syncthing@${USERNAME}.service
-    systemctl status syncthing@${USERNAME}.service
 
+    no_suspend
+
+    echo "... setting capslock to control"
+    sed -i "s/^XKBOPTIONS=.*/XKBOPTIONS=\"ctrl:nocaps\"/" /etc/default/keyboard
 }
 
 install_vscodium() {
@@ -439,15 +412,11 @@ install_golang() {
     )
 }
 
-install_rust() {
-    echo ".... TODO ! rustup.sh ... "
-}
-
 main() {
     local cmd=$1
 
     if [[ -z "$cmd" ]]; then
-        echo "Usage: \n base (incl docker+compose)| desktop | server | dotfiles | vscode | latex | update-docker | go | rust"
+        echo "Usage: \n base (includes docker+compose)| desktop | server | dotfiles | vscode | latex | update-docker | go"
     fi
 
     case "$cmd" in
@@ -468,9 +437,7 @@ main() {
             base_applications
             install_docker
             install_compose
-            install_syncthing
             install_i3
-            install_workstation_apps
             if [ -f "./get_private_stuff.sh" ]; then
                 source get_private_stuff.sh
             fi
@@ -488,9 +455,6 @@ main() {
         go)
             install_golang
             ;;
-        rust)
-            install_rust
-            ;;
     esac
 }