diff options
| -rw-r--r-- | files/etc/locale.gen | 97 | ||||
| -rw-r--r-- | manifests/base/physical.pp | 4 | ||||
| -rw-r--r-- | manifests/role/nas.pp | 2 | ||||
| -rw-r--r-- | manifests/subsystem/inception.pp | 3 | ||||
| -rw-r--r-- | manifests/utils/interface.pp | 73 | ||||
| -rw-r--r-- | manifests/utils/microcode/amd64.pp | 15 | ||||
| -rw-r--r-- | manifests/utils/microcode/intel.pp | 11 | ||||
| -rw-r--r-- | manifests/utils/network/ftp.pp | 9 | ||||
| -rw-r--r-- | manifests/utils/web/console.pp | 2 |
9 files changed, 198 insertions, 18 deletions
diff --git a/files/etc/locale.gen b/files/etc/locale.gen index 4861ee7..6726392 100644 --- a/files/etc/locale.gen +++ b/files/etc/locale.gen @@ -421,3 +421,100 @@ pt_BR.UTF-8 UTF-8 # zh_TW.UTF-8 UTF-8 # zu_ZA ISO-8859-1 # zu_ZA.UTF-8 UTF-8 +# C.UTF-8 UTF-8 +# agr_PE UTF-8 +# ak_GH UTF-8 +# anp_IN UTF-8 +# ar_SS UTF-8 +# as_IN UTF-8 +# ayc_PE UTF-8 +# az_AZ UTF-8 +# az_IR UTF-8 +# bem_ZM UTF-8 +# bhb_IN.UTF-8 UTF-8 +# bho_IN UTF-8 +# bho_NP UTF-8 +# bi_VU UTF-8 +# bo_CN UTF-8 +# bo_IN UTF-8 +# brx_IN UTF-8 +# ca_ES@valencia UTF-8 +# ce_RU UTF-8 +# chr_US UTF-8 +# ckb_IQ UTF-8 +# cmn_TW UTF-8 +# cv_RU UTF-8 +# de_IT ISO-8859-1 +# de_IT.UTF-8 UTF-8 +# doi_IN UTF-8 +# dsb_DE UTF-8 +# dv_MV UTF-8 +# el_GR@euro ISO-8859-7 +# en_AG UTF-8 +# en_IL UTF-8 +# en_SC.UTF-8 UTF-8 +# en_ZM UTF-8 +# eo UTF-8 +# es_CU UTF-8 +# ff_SN UTF-8 +# hak_TW UTF-8 +# hif_FJ UTF-8 +# hne_IN UTF-8 +# ht_HT UTF-8 +# ia_FR UTF-8 +# kab_DZ UTF-8 +# kk_KZ.RK1048 RK1048 +# kok_IN UTF-8 +# ks_IN@devanagari UTF-8 +# lb_LU UTF-8 +# lij_IT UTF-8 +# ln_CD UTF-8 +# lzh_TW UTF-8 +# mag_IN UTF-8 +# mai_NP UTF-8 +# mfe_MU UTF-8 +# mhr_RU UTF-8 +# miq_NI UTF-8 +# mjw_IN UTF-8 +# mni_IN UTF-8 +# mnw_MM UTF-8 +# my_MM UTF-8 +# nan_TW UTF-8 +# nan_TW@latin UTF-8 +# nhn_MX UTF-8 +# niu_NU UTF-8 +# niu_NZ UTF-8 +# nl_AW UTF-8 +# os_RU UTF-8 +# pap_AW UTF-8 +# pap_CW UTF-8 +# ps_AF UTF-8 +# quz_PE UTF-8 +# raj_IN UTF-8 +# rif_MA UTF-8 +# sah_RU UTF-8 +# sat_IN UTF-8 +# sd_IN UTF-8 +# sd_IN@devanagari UTF-8 +# sgs_LT UTF-8 +# shn_MM UTF-8 +# shs_CA UTF-8 +# sm_WS UTF-8 +# sq_MK UTF-8 +# sw_KE UTF-8 +# sw_TZ UTF-8 +# syr UTF-8 +# szl_PL UTF-8 +# ta_LK UTF-8 +# tcy_IN.UTF-8 UTF-8 +# the_NP UTF-8 +# to_TO UTF-8 +# tpi_PG UTF-8 +# tt_RU UTF-8 +# tt_RU@iqtelif UTF-8 +# unm_US UTF-8 +# ur_IN UTF-8 +# wae_CH UTF-8 +# wal_ET UTF-8 +# yue_HK UTF-8 +# yuw_PG UTF-8 diff --git a/manifests/base/physical.pp b/manifests/base/physical.pp index 035f5c7..42d2ce1 100644 --- a/manifests/base/physical.pp +++ b/manifests/base/physical.pp @@ -1,6 +1,10 @@ class nodo::base::physical inherits nodo::base::host { include nodo::subsystem::sensors + # Install all available CPU microcode packages + include nodo::utils::microcode::intel + include nodo::utils::microcode::amd64 + # Downtime monitoring # # Check https://tracker.debian.org/pkg/downtimed diff --git a/manifests/role/nas.pp b/manifests/role/nas.pp index 27d06bd..ca2059f 100644 --- a/manifests/role/nas.pp +++ b/manifests/role/nas.pp @@ -96,6 +96,8 @@ class nodo::role::nas( virtualchroot => true, } + include nodo::utils::network::ftp + # Enable anonymous ftp file { '/etc/pure-ftpd/conf/NoAnonymous': ensure => present, diff --git a/manifests/subsystem/inception.pp b/manifests/subsystem/inception.pp index 913f5d5..8698baa 100644 --- a/manifests/subsystem/inception.pp +++ b/manifests/subsystem/inception.pp @@ -9,8 +9,9 @@ define nodo::subsystem::inception( user => $name, provider => git, source => "https://git.fluxo.info/${git_dev}/apps", - revision => '63e093c355258142053d37a46579d9b19074324d', + revision => '2a58bb3945c96b02bd65d0d59b421fadc61a99ff', submodules => true, + depth => 1, require => [ File["/home/${name}"], User[$name] ], } diff --git a/manifests/utils/interface.pp b/manifests/utils/interface.pp index 8a67557..1c6e88f 100644 --- a/manifests/utils/interface.pp +++ b/manifests/utils/interface.pp @@ -16,20 +16,66 @@ class nodo::utils::interface inherits nodo::utils::interface::console { 'xinput', 'numlockx', 'autocutsel', - 'parcellite', + 'clipit', 'unclutter', 'xserver-xephyr', 'policykit-1-gnome', 'firejail', 'sm', 'i3lock', - 'materia-gtk-theme', - 'blackbird-gtk-theme', + 'alacritty', + ]: + ensure => installed, + } + + # Themes + package { [ 'obsidian-icon-theme', + 'blackbird-gtk-theme', + + # These are needed to bring uniform look on tools such as nm-tray + # + # References: + # + # * https://doc.qt.io/qt-6/qpa.html + # * https://wiki.archlinux.org/title/Uniform_look_for_Qt_and_GTK_applications + # * https://wiki.gentoo.org/wiki/GTK_themes_in_Qt_applications + # * https://itsfoss.gitlab.io/blog/how-to-add-qtqpaplatformthemeqt5ct-environment-variable-in-arch-linux/ + # * https://unix.stackexchange.com/questions/680483/how-to-add-qt-qpa-platformtheme-qt5ct-environment-variable-in-arch-linux + # * https://bugs.debian.org/cgi-bin/bugreport.cgi?bug=983536 + 'breeze-icon-theme', + 'qt5ct', + 'qt6ct', ]: ensure => installed, } + # Themes available until Debian bookworm + package { [ + 'materia-gtk-theme', + ]: + ensure => $::lsbdistcodename ? { + 'bookworm' => present, + default => absent, + } + } + + # Themes not in use + package { [ + # 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, + } + # Fonts package { [ 'xfonts-terminus', @@ -39,6 +85,16 @@ class nodo::utils::interface inherits nodo::utils::interface::console { ensure => installed, } + # Absent on Debian trixie + package { [ + 'parcellite', + ]: + ensure => $::lsbdistcodename ? { + 'trixie' => absent, + default => present, + } + } + # We need a workaround for this: # https://bbs.archlinux.org/viewtopic.php?id=50647 # http://linuxforcynics.com/how-to/using-rxvt-unicode-with-screen @@ -72,17 +128,6 @@ 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/microcode/amd64.pp b/manifests/utils/microcode/amd64.pp new file mode 100644 index 0000000..653f1f1 --- /dev/null +++ b/manifests/utils/microcode/amd64.pp @@ -0,0 +1,15 @@ +class nodo::utils::microcode::amd64 ( + $ensure = 'installed', +) { + # Microcode + # + # See https://wiki.debian.org/Microcode + package { [ + 'amd64-microcode', + ]: + ensure => $architecture ? { + 'amd64' => $ensure, + default => absent, + }, + } +} diff --git a/manifests/utils/microcode/intel.pp b/manifests/utils/microcode/intel.pp index 10a32ef..fd3664b 100644 --- a/manifests/utils/microcode/intel.pp +++ b/manifests/utils/microcode/intel.pp @@ -2,11 +2,16 @@ class nodo::utils::microcode::intel ( $ensure = 'installed', ) { # Microcode - # See https://wiki.archlinux.org/index.php/Microcode - # http://en.gentoo-wiki.com/wiki/Intel_Microcode + # + # See https://wiki.debian.org/Microcode + # https://wiki.archlinux.org/index.php/Microcode + # https://wiki.gentoo.org/wiki/Intel_microcode package { [ 'intel-microcode', ]: - ensure => $ensure, + ensure => $architecture ? { + 'amd64' => $ensure, + default => absent, + }, } } diff --git a/manifests/utils/network/ftp.pp b/manifests/utils/network/ftp.pp new file mode 100644 index 0000000..854769e --- /dev/null +++ b/manifests/utils/network/ftp.pp @@ -0,0 +1,9 @@ +class nodo::utils::network::ftp ( + $ensure = 'installed', +) { + package { [ + 'ftp', + ]: + ensure => $ensure, + } +} diff --git a/manifests/utils/web/console.pp b/manifests/utils/web/console.pp index d0a5877..755a25a 100644 --- a/manifests/utils/web/console.pp +++ b/manifests/utils/web/console.pp @@ -6,6 +6,8 @@ class nodo::utils::web::console ( 'elinks', 'surfraw', 'w3m', + 'w3m-img', + 'ueberzug', 'newsboat', ]: ensure => $ensure, |
