From 170e642377b85bbd4ec62d4185c622a2ddb1b5fb Mon Sep 17 00:00:00 2001 From: Jonas Forsberg Date: Tue, 4 Aug 2020 10:28:47 +0200 Subject: [PATCH 1/7] changed packman repo to also include other versions --- salt/pillars/repositories.sls | 7 +++---- 1 file changed, 3 insertions(+), 4 deletions(-) diff --git a/salt/pillars/repositories.sls b/salt/pillars/repositories.sls index 37d34a8..14d92fa 100644 --- a/salt/pillars/repositories.sls +++ b/salt/pillars/repositories.sls @@ -1,17 +1,16 @@ repositories: google-chrome: humanname: Google Chrome - baseurl: https://dl.google.com/linux/chrome/rpm/stable/x86_64 + baseurl: http://dl.google.com/linux/chrome/rpm/stable/x86_64/ enabled: True gpgautoimport: True gpgkey: https://dl.google.com/linux/linux_signing_key.pub refresh: True -{% if grains['lsb_distrib_id'] == "openSUSE Leap" %} +{% if grains['os'] == "SUSE" %} packman: humanname: packman - baseurl: https://ftp.gwdg.de/pub/linux/misc/packman/suse/openSUSE_Leap_{{ grains['lsb_distrib_release'] }}/ + baseurl: https://ftp.gwdg.de/pub/linux/misc/packman/suse/{{ grains['oscodename'].replace(" ", "_") }}/ enabled: True gpgautoimport: True refresh: True {% endif %} - From b1a510db5f6053ae93263eb4ae26e6e20dc09a5c Mon Sep 17 00:00:00 2001 From: Jonas Forsberg Date: Tue, 4 Aug 2020 11:00:19 +0200 Subject: [PATCH 2/7] fixed google-chrome repository --- salt/pillars/repositories.sls | 6 +- .../states/files/google_linux_signing_key.pub | 165 ++++++++++++++++++ salt/states/repositories.sls | 16 ++ 3 files changed, 184 insertions(+), 3 deletions(-) create mode 100644 salt/states/files/google_linux_signing_key.pub diff --git a/salt/pillars/repositories.sls b/salt/pillars/repositories.sls index 14d92fa..41a0c5a 100644 --- a/salt/pillars/repositories.sls +++ b/salt/pillars/repositories.sls @@ -1,10 +1,10 @@ repositories: google-chrome: - humanname: Google Chrome - baseurl: http://dl.google.com/linux/chrome/rpm/stable/x86_64/ + humanname: google-chrome + baseurl: https://dl.google.com/linux/chrome/rpm/stable/x86_64/ enabled: True gpgautoimport: True - gpgkey: https://dl.google.com/linux/linux_signing_key.pub + gpgkey: /root/google_linux_signing_key.pub refresh: True {% if grains['os'] == "SUSE" %} packman: diff --git a/salt/states/files/google_linux_signing_key.pub b/salt/states/files/google_linux_signing_key.pub new file mode 100644 index 0000000..39d3905 --- /dev/null +++ b/salt/states/files/google_linux_signing_key.pub @@ -0,0 +1,165 @@ +-----BEGIN PGP PUBLIC KEY BLOCK----- +Version: GnuPG v1.4.2.2 (GNU/Linux) + +mQGiBEXwb0YRBADQva2NLpYXxgjNkbuP0LnPoEXruGmvi3XMIxjEUFuGNCP4Rj/a +kv2E5VixBP1vcQFDRJ+p1puh8NU0XERlhpyZrVMzzS/RdWdyXf7E5S8oqNXsoD1z +fvmI+i9b2EhHAA19Kgw7ifV8vMa4tkwslEmcTiwiw8lyUl28Wh4Et8SxzwCggDcA +feGqtn3PP5YAdD0km4S4XeMEAJjlrqPoPv2Gf//tfznY2UyS9PUqFCPLHgFLe80u +QhI2U5jt6jUKN4fHauvR6z3seSAsh1YyzyZCKxJFEKXCCqnrFSoh4WSJsbFNc4PN +b0V0SqiTCkWADZyLT5wll8sWuQ5ylTf3z1ENoHf+G3um3/wk/+xmEHvj9HCTBEXP +78X0A/0Tqlhc2RBnEf+AqxWvM8sk8LzJI/XGjwBvKfXe+l3rnSR2kEAvGzj5Sg0X +4XmfTg4Jl8BNjWyvm2Wmjfet41LPmYJKsux3g0b8yzQxeOA4pQKKAU3Z4+rgzGmf +HdwCG5MNT2A5XxD/eDd+L4fRx0HbFkIQoAi1J3YWQSiTk15fw7RMR29vZ2xlLCBJ +bmMuIExpbnV4IFBhY2thZ2UgU2lnbmluZyBLZXkgPGxpbnV4LXBhY2thZ2VzLWtl +eW1hc3RlckBnb29nbGUuY29tPohjBBMRAgAjAhsDBgsJCAcDAgQVAggDBBYCAwEC +HgECF4AFAkYVdn8CGQEACgkQoECDD3+sWZHKSgCfdq3HtNYJLv+XZleb6HN4zOcF +AJEAniSFbuv8V5FSHxeRimHx25671az+uQINBEXwb0sQCACuA8HT2nr+FM5y/kzI +A51ZcC46KFtIDgjQJ31Q3OrkYP8LbxOpKMRIzvOZrsjOlFmDVqitiVc7qj3lYp6U +rgNVaFv6Qu4bo2/ctjNHDDBdv6nufmusJUWq/9TwieepM/cwnXd+HMxu1XBKRVk9 +XyAZ9SvfcW4EtxVgysI+XlptKFa5JCqFM3qJllVohMmr7lMwO8+sxTWTXqxsptJo +pZeKz+UBEEqPyw7CUIVYGC9ENEtIMFvAvPqnhj1GS96REMpry+5s9WKuLEaclWpd +K3krttbDlY1NaeQUCRvBYZ8iAG9YSLHUHMTuI2oea07Rh4dtIAqPwAX8xn36JAYG +2vgLAAMFB/wKqaycjWAZwIe98Yt0qHsdkpmIbarD9fGiA6kfkK/UxjL/k7tmS4Vm +CljrrDZkPSQ/19mpdRcGXtb0NI9+nyM5trweTvtPw+HPkDiJlTaiCcx+izg79Fj9 +KcofuNb3lPdXZb9tzf5oDnmm/B+4vkeTuEZJ//IFty8cmvCpzvY+DAz1Vo9rA+Zn +cpWY1n6z6oSS9AsyT/IFlWWBZZ17SpMHu+h4Bxy62+AbPHKGSujEGQhWq8ZRoJAT +G0KSObnmZ7FwFWu1e9XFoUCt0bSjiJWTIyaObMrWu/LvJ3e9I87HseSJStfw6fki +5og9qFEkMrIrBCp3QGuQWBq/rTdMuwNFiEkEGBECAAkFAkXwb0sCGwwACgkQoECD +D3+sWZF/WACfeNAu1/1hwZtUo1bR+MWiCjpvHtwAnA1R3IHqFLQ2X3xJ40XPuAyY +/FJG +=Quqp +-----END PGP PUBLIC KEY BLOCK----- +-----BEGIN PGP PUBLIC KEY BLOCK----- + +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 +eBqxcHwQ +=4zaS +-----END PGP PUBLIC KEY BLOCK----- diff --git a/salt/states/repositories.sls b/salt/states/repositories.sls index ec39af1..2fe9e2d 100644 --- a/salt/states/repositories.sls +++ b/salt/states/repositories.sls @@ -1,3 +1,16 @@ +add the google-chrome signing key: + file.managed: + - name: /root/google_linux_signing_key.pub + - source: salt://files/google_linux_signing_key.pub + - user: root + - group: root + +import google signing key: + cmd.run: + - name: rpm --import /root/google_linux_signing_key.pub + - onchanges: + - file: add the google-chrome signing key + {% for repo, args in salt['pillar.get']('repositories', {}).items() %} Add {{ repo }} repository: pkgrepo.managed: @@ -7,4 +20,7 @@ Add {{ repo }} repository: - enabled: {{ args['enabled'] }} - gpgautoimport: {{ args['gpgautoimport'] }} - refresh: {{ args['refresh'] }} + {% if 'gpgkey' in args -%} + - gpgkey: {{ args['gpgkey'] }} + {% endif %} {% endfor %} From 44f4738f77c5f03bebc4a9404a0bea531e61efe5 Mon Sep 17 00:00:00 2001 From: Jonas Forsberg Date: Tue, 4 Aug 2020 11:27:35 +0200 Subject: [PATCH 3/7] added google-chrome and fixed gnome config --- .dconf.conf | 29 ++++++++++++++++++++++++ bin/initDesktop | 59 ++++++++++++++++++++----------------------------- 2 files changed, 53 insertions(+), 35 deletions(-) create mode 100644 .dconf.conf diff --git a/.dconf.conf b/.dconf.conf new file mode 100644 index 0000000..70f91cb --- /dev/null +++ b/.dconf.conf @@ -0,0 +1,29 @@ +[system/locale] +region='sv_SE.UTF-8' + + +[org/gnome/settings-daemon/plugins/media-keys/custom-keybindings/custom0] +binding='Return' +command='terminator' +name='Open Terminator' + +[org/gnome/evolution-data-server/calendar] + +[org/gnome/shell] +enabled-extensions=['TopIcons@phocean.net', 'multi-monitors-add-on@spin83', 'launch-new-instance@gnome-shell-extensions.gcampax.github.com'] + +[org/gnome/shell/extensions/topicons] +icon-opacity=221 +tray-pos='right' +tray-order=1 + + +[org/gnome/shell/extensions/multi-monitors-add-on] +show-activities=false +show-app-menu=false +available-indicators=@as [] +show-date-time=false +show-panel=false +thumbnails-on-left-side=false +show-thumbnails-slider=false + diff --git a/bin/initDesktop b/bin/initDesktop index bad1bc3..979cd38 100755 --- a/bin/initDesktop +++ b/bin/initDesktop @@ -22,6 +22,7 @@ Usage ${0##*/} [options..] -h,-?, --help Show help and exit -f, --firefox configure firefox and install addons -g, --gnome configure gnome and install extentions +-G, --google-chrome configure and install google-chrome extentions -d, --dotfiles configure dotfiles -s, --salt run a masterless salt-call -y, --yes answer 'yes' on all questions @@ -56,7 +57,7 @@ function log(){ function gnome_config(){ new_log "Setting my default gnome bindings" - log "WARNING! All running firefox instances will be killed" + log "WARNING! All running google-chrome instances will be killed" if asktobreak; then return fi @@ -65,42 +66,12 @@ function gnome_config(){ set -e printf "Current version %s\n" "$(gnome-shell --version)" log "Launching firefox to install GNOME Extetions" - firefox https://extensions.gnome.org/extension/1031/topicons/ - firefox https://extensions.gnome.org/extension/600/launch-new-instance/ - firefox https://extensions.gnome.org/extension/921/multi-monitors-add-on/ + google-chrome https://extensions.gnome.org/extension/1031/topicons/ 2> /dev/null + google-chrome https://extensions.gnome.org/extension/600/launch-new-instance/ 2> /dev/null + google-chrome https://extensions.gnome.org/extension/921/multi-monitors-add-on/ 2> /dev/null log "loading dconf settings" - dconf load < cat < /dev/null +} + #initialize all options ALL=true FIREFOX=false GNOME=false SALT=false DOTFILES=false +CHROME=false ANSWER_YES=false while :; do case $1 in @@ -176,6 +160,10 @@ while :; do GNOME=true ALL=false ;; + -G|--google-chrome) + CHROME=true + ALL=false + ;; -s|--salt) SALT=true ALL=false @@ -204,6 +192,7 @@ done [[ $ALL == true ]] || [[ $DOTFILES == true ]] && setup_dotfiles [[ $ALL == true ]] || [[ $SALT == true ]] && do_salt_call [[ $ALL == true ]] || [[ $FIREFOX == true ]] && firefox_config +[[ $ALL == true ]] || [[ $CHROME == true ]] && chrome_config [[ $ALL == true ]] || [[ $GNOME == true ]] && gnome_config printf "\n DONE!!!!!!!\n" From f82695bb96f27508552ffd05063d731090bca7a1 Mon Sep 17 00:00:00 2001 From: Jonas Forsberg Date: Wed, 5 Aug 2020 07:33:46 +0200 Subject: [PATCH 4/7] added custom0 keybinding --- .dconf.conf | 2 ++ 1 file changed, 2 insertions(+) diff --git a/.dconf.conf b/.dconf.conf index 70f91cb..5e11238 100644 --- a/.dconf.conf +++ b/.dconf.conf @@ -1,6 +1,8 @@ [system/locale] region='sv_SE.UTF-8' +[org/gnome/settings-daemon/plugins/media-keys] +custom-keybindings=['/org/gnome/settings-daemon/plugins/media-keys/custom-keybindings/custom0/'] [org/gnome/settings-daemon/plugins/media-keys/custom-keybindings/custom0] binding='Return' From efab21e9d1b8c6c7c4ea9fbb4d3abded09655305 Mon Sep 17 00:00:00 2001 From: Jonas Forsberg Date: Wed, 5 Aug 2020 07:41:50 +0200 Subject: [PATCH 5/7] Added autostart files --- .../com.nextcloud.desktopclient.nextcloud.desktop | 10 ++++++++++ .config/autostart/org.keepassxc.KeePassXC.desktop | 14 ++++++++++++++ 2 files changed, 24 insertions(+) create mode 100644 .config/autostart/com.nextcloud.desktopclient.nextcloud.desktop create mode 100644 .config/autostart/org.keepassxc.KeePassXC.desktop diff --git a/.config/autostart/com.nextcloud.desktopclient.nextcloud.desktop b/.config/autostart/com.nextcloud.desktopclient.nextcloud.desktop new file mode 100644 index 0000000..0b3dddc --- /dev/null +++ b/.config/autostart/com.nextcloud.desktopclient.nextcloud.desktop @@ -0,0 +1,10 @@ +[Desktop Entry] +Name=Nextcloud +GenericName=File Synchronizer +Exec=/usr/bin/nextcloud +Terminal=false +Icon=Nextcloud +Categories=Network +Type=Application +StartupNotify=false +X-GNOME-Autostart-enabled=true diff --git a/.config/autostart/org.keepassxc.KeePassXC.desktop b/.config/autostart/org.keepassxc.KeePassXC.desktop new file mode 100644 index 0000000..14eade2 --- /dev/null +++ b/.config/autostart/org.keepassxc.KeePassXC.desktop @@ -0,0 +1,14 @@ +[Desktop Entry] +Name=KeePassXC +GenericName=Password Manager +Exec=/usr/bin/keepassxc +TryExec=/usr/bin/keepassxc +Icon=keepassxc +StartupWMClass=keepassxc +StartupNotify=true +Terminal=false +Type=Application +Version=1.0true +Categories=Utility;Security;Qt; +MimeType=application/x-keepass2; +X-GNOME-Autostart-enabled=true From 667d0a6cac1de9c17c60cb87fb13f71dde6f740e Mon Sep 17 00:00:00 2001 From: Jonas Forsberg Date: Wed, 5 Aug 2020 07:52:21 +0200 Subject: [PATCH 6/7] Added possibility to change to ssh on dotfiles repo --- bin/initDesktop | 8 ++++++++ 1 file changed, 8 insertions(+) diff --git a/bin/initDesktop b/bin/initDesktop index 979cd38..a1c7607 100755 --- a/bin/initDesktop +++ b/bin/initDesktop @@ -7,6 +7,7 @@ DOTFILES_REPO="$HOME/.dotfiles" DOTFILES_REMOTE="https://git.rre.nu:443/jonas/dotfiles.git" +DOTFILES_REMOTE_SSH="ssh://git@curry.rre.nu:3022/jonas/dotfiles.git" DOTFILES_RENAME_EXISTING_FILES=( .bashrc @@ -100,6 +101,13 @@ function setup_dotfiles(){ log "fetching dotfiles" $dotf fetch origin $dotf checkout master + + printf "Do you want to switch to SSH remote on dotfiles [N/y]? " + read -r -n 1 -s answer + if [[ $answer == [Yy] ]];then + $dotf remote set-url origin "$DOTFILES_REMOTE_SSH" + fi + } function do_salt_call(){ From 22e4d8aa7b0843f4355ca5c483379480cc524bfa Mon Sep 17 00:00:00 2001 From: Jonas Forsberg Date: Wed, 5 Aug 2020 17:41:06 +0200 Subject: [PATCH 7/7] added Proprietary media codecs for openSUSE --- bin/initDesktop | 15 +++++++++++++++ 1 file changed, 15 insertions(+) diff --git a/bin/initDesktop b/bin/initDesktop index a1c7607..1f5effc 100755 --- a/bin/initDesktop +++ b/bin/initDesktop @@ -21,6 +21,7 @@ function printHelp(){ cat << EOF Usage ${0##*/} [options..] -h,-?, --help Show help and exit +-c, --codecs install propriatory media codecs (openSUSE) -f, --firefox configure firefox and install addons -g, --gnome configure gnome and install extentions -G, --google-chrome configure and install google-chrome extentions @@ -145,9 +146,18 @@ function chrome_config(){ set -e google-chrome https://chrome.google.com/webstore/detail/gnome-shell-integration/gphhapmejobijbbhgpjhcjognlahblep 2> /dev/null } +function suse_install_codecs(){ + new_log "Install Proprietary media codecs?" + log "WARNING! This is for openSUSE only" + if asktobreak; then + return + fi + sudo "$HOME/bin/install_codecs" +} #initialize all options ALL=true +CODECS=false FIREFOX=false GNOME=false SALT=false @@ -156,6 +166,10 @@ CHROME=false ANSWER_YES=false while :; do case $1 in + -c|--codecs) + CODECS=true + ALL=false + ;; -h|-\?|--help) printHelp exit @@ -202,5 +216,6 @@ done [[ $ALL == true ]] || [[ $FIREFOX == true ]] && firefox_config [[ $ALL == true ]] || [[ $CHROME == true ]] && chrome_config [[ $ALL == true ]] || [[ $GNOME == true ]] && gnome_config +[[ $ALL == true ]] || [[ $CODECS == true ]] && suse_install_codecs printf "\n DONE!!!!!!!\n"