swutch 2 github

mint-config-update.sh

@@ -15,7 +15,8 @@ then
 fi
 
 # download and run
-until wget https://gitea.ds9.dedyn.io/olli/linux-mint/raw/branch/main/mint.sh -O /tmp/mint.sh
+#until wget https://gitea.ds9.dedyn.io/olli/linux-mint/raw/branch/main/mint.sh -O /tmp/mint.sh
+until wget https://raw.githubusercontent.com/egabosh/linux-setups/refs/heads/main/mint/mint.sh -O /tmp/mint.sh
 do
   echo "mint.sh could not be downloaded trying again in 5 seconds"
   sleep 5

mint.sh

@@ -15,7 +15,20 @@ Nutzung auf einene Gefahr!!! Nur mit Enter/Return fortfahren wenn dieses Skript
 
 whoami | grep -q ^root$ || read x
 
-set -x
+## sudo without password
+#echo '%adm ALL=(ALL) NOPASSWD:ALL' | sudo tee /etc/sudoers.d/adm
+#sudo chmod 640 /etc/sudoers.d/adm
+
+## admin actions without password
+#echo '/* Allow members of the adm group to execute any actions
+# * without password authentication, similar to "sudo NOPASSWD:"
+# */
+#polkit.addRule(function(action, subject) {
+#    if (subject.isInGroup("adm")) {
+#        return polkit.Result.YES;
+#    }
+#});' | sudo tee /etc/polkit-1/rules.d/adm.rules
+#sudo chmod 644 /etc/polkit-1/rules.d/adm.rules
 
 # Check for using DoHoT
 if [ -s /etc/dnscrypt-proxy/blocked-names.txt ]
@@ -34,6 +47,15 @@ fi
 defaultuser=$(getent passwd 1000 | cut -d: -f1)
 defaultuserhome=$(getent passwd 1000 | cut -d: -f6)
 
+# move data from element/signal flatpaks to default element/signal
+if [ -d "$defaultuserhome/.var/app/org.signal.Signal/config/Signal" ] 
+then 
+   [ -d "$defaultuserhome/.config/Signal" ] || rsync -av "$defaultuserhome"/.var/app/org.signal.Signal/config/Signal/ "$defaultuserhome"/.config/Signal/
+fi
+if [ -d "$defaultuserhome/.var/app/im.riot.Riot/config/Element" ] 
+then
+  [ -d "$defaultuserhome/.config/Element" ] || rsync -av "$defaultuserhome"/.var/app/im.riot.Riot/config/Element/ "$defaultuserhome"/.config/Element/
+fi
 
 # hostname
 if hostname | grep -q "^${defaultuser}-"
@@ -83,7 +105,7 @@ sudo DEBIAN_FRONTEND=noninteractive apt-get -y dist-upgrade
 # install ansible
 if grep -q ^RELEASE=22 /etc/linuxmint/info
 then
-  sudo apt-get -y install ansible
+  sudo apt-get -y install ansible git
 else
   sudo DEBIAN_FRONTEND=noninteractive apt-get -y install python3-pip git
   sudo pip install ansible
@@ -114,9 +136,9 @@ for playbook in debian.ansible.basics \
  debian.ansible.firewall \
  debian.ansible.tornet.network \
  debian.ansible.vnet.network \
- debian.ansible.autoupdate \
- debian.ansible.signal-cli.client \
- debian.ansible.dedyn.client
+ debian.ansible.signal-desktop \
+ debian.ansible.element-desktop \
+ debian.ansible.autoupdate
 do
   sudo rm -rf ${playbook}
   git clone https://gitea.${mydomain}/olli/${playbook}.git
@@ -142,9 +164,9 @@ sudo cat <<EOF >${defaultuserhome}/.xsessionrc
 # https://github.com/vector-im/element-web/issues/25776
 rm -rf ~/.var/app/im.riot.Riot/config/Element/GPUCache
 
-# Backup only if autologin deactivated
-if ! grep -qr ^autologin-user= /etc/lightdm 
-then 
+# Backup #only if autologin deactivated
+#if ! grep -qr ^autologin-user= /etc/lightdm 
+#then 
   if [ -f ~/Nextcloud/scripts/backup-this-device.sh ]
   then
     gnome-terminal --hide-menubar --title=BACKUP --geometry=120x35 -- bash ~/Nextcloud/scripts/backup-this-device.sh
