media.yml

@@ -1,4 +0,0 @@
-- name: Media
-  hosts: odhosts
-  roles:
-    - media

multimedia.yml

@@ -0,0 +1,23 @@
+- name: Multimedia
+  hosts: odhosts
+  tasks:
+   - name: Install video/audio players
+     become: true
+     ansible.builtin.apt:
+       pkg:
+         - mpv
+         - haruna
+         - vlc
+   - name: Install image viewers and editors
+     become: true
+     ansible.builtin.apt:
+       pkg:
+         - gwenview
+         - gimp
+         - inkscape
+   - name: Install image/video processing software
+     become: true
+     ansible.builtin.apt:
+       pkg:
+         - imagemagick
+         - ffmpeg

roles/desktop/files/sway.conf

@@ -17,6 +17,4 @@ set $term alacritty
 # on the original workspace that the command was run on.
 set $menu wofi --show run --style ~/.config/wofi/style.css | xargs swaymsg exec --
 
-exec dbus-update-activation-environment --systemd DISPLAY WAYLAND_DISPLAY SWAYSOCK
-
 include ~/.config/sway/config.d/*

roles/media/files/mpv.conf

@@ -1,16 +0,0 @@
-# Don't start in fullscreen mode by default.
-fs=no
-
-# Enable hardware decoding if available. Often, this does not work with all
-# video outputs, but should work well with default settings on most systems.
-# If performance or energy usage is an issue, forcing the vdpau or vaapi VOs
-# may or may not help.
-hwdec=auto
-
-# Display Russian subtitles if available.
-slang=ru
-# Enable fuzzy searching.
-sub-auto=fuzzy
-
-# Play Japanese audio if available, fall back to English and Russian otherwise.
-alang=en,jp,ru

roles/media/tasks/hw-accel.yml

@@ -1,11 +0,0 @@
-- name: Install VA-API and VDPAU
-  become: true
-  ansible.builtin.apt:
-    pkg:
-      - mesa-va-drivers
-      - vdpau-driver-all
-- name: Install vulkan drivers
-  become: true
-  ansible.builtin.apt:
-    pkg:
-      - mesa-vulkan-drivers

roles/media/tasks/main.yml

@@ -1,4 +0,0 @@
-- name: Hardware acceleration
-  import_tasks: hw-accel.yml
-- name: MPV
-  import_tasks: mpv.yml

roles/media/tasks/mpv.yml

@@ -1,15 +0,0 @@
-- name: Install mpv
-  become: true
-  ansible.builtin.apt:
-    pkg:
-      - mpv
-- name: Create mpv config dir
-  ansible.builtin.file:
-    path: "{{ ansible_env.HOME }}/.config/mpv"
-    state: directory
-    mode: '1770'
-- name: Copy mpv config file
-  ansible.builtin.copy:
-    src: files/mpv.conf
-    dest: "{{ ansible_env.HOME }}/.config/mpv/mpv.conf"
-    mode: '0660'

roles/terminal/files/profile.sh

@@ -5,47 +5,20 @@
 
 # if running bash
 if [ -n "$BASH_VERSION" ]; then
-  # include .bashrc if it exists
+    # include .bashrc if it exists
-  if [ -f "$HOME/.bashrc" ]; then
+    if [ -f "$HOME/.bashrc" ]; then
-	  . "$HOME/.bashrc"
+	. "$HOME/.bashrc"
-  fi
+    fi
 fi
 
 # set PATH so it includes user's private bin if it exists
 if [ -d "$HOME/bin" ] ; then
-  PATH="$HOME/bin:$PATH"
+    PATH="$HOME/bin:$PATH"
 fi
 
 # set PATH so it includes user's private bin if it exists
 if [ -d "$HOME/.local/bin" ] ; then
-  PATH="$HOME/.local/bin:$PATH"
+    PATH="$HOME/.local/bin:$PATH"
 fi
 
 export GPG_TTY=$(tty)
-export QT_QPA_PLATFORMTHEME="qt5ct"
-
-# Flutter
-export CHROME_EXECUTABLE="/usr/bin/chromium"
-export FLUTTER_ROOT="$HOME/flutter/flutter"
-if [ -d "$FLUTTER_ROOT/bin" ] ; then
-  PATH="$FLUTTER_ROOT/bin:$PATH"
-fi
-
-export EDITOR="nvim"
-
-# Go
-export GOPATH="$HOME/go"
-if [ -d "$GOPATH/bin" ] ; then
-  PATH="$GOPATH/bin:$PATH"
-fi
-if [ -d "/usr/lib/go-1.22/bin" ] ; then
-  PATH="/usr/lib/go-1.22/bin:$PATH"
-fi
-
-# Rustup
-if [ -d "$HOME/.cargo" ] ; then
-  . "$HOME/.cargo/env"
-fi
-
-# Firefox
-export MOZ_ENABLE_WAYLAND=1

roles/terminal/tasks/bash.yml

@@ -20,6 +20,6 @@
     mode: '0660'
 - name: Copy bash logout
   ansible.builtin.copy:
-    src: files/bash_logout.sh
+    src: files/profile.sh
     dest: "{{ ansible_env.HOME }}/.bash_logout"
     mode: '0660'