apt install firmware-linux

playbooks/apt.yaml

@@ -18,9 +18,12 @@
           - composer
           - cups
           - curl
+          - dbus-broker
           - dia
           - evince
           - fcitx5
+          - file-roller
+          - firmware-linux
           - flameshot
           - foot
           - git
@@ -29,9 +32,11 @@
           - inkscape
           - isort
           - libreoffice
+          - lightdm
           - lxpolkit
           - mesa-utils
           - mesa-utils-bin
+          - meson
           - network-manager-gnome
           - network-manager-config-connectivity-debian
           - nextcloud-desktop
@@ -40,9 +45,13 @@
           - npm
           - pass
           - pavucontrol
+          - pipewire
           - pipewire-audio
           - pipx
           - plocate
+          - plymouth
+          - plymouth-themes
+          - plymouth-label
           - pkexec
           - puppet-lint
           - python3-deepdiff
@@ -51,6 +60,7 @@
           - qt5ct
           - rsync
           - scdaemon
+          - shfmt
           - simple-scan
           - sway
           - sway-backgrounds
@@ -62,17 +72,18 @@
           - tsocks
           - unzip
           - waybar
+          - waypipe
           - wdisplays
           - wget
           - wl-clipboard
           - wlr-randr
           - wofi
           - xdg-desktop-portal
+          - xdg-desktop-portal-gtk
           - xdg-desktop-portal-wlr
           - xwayland
           - yapf3
           - yq
-          - zathura
           - zsh
         state: latest
         update_cache: true

playbooks/firefox.yaml

@@ -14,18 +14,19 @@
         path: '{{key_path}}'
       register: key
     - name: Get key
+      become: true
       ansible.builtin.command:
         chdir: /tmp
-        cmd: wget -O ./keyring.gpg '{{ key_url }}'
+        cmd: wget -O '{{ key_path }}' '{{ key_url }}'
-        creates: /tmp/keyring.gpg
-      when: not key.stat.exists
-    - name: Dearmor key
-      ansible.builtin.command:
-        chdir: /tmp
-        cmd: gpg --dearmor -o {{ key_path }} ./keyring.gpg 
         creates: '{{key_path}}'
-      become: true
       when: not key.stat.exists
+    # - name: Dearmor key
+    #   ansible.builtin.command:
+    #     chdir: /tmp
+    #     cmd: gpg --dearmor -o {{ key_path }} ./keyring.gpg 
+    #     creates: '{{key_path}}'
+    #   become: true
+    #   when: not key.stat.exists
     - name: install repo
       become: true
       ansible.builtin.template:
@@ -38,7 +39,7 @@
         autoclean: true
         autoremove: true
         install_recommends: true
-        pkg: [firefox-mozilla-build]
+        pkg: [firefox]
         state: latest
         update_cache: true
     - name: Get host app

playbooks/uwsm.yaml

@@ -0,0 +1,32 @@
+---
+- name: Set up uwsm
+  vars:
+    uid: "{{ lookup('env','USER') }}"
+  hosts: localhost
+  connection: local
+  become: false
+  tasks:
+    - name: Get source code
+      ansible.builtin.command:
+        chdir: /home/{{ uid }}/sources
+        cmd: git clone https://github.com/Vladimir-csp/uwsm.git
+        creates: /home/{{ uid }}/sources/uwsm
+    - name: Build uwsm from source code
+      ansible.builtin.command:
+        chdir: /home/{{ uid }}/sources/uwsm
+        cmd: meson setup --wipe --prefix=/usr/local build -Duuctl=enabled -Duwsm-app=enabled
+        creates: /home/{{ uid }}/sources/uwsm/build
+    - name: Install uwsm
+      become: true
+      ansible.builtin.command:
+        chdir: /home/{{ uid }}/sources/uwsm
+        cmd: meson install -C build
+        creates: /usr/local/bin/uwsm
+    - name: Install uwsm config
+      become: true
+      ansible.builtin.template:
+        src: ../templates/sway_desktop.j2
+        dest: /usr/share/wayland-sessions/swa.desktop
+        owner: 'root'
+        group: 'root'
+        mode: '0640'

setup.yaml

@@ -3,6 +3,7 @@
 - import_playbook: playbooks/env.yaml
 - import_playbook: playbooks/firefox.yaml
 - import_playbook: playbooks/fonts.yaml
+- import_playbook: playbooks/kubectl.yaml
 - import_playbook: playbooks/mattermost.yaml
 - import_playbook: playbooks/network.yaml
 - import_playbook: playbooks/pass.yaml
@@ -12,7 +13,8 @@
 - import_playbook: playbooks/ssh.yaml
 - import_playbook: playbooks/sunet.yaml
 - import_playbook: playbooks/sway.yaml
-  #- import_playbook: playbooks/zoom.yaml
+- import_playbook: playbooks/uwsm.yaml
+- import_playbook: playbooks/zoom.yaml
 - import_playbook: playbooks/zsh.yaml
 # needs pass
 - import_playbook: playbooks/nvim.yaml

templates/sway_config.j2

@@ -14,12 +14,8 @@ set $term footclient
 # on the original workspace that the command was run on.
 set $menu wofi -S drun | xargs swaymsg exec --
 
-# Dbus stuff
-exec systemctl --user import-environment DISPLAY WAYLAND_DISPLAY SWAYSOCK
-exec hash dbus-update-activation-environment 2>/dev/null && \
-     dbus-update-activation-environment --systemd DISPLAY WAYLAND_DISPLAY SWAYSOCK
-
 # Autostart
+exec exec uwsm finalize SWAYSOCK I3SOCK XCURSOR_SIZE XCURSOR_THEME
 exec --no-startup-id nm-applet
 exec --no-startup-id autotiling
 exec --no-startup-id lxpolkit
@@ -179,9 +175,6 @@ input type:keyboard {
     # Show the next scratchpad window or hide the focused scratchpad window.
     # If there are multiple scratchpad windows, this command cycles through them.
     bindsym $mod+minus scratchpad show
-
-# Flameshot
-for_window [app_id="flameshot"] border pixel 0, floating enable, fullscreen disable, move absolute position 0 0
 #
 # Resizing containers:
 #
@@ -238,16 +231,16 @@ mode $screenshot_mode {
 
 # Status Bar:
 # Read `man 5 sway-bar` for more information about this section.
-bar {
+# bar {
-    position top
+#     position top
 
-    swaybar_command waybar
+#     swaybar_command waybar
 
-    colors {
+#     colors {
-        statusline #ffffff
+#         statusline #ffffff
-        background #5c5c5c
+#         background #5c5c5c
-        active_workspace #5c5c5c00 #5c5c5c00 #323232
+#         active_workspace #5c5c5c00 #5c5c5c00 #323232
-    }
+#     }
-}
+# }
 
 include /etc/sway/config.d/*

templates/sway_desktop.j2

@@ -0,0 +1,6 @@
+[Desktop Entry]
+Name=Sway (with UWSM)
+Comment=Sway
+Exec=uwsm start -N "Sway" -D sway -C "Sway" sway
+DesktopNames=sway
+Type=Application