geoffrey/dotfiles
geoffrey/dotfiles
1
0
Fork 0
Code Issues 7 Pull requests Releases Activity

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

Browse source
This commit is contained in:
Geoffrey Frogeye 2021-06-18 21:53:42 +02:00
parent c9657f69d4
commit fd580acf2c
Signed by: geoffrey
GPG key ID: C72403E7F82E6AD8
13 changed files with 22 additions and 22 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

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

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

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

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

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

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

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

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

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

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

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

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

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

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

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

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

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

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

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

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

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

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

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

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

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

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