diff options
| -rw-r--r-- | group_vars/all.yml | bin | 4326 -> 4548 bytes | |||
| -rw-r--r-- | group_vars/all.yml.example | 2 | ||||
| -rw-r--r-- | roles/obsidian/defaults/main.yml | 2 | ||||
| -rw-r--r-- | roles/obsidian/meta/main.yml | 4 | ||||
| -rw-r--r-- | roles/obsidian/tasks/install-debian.yml | 27 |
5 files changed, 10 insertions, 25 deletions
diff --git a/group_vars/all.yml b/group_vars/all.yml Binary files differindex cba875ac..26247f9f 100644 --- a/group_vars/all.yml +++ b/group_vars/all.yml diff --git a/group_vars/all.yml.example b/group_vars/all.yml.example index cc323a1f..d9cab57a 100644 --- a/group_vars/all.yml.example +++ b/group_vars/all.yml.example @@ -58,7 +58,7 @@ vimrc_setup_script: | vim -E -s -u ~/.vimrc +PlugInstall +qall chromium_is_default: false -firefox_is_default: true +firefox_is_default: false wireguard_autostart_connection: "vpn0" wireguard_connections: diff --git a/roles/obsidian/defaults/main.yml b/roles/obsidian/defaults/main.yml deleted file mode 100644 index e2164840..00000000 --- a/roles/obsidian/defaults/main.yml +++ /dev/null @@ -1,2 +0,0 @@ ---- -obsidian_version: "1.11.5" diff --git a/roles/obsidian/meta/main.yml b/roles/obsidian/meta/main.yml index 0d2372a1..a8a3f4bf 100644 --- a/roles/obsidian/meta/main.yml +++ b/roles/obsidian/meta/main.yml @@ -1,5 +1,7 @@ --- -dependencies: [] +dependencies: + - role: "flatpak" + when: ansible_facts['os_family'] == "Debian" galaxy_info: author: "a14m" description: "Install obsidian" diff --git a/roles/obsidian/tasks/install-debian.yml b/roles/obsidian/tasks/install-debian.yml index b667fe91..f117ef15 100644 --- a/roles/obsidian/tasks/install-debian.yml +++ b/roles/obsidian/tasks/install-debian.yml @@ -1,22 +1,7 @@ --- -- name: "Check obsidian binary" - ansible.builtin.stat: - path: "{{ ansible_facts['env']['HOME'] }}/.local/bin/obsidian" - register: obsidian_binary - -- name: "Install obsidian" - when: not obsidian_binary.stat.exists - block: - - name: "Download obsidian" - ansible.builtin.get_url: - # yamllint disable-line - url: "https://github.com/obsidianmd/obsidian-releases/releases/download/v{{ obsidian_version }}/obsidian_{{ obsidian_version }}_amd64.deb" - dest: "/tmp/obsidian.deb" - mode: "0755" - - - name: "Install deb" - become: true - ansible.builtin.apt: - deb: "/tmp/obsidian.deb" - autoremove: true - autoclean: true +- name: "Ensure obsidian is installed via flatpak" + community.general.flatpak: + name: "md.obsidian.Obsidian" + remote: "flathub" + state: "present" + method: "user" |