diff options
Diffstat (limited to 'manifests/utils')
-rw-r--r-- | manifests/utils/bundle/standard.pp | 8 | ||||
-rw-r--r-- | manifests/utils/development/debian.pp | 1 | ||||
-rw-r--r-- | manifests/utils/development/ide.pp | 7 | ||||
-rw-r--r-- | manifests/utils/firmware/efi.pp | 10 | ||||
-rw-r--r-- | manifests/utils/interface.pp | 16 | ||||
-rw-r--r-- | manifests/utils/multimedia.pp | 3 | ||||
-rw-r--r-- | manifests/utils/multimedia/bluetooth.pp | 13 | ||||
-rw-r--r-- | manifests/utils/network/minimal.pp | 1 | ||||
-rw-r--r-- | manifests/utils/network/signal.pp | 4 | ||||
-rw-r--r-- | manifests/utils/network/tor.pp | 32 | ||||
-rw-r--r-- | manifests/utils/office/console.pp | 5 | ||||
-rw-r--r-- | manifests/utils/office/gui.pp | 1 | ||||
-rw-r--r-- | manifests/utils/storage/archive.pp | 1 |
13 files changed, 89 insertions, 13 deletions
diff --git a/manifests/utils/bundle/standard.pp b/manifests/utils/bundle/standard.pp index ff33e87..fe6e37c 100644 --- a/manifests/utils/bundle/standard.pp +++ b/manifests/utils/bundle/standard.pp @@ -3,9 +3,11 @@ class nodo::utils::bundle::standard { include nodo::utils::office::gui include nodo::utils::printer include nodo::utils::network - include nodo::utils::network::xmpp include nodo::utils::web::gui - include nodo::utils::desktop::gnome include nodo::utils::desktop::cinnamon - include nodo::utils::multimedia::downloaders + + # Old dependencies + #include nodo::utils::network::xmpp + #include nodo::utils::desktop::gnome + #include nodo::utils::multimedia::downloaders } diff --git a/manifests/utils/development/debian.pp b/manifests/utils/development/debian.pp index 4f0831b..2836d95 100644 --- a/manifests/utils/development/debian.pp +++ b/manifests/utils/development/debian.pp @@ -29,6 +29,7 @@ class nodo::utils::development::debian ( 'apt-listchanges', 'apt-forktracer', 'aptitude', + 'apt-utils', #'deborphans', ]: ensure => $ensure, diff --git a/manifests/utils/development/ide.pp b/manifests/utils/development/ide.pp index 3568979..8361562 100644 --- a/manifests/utils/development/ide.pp +++ b/manifests/utils/development/ide.pp @@ -8,7 +8,7 @@ class nodo::utils::development::ide ( 'myrepos', 'python3-sphinx', - 'python3-recommonmark', + 'python3-myst-parser', 'yamllint', @@ -22,6 +22,7 @@ class nodo::utils::development::ide ( 'pelican', 'hugo', 'mkdocs', + #'markdown', ]: ensure => $ensure, } @@ -65,6 +66,10 @@ class nodo::utils::development::ide ( 'exuberant-ctags', 'doxygen', 'agave', + + # Deprecated in favor of python3-myst-parser + # https://github.com/readthedocs/recommonmark + 'python3-recommonmark', ]: ensure => absent, } diff --git a/manifests/utils/firmware/efi.pp b/manifests/utils/firmware/efi.pp new file mode 100644 index 0000000..fa66284 --- /dev/null +++ b/manifests/utils/firmware/efi.pp @@ -0,0 +1,10 @@ +class nodo::utils::firmware::efi ( + $ensure = 'installed', +) { + package { [ + 'fwupd', + 'efivar', + ]: + ensure => $ensure, + } +} diff --git a/manifests/utils/interface.pp b/manifests/utils/interface.pp index d337d13..8a67557 100644 --- a/manifests/utils/interface.pp +++ b/manifests/utils/interface.pp @@ -25,6 +25,7 @@ class nodo::utils::interface inherits nodo::utils::interface::console { 'i3lock', 'materia-gtk-theme', 'blackbird-gtk-theme', + 'obsidian-icon-theme', ]: ensure => installed, } @@ -61,9 +62,7 @@ class nodo::utils::interface inherits nodo::utils::interface::console { 'compton', 'xzoom', 'xautomation', - 'gtk-theme-switch', - 'gtk-smooth-themes', - 'lxappearance', + 'wmctrl', 'pcmanfm', 'metar', @@ -73,6 +72,17 @@ class nodo::utils::interface inherits nodo::utils::interface::console { 'xterm', 'eterm', 'gnome-terminal', + + # Check https://wiki.archlinux.org/title/GTK + # https://wiki.gnome.org/Apps/DconfEditor + 'gtk-theme-switch', + 'gtk-smooth-themes', + 'dconf-editor', + 'lxappearance', + + # xsettingsd is a daemon that implements the XSETTINGS specification. + # https://codeberg.org/derat/xsettingsd + 'xsettingsd', ]: ensure => absent, } diff --git a/manifests/utils/multimedia.pp b/manifests/utils/multimedia.pp index d85cebe..0b40660 100644 --- a/manifests/utils/multimedia.pp +++ b/manifests/utils/multimedia.pp @@ -1,11 +1,12 @@ # Multimedia utilities class nodo::utils::multimedia inherits nodo::utils::multimedia::minimal { package { [ + 'pulseaudio', 'pavucontrol', + 'pasystray', 'jhead', 'qrencode', 'scrot', - 'pulseaudio', ]: ensure => installed, } diff --git a/manifests/utils/multimedia/bluetooth.pp b/manifests/utils/multimedia/bluetooth.pp new file mode 100644 index 0000000..8d3c74a --- /dev/null +++ b/manifests/utils/multimedia/bluetooth.pp @@ -0,0 +1,13 @@ +# https://wiki.debian.org/BluetoothUser +# https://wiki.debian.org/BluetoothUser/a2dp +class nodo::utils::multimedia::bluetooth ( + $ensure = 'installed', +) { + package { [ + 'blueman', + 'bluetooth', + 'pulseaudio-module-bluetooth', + ]: + ensure => $ensure, + } +} diff --git a/manifests/utils/network/minimal.pp b/manifests/utils/network/minimal.pp index e6ac1dc..4510e85 100644 --- a/manifests/utils/network/minimal.pp +++ b/manifests/utils/network/minimal.pp @@ -3,6 +3,7 @@ class nodo::utils::network::minimal inherits nodo::utils::http { include nodo::utils::network::torrent package { [ + 'ldnsutils', 'unison', 'httrack', 'zsync', diff --git a/manifests/utils/network/signal.pp b/manifests/utils/network/signal.pp index 037140a..6cd200b 100644 --- a/manifests/utils/network/signal.pp +++ b/manifests/utils/network/signal.pp @@ -1,7 +1,7 @@ class nodo::utils::network::signal { nodo::subsystem::apt::repo { 'signal.org': - definition => 'deb [arch=amd64] https://updates.signal.org/desktop/apt xenial main', - key_source => 'puppet:///modules/nodo/etc/apt/trusted.gpg.d/signal.org.gpg', + definition => 'deb [signed-by=/etc/apt/keyrings/signal.org.gpg arch=amd64] https://updates.signal.org/desktop/apt xenial main', + key_source => 'puppet:///modules/nodo/etc/apt/keyrings/signal.org.gpg', } package { 'signal-desktop': diff --git a/manifests/utils/network/tor.pp b/manifests/utils/network/tor.pp index 78b08a4..f93d37a 100644 --- a/manifests/utils/network/tor.pp +++ b/manifests/utils/network/tor.pp @@ -3,9 +3,28 @@ class nodo::utils::network::tor ( $ensure = 'installed', ) { + $keyrings_folder = "/usr/share/keyrings" + $keyring = "${keyrings_folder}/deb.torproject.org-keyring.gpg" + nodo::subsystem::apt::repo { 'torproject.org': - definition => "deb [signed-by=/etc/apt/trusted.gpg.d/torproject.org.gpg] https://deb.torproject.org/torproject.org ${::lsbdistcodename} main", - key_source => 'puppet:///modules/nodo/etc/apt/trusted.gpg.d/torproject.org.gpg', + definition => "deb [signed-by=${keyring}] https://deb.torproject.org/torproject.org ${::lsbdistcodename} main", + key_source => "puppet:///modules/nodo/${keyring}", + keyrings_folder => "${keyrings_folder}", + } + + # Puppet should setup the Tor Project's APT keyring only in the first time + # Afterwards ${keyring} will be managed by the deb.torproject.org-keyring package + # + # References: + # + # * https://support.torproject.org/apt/tor-deb-repo/ + # * https://gitlab.torproject.org/tpo/web/support/-/merge_requests/220 + exec { 'torproject-keyring-copy': + command => "cp ${keyrings_folder}/torproject.org.gpg ${keyring}", + onlyif => "/bin/test ! -e ${keyring}", + creates => "${keyring}", + require => File["${keyrings_folder}/torproject.org.gpg"], + notify => Exec["apt-repo-auto-update-torproject.org"], } package { "deb.torproject.org-keyring": @@ -14,8 +33,15 @@ class nodo::utils::network::tor ( } package { [ - 'tor-arm', + 'nyx', ]: ensure => $ensure, } + + # Package 'tor-arm' was renamed to 'nyx' + package { [ + 'tor-arm', + ]: + ensure => absent, + } } diff --git a/manifests/utils/office/console.pp b/manifests/utils/office/console.pp index b35247e..201adbb 100644 --- a/manifests/utils/office/console.pp +++ b/manifests/utils/office/console.pp @@ -17,6 +17,11 @@ class nodo::utils::office::console ( #'worklog', #'lolcat', #'aewan', + + # Needed by finder + # https://git.fluxo.info/finder + 'python3-prompt-toolkit', + 'python3-platformdirs', ]: ensure => $ensure, } diff --git a/manifests/utils/office/gui.pp b/manifests/utils/office/gui.pp index 6cde1aa..5f80288 100644 --- a/manifests/utils/office/gui.pp +++ b/manifests/utils/office/gui.pp @@ -4,6 +4,7 @@ class nodo::utils::office::gui ( package { [ 'libreoffice', 'libreoffice-gtk3', + 'pdfarranger', #'pdftk', ]: ensure => $ensure, diff --git a/manifests/utils/storage/archive.pp b/manifests/utils/storage/archive.pp index 336c74d..9eecc44 100644 --- a/manifests/utils/storage/archive.pp +++ b/manifests/utils/storage/archive.pp @@ -6,6 +6,7 @@ class nodo::utils::storage::archive ( 'convmv', 'rdfind', 'rclone', + 'onionshare', ]: #ensure => latest, ensure => $ensure, |