@@ -155,46 +177,54 @@ then
   then
     gnome-terminal --hide-menubar --title=BACKUP --geometry=120x35 -- bash ~/.scripts/backup-this-device.sh
   fi
-fi
+#fi
 
 # Autoupdate flatpak and cinnamon
 dconf write /com/linuxmint/updates/auto-update-cinnamon-spices true
 dconf write /com/linuxmint/updates/auto-update-flatpaks true
 
-# disable saving recent files
-dconf write /org/cinnamon/desktop/privacy/remember-recent-files false
+if ! [ -s ~/.initial-mint-config-by-xsessionrc ]
+then
 
-# Touchpad Scrolling
-dconf write /org/cinnamon/desktop/peripherals/touchpad/edge-scrolling-enabled true
-dconf write /org/cinnamon/desktop/peripherals/touchpad/two-finger-scrolling-enabled false
+  # disable saving recent files
+  dconf write /org/cinnamon/desktop/privacy/remember-recent-files false
 
-# Terminus font in Terminal
-#dconf write "/org/gnome/terminal$(dconf dump /org/gnome/terminal/ | egrep '/profiles:...*' | sed 's/\[//g ; s/\]//g; s/\/$//')/font" "'Terminus (TTF) Medium 12'"
+  # Touchpad Scrolling
+  dconf write /org/cinnamon/desktop/peripherals/touchpad/edge-scrolling-enabled true
+  dconf write /org/cinnamon/desktop/peripherals/touchpad/two-finger-scrolling-enabled false
 
-# Winkey+l=Locksreen
-dconf write /org/cinnamon/desktop/keybindings/custom-keybindings/custom8/command '"cinnamon-screensaver-command --lock"'
-dconf write /org/cinnamon/desktop/keybindings/custom-keybindings/custom8/binding "['<Mod4>l']"
-dconf write /org/cinnamon/desktop/keybindings/custom-keybindings/custom8/name '"Lockscreen"'
-dconf write /org/cinnamon/desktop/keybindings/custom-list "['__dummy__'$(dconf dump / 2>&1 | egrep '^\[org/cinnamon/desktop/keybindings/custom-keybindings/' | cut -d/ -f 6 | cut -d] -f1 | perl -pe "s/(.+)\n/, '\$1'/g")]"
+  # Terminal font Terminus
+  termprofile=\$(dconf dump /org/gnome/terminal/legacy/profiles:/ | grep '^\\[:' | cut -d : -f2 | cut -d] -f1)
+  dconf write "/org/gnome/terminal/legacy/profiles:/:\${termprofile}/font" "'Terminus (TTF) Medium 12'"
 
-# dark theme
-#dconf write /org/cinnamon/desktop/interface/gtk-theme "'Mint-Y-Dark'"
-#dconf write /org/cinnamon/desktop/interface/icon-theme "'Mint-Y-Dark'"
+  # Winkey+l=Locksreen
+  dconf write /org/cinnamon/desktop/keybindings/custom-keybindings/custom8/command '"cinnamon-screensaver-command --lock"'
+  dconf write /org/cinnamon/desktop/keybindings/custom-keybindings/custom8/binding "['<Mod4>l']"
+  dconf write /org/cinnamon/desktop/keybindings/custom-keybindings/custom8/name '"Lockscreen"'
+  dconf write /org/cinnamon/desktop/keybindings/custom-list "['__dummy__']"
   
-# Nemo Filemanager Settings
-dconf write /org/nemo/preferences/default-folder-viewer "'list-view'"
-dconf write /org/nemo/preferences/show-location-entry true
+  # dark theme
+  dconf write /org/cinnamon/desktop/interface/gtk-theme "'Mint-Y-Dark'"
+  dconf write /org/cinnamon/desktop/interface/icon-theme "'Mint-Y'"
+  dconf write /org/cinnamon/theme/name "'Mint-Y-Dark'"
+  dconf write /org/gnome/desktop/interface/icon-theme "'Mint-Y-Dark'"
+  dconf write /org/gnome/desktop/interface/gtk-theme "'Mint-Y-Dark'"
  
