diff --git a/Dockerfile b/Dockerfile index 9c220ee..c0c5d4a 100644 --- a/Dockerfile +++ b/Dockerfile @@ -1,22 +1,22 @@ # vim:set ft=dockerfile: -FROM debian:stretch +FROM debian:bullseye MAINTAINER "cytopia" RUN set -eux \ && apt-get update \ && apt-get install --no-install-recommends --no-install-suggests -y \ - python-apt \ - python-dev \ - python-jmespath \ - python-pip \ - python-setuptools \ + python3-apt \ + python3-dev \ + python3-jmespath \ + python3-pip \ + python3-setuptools \ sudo \ && rm -rf /var/lib/apt/lists/* \ && apt-get purge -y --autoremove RUN set -eux \ - && pip install wheel \ - && pip install ansible + && pip3 install wheel \ + && pip3 install ansible # Add user with password-less sudo RUN set -eux \ diff --git a/Makefile b/Makefile index 6ca9d96..b6f4ecd 100644 --- a/Makefile +++ b/Makefile @@ -5,7 +5,7 @@ TAG = latest # Ansible variables VERBOSE= -PROFILE=cytopia-t470p +PROFILE=cytopia-p1gen4 ARG= .PHONY: help build-docker test-docker-full test-docker-random test-docker-single itest-docker-full itest-docker-random itest-docker-single @@ -98,13 +98,13 @@ ifneq ($(USER),root) endif DEBIAN_FRONTEND=noninteractive apt-get update -qq DEBIAN_FRONTEND=noninteractive apt-get install -qq -q --no-install-recommends --no-install-suggests \ - python-apt \ - python-dev \ - python-jmespath \ - python-pip \ - python-setuptools - pip install wheel - pip install ansible + python3-apt \ + python3-dev \ + python3-jmespath \ + python3-pip \ + python3-setuptools + pip3 install wheel + pip3 install ansible # (Step 2/4) Add new Debian sources deploy-apt-sources: diff --git a/host_vars/cytopia-p1gen4.yml b/host_vars/cytopia-p1gen4.yml new file mode 100644 index 0000000..b65741b --- /dev/null +++ b/host_vars/cytopia-p1gen4.yml @@ -0,0 +1,360 @@ +--- + +### +### Custom variables +### +debian_dist: bullseye + + +### +### Debian apt repositories +### +apt_repo_repositories: + # main + - file: debian-main + repo: "deb http://deb.debian.org/debian {{ debian_dist }} main contrib non-free" + - file: debian-main + repo: "deb-src http://deb.debian.org/debian {{ debian_dist }} main contrib non-free" + # updates + - file: debian-updates + repo: "deb http://deb.debian.org/debian {{ debian_dist }}-updates main contrib non-free" + - file: debian-updates + repo: "deb-src http://deb.debian.org/debian {{ debian_dist }}-updates main contrib non-free" + # security + - file: debian-security + repo: "deb http://security.debian.org/debian-security {{ debian_dist }}-security main contrib non-free" + - file: debian-security + repo: "deb-src http://security.debian.org/debian-security {{ debian_dist }}-security main contrib non-free" + + +### +### Systemd services +### +systemd_enabled: [] + +# https://github.com/Airblader/dotfiles-manjaro/blob/master/SETUP +systemd_disabled: + - exim4.service + - ModemManager.services + - nfs-common.service + - rpcbind.service + - rpcbind.target + - binfmt-support.service + + +### +### System Python versions +### +python_2: False +python_3: True + + +### +### Python pip packages (add your custom packages here) +### +pip2_packages: [] +# - awscli +# - aws-adfs + +pip3_packages: [] + + +### +### Debian packages (add your custom packages here) +### +apt_packages: + # ---- Base Utils ---- + - dnsutils + - fzf + - gnupg + - gnupg-agent + - htop + - iw + - keychain + - less + - lsb-release + - lsof + - man-db + - manpages + - moreutils + - net-tools + - pinentry-gtk2 + - pinentry-tty + - pwgen + - socat + - tmux + - traceroute + - tree + - wireless-tools + - xxd + + # ---- Sec Tools (default) ---- + - ncat + - nmap + - wireshark-gtk + + # ---- Sec Tools (wireless) ---- + - aircrack-ng + - horst + + # ---- Theme tools ---- + - lxappearance + + # ---- Fonts ---- + - fonts-arphic-ukai + - fonts-arphic-uming + - fonts-ipafont-gothic + - fonts-ipafont-mincho + - fonts-liberation + - fonts-open-sans + - fonts-opensymbol + - fonts-symbola + - ttf-mscorefonts-installer + - ttf-wqy-zenhei + + # ---- Firmwares: General ---- + - intel-microcode + - firmware-misc-nonfree + - firmware-linux + # ---- Firmwares: WiFi ---- + - firmware-iwlwifi + # ---- Firmwares: Sound ---- + - firmware-sof-signed + + # ---- Block devices ---- + - libblockdev-plugins-all + - udisks2-btrfs + - udisks2-lvm2 + + # ---- Window Manager ---- + - arandr + - compton + - dunst + - feh + - redshift + - redshift-gtk + - rofi + - xss-lock + + # ---- Office / Productivity ---- + - keepassxc + - ristretto + + # ---- Video ---- + - vlc + - vlc-plugin-notify + - vlc-plugin-samba + - x264 + - x265 + + # ---- Audio ---- + - alsa-utils + - alsa-oss + - blueman + - pavucontrol + - pulseaudio + - pulseaudio-module-bluetooth + - pulseaudio-utils + + # ---- Network clients ---- + - jxplorer + - mariadb-client + - openssh-client + - redis-tools + - remmina + - remmina-plugin-rdp + - remmina-plugin-vnc + - swaks + + # ---- Development ---- + - ack + - ack-grep + - binutils + - devscripts + - dos2unix + - exuberant-ctags + - jq + - php-cli + - pylint + - python3-pep8 + - shellcheck + - silversearcher-ag + - yamllint + + # ---- Phone - android ---- + - adb + - fastboot + + +### +### Select packages to install +### +### 'install': Install the package +### 'remove': Uninstall the package +### Any other value will ignore the package (neither install nor uninstall) + +autorunner: 'install' +chromium: 'install' +clipmenu: 'install' +dbeaver: 'install' +diff_highlight: 'install' +docker: 'install' +docker_compose: 'install' +ffscreencast: 'install' +firefox: 'noop' +font_font_awesome: 'install' +font_droid_sans_mono: 'install' +font_san_francisco: 'install' +font_terminus: 'install' +font_ubuntu: 'noop' +fzf: 'noop' +gimp: 'install' +i3: 'install' +i3_gaps: 'noop' +i3_utils_bin: 'install' +i3_utils_systemd: 'install' +i3blocks_modules: 'install' +icon_moka: 'install' +kops: 'install' +kubectl: 'install' +libreoffice: 'install' +lxdm: 'install' +neovim: 'install' +network_manager: 'install' +oh_my_zsh: 'noop' +packer: 'noop' +pinta: 'install' +ranger: 'noop' +skype: 'noop' +sublime: 'noop' +sxiv: 'noop' +telegram: 'install' +terraform: 'noop' +theme_arc: 'install' +thunar: 'install' +thunar_custom_actions: 'noop' +thunderbird: 'install' +timemachine: 'install' +urxvt: 'install' +virtualbox: 'noop' +xbacklight: 'install' +xorg: 'install' +zathura: 'install' + + +### +### Settings for packages +### + +# ---- Chromium ---- +# Only works for extensions from web store +chromium_extensions: + # vimium + - dbepggeogbaibhgnhhndojpepiihcmeb + # uBlock Origin + - cjpalhdlnbpafiamejdnhcphjbkeiagm + # uBlock Origin Extra + - pgdnlhfefecpicbbihgmbmffkjpaplco + # PrivacyBadger + - pkehgijcmpdhfbdbbnkijodmdjhbjlgp + # Github Flavored Markdown + - faelggnmhofdamhdegcdhhemfokkfngk + +# ---- Docker ---- +# 'wheezy', 'jessie', 'stretch' or 'buster' +docker_repo_dist: "bullseye" +# 'stable' or 'edge' +docker_repo_channel: stable + +# ---- FZF ---- +# Add sourcing ~/.fzf.bash to your normal shell config? +fzf_update_rc: True +# Enable/Disable fuzzy completion (bash & zsh)? +fzf_completion: False +# Enable/disable key bindings (CTRL-T, CTRL-R, ALT-C)? +fzf_key_bindings: False + +# ---- LXDM ---- +lxdm_dpi: 128 +lxdm_gtk_theme: Arc-Darker +lxdm_show_user_list: False + +# ---- NetworkManager ---- +network_manager_nm_applet: True +network_manager_plugin_openvpn: True +network_manager_plugin_l2tp: False +network_manager_plugin_openconnect: False +network_manager_plugin_pptp: False +network_manager_plugin_ssh: False +network_manager_plugin_strongswan: False +network_manager_plugin_vpnc: False + +# ---- Skype ---- +# 'stable' or 'unstable' +skype_repo_channel: stable + +# ---- Sublime ---- +# 'stable' or 'dev' +sublime_repo_channel: stable + +# ---- sxiv ---- +# Make sxiv default program for pictures +sxiv_default_image_viewer: True + +# ---- Thunar ---- +thunar_volman_enable: True +thunar_archive_plugin_enable: True + +# ---- Thunderbird ---- +thunderbird_ext_apt: [] +# - lightning +# - enigmail + +thunderbird_ext_official: [] +# - https://addons.mozilla.org/en-US/thunderbird/addon/dkim-verifier/ +## - https://addons.mozilla.org/en-US/thunderbird/addon/enigmail/ +# - https://addons.mozilla.org/en-US/thunderbird/addon/gnotifier/ +## - https://addons.mozilla.org/en-US/thunderbird/addon/lightning/ +# - https://addons.mozilla.org/en-US/thunderbird/addon/provider-for-google-calendar/ +# - https://addons.mozilla.org/en-US/thunderbird/addon/x-unsent-support/ + +# List of urls pages in which an XPI download link can be found. +# Note: The first found XPI download url will be used +thunderbird_ext_custom: [] +# - https://github.com/ExchangeCalendar/exchangecalendar/releases + +# ---- Xorg ---- +# Supported values: 'amdgpu' 'ati' 'intel' 'modesetting' 'nouveau' 'nvidia' 'radeon' +xorg_gpu: modesetting +# Supported values: 'XAA' 'EXA' 'UXA' 'SNA' 'glamor' +xorg_gpu_accel_method: glamor +# Enable VDPAU_DRIVER=va_gl systemwide +xorg_gpu_vdpau_va_gl_enable: True +# 'libinput' or 'synaptics' +xorg_touchpad_enable: True +xorg_touchpad_driver: 'synaptics' + + +### +### Set your preferred default applications +### +xdg_mime_defaults: + - desktop_file: Thunar.desktop + mime_types: + - inode/directory + - desktop_file: chromium.desktop + mime_types: + - text/html + - text/xml + - application/xhtml_xml + - application/x-mimearchive + - x-scheme-handler/http + - x-scheme-handler/https + - desktop_file: zathura.desktop + mime_types: + - application/pdf + - application/postscript + - application/eps + - application/x-eps + - image/eps + - image/x-eps diff --git a/host_vars/cytopia-t470p.yml b/host_vars/cytopia-t470p.yml index b89fc95..e7bb480 100644 --- a/host_vars/cytopia-t470p.yml +++ b/host_vars/cytopia-t470p.yml @@ -95,11 +95,11 @@ apt_packages: # ---- Sec Tools (wireless) ---- - aircrack-ng - horst - - kismet - - kismet-plugins +# - kismet +# - kismet-plugins # ---- Theme tools ---- - lxappearance - - qt4-qtconfig +# - qt4-qtconfig # ---- Fonts ---- - fonts-arphic-ukai - fonts-arphic-uming @@ -303,9 +303,9 @@ thunar_volman_enable: True thunar_archive_plugin_enable: True # ---- Thunderbird ---- -thunderbird_ext_apt: - - lightning - - enigmail +thunderbird_ext_apt: [] +# - lightning +# - enigmail thunderbird_ext_official: - https://addons.mozilla.org/en-US/thunderbird/addon/dkim-verifier/ diff --git a/inventory b/inventory index 57fe1a8..c5df98c 100644 --- a/inventory +++ b/inventory @@ -29,6 +29,7 @@ generic-all ansible_connection=local [cytopia] # $ ansible-playbook -i inventory playbook.yml --diff --limit cytopia-t470p --ask-become-pass cytopia-t470p ansible_connection=local +cytopia-p1gen4 ansible_connection=local ### diff --git a/libreoffice/defaults/main.yml b/libreoffice/defaults/main.yml new file mode 100644 index 0000000..80e9325 --- /dev/null +++ b/libreoffice/defaults/main.yml @@ -0,0 +1,4 @@ +--- + +# 'install', 'remove' or 'ignore' +libreoffice: 'ignore' diff --git a/libreoffice/files/images_office2013.zip b/libreoffice/files/images_office2013.zip new file mode 100644 index 0000000..9db972f Binary files /dev/null and b/libreoffice/files/images_office2013.zip differ diff --git a/libreoffice/files/registrymodifications.xcu b/libreoffice/files/registrymodifications.xcu new file mode 100644 index 0000000..b66702c --- /dev/null +++ b/libreoffice/files/registrymodifications.xcu @@ -0,0 +1,539 @@ + + +false +0.001 +100 +true +30 +12 +1899 +65535 +false +false +false +true +true +0 +true +0 +0 +false +true +0 +true +true +true +2 +true +false +true +false +1270 +1270 +1270 +1270 +1 +1 +true +true +224 226 222 223 6 +true +12632256 +false +false +true +2 +1 +514 +1270 +true +true +true +true +true +true +0 +100 +5000 +8000 +true +-1 +-1 +-1 +-1 +Mon,Tue,Wed,Thu,Fri,Sat,SunSunday,Monday,Tuesday,Wednesday,Thursday,Friday,SaturdayJan,Feb,Mar,Apr,May,Jun,Jul,Aug,Sep,Oct,Nov,DecJanuary,February,March,April,May,June,July,August,September,October,November,DecemberSunday,Monday,Tuesday,Wednesday,Thursday,Friday,ShabbatNissan,Iyar,Sivan,Tammuz,Av,Elul,Tishri,Heshvan,Kislev,Tevet,Shevat,Adar,Adar B +false +true +true +false +true +false + +false +false +true +false +false +1 +no + +true +true +1 +0 +office2013 +1 +false +true +false +12632256 +Grid color +true +true +0,2 +true +0 +false +false +false +2147483647,2147483647 +0,0 +false +0 +Formatting +false +true +true +0,0 +true +0 +false +false +false +2147483647,2147483647 +0,0 +false +0 +Standard +false +true +true +0,0 +true +0 +false +false +false +2147483647,2147483647 +0,0 +false +0 +Standard +true +true +true +1,0 +true +0 +false +false +false +2147483647,2147483647 +0,0 +false +0 +Presentation +false +true +true +0,0 +true +0 +false +false +false +2147483647,2147483647 +0,0 +false +0 +Standard +false +true +false +0,1 +true +0 +false +false +false +2147483647,2147483647 +0,0 +false +0 +Drawing +false +true +true +0,0 +true +0 +false +false +false +2147483647,2147483647 +0,0 +false +0 +Standard +true +true +false +1,0 +true +0 +false +false +false +2147483647,2147483647 +0,0 +false +0 +Tools +true +true +true +true +any, any, visible +any, any, visible +any, any, visible +com.sun.star.sheet.SpreadsheetDocument, any, visible +any, any, visible +any,PropertyDeckcom.sun.star.sheet.SpreadsheetDocument,PropertyDeckcom.sun.star.text.TextDocument,PropertyDeck +any, any, visible +Notebookbar +private:resource/toolbar/standardbarprivate:resource/toolbar/formatobjectbar +Notebookbar +private:resource/toolbar/standardbarprivate:resource/toolbar/commontaskbarprivate:resource/toolbar/toolbar +Notebookbar +private:resource/toolbar/standardbarprivate:resource/toolbar/textobjectbar +true +false +0,0 +true +0 +false +false +false +2147483647,2147483647 +0,0 +false +0 +Logo +false +true +true +0,0 +true +0 +false +false +false +2147483647,2147483647 +0,0 +false +0 +Standard +false +true +true +0,1 +true +0 +false +false +false +2147483647,2147483647 +0,0 +false +0 +Formatting +false +1420,391,,;;,,,; +21304,408,,;;,,,; +54 +220;1 +135;1 +0 +V1,2,0 +V1,2,0 +V1,0,1,10336 +V1,2,0 +V2,V,0,AL:(5,16,0/0/36/450,36;450) + +V2,V,128 +V2,V,20 +V2,V,0,AL:(5,16,0/0/400/450,400;1254) + +V2,V,128 +V2,H,128,AL:(16,4,0/0/270/240,270;240)1033,39,349,380;1;0,0,0,0; +true +false +true +true +true +true +true +false +true +false +true +true +true +true +true +true +true +true +1 +2 +false +true +false + + +true + +0 +true +false +false +false +false +1000 +1000 +1 +1 +true +false +false +false +false +: +Illustration + +. +0 +4 +. +1 +false +false +: +Illustration + +. +0 +4 +. +1 +false +false +: +Illustration + +. +0 +4 +. +1 +false +false +: +Illustration + +. +0 +4 +. +1 +false +false +: +Illustration + +. +0 +4 +. +1 +false +false +: +Illustration + +. +0 +4 +. +1 +false +: +Text + +. +0 +4 +. +1 +false +false +: +Illustration + +. +0 +4 +. +1 +false + +Table + +. +0 +4 +. +1 +true +false +true +true +true +false +true +true +2 +1251 +false +1 +true +2 +true +false +true +true +false +true +2 +true +0 +140 +<0>\n<1> <2>\n<4>\n<8> <6><0>\n<1> <2>\n<4>\n<8> <6>\n<9><3>\n<1> <2>\n<4>\n<8> <6><3>\n<1> <2>\n<4>\n<8> <6>\n<9> +0 +0 +0 +0 +0 +EvolutionLocal +Personal +true + + +Dear Mrs. <2>, + +true + + +110 + +false +true +false +true +true +true +true +true +false +false +false + + + + + + + +Dear Mr. <2>, +To whom it may concern,Dear Friends,Dear Sir or Madam,Hello, +true + +true +false +0 +3 +1 +-1 +3 +-1 +3 +-1 +() \t\n\xff +-1 +true +false +true +true +true +true +false +true +true +true +true +false +false +false +1000 +1000 +1 +1 +false +true +2 +true +2 +true +true +false +false +2 +true +0 +100 +en-US +1286,39,1268,1395;1;0,0,0,0; +57,50,2445,1340;5;1286,39,1268,1395; +1286,39,1268,1395;1;0,0,0,0; +d2bec56d7865f05a1003dc88449f2b0fdd85309a +false +true + + +true + + + + + + + + + + + + + + + + diff --git a/libreoffice/tasks/install.yml b/libreoffice/tasks/install.yml new file mode 100644 index 0000000..a4c4dfe --- /dev/null +++ b/libreoffice/tasks/install.yml @@ -0,0 +1,34 @@ +--- + +- name: ensure chromium is installed + include_role: + name: apt-meta + vars: + apt_packages: "{{ [libreoffice_package_name] + libreoffice_shared_packages }}" + + +### +### Basic config/theming +### +- name: ensure office2016 icon pack is copied + copy: + src: "files/{{ libreoffice_icon_name }}" + dest: "{{ libreoffice_icon_path }}/{{ libreoffice_icon_name }}" + owner: root + group: root + mode: 0644 + become: yes + +- name: ensure config directory exists + file: + path: "{{ libreoffice_config_path }}" + state: directory + mode: 0700 + when: libreoffice_installed.rc == 1 + +- name: ensure libreoffice base config is copied once + copy: + src: "files/registrymodifications.xcu" + dest: "{{ libreoffice_config_path }}/registrymodifications.xcu" + mode: 0600 + when: libreoffice_installed.rc == 1 diff --git a/libreoffice/tasks/main.yml b/libreoffice/tasks/main.yml new file mode 100644 index 0000000..a67778d --- /dev/null +++ b/libreoffice/tasks/main.yml @@ -0,0 +1,7 @@ +--- + +- include_tasks: install.yml + when: libreoffice == 'install' + +- include_tasks: uninstall.yml + when: libreoffice == 'remove' diff --git a/libreoffice/tasks/uninstall.yml b/libreoffice/tasks/uninstall.yml new file mode 100644 index 0000000..496a123 --- /dev/null +++ b/libreoffice/tasks/uninstall.yml @@ -0,0 +1,14 @@ +--- + +- name: ensure libreoffice is uninstalled + include_role: + name: apt-meta + vars: + apt_state: absent + apt_packages: + - "{{ libreoffice_package_name }}*" + +- name: ensure libreoffice config directory is removed + file: + state: absent + path: "{{ libreoffice_base_config }}" diff --git a/libreoffice/vars/main.yml b/libreoffice/vars/main.yml new file mode 100644 index 0000000..08726ee --- /dev/null +++ b/libreoffice/vars/main.yml @@ -0,0 +1,15 @@ +--- + +libreoffice_package_name: libreoffice + +# Required for DPI wrapper +libreoffice_shared_packages: + - x11-xserver-utils + +# Icons +libreoffice_icon_name: images_office2013.zip +libreoffice_icon_path: /usr/share/libreoffice/share/config + +# User config +libreoffice_base_config: "{{ lookup('env','HOME') }}/.config/libreoffice" +libreoffice_config_path: "{{ libreoffice_base_config }}/4/user" diff --git a/roles/apt-repo-meta/tasks/main.yml b/roles/apt-repo-meta/tasks/main.yml index 25da694..4645d78 100644 --- a/roles/apt-repo-meta/tasks/main.yml +++ b/roles/apt-repo-meta/tasks/main.yml @@ -8,8 +8,8 @@ install_recommends: False register: task_result until: task_result is succeeded - retries: 30 - delay: 10 + retries: 3 + delay: 5 become: True - name: ensure default sources.list is removed @@ -29,8 +29,8 @@ validate_certs: True register: task_result until: task_result is succeeded - retries: 30 - delay: 10 + retries: 3 + delay: 5 become: True with_items: - "{{ apt_repo_keys }}" @@ -45,8 +45,8 @@ update_cache: True register: task_result until: task_result is succeeded - retries: 30 - delay: 10 + retries: 3 + delay: 5 become: True with_items: - "{{ apt_repo_repositories }}" diff --git a/roles/autorunner/tasks/install.yml b/roles/autorunner/tasks/install.yml index 5c17b98..57e8c0a 100644 --- a/roles/autorunner/tasks/install.yml +++ b/roles/autorunner/tasks/install.yml @@ -8,7 +8,7 @@ - name: ensure autorunner is downloaded get_url: - url: https://raw.githubusercontent.com/cytopia/autorunner/master/autorunner + url: https://raw.githubusercontent.com/cytopia/autorunner/master/bin/autorunner dest: "{{ autorunner_bin_path }}/autorunner" mode: 0755 force: True diff --git a/roles/clipmenu/tasks/install.yml b/roles/clipmenu/tasks/install.yml index 4f41194..363dabc 100644 --- a/roles/clipmenu/tasks/install.yml +++ b/roles/clipmenu/tasks/install.yml @@ -6,6 +6,42 @@ vars: apt_packages: "{{ clipmenu_shared_packages }}" +- name: ensure temporary build directory exists + ansible.builtin.tempfile: + state: directory + suffix: build + register: clipmenu_tempdir + +- name: ensure clipnotify is downloaded + get_url: + url: "https://raw.githubusercontent.com/cdown/clipnotify/master/{{ item }}" + dest: "{{ clipmenu_tempdir.path }}/{{ item }}" + mode: 0755 + force: True + timeout: 30 + register: task_result + until: task_result is succeeded + retries: 30 + delay: 10 + become: True + with_items: + - Makefile + - clipnotify.c + +# You can also use the 'cmd' parameter instead of free form format. +- name: ensure clipnotify is compiled + ansible.builtin.shell: + cmd: make all + chdir: "{{ clipmenu_tempdir.path }}" + creates: clipnotify + +- name: ensure clipnotify is moved to bin path + ansible.builtin.copy: + src: "{{ clipmenu_tempdir.path }}/clipnotify" + dest: "{{ clipmenu_bin_path }}/clipnotify" + mode: '0755' + become: True + - name: ensure clipmenu is downloaded get_url: url: "https://raw.githubusercontent.com/cdown/clipmenu/develop/{{ item }}" @@ -21,3 +57,6 @@ with_items: - clipmenu - clipmenud + - clipctl + - clipdel + - clipfsck diff --git a/roles/clipmenu/vars/main.yml b/roles/clipmenu/vars/main.yml index c6fa77a..c4ee6ec 100644 --- a/roles/clipmenu/vars/main.yml +++ b/roles/clipmenu/vars/main.yml @@ -7,3 +7,7 @@ clipmenu_shared_packages: # dmenu - suckless-tools - xsel + # Required to compile clipnotify + - x11proto-core-dev + - libx11-dev + - libxfixes-dev diff --git a/roles/dbeaver/vars/main.yml b/roles/dbeaver/vars/main.yml index 97d9c5d..b4cd4e4 100644 --- a/roles/dbeaver/vars/main.yml +++ b/roles/dbeaver/vars/main.yml @@ -3,11 +3,11 @@ dbeaver_package_name: dbeaver-ce dbeaver_shared_packages: - - openjdk-8-jre-headless + - default-jre-headless dbeaver_deb: dbeaver-ce_latest_amd64.deb dbeaver_deb_path: "{{ lookup('env','HOME') }}/.cache/dbeaver/{{ dbeaver_deb }}" -dbeaver_deb_url: "https://dbeaver.jkiss.org/files/{{ dbeaver_deb }}" +dbeaver_deb_url: "https://dbeaver.io/files/{{ dbeaver_deb }}" # TODO: Are fonts required? # fonts-dejavu-extra, fonts-ipafont-gothic, fonts-ipafont-mincho, fonts-wqy-microhei, fonts-wqy-zenhei, fonts-indic diff --git a/roles/docker/tasks/main.yml b/roles/docker/tasks/main.yml index cb5960a..fe6a15c 100644 --- a/roles/docker/tasks/main.yml +++ b/roles/docker/tasks/main.yml @@ -9,8 +9,8 @@ - name: assert that docker repository distribution is set correctly assert: that: - - docker_repo_channel == 'wheezy' or docker_repo_dist == 'jessie' or docker_repo_dist == 'stretch' or docker_repo_dist == 'buster' - msg: docker_repo_dist must be 'wheezy', 'jessie', 'stretch' or 'buster' + - docker_repo_channel == 'wheezy' or docker_repo_dist == 'jessie' or docker_repo_dist == 'stretch' or docker_repo_dist == 'buster' or docker_repo_dist == 'bullseye' + msg: docker_repo_dist must be 'wheezy', 'jessie', 'stretch' 'stretch' or 'bullseye' - include_tasks: install.yml when: docker == 'install' diff --git a/roles/gimp/vars/main.yml b/roles/gimp/vars/main.yml index babe096..f11f9be 100644 --- a/roles/gimp/vars/main.yml +++ b/roles/gimp/vars/main.yml @@ -2,9 +2,9 @@ gimp_package_name: gimp -gimp_required_packages: +gimp_required_packages: [] #- gimp-dcraw (either dcraw or ufraw) - - gimp-ufraw + #- gimp-ufraw gimp_theme_url: https://github.com/cytopia-forked/gimp-cc-themes/releases/download/v2/Gimp-CC-Theme-Darker.tar.gz diff --git a/roles/neovim/vars/main.yml b/roles/neovim/vars/main.yml index 46df701..ee67ca4 100644 --- a/roles/neovim/vars/main.yml +++ b/roles/neovim/vars/main.yml @@ -7,12 +7,16 @@ neovim_package_name: neovim neovim_shared_packages: - xsel + - cmake + - g++ neovim_exclusive_packages: - lua-nvim + - ruby-neovim neovim_python2_packages: - python-neovim neovim_python3_packages: - python3-neovim + - python3-pynvim diff --git a/roles/python-meta/vars/main.yml b/roles/python-meta/vars/main.yml index 4bd9925..77a75a2 100644 --- a/roles/python-meta/vars/main.yml +++ b/roles/python-meta/vars/main.yml @@ -1,7 +1,7 @@ --- python_2_required_apt_packages: - - python + - python2 - python-pip - python-setuptools diff --git a/roles/thunar/vars/main.yml b/roles/thunar/vars/main.yml index f9bef07..b8a0b88 100644 --- a/roles/thunar/vars/main.yml +++ b/roles/thunar/vars/main.yml @@ -9,7 +9,7 @@ thunar_volman_shared_packages: # ---- gvfs - gvfs - gvfs-backends - - gvfs-bin + #- gvfs-bin - gvfs-common - gvfs-daemons - gvfs-fuse @@ -17,18 +17,18 @@ thunar_volman_shared_packages: # ---- Udisk - udisks2 # ---- Fuse - - fuse + - fuse3 - fuse2fs #- fuseext2 # Does not seem to be available anymore #- fusefat # Does not seem to be available anymore - fuseiso #- fuseiso9660 # Does not seem to be available anymore - - fusesmb + #- fusesmb # ---- Filesystem tools - btrfs-progs - dosfstools - e2fsprogs - - exfat-utils + #- exfat-utils - ntfs-3g - reiserfsprogs - udftools diff --git a/roles/urxvt/vars/main.yml b/roles/urxvt/vars/main.yml index 0e8318d..d2be6c5 100644 --- a/roles/urxvt/vars/main.yml +++ b/roles/urxvt/vars/main.yml @@ -1,6 +1,6 @@ --- -urxvt_package_name: rxvt-unicode-256color +urxvt_package_name: rxvt-unicode urxvt_shared_packages: - xclip diff --git a/roles/xorg/vars/main.yml b/roles/xorg/vars/main.yml index e3a5ca8..6f0058b 100644 --- a/roles/xorg/vars/main.yml +++ b/roles/xorg/vars/main.yml @@ -52,7 +52,7 @@ xorg_gpu_vdpau_packages: # Vulkan xorg_gpu_vulkan_packages: - - vulkan-utils + - vulkan-tools # Mesa xorg_gpu_mesa_packages: