Browse Source

It's a display **server**, you dummy

master
Geoffrey Frogeye 1 year ago
parent
commit
fd580acf2c
Signed by: geoffrey GPG Key ID: C72403E7F82E6AD8
  1. 2
      config/automatrop/host_vars/curacao.geoffrey.frogeye.fr
  2. 2
      config/automatrop/host_vars/pindakaas.geoffrey.frogeye.fr
  3. 2
      config/automatrop/roles/software/templates/package_manager.j2
  4. 4
      config/automatrop/roles/software/templates/snippets/pm_desktop_environment.j2
  5. 2
      config/automatrop/roles/software/templates/snippets/pm_dev_fpga.j2
  6. 2
      config/automatrop/roles/software/templates/snippets/pm_dev_network.j2
  7. 2
      config/automatrop/roles/software/templates/snippets/pm_document.j2
  8. 2
      config/automatrop/roles/software/templates/snippets/pm_download.j2
  9. 2
      config/automatrop/roles/software/templates/snippets/pm_multimedia_common.j2
  10. 2
      config/automatrop/roles/software/templates/snippets/pm_multimedia_editors.j2
  11. 4
      config/automatrop/roles/software/templates/snippets/pm_noandroid.j2
  12. 2
      config/automatrop/roles/software/templates/snippets/pm_remote.j2
  13. 16
      config/automatrop/roles/system/tasks/main.yml

2
config/automatrop/host_vars/curacao.geoffrey.frogeye.fr

@ -1,5 +1,5 @@
root_access: yes
display_manager: "x11"
display_server: "x11"
dev_stuffs:
- python
- shell

2
config/automatrop/host_vars/pindakaas.geoffrey.frogeye.fr

@ -1,5 +1,5 @@
root_access: yes
display_manager: "x11"
display_server: "x11"
dev_stuffs:
- shell
- network

2
config/automatrop/roles/software/templates/package_manager.j2

@ -18,7 +18,7 @@
{% include 'snippets/pm_multimedia_common.j2' %}
{% include 'snippets/pm_data_management.j2' %}
{# Include rules-determined snippets #}
{% if display_manager %}
{% if display_server %}
{% include 'snippets/pm_desktop_environment.j2' %}
{% endif %}
{% if termux %}

4
config/automatrop/roles/software/templates/snippets/pm_desktop_environment.j2

@ -26,7 +26,7 @@ meld
{% if arch_based %}
yubikey-touch-detector
{% endif %}
{% if display_manager == "x11" %}
{% if display_server == "x11" %}
i3-wm
libgnomekbd{{ lib_suffix }}
dunst
@ -64,6 +64,6 @@ xorg-xbacklight
{% elif debian_based %}
xbacklight
{% endif %}
{% elif display_manager == "wayland" %}
{% elif display_server == "wayland" %}
sway
{% endif %}

2
config/automatrop/roles/software/templates/snippets/pm_dev_fpga.j2

@ -1,6 +1,6 @@
yosys
iverilog
ghdl
{% if display_manager %}
{% if display_server %}
gtkwave
{% endif %}

2
config/automatrop/roles/software/templates/snippets/pm_dev_network.j2

@ -9,6 +9,6 @@ dnsutils
whois
nmap
tcpdump
{% if display_manager %}
{% if display_server %}
wireshark-qt
{% endif %}

2
config/automatrop/roles/software/templates/snippets/pm_document.j2

@ -14,7 +14,7 @@ texlive-base
texlive-lang-european
{% endif %}
pdftk
{% if display_manager %}
{% if display_server %}
{# Spell checking #}
hunspell-en_gb
hunspell-en_us

2
config/automatrop/roles/software/templates/snippets/pm_download.j2

@ -7,6 +7,6 @@ rsync
youtube-dl
megatools
transmission-cli
{% if display_manager %}
{% if display_server %}
transmission-qt
{% endif %}

2
config/automatrop/roles/software/templates/snippets/pm_multimedia_common.j2

@ -1,4 +1,4 @@
{% if display_manager %}
{% if display_server %}
gimp
inkscape
mpv

2
config/automatrop/roles/software/templates/snippets/pm_multimedia_editors.j2

@ -1,7 +1,7 @@
{#
Big behemoth applications
#}
{% if display_manager %}
{% if display_server %}
gimp
inkscape
darktable

4
config/automatrop/roles/software/templates/snippets/pm_noandroid.j2

@ -4,7 +4,7 @@ Stuff that isn't required on Android because there are apps for that
{# Password handling #}
pass
pwgen
{% if display_manager %}
{% if display_server %}
rofi-pass
{# TODO Try autopass.cr #}
{% endif %}
@ -18,7 +18,7 @@ lynx
{# https://aur.archlinux.org/packages/tiv/#comment-812593 #}
tiv
{% endif %}
{% if display_manager %}
{% if display_server %}
thunderbird
{% endif %}
{# Organisation #}

2
config/automatrop/roles/software/templates/snippets/pm_remote.j2

@ -1,6 +1,6 @@
openssh
wget
rsync
{% if display_manager %}
{% if display_server %}
tigervnc
{% endif %}

16
config/automatrop/roles/system/tasks/main.yml

@ -111,7 +111,7 @@
stat:
path: /etc/X11/nvidia-xorg.conf
register: nvidia_xrun
when: display_manager == 'x11'
when: display_server == 'x11'
- name: Add nvidia-xrun xorg config directory
set_fact:
@ -120,14 +120,14 @@
xorg_default_config_dirs:
- /etc/X11/xorg.conf.d
xorg_nvidia_config_dirs: "{{ ['/etc/X11/nvidia-xorg.conf.d'] if nvidia_xrun.stat.exists else [] }}"
when: display_manager == 'x11'
when: display_server == 'x11'
- name: Configure Xorg keyboard layout
copy:
src: xorg/keyboard.conf
dest: "{{ item }}/00-keyboard.conf"
become: yes
when: display_manager == 'x11'
when: display_server == 'x11'
notify: etc changed
loop: "{{ xorg_common_config_dirs }}"
@ -135,7 +135,7 @@
stat:
path: /sys/class/backlight/intel_backlight
register: intel_backlight
when: display_manager == 'x11'
when: display_server == 'x11'
- name: Install Intel video drivers (Arch based)
pacman:
@ -143,14 +143,14 @@
# state: "{{ intel_backlight.stat.exists }}"
state: present
become: yes
when: display_manager == 'x11' and intel_backlight.stat.exists and arch_based
when: display_server == 'x11' and intel_backlight.stat.exists and arch_based
- name: Configure Xorg Intel backlight
copy:
src: xorg/intel_backlight.conf
dest: "{{ item }}/20-intel_backlight.conf"
become: yes
when: display_manager == 'x11' and intel_backlight.stat.exists
when: display_server == 'x11' and intel_backlight.stat.exists
notify: etc changed
loop: "{{ xorg_common_config_dirs }}"
@ -159,7 +159,7 @@
src: xorg/touchpad.conf
dest: "{{ item }}/30-touchpad.conf"
become: yes
when: display_manager == 'x11'
when: display_server == 'x11'
notify: etc changed
loop: "{{ xorg_common_config_dirs }}"
@ -168,7 +168,7 @@
src: xorg/joystick.conf
dest: "{{ item }}/50-joystick.conf"
become: yes
when: display_manager == 'x11'
when: display_server == 'x11'
notify: etc changed
loop: "{{ xorg_common_config_dirs }}"

Loading…
Cancel
Save