Add Linux support to webcatalog role

.gitignore

@@ -1,3 +1,2 @@
 external
 modules/win_git*
-playbooks/test.yaml

playbooks/Linux.yaml

@@ -1,3 +0,0 @@
----
-- import_playbook: LinuxCLI.yaml
-- import_playbook: UnixGUI.yaml

playbooks/LinuxCLI.yaml

@@ -1,5 +0,0 @@
----
-- hosts: localhost
-  roles:
-    - role: gdb
-    - role: system-info

playbooks/UnixCLI.yaml

@@ -8,25 +8,26 @@
     - role: zsh
     - role: neovim
     - role: tmux
+    - role: system-info
+      when: '"WSL" not in ansible_kernel'
 
     - role: ag
-    - role: bash
     - role: bat
     - role: curl
-    - role: editline
     - role: fzf
     - role: gh
     - role: git
-    - role: glab
     - role: htop
     - role: jp
     - role: jq
     - role: readline
     - role: tidy
     - role: tree
-    - role: watch
-    - role: wget
     - role: yq
+    - role: watch
 
     - role: llvm
     - role: nodejs
+
+    - role: wsl
+      when: '"WSL" in ansible_kernel'

playbooks/UnixGUI.yaml

@@ -1,7 +1,5 @@
 ---
+- import_playbook: UnixCLI.yaml
 - hosts: localhost
   roles:
     - role: 1password
-    - role: fonts
-    - role: obsidian
-    - role: webcatalog

playbooks/WSL.yaml

@@ -1,6 +1,3 @@
 ---
-- import_playbook: UnixCLI.yaml
+- import_playbook: Unix.yaml
-- hosts: localhost
+- import_playbook: Windows.yaml
-  roles:
-    - role: gdb
-    - role: wsl

playbooks/macOS.yaml

@@ -1,14 +1,13 @@
 ---
-- import_playbook: UnixCLI.yaml
-- hosts: localhost
-  roles:
-    - role: system-info
 - import_playbook: UnixGUI.yaml
 - hosts: localhost
   roles:
+    - role: fonts
     - role: mas
 
     - role: iterm
     - role: magnet
     - role: microsoft-remote-desktop
+    - role: obsidian
     - role: viscosity
+    - role: webcatalog

roles/1password/tasks/main.yaml

@@ -1,3 +1,2 @@
 ---
 - include_tasks: '{{ansible_os_family}}.yaml'
-# TODO: If gnome-shell on wayland set global key binding in custom keyboard settings

roles/gdb/RedHat.yaml

@@ -1,6 +0,0 @@
----
-- name: install dnf package
-  become: true
-  dnf:
-    name: gdb
-    state: latest

roles/glab/tasks/RedHat.yaml

@@ -1,6 +0,0 @@
----
-- name: install dnf package
-  become: true
-  dnf:
-    name: glab
-    state: latest

roles/neovim/tasks/Darwin.yaml

@@ -1,11 +1,7 @@
 ---
 - name: install homebrew packages
   homebrew:
-    name:
+    name: neovim
-      - neovim
     state: latest
 
-- set_fact:
-    neovim_pip_packages: '{{neovim_pip_packages + ["pynvim"]}}'
-
 - include_tasks: Unix.yaml

roles/neovim/tasks/Debian.yaml

@@ -10,9 +10,7 @@
 - name: install apt package
   become: true
   apt:
-    name:
+    name: neovim
-      - neovim
-      - python3-neovim
     state: latest
 
 - include_tasks: Unix.yaml

roles/neovim/tasks/RedHat.yaml

@@ -1,10 +1,8 @@
 ---
-- name: install dnf package
+- name: install yum package
   become: true
-  dnf:
+  yum:
-    name:
+    name: neovim
-      - neovim
-      - python3-neovim
     state: latest
 
 - include_tasks: Unix.yaml

roles/neovim/tasks/Unix.yaml

@@ -8,6 +8,8 @@
     dest: '{{vim_config_dir}}'
     version: master
 
+# TODO: - name: set repo email
+
 - name: install pip packages
   pip:
     name: '{{neovim_pip_packages}}'

roles/neovim/vars/main.yaml

@@ -3,5 +3,6 @@ neovim_pip_packages:
   - cmake-language-server
   - cmakelint
   - compdb
+  - pynvim
   - vim-vint
   - yamllint

roles/obsidian/handlers/main.yaml

@@ -1,5 +0,0 @@
----
-- name: install desktop menu
-  command: >
-    xdg-desktop-menu install --mode user
-      {{ansible_env.HOME}}/.local/share/applications/obsidian-obsidian.desktop

