Commit Diff


commit - 00381bde618367a9a639b80541b0eae03d448cac
commit + 18d409103af51318272efc2b0d0084538480b1d3
blob - e63bd513f7b184eeb915cf02e3d79a1625dac2d8
blob + 359fd0ebe1e46894217c1bcf21c9c4e45434cecb
--- group_vars/workstation
+++ group_vars/workstation
@@ -2,3 +2,136 @@
 
 is_workstation: true
 ansible_connection: local
+
+packages:
+  - ImageMagick
+  - ansible
+  - asciinema
+  - bzip2
+  - chromium
+  - cmus
+  - curl
+  - djview4
+  - exfat-fuse
+  - exiftran
+  - fdupes
+  - feh
+  - firefox
+  - fossil--static
+  - fswebcam
+  - fzy
+  - fzf
+  - geeqie
+  - ghostscript
+  - gimp
+  - gnome-themes-extra
+  - gnuplot--no_x11
+  #- gpxsee
+  - grap
+  - graphviz
+  - groff
+  - hugo
+  - inkscape
+  - ipython
+  - ispell--russian
+  - isync
+  - jpegoptim
+  - jhead
+  - jq
+  - jo
+  - liberation-fonts
+  - libqrencode
+  - libreoffice
+  - libreoffice-i18n-ru
+  - lifelines
+  - maim
+  - mc
+  - moka-icon-theme
+  - mpv
+  - msmtp
+  - mutt--gpgme-sasl
+  - noice
+  - ntfs_3g
+  - nvi--iconv
+  - nnn
+  - optipng
+  - p5-Image-ExifTool
+  - p7zip
+  - p7zip-rar
+  - passwdqc
+  - pdfpc
+  - pdfsandwich
+  - pdftk
+  - pianobar
+  - pidgin--gtkspell
+  - pjsua
+  - pngcrush
+  - py-casttube
+  - rclone
+  - remmina
+  - restic
+  - rofi
+  - rtl-sdr
+  - scrot
+  - sxiv
+  - sysclean
+  - swish-e
+  - sqlite3
+  - tango-icon-theme
+  - tango-icon-theme-extras
+  #- tarsnap-gui
+  - tesseract
+  - tesseract-rus
+  #- texlive_base-
+  #- texlive_texmf-buildset-
+  #- texlive_texmf-minimal-
+  - thunar
+  - tor
+  - unpaper
+  - unzip
+  - urlview--
+  - vim
+  - xbattbar
+  - xbindkeys
+  - xcalib
+  - xclip
+  - xsel
+  - xz
+  - zathura
+  - zathura-djvu
+  - zathura-pdf-poppler
+  - zathura-ps
+
+dev_packages:
+  - afl
+  - cbmc
+  - cmake
+  - coq
+  - entr
+  - frama-c
+  - gcc
+  - git
+  - gmake
+  - go
+  - jupyter-notebook
+  - spin
+  - mscgen
+  - tkdiff
+  - the_silver_searcher
+  - z3
+  - uncrustify
+
+game_packages:
+  - chessx
+  - openttd
+  - xmahjongg
+
+python_packages:
+  - py-virtualenv
+  - py-pip
+
+firmwares:
+  - intel-firmware
+  - iwm-firmware
+  - uvideo-firmware
+  - vmm-firmware
blob - 496a498315377c095a7692d7724bc45e8a06ebde
blob + 57e57a4970aadba3141247fc0c26fa8b218a00e4
--- roles/common/tasks/local_known_hosts.yml
+++ roles/common/tasks/local_known_hosts.yml
@@ -1,8 +1,7 @@
 ---
 
-## not available in 1.7.2, new in 1.9
-# - name: set known_hosts
-#   known_hosts:
-#     name: www.bronevichok.ru
-#     state: present
-#     key: ""
+#- name: set known_hosts
+#  known_hosts:
+#    name: www.bronevichok.ru
+#    state: present
+#    key: ""
blob - 03c0d741f7dfb7e37ee3919b37305f9d8ca6f78e
blob + 6636cf4d9bce94f7c0901ddb5c10c51b0adf839d
--- roles/workstation/tasks/install_essentials.yml
+++ roles/workstation/tasks/install_essentials.yml
@@ -5,105 +5,8 @@
   become_method: doas
   when: ansible_os_family == "OpenBSD"
   openbsd_pkg:
-    name: "{{item}}"
     state: present
