diff options
Diffstat (limited to 'vars')
| -rw-r--r-- | vars/common | 1 | ||||
| -rw-r--r-- | vars/hostclass/desktop | 56 | ||||
| l--------- | vars/hostclass/laptop | 1 | ||||
| l--------- | vars/hostclass/laptop/10-desktop (renamed from vars/hostclass/roadwarrior_laptop/desktop) | 0 | ||||
| -rw-r--r-- | vars/hostclass/laptop/20-vars | 3 | ||||
| l--------- | vars/hostclass/roadwarrior_laptop/10-desktop | 1 | ||||
| -rw-r--r-- | vars/hostclass/roadwarrior_laptop/20-vars (renamed from vars/hostclass/roadwarrior_laptop/vars) | 3 | ||||
| -rw-r--r-- | vars/hostname/rlaptop1 | 1 |
8 files changed, 27 insertions, 39 deletions
diff --git a/vars/common b/vars/common index ff62fc1..be8e34a 100644 --- a/vars/common +++ b/vars/common @@ -40,7 +40,6 @@ nproc=$(nproc) allowed_tcp_ports=ssh bootstrap_resolvers='1.1.1.1' -desktop_type=kde enable_serial_console=true graphics_type=intel boxconf_username='s-boxconf' diff --git a/vars/hostclass/desktop b/vars/hostclass/desktop index 0e708f2..f56a5ae 100644 --- a/vars/hostclass/desktop +++ b/vars/hostclass/desktop @@ -38,38 +38,55 @@ gsound" # signal-desktop requires pulseaudio for audio/video chat. SAD! # Also, freedesktop-sound-theme is required for notification sounds in Dino -desktop_common_packages=" +desktop_packages=" +${gajim_packages} +android-file-transfer-qt5 android-tools +audacious-plugins-qt5 +audacious-qt5 bind-tools ca_root_nss cantarell-fonts chromium +digikam +dino droid-fonts-ttf eclipse +elisa +en-hunspell ffmpeg firefox +freedesktop-sound-theme git gnupg +gtksourceview4 hs-pandoc inconsolata-ttf jq +k3b +kde5 +kid3-kf5 +kmix +konversation krb5 libreoffice libva-utils libvdpau-va-gl +merkuro mpv neofetch noto-basic noto-emoji password-store pdftk +pim-sieve-editor postgresql16-client pulseaudio -python py${python_version}-pip +python roboto-fonts-ttf rsync -freedesktop-sound-theme +sddm signal-desktop sndio stow @@ -79,41 +96,10 @@ thunderbird tmux tree ubuntu-font -vdpauinfo v4l-utils v4l_compat +vdpauinfo webcamd webfonts wireguard-tools xorg" - -desktop_kde_packages=" -android-file-transfer-qt5 -audacious-qt5 -audacious-plugins-qt5 -digikam -dino -elisa -${gajim_packages} -gtksourceview4 -k3b -kde5 -kid3-kf5 -kmix -konversation -pim-sieve-editor -en-hunspell -merkuro -sddm" - -desktop_i3_packages=' -compton -dunst -dmenu -i3 -i3lock -i3status -profanity -xfontsel -xidle -xterm' diff --git a/vars/hostclass/laptop b/vars/hostclass/laptop deleted file mode 120000 index 8714ca2..0000000 --- a/vars/hostclass/laptop +++ /dev/null @@ -1 +0,0 @@ -desktop
\ No newline at end of file diff --git a/vars/hostclass/roadwarrior_laptop/desktop b/vars/hostclass/laptop/10-desktop index 2c7c348..2c7c348 120000 --- a/vars/hostclass/roadwarrior_laptop/desktop +++ b/vars/hostclass/laptop/10-desktop diff --git a/vars/hostclass/laptop/20-vars b/vars/hostclass/laptop/20-vars new file mode 100644 index 0000000..c9f82d9 --- /dev/null +++ b/vars/hostclass/laptop/20-vars @@ -0,0 +1,3 @@ +#!/bin/sh + +polkit_disable_suspend=false diff --git a/vars/hostclass/roadwarrior_laptop/10-desktop b/vars/hostclass/roadwarrior_laptop/10-desktop new file mode 120000 index 0000000..2c7c348 --- /dev/null +++ b/vars/hostclass/roadwarrior_laptop/10-desktop @@ -0,0 +1 @@ +../desktop
\ No newline at end of file diff --git a/vars/hostclass/roadwarrior_laptop/vars b/vars/hostclass/roadwarrior_laptop/20-vars index 712d724..b7896f4 100644 --- a/vars/hostclass/roadwarrior_laptop/vars +++ b/vars/hostclass/roadwarrior_laptop/20-vars @@ -1,6 +1,7 @@ #!/bin/sh -resolvers=$bootstrap_resolvers pf_skip_interfaces=wg see_other_uids=1 enable_idm=false + +polkit_disable_suspend=false diff --git a/vars/hostname/rlaptop1 b/vars/hostname/rlaptop1 index 7c8df01..b9bef40 100644 --- a/vars/hostname/rlaptop1 +++ b/vars/hostname/rlaptop1 @@ -1,7 +1,6 @@ #!/bin/sh pf_egress_interfaces='wlan0 em0 ue0' -desktop_type=i3 wireless_type=iwm8265 console_font=spleen-12x24 laptop_type=thinkpad |