roles/obsidian/tasks/Darwin.yaml

@@ -4,4 +4,8 @@
     name: obsidian
     state: latest
 
-- include_tasks: Unix.yaml
+- name: clone notes repository
+  git:
+    repo: git@github.com:kbenzie/notes.git
+    dest: '{{ansible_env.HOME}}/Documents/Notes'
+    version: main

roles/obsidian/tasks/RedHat.yaml

@@ -1,48 +0,0 @@
----
-- name: stat symlink
-  stat:
-    path: '{{ansible_env.HOME}}/.local/bin/Obsidian'
-  register: symlink_file
-
-- name: get latest release
-  uri:
-    url: https://api.github.com/repos/obsidianmd/obsidian-releases/releases/latest
-  register: latest
-
-- set_fact:
-    appimage: 'Obsidian-{{latest.json.name}}.AppImage'
-- set_fact:
-    filepath: '{{ansible_env.HOME}}/.local/bin/{{appimage}}'
-    asset_query: '[?contains(name, `{{appimage}}`)] | [0]'
-- set_fact:
-    needs_installed:
-      '{{not symlink_file.stat.exists or symlink_file.stat.lnk_source != filepath}}'
-    asset: '{{latest.json.assets | to_json | from_json | json_query(asset_query)}}'
-
-- name: download latest version
-  get_url:
-    url: '{{asset.browser_download_url}}'
-    dest: '{{filepath}}'
-    mode: '0755'
-
-- name: create symlink
-  file:
-    src: '{{filepath}}'
-    dest: '{{ansible_env.HOME}}/.local/bin/Obsidian'
-    state: link
-
-# TODO: icon for desktop file
-
-- name: create desktop file
-  template:
-    src: obsidian.desktop.j2
-    dest: '{{ansible_env.HOME}}/.local/share/applications/obsidian-obsidian.desktop'
-  notify: install desktop menu
-
-- name: remove old appimage
-  when: needs_installed and symlink_file.stat.exists
-  file:
-    path: '{{symlink_file.stat.lnk_source}}'
-    state: absent
-
-- include_tasks: Unix.yaml

roles/obsidian/tasks/Unix.yaml

@@ -1,6 +0,0 @@
----
-- name: clone notes repository
-  git:
-    repo: git@github.com:kbenzie/notes.git
-    dest: '{{ansible_env.HOME}}/Documents/Notes'
-    version: main

roles/obsidian/templates/obsidian.desktop.j2

@@ -1,11 +0,0 @@
-[Desktop Entry]
-Name=Obsidian
-Exec={{ansible_env.HOME}}/.local/bin/Obsidian
-Terminal=false
-Type=Application
-Icon=obsidian
-StartupWMClass=Obsidian
-X-AppImage-Version={{latest.json.name}}
-Comment=Private and flexible note‑taking app that adapts to the way you think. 
-MimeType=x-scheme-handler/obsidian;
-Categories=Utility;

roles/ulauncher/tasks/main.yaml

@@ -1,4 +0,0 @@
----
-# TODO: Install ulauncher - or find a better alternative
-# TODO: If gnome-shell on wayland set global key binding in custom keyboard settings
-# TODO: Clone https://github.com/shepda/ulauncher-adwaita-darkish into ~/.config/ulauncher/user-themes

roles/webcatalog/handlers/main.yaml

@@ -1,5 +0,0 @@
----
-- name: install desktop menu
-  command: >
-    xdg-desktop-menu install --mode user
-      {{ansible_env.HOME}}/.local/share/applications/webcatalog-webcatalog.desktop

roles/webcatalog/tasks/Linux.yaml

@@ -34,13 +34,10 @@
     dest: '{{ansible_env.HOME}}/.local/bin/WebCatalog'
     state: link
 
-# TODO: icon for desktop file
-
 - name: create desktop file
   template:
     src: webcatalog.desktop.j2
     dest: '{{ansible_env.HOME}}/.local/share/applications/webcatalog-webcatalog.desktop'
-  notify: install desktop menu
 
 - name: remove old appimage
   when: needs_installed and symlink_file.stat.exists

roles/wget/tasks/Debian.yaml

@@ -1,6 +1,5 @@
 ---
 - name: install apt package
-  become: true
   apt:
     name: wget
     state: latest

roles/wget/tasks/RedHat.yaml

@@ -1,6 +0,0 @@
----
-- name: install dnf package
-  become: true
-  dnf:
-    name: wget
-    state: latest