diff options
author | Stonewall Jackson <stonewall@sacredheartsc.com> | 2023-04-13 07:43:49 -0400 |
---|---|---|
committer | Stonewall Jackson <stonewall@sacredheartsc.com> | 2023-04-13 07:43:49 -0400 |
commit | a1df78d92401c0d287e03f4992f2a2a6d4dbd462 (patch) | |
tree | b7100f859d753147f7a2dafa9b670343c878227d /roles | |
parent | 7e4cfba29e7a75a0bc8efa6d07a69eb98d641ce6 (diff) | |
download | selfhosted-a1df78d92401c0d287e03f4992f2a2a6d4dbd462.tar.gz selfhosted-a1df78d92401c0d287e03f4992f2a2a6d4dbd462.zip |
linux_desktop: switch to xfce
Diffstat (limited to 'roles')
-rw-r--r-- | roles/linux_desktop/README.md | 4 | ||||
-rw-r--r-- | roles/linux_desktop/defaults/main.yml | 2 | ||||
-rw-r--r-- | roles/linux_desktop/files/etc/dconf/db/local.d/00-hidpi | 2 | ||||
-rw-r--r-- | roles/linux_desktop/files/etc/dconf/db/local.d/locks/hidpi | 1 | ||||
-rw-r--r-- | roles/linux_desktop/tasks/gdm.yml | 17 | ||||
-rw-r--r-- | roles/linux_desktop/tasks/lightdm.yml | 17 | ||||
-rw-r--r-- | roles/linux_desktop/tasks/main.yml | 26 | ||||
-rw-r--r-- | roles/linux_desktop/templates/etc/dconf/db/local.d/00-gnome.j2 | 10 | ||||
-rw-r--r-- | roles/linux_desktop/templates/etc/gdm/custom.conf.j2 | 16 | ||||
-rw-r--r-- | roles/linux_desktop/vars/main.yml | 4 |
10 files changed, 12 insertions, 87 deletions
diff --git a/roles/linux_desktop/README.md b/roles/linux_desktop/README.md index 6e95c64..0660a1c 100644 --- a/roles/linux_desktop/README.md +++ b/roles/linux_desktop/README.md @@ -7,7 +7,7 @@ Description The `linux_desktop` role performs various setup tasks for Linux workstations, including: - - install and configure GNOME desktop environment + - install and configure XFCE desktop environment - set the default systemd target to `graphical` - configure Flatpak repository and install apps @@ -23,9 +23,7 @@ Variable | Default | -------------------------------------------|-----------------------------------|------------ `linux_desktop_access_group` | `role-linux-desktop-access` | FreeIPA group allowed to login to GDM (will be created) `linux_desktop_flatpak_update_on_calendar` | `daily` | Systemd [calendar interval](https://www.freedesktop.org/software/systemd/man/systemd.time.html#Calendar%20Events) for updating Flatpak apps -`linux_desktop_enable_wayland` | yes | Enable Wayland compositor `linux_desktop_thumbnail_cache_size` | 4096 | Size of thumbnail cache (MB) -`linux_desktop_display_manager` | `gdm` | Either `gdm` or `lightdm` `linux_desktop_qogir_version` | see [defaults](defaults/main.yml) | [Qogir theme](https://github.com/vinceliuice/Qogir-theme) version `linux_desktop_qogir_icon_version` | see [defaults](defaults/main.yml) | [Qogir icon theme](https://github.com/vinceliuice/Qogir-icon-theme) version `linux_desktop_lightdm_gtk_theme` | `Qogir` | LightDM GTK theme name diff --git a/roles/linux_desktop/defaults/main.yml b/roles/linux_desktop/defaults/main.yml index 048391c..33e972b 100644 --- a/roles/linux_desktop/defaults/main.yml +++ b/roles/linux_desktop/defaults/main.yml @@ -1,8 +1,6 @@ linux_desktop_access_group: role-linux-desktop-access linux_desktop_flatpak_update_on_calendar: daily -linux_desktop_enable_wayland: yes linux_desktop_thumbnail_cache_size: 4096 # MB -linux_desktop_display_manager: gdm linux_desktop_qogir_version: 2023-02-27 linux_desktop_qogir_icon_version: 2023-02-23 diff --git a/roles/linux_desktop/files/etc/dconf/db/local.d/00-hidpi b/roles/linux_desktop/files/etc/dconf/db/local.d/00-hidpi deleted file mode 100644 index eef356b..0000000 --- a/roles/linux_desktop/files/etc/dconf/db/local.d/00-hidpi +++ /dev/null @@ -1,2 +0,0 @@ -[org/gnome/mutter] -experimental-features=['scale-monitor-framebuffer'] diff --git a/roles/linux_desktop/files/etc/dconf/db/local.d/locks/hidpi b/roles/linux_desktop/files/etc/dconf/db/local.d/locks/hidpi deleted file mode 100644 index 15e31c2..0000000 --- a/roles/linux_desktop/files/etc/dconf/db/local.d/locks/hidpi +++ /dev/null @@ -1 +0,0 @@ -/org/gnome/mutter/experimental-features diff --git a/roles/linux_desktop/tasks/gdm.yml b/roles/linux_desktop/tasks/gdm.yml deleted file mode 100644 index 124f415..0000000 --- a/roles/linux_desktop/tasks/gdm.yml +++ /dev/null @@ -1,17 +0,0 @@ -- name: generate gdm configuration - template: - src: etc/gdm/custom.conf.j2 - dest: /etc/gdm/custom.conf - notify: restart gdm - -- name: disable lightdm - systemd: - name: lightdm - enabled: no - state: stopped - -- name: enable gdm - systemd: - name: gdm - enabled: yes - state: started diff --git a/roles/linux_desktop/tasks/lightdm.yml b/roles/linux_desktop/tasks/lightdm.yml deleted file mode 100644 index 818aaec..0000000 --- a/roles/linux_desktop/tasks/lightdm.yml +++ /dev/null @@ -1,17 +0,0 @@ -- name: configure lightdm greeter - template: - src: etc/lightdm/lightdm-gtk-greeter.conf.j2 - dest: /etc/lightdm/lightdm-gtk-greeter.conf - notify: restart lightdm - -- name: disable gdm - systemd: - name: gdm - enabled: no - state: stopped - -- name: enable lightdm - systemd: - name: lightdm - enabled: yes - state: started diff --git a/roles/linux_desktop/tasks/main.yml b/roles/linux_desktop/tasks/main.yml index 8666668..16aace3 100644 --- a/roles/linux_desktop/tasks/main.yml +++ b/roles/linux_desktop/tasks/main.yml @@ -42,23 +42,17 @@ changed_when: false failed_when: false -- name: configure display manager - include_tasks: '{{ linux_desktop_display_manager }}.yml' - -- name: enable fractional scaling - copy: - src: '{{ item[1:] }}' - dest: '{{ item }}' - loop: - - /etc/dconf/db/local.d/00-hidpi - - /etc/dconf/db/local.d/locks/hidpi - notify: update dconf - -- name: add local dconf settings +- name: configure lightdm greeter template: - src: etc/dconf/db/local.d/00-gnome.j2 - dest: /etc/dconf/db/local.d/00-gnome - notify: update dconf + src: etc/lightdm/lightdm-gtk-greeter.conf.j2 + dest: /etc/lightdm/lightdm-gtk-greeter.conf + notify: restart lightdm + +- name: enable lightdm + systemd: + name: lightdm + enabled: yes + state: started - name: add flathub flatpak repository flatpak_remote: diff --git a/roles/linux_desktop/templates/etc/dconf/db/local.d/00-gnome.j2 b/roles/linux_desktop/templates/etc/dconf/db/local.d/00-gnome.j2 deleted file mode 100644 index 69a7632..0000000 --- a/roles/linux_desktop/templates/etc/dconf/db/local.d/00-gnome.j2 +++ /dev/null @@ -1,10 +0,0 @@ -[org/gnome/desktop/thumbnail-cache] -maximum-size={{ linux_desktop_thumbnail_cache_size }} - -[org/gnome/nautilus/preferences] -recursive-search='always' -show-directory-item-counts='always' -show-image-thumbnails='always' - -[org/gnome/nautilus/list-view] -use-tree-view=true diff --git a/roles/linux_desktop/templates/etc/gdm/custom.conf.j2 b/roles/linux_desktop/templates/etc/gdm/custom.conf.j2 deleted file mode 100644 index a1099d2..0000000 --- a/roles/linux_desktop/templates/etc/gdm/custom.conf.j2 +++ /dev/null @@ -1,16 +0,0 @@ -# GDM configuration storage - -[daemon] -InitialSetupEnable=false -# Uncomment the line below to force the login screen to use Xorg -WaylandEnable={{ linux_desktop_enable_wayland | bool | to_json }} - -[security] - -[xdmcp] - -[chooser] - -[debug] -# Uncomment the line below to turn on debugging -#Enable=true diff --git a/roles/linux_desktop/vars/main.yml b/roles/linux_desktop/vars/main.yml index 516d3e9..4a206b4 100644 --- a/roles/linux_desktop/vars/main.yml +++ b/roles/linux_desktop/vars/main.yml @@ -1,12 +1,10 @@ linux_desktop_packages: - - '@gnome-desktop' - '@fonts' - '@hardware-support' - '@internet-browser' - '@base-x' - '@networkmanager-submodules' - '@print-client' - - gnome-tweaks - evolution - libreoffice-calc - libreoffice-draw @@ -27,7 +25,6 @@ linux_desktop_packages: - intel-media-driver - seahorse - inkscape - - dconf-editor - libdvdcss - gimp - brasero @@ -83,6 +80,7 @@ linux_desktop_flatpaks: linux_desktop_flatpak_overrides: org.gnome.EasyTAG: --filesystem=host org.gnome.Rhythmbox3: --filesystem=host + org.signal.Signal: --env=SIGNAL_USE_TRAY_ICON=1 linux_desktop_qogir_url: https://github.com/vinceliuice/Qogir-theme/archive/refs/tags/{{ linux_desktop_qogir_version }}.tar.gz linux_desktop_qogir_icon_url: https://github.com/vinceliuice/Qogir-icon-theme/archive/refs/tags/{{ linux_desktop_qogir_icon_version }}.tar.gz |