diff --git a/group_vars/all b/group_vars/all index 15c19fb..7c366f4 100644 --- a/group_vars/all +++ b/group_vars/all @@ -225,48 +225,8 @@ libinput: button_mapping: "1 2 3 4 5 6 7 8 9 10 11 2" display_manager: lightdm -gdm: - sound: False - font_scaling_factor: 1 - logo_path: False - touchpad: - tap_to_click: True - accessibility_menu: True desktop_environment: i3 -gnome: - night_light: - enabled: True - color_temperature: 4000 # in Kelvin - date_time: - show_date_in_clock: True - show_weeks_in_calendar: True - battery: - show_percentage: True - power: - sleep_timeout_when_computer_on_ac: 3600 # in seconds - timeout_action_when_computer_on_ac: suspend - sleep_timeout_when_computer_on_battery: 1800 # in seconds - timeout_action_when_computer_on_battery: suspend - power_button_action: suspend - touchpad: - tap_to_click: True - natural_scrolling: True - disabled_while_typing: True - online_accounts_support: True - lock_screen: - automatic_lock: True - lock_screen_after_blank_for: 0 # in seconds - show_notifications: True - show_full_name_of_user: True - theme: - theme_name: Adwaita - icon_theme_name: Adwaita - font_name: Dejavu Sans 13 - dark_variant: True - gnome_shell: - disable_top_left_hot_corner: False - extensions_support: True base_fonts: - adobe-source-code-pro-fonts diff --git a/playbook.yml b/playbook.yml index bf76a28..f395e83 100644 --- a/playbook.yml +++ b/playbook.yml @@ -18,9 +18,7 @@ - { role: x, tags: ["x"] } - { role: terminal, tags: ["terminal"], when: "terminal is defined" } - { role: lightdm, tags: ["lightdm"], when: "display_manager == 'lightdm'" } - - { role: gdm, tags: ["gdm"], when: "display_manager == 'gdm'" } - { role: i3, tags: ["i3"], when: "desktop_environment == 'i3'" } - - { role: gnome, tags: ["gnome"], when: "desktop_environment == 'gnome'" } - { role: pass, tags: ["pass"] } - { role: iptables, tags: ["iptables"] } - { role: nettools, tags: ["nettools"] } diff --git a/roles/gdm/files/profile/gdm b/roles/gdm/files/profile/gdm deleted file mode 100644 index 817afc5..0000000 --- a/roles/gdm/files/profile/gdm +++ /dev/null @@ -1,3 +0,0 @@ -user-db:user -system-db:gdm -file-db:/usr/share/gdm/greeter-dconf-defaults diff --git a/roles/gdm/meta/main.yml b/roles/gdm/meta/main.yml deleted file mode 100644 index 9cedda8..0000000 --- a/roles/gdm/meta/main.yml +++ /dev/null @@ -1,3 +0,0 @@ ---- -dependencies: - - { role: dconf } diff --git a/roles/gdm/tasks/main.yml b/roles/gdm/tasks/main.yml deleted file mode 100644 index 7562a87..0000000 --- a/roles/gdm/tasks/main.yml +++ /dev/null @@ -1,29 +0,0 @@ ---- -- name: Install GNOME Display Manager (GDM) - community.general.pacman: - name: gdm - state: present - -- name: Enable GDM - ansible.builtin.service: - name: gdm.service - enabled: true - -- name: Creating DConf configuration profile - ansible.builtin.copy: - src: profile/gdm - dest: /etc/dconf/profile/gdm - mode: "0644" - -- name: Creating gdm.d directory for DConf - ansible.builtin.file: - path: /etc/dconf/db/gdm.d - state: directory - mode: "0755" - -- name: Configuring GDM - ansible.builtin.template: - src: gdm.d/00-spark.j2 - dest: /etc/dconf/db/gdm.d/00-spark - mode: "0644" - notify: Update DConf database diff --git a/roles/gdm/templates/gdm.d/00-spark.j2 b/roles/gdm/templates/gdm.d/00-spark.j2 deleted file mode 100644 index eb1a6c1..0000000 --- a/roles/gdm/templates/gdm.d/00-spark.j2 +++ /dev/null @@ -1,22 +0,0 @@ -# {{ ansible_managed }} - -# Log-in screen logo -[org/gnome/login-screen] -{% if gdm.logo_path %} -logo='{{ gdm.logo_path }}' -{% endif %} - -[org/gnome/desktop/interface] -# Larger font for log-in screen -text-scaling-factor={{ gdm.font_scaling_factor | default(1) }} - -# Enable Accessibility menu -toolkit-accessibility={{ gdm.accessibility_menu | ternary('true', 'false') }} - -# Turning the sound on/off -[org/gnome/desktop/sound] -event-sounds={{ gdm.sound | ternary('true', 'false') }} - -# Enable tap-to-click -[org/gnome/desktop/peripherals/touchpad] -tap-to-click={{ gdm.touchpad.tap_to_click | ternary('true', 'false') }} diff --git a/roles/gnome/meta/main.yml b/roles/gnome/meta/main.yml deleted file mode 100644 index 8c71e92..0000000 --- a/roles/gnome/meta/main.yml +++ /dev/null @@ -1,6 +0,0 @@ ---- -dependencies: - - { role: dconf } - - { role: x } - - { role: gdm } - - { role: networkmanager } diff --git a/roles/gnome/tasks/dconf.yml b/roles/gnome/tasks/dconf.yml deleted file mode 100644 index 0253b66..0000000 --- a/roles/gnome/tasks/dconf.yml +++ /dev/null @@ -1,23 +0,0 @@ ---- -- name: Creating gnome.d directory for DConf - ansible.builtin.file: - path: /etc/dconf/db/gnome.d - state: directory - mode: "0755" - -- name: Configuring GNOME - ansible.builtin.template: - src: gnome.d/00-spark.j2 - dest: /etc/dconf/db/gnome.d/00-spark - mode: "0644" - notify: Update DConf database - -- name: Configuring DConf - ansible.builtin.lineinfile: - path: /etc/dconf/profile/user - line: "{{ item }}" - create: "yes" - mode: "0644" - with_items: - - "user-db:user" - - "system-db:gnome" diff --git a/roles/gnome/tasks/gnome_shell.yml b/roles/gnome/tasks/gnome_shell.yml deleted file mode 100644 index 79c2019..0000000 --- a/roles/gnome/tasks/gnome_shell.yml +++ /dev/null @@ -1,22 +0,0 @@ ---- -- name: Disabling GNOME Shell top left hot corner - kewlfft.aur.aur: - name: gnome-shell-extension-no-topleft-hot-corner - become: true - become_user: "{{ aur.user }}" - when: "gnome.gnome_shell.disable_top_left_hot_corner" - tags: - - aur - -- name: Enabling GNOME Shell top left hot corner - community.general.pacman: - name: gnome-shell-extension-no-topleft-hot-corner - state: absent - when: "not gnome.gnome_shell.disable_top_left_hot_corner" - -- name: Configuring GNOME Shell Extensions support - community.general.pacman: - name: - - gnome-shell-extensions - - chrome-gnome-shell - state: "{{ 'present' if gnome.gnome_shell.extensions_support else 'absent' }}" diff --git a/roles/gnome/tasks/gtk.yml b/roles/gnome/tasks/gtk.yml deleted file mode 100644 index 4a3c9ff..0000000 --- a/roles/gnome/tasks/gtk.yml +++ /dev/null @@ -1,12 +0,0 @@ ---- -- name: Creating GTK+ 3 system wide settings - ansible.builtin.file: - path: /etc/gtk-3.0 - state: directory - mode: "0755" - -- name: Configuring GTK+ 3 theme - ansible.builtin.template: - src: gtk-3.0/settings.ini.j2 - dest: /etc/gtk-3.0/settings.ini - mode: "0644" diff --git a/roles/gnome/tasks/main.yml b/roles/gnome/tasks/main.yml deleted file mode 100644 index f60d61d..0000000 --- a/roles/gnome/tasks/main.yml +++ /dev/null @@ -1,18 +0,0 @@ ---- -- name: Install GNOME - community.general.pacman: - name: - - gnome - - gnome-extra - - gnome-tweaks - - xorg-server-xwayland - state: present - -- name: Include DConf tasks - ansible.builtin.include_tasks: dconf.yml -- name: Include GTK tasks - ansible.builtin.include_tasks: gtk.yml -- name: Include GNOME Shell tasks - ansible.builtin.include_tasks: gnome_shell.yml -- name: Include online accounts tasks - ansible.builtin.include_tasks: online_accounts.yml diff --git a/roles/gnome/tasks/online_accounts.yml b/roles/gnome/tasks/online_accounts.yml deleted file mode 100644 index d18243e..0000000 --- a/roles/gnome/tasks/online_accounts.yml +++ /dev/null @@ -1,5 +0,0 @@ ---- -- name: Configuring GNOME Online Accounts integration - community.general.pacman: - name: gvfs-goa - state: '{{ "present" if gnome.online_accounts_support else "absent" }}' diff --git a/roles/gnome/templates/gnome.d/00-spark.j2 b/roles/gnome/templates/gnome.d/00-spark.j2 deleted file mode 100644 index b24e98c..0000000 --- a/roles/gnome/templates/gnome.d/00-spark.j2 +++ /dev/null @@ -1,37 +0,0 @@ -# {{ ansible_managed }} - -# Night Light settings -[org/gnome/settings-daemon/plugins/color] -night-light-enabled={{ gnome.night_light.enabled | ternary('true', 'false') }} -night-light-temperature={{ gnome.night_light.color_temperature | default(4000) }} - -[org/gnome/desktop/calendar] -show-weekdate={{ gnome.date_time.show_weeks_in_calendar | ternary('true', 'false') }} - -[org/gnome/desktop/interface] -# Date and time settings -clock-show-date={{ gnome.date_time.show_date_in_clock | ternary('true', 'false') }} - -# Battery settings -show-battery-percentage={{ gnome.battery.show_percentage | ternary('true', 'false') }} - -# Touchpad settings -[org/gnome/desktop/peripherals/touchpad] -tap-to-click={{ gnome.touchpad.tap_to_click | ternary('true', 'false') }} -natural-scroll={{ gnome.touchpad.natural_scrolling | ternary('true', 'false') }} -disable-while-typing={{ gnome.touchpad.disabled_while_typing | ternary('true', 'false') }} - -# Power settings -[org/gnome/settings-daemon/plugins/power] -sleep-inactive-ac-timeout={{ gnome.power.sleep_timeout_when_computer_on_ac | default(3600) }} -sleep-inactive-ac-type='{{ gnome.power.timeout_action_when_computer_on_ac | default("hibernate") }}' -sleep-inactive-battery-timeout={{ gnome.power.sleep_timeout_when_computer_on_battery | default(3600) }} -sleep-inactive-battery-type='{{ gnome.power.timeout_action_when_computer_on_battery | default("hibernate") }}' -power-button-action='{{ gnome.power.power_button_action | default("suspend") }}' - -# Lock screen settings -[org/gnome/desktop/screensaver] -lock-enabled={{ gnome.lock_screen.automatic_lock | ternary('true', 'false') }} -lock-delay={{ gnome.lock_screen.lock_screen_after_blank_for | default(0) }} -status-message-enabled={{ gnome.lock_screen.show_notifications | ternary('true', 'false') }} -show-full-name-in-top-bar={{ gnome.lock_screen.show_full_name_of_user | ternary('true', 'false') }} diff --git a/roles/gnome/templates/gtk-3.0/settings.ini.j2 b/roles/gnome/templates/gtk-3.0/settings.ini.j2 deleted file mode 100644 index 6fe18d5..0000000 --- a/roles/gnome/templates/gtk-3.0/settings.ini.j2 +++ /dev/null @@ -1,11 +0,0 @@ -[Settings] -{% if gnome.theme.theme_name %} -gtk-icon-theme-name = {{ gnome.theme.theme_name }} -{% endif %} -{% if gnome.theme.icon_theme_name %} -gtk-theme-name = {{ gnome.theme.icon_theme_name }} -{% endif %} -{% if gnome.theme.font_name %} -gtk-font-name = {{ gnome.theme.font_name }} -{% endif %} -gtk-application-prefer-dark-theme = {% if gnome.theme.dark_variant %}true{% else %}false{% endif %}