-  with_items:
-    - ImageMagick
-    - ansible
-    - asciinema
-    - bzip2
-    - chromium
-    - cmus
-    - curl
-    - djview4
-    - exfat-fuse
-    - exiftran
-    - fdupes
-    - feh
-    - firefox
-    - fossil
-    - fswebcam
-    - fzy
-    - fzf
-    - geeqie
-    - ghostscript
-    - gimp
-    - gnome-themes-standard
-    - gnuplot--no_x11
-    - grap
-    - graphviz
-    - groff
-    - hugo
-    - inkscape
-    - ipython
-    - ispell--russian
-    - isync
-    - jpegoptim
-    - jhead
-    - jq
-    - jo
-    - liberation-fonts
-    - libqrencode
-    - libreoffice
-    - libreoffice-i18n-ru
-    - lifelines
-    - maim
-    - mc
-    - moka-icon-theme
-    - mpv
-    - msmtp
-    - mutt
-    - noice
-    - ntfs_3g
-    - nvi--iconv
-    - nnn
-    - optipng
-    - p5-Image-ExifTool
-    - p7zip
-    - p7zip-rar
-    - passwdqc
-    - pdfpc
-    - pdfsandwich
-    - pdftk
-    - pianobar
-    - pidgin--gtkspell
-    - pjsua
-    - pngcrush
-    - py-casttube
-    - rclone
-    - remmina
-    - restic
-    - rofi
-    - rtl-sdr
-    - scrot
-    - sxiv
-    - sysclean
-    - swish-e
-    - sqlite3
-    - tango-icon-theme
-    - tango-icon-theme-extras
-    - tarsnap-gui
-    - tesseract
-    - tesseract-rus
-    - texlive_base
-    - texlive_texmf-buildset
-    - texlive_texmf-minimal
-    - thunar
-    - tor
-    - unpaper
-    - unzip
-    - urlview
-    - vim
-    - xbattbar
-    - xbindkeys
-    - xcalib
-    - xclip
-    - xsel
-    - xz
-    - zathura
-    - zathura-djvu
-    - zathura-pdf-poppler
-    - zathura-ps
+    name: "{{ packages }}"
 
 - name: create directories
   become: no
@@ -120,48 +23,21 @@
   become_method: doas
   when: ansible_os_family == "OpenBSD"
   openbsd_pkg:
-    name: "{{item}}"
+    name: "{{ python_packages }}"
     state: latest
-  with_items:
-    - py-virtualenv
-    - py-pip
 
 - name: install various development packages
   become: yes
   become_method: doas
   when: ansible_os_family == "OpenBSD"
   openbsd_pkg:
-    name: "{{item}}"
+    name: "{{ dev_packages }}"
     state: latest
-  with_items:
-    - autoconf
-    - automake
-    - afl
-    - cbmc
-    - cmake
-    - coq
-    - entr
-    - frama-c
-    - gcc
-    - git
-    - gmake
-    - go
-    - jupyter-notebook
-    - spin
-    - mscgen
-    - tkdiff
-    - the_silver_searcher
-    - z3
-    - uncrustify
 
 - name: install various games
   when: ansible_distribution == "OpenBSD"
   become: true
   become_method: doas
   openbsd_pkg:
-    name: "{{item}}"
+    name: "{{ game_packages }}"
     state: present
-  with_items:
-    - chessx
-    - openttd
-    - xmahjongg
blob - 954e2b4d41c5ba7dfc09a6d7e29b4a0344cc03f2
blob + 873480a665d0d31507eb8841c0016e5ad93ad241
--- roles/workstation/tasks/install_firmwares.yml
+++ roles/workstation/tasks/install_firmwares.yml
@@ -1,14 +1,9 @@
 ---
+
 - name: install firmware
   become: yes
   become_method: doas
   when: ansible_os_family == "OpenBSD"
   openbsd_pkg:
-    name: "{{item}}"
+    name: "{{ firmwares }}"
     state: present
-  with_items:
-    - intel-firmware
-    - iwm-firmware
-    - urtwn-firmware
-    - uvideo-firmware
-    - vmm-firmware
blob - ce4e00d8317328ee3665927a6ab9b370f19f3057
blob + 156455ceb838c48473d94580eddc9f8312f9a793
--- roles/workstation/tasks/main.yml
+++ roles/workstation/tasks/main.yml
@@ -28,3 +28,6 @@
 
 - name: setup vim
   import_tasks: setup_vim.yml
+
+- name: install patches
+  import_tasks: patches.yml
blob - 9feacf843bef0d9f9b9fd15044dc902199d00fd5
blob + 06eed26902ac846c055a22b78fd2b550160ebacb
--- roles/workstation/tasks/setup_system.yml
+++ roles/workstation/tasks/setup_system.yml
@@ -28,6 +28,16 @@
     - "attach"
     - "detach"
 
+- name: create directory /etc/apm
+  become: yes
+  become_method: doas
+  when: ansible_os_family == "OpenBSD"
+  file:
+    path: "/etc/apm"
+    state: directory
+    group: wheel
+    mode: 0655
+
 - name: setup /etc/apm/suspend
   become: yes
   become_method: doas