-# Traditional Cinnamon task bar (https://forums.linuxmint.com/viewtopic.php?t=321872)
-dconf write /org/cinnamon/panels-enabled "['1:0:bottom']"
-dconf write /org/cinnamon/panels-height "['1:27']"
-dconf write /org/cinnamon/panel-zone-icon-sizes '[{"left":0,"center":0,"right":0,"panelId":1}]'
-#dconf write /org/cinnamon/enabled-applets "['panel1:left:0:menu@cinnamon.org','panel1:left:1:show-desktop@cinnamon.org','panel1:left:2:panel-launchers@cinnamon.org','panel1:left:3:window-list@cinnamon.org','panel1:right:0:systray@cinnamon.org','panel1:right:1:xapp-status@cinnamon.org','panel1:right:2:keyboard@cinnamon.org','panel1:right:3:notifications@cinnamon.org','panel1:right:4:printers@cinnamon.org','panel1:right:5:removable-drives@cinnamon.org','panel1:right:6:user@cinnamon.org','panel1:right:7:network@cinnamon.org','panel1:right:8:sound@cinnamon.org','panel1:right:9:power@cinnamon.org','panel1:right:10:calendar@cinnamon.org']"
-dconf write /org/cinnamon/theme/name "'Linux Mint'"
-#cinnamon --replace > /dev/null 2>&1 & disown
+  # Nemo Filemanager Settings
+  dconf write /org/nemo/preferences/default-folder-viewer "'list-view'"
+  dconf write /org/nemo/preferences/show-location-entry true
+
+  # Traditional Cinnamon task bar (https://forums.linuxmint.com/viewtopic.php?t=321872)
+  dconf write /org/cinnamon/panels-enabled "['1:0:bottom']"
+  dconf write /org/cinnamon/panels-height "['1:27']"
+  dconf write /org/cinnamon/panel-zone-icon-sizes '[{"left":0,"center":0,"right":0,"panelId":1}]'
+  dconf write /org/cinnamon/enabled-applets "['panel1:left:0:menu@cinnamon.org','panel1:left:1:show-desktop@cinnamon.org','panel1:left:2:panel-launchers@cinnamon.org','panel1:left:3:window-list@cinnamon.org','panel1:right:0:systray@cinnamon.org','panel1:right:1:xapp-status@cinnamon.org','panel1:right:2:keyboard@cinnamon.org','panel1:right:3:notifications@cinnamon.org','panel1:right:4:printers@cinnamon.org','panel1:right:5:removable-drives@cinnamon.org','panel1:right:6:user@cinnamon.org','panel1:right:7:network@cinnamon.org','panel1:right:8:sound@cinnamon.org','panel1:right:9:power@cinnamon.org','panel1:right:10:calendar@cinnamon.org']"
+
+  date >> ~/.initial-mint-config-by-xsessionrc
+
+fi
 
 [ -x ~/.xsessionrc.followup ] && ~/.xsessionrc.followup
-
 EOF
 
 sudo chmod 700 "${defaultuserhome}"/.xsessionrc 

mint.yml

@@ -52,8 +52,14 @@
           - mediathekview
           - audacious
           - guvcview
-          - easyeffects
           - calf-plugins
+          - lame
+          - vorbis-tools
+          - fdkaac
+          - flac
+          - opus-tools
+          - wavpack
+          - musepack-tools
           # retro
           - dosbox
           # brennen
@@ -66,10 +72,18 @@
           - tinyproxy
           - hardinfo
           - rpi-imager
+          - redshift-gtk
           # virtualization
           - virtualbox
           - virtualbox-qt
           - virtualbox-guest-additions-iso
+          # screenshot
+          - flameshot
+          # groupware
+          - evolution
+          # nextcloud
+          - nextcloud-desktop
+          - nemo-nextcloud
         update_cache: yes
         install_recommends: no
         
@@ -77,17 +91,10 @@
       community.general.flatpak:
         name:
           - org.gtk.Gtk3theme.Mint-Y-Dark
-          - org.signal.Signal
-          - com.nextcloud.desktopclient.nextcloud
-          - com.vscodium.codium
-          - org.ksnip.ksnip
-          - org.gnome.Evolution
           - com.github.tchx84.Flatseal
-          - tv.kodi.Kodi
         state: present
         method: system
 
-
     - name: mint-config-update
       blockinfile:
         path: /etc/systemd/system/mint-config-update.service