From d2b6c627aea05f80c3a4b5d4eb8970d2b7927723 Mon Sep 17 00:00:00 2001 From: Tom Alexander Date: Fri, 2 Dec 2022 00:09:33 -0500 Subject: [PATCH] Remove hibernate on FreeBSD. --- .../environments/laptop/host_vars/odofreebsd | 1 + .../roles/sway/files/wlogout_layout_freebsd | 30 +++++++++++++++++++ .../{wlogout_layout => wlogout_layout_linux} | 0 ansible/roles/sway/tasks/peruser.yaml | 1 + ansible/roles/sway/tasks/peruser_freebsd.yaml | 12 +------- ansible/roles/sway/tasks/peruser_linux.yaml | 10 +++++++ 6 files changed, 43 insertions(+), 11 deletions(-) create mode 100644 ansible/roles/sway/files/wlogout_layout_freebsd rename ansible/roles/sway/files/{wlogout_layout => wlogout_layout_linux} (100%) diff --git a/ansible/environments/laptop/host_vars/odofreebsd b/ansible/environments/laptop/host_vars/odofreebsd index 75dadf1..613c1a0 100644 --- a/ansible/environments/laptop/host_vars/odofreebsd +++ b/ansible/environments/laptop/host_vars/odofreebsd @@ -29,6 +29,7 @@ users: - name: wheel - name: video - name: u2f + - name: operator # To be able to shutdown without root authorized_keys: - yubikey - main_fido diff --git a/ansible/roles/sway/files/wlogout_layout_freebsd b/ansible/roles/sway/files/wlogout_layout_freebsd new file mode 100644 index 0000000..94abfad --- /dev/null +++ b/ansible/roles/sway/files/wlogout_layout_freebsd @@ -0,0 +1,30 @@ +{ + "label" : "lock", + "action" : "swaylock -c 000000", + "text" : "Lock", + "keybind" : "l" +} +{ + "label" : "logout", + "action" : "kill -9 -1", + "text" : "Logout", + "keybind" : "e" +} +{ + "label" : "shutdown", + "action" : "shutdown -p now", + "text" : "Shutdown", + "keybind" : "s" +} +{ + "label" : "suspend", + "action" : "zzz", + "text" : "Suspend", + "keybind" : "u" +} +{ + "label" : "reboot", + "action" : "shutdown -r now", + "text" : "Reboot", + "keybind" : "r" +} diff --git a/ansible/roles/sway/files/wlogout_layout b/ansible/roles/sway/files/wlogout_layout_linux similarity index 100% rename from ansible/roles/sway/files/wlogout_layout rename to ansible/roles/sway/files/wlogout_layout_linux diff --git a/ansible/roles/sway/tasks/peruser.yaml b/ansible/roles/sway/tasks/peruser.yaml index 5a753cf..fe18284 100644 --- a/ansible/roles/sway/tasks/peruser.yaml +++ b/ansible/roles/sway/tasks/peruser.yaml @@ -13,6 +13,7 @@ - ".config/sway/config.d" - ".config/xdg-desktop-portal-wlr" - ".config/mako" + - ".config/wlogout" - name: Copy files copy: diff --git a/ansible/roles/sway/tasks/peruser_freebsd.yaml b/ansible/roles/sway/tasks/peruser_freebsd.yaml index 689f864..c090015 100644 --- a/ansible/roles/sway/tasks/peruser_freebsd.yaml +++ b/ansible/roles/sway/tasks/peruser_freebsd.yaml @@ -1,13 +1,3 @@ -- name: Create directories - file: - name: "{{ account_homedir.stdout }}/{{ item }}" - state: directory - mode: 0700 - owner: "{{ account_name.stdout }}" - group: "{{ group_name.stdout }}" - loop: - - ".config/wlogout" - - name: Copy files copy: src: "files/{{ item.src }}" @@ -16,5 +6,5 @@ owner: "{{ account_name.stdout }}" group: "{{ group_name.stdout }}" loop: - - src: wlogout_layout + - src: wlogout_layout_freebsd dest: .config/wlogout/layout diff --git a/ansible/roles/sway/tasks/peruser_linux.yaml b/ansible/roles/sway/tasks/peruser_linux.yaml index e69de29..056deb6 100644 --- a/ansible/roles/sway/tasks/peruser_linux.yaml +++ b/ansible/roles/sway/tasks/peruser_linux.yaml @@ -0,0 +1,10 @@ +- name: Copy files + copy: + src: "files/{{ item.src }}" + dest: "{{ account_homedir.stdout }}/{{ item.dest }}" + mode: 0600 + owner: "{{ account_name.stdout }}" + group: "{{ group_name.stdout }}" + loop: + - src: wlogout_layout_linux + dest: .config/wlogout/layout