diff --git a/localhost.yml b/localhost.yml index 6b92631..fe84d2e 100644 --- a/localhost.yml +++ b/localhost.yml @@ -1,24 +1,25 @@ --- - hosts: localhost roles: + - prepare - ubuntu - - dwm - - firefox - - docker - - dotfiles - - java - - jetbrains + - ubuntu-java - signal - - virtual - - lutris - - ego - - laptop + - dotfiles + - jetbrains - prusa-slicer - intellij - - chromium - - terraform - - no-snap - - flutter - autofs + - dwm + - docker + - laptop + - desktop + +# - flutter +# - virtual +# - lutris +# - ego +# - terraform vars: - desktop_src_dir: "{{ ansible_user_dir }}/src/desktop" \ No newline at end of file + desktop_src_dir: "{{ ansible_user_dir }}/src/desktop" + arch_src_dir: "{{ ansible_user_dir }}/src/arch" diff --git a/roles/autofs/tasks/arch.yml b/roles/autofs/tasks/arch.yml new file mode 100644 index 0000000..6840341 --- /dev/null +++ b/roles/autofs/tasks/arch.yml @@ -0,0 +1,31 @@ +- name: install client packages + become: yes + community.general.pacman: + name: + - samba + - nfs-utils + +- name: install autofs + shell: + cmd: + yay -S --needed --noconfirm autofs + when: ansible_distribution == "Archlinux" + +- name: copy bender.autofs + become: yes + copy: + src: etc/auto.master.d/bender.autofs + dest: /etc/autofs/auto.master.d/bender.autofs + +- name: copy auto.bender + become: yes + copy: + src: etc/autofs/auto.bender + dest: /etc/autofs/auto.bender + +- name: "Enable service" + become: yes + ansible.builtin.systemd: + name: autofs + state: started + enabled: yes diff --git a/roles/autofs/tasks/install.yml b/roles/autofs/tasks/install.yml deleted file mode 100644 index 7c48b9d..0000000 --- a/roles/autofs/tasks/install.yml +++ /dev/null @@ -1,8 +0,0 @@ -- name: install necessary software - become: yes - apt: - update_cache: yes - pkg: - - autofs - - cifs-utils - - nfs-common \ No newline at end of file diff --git a/roles/autofs/tasks/main.yml b/roles/autofs/tasks/main.yml index 08e18e4..1fa16bf 100644 --- a/roles/autofs/tasks/main.yml +++ b/roles/autofs/tasks/main.yml @@ -1,3 +1,5 @@ -- import_tasks: install.yml +- import_tasks: ubuntu.yml + when: ansible_distribution == "Ubuntu" -- import_tasks: configure.yml \ No newline at end of file +- import_tasks: arch.yml + when: ansible_distribution == "Archlinux" diff --git a/roles/autofs/tasks/configure.yml b/roles/autofs/tasks/ubuntu.yml similarity index 70% rename from roles/autofs/tasks/configure.yml rename to roles/autofs/tasks/ubuntu.yml index 70cc66f..b4f822e 100644 --- a/roles/autofs/tasks/configure.yml +++ b/roles/autofs/tasks/ubuntu.yml @@ -1,3 +1,12 @@ +- name: install necessary software + become: yes + apt: + update_cache: yes + pkg: + - autofs + - cifs-utils + - nfs-common + - name: copy bender.autofs become: yes copy: diff --git a/roles/chromium/tasks/main.yml b/roles/chromium/tasks/main.yml deleted file mode 100644 index 64cb424..0000000 --- a/roles/chromium/tasks/main.yml +++ /dev/null @@ -1,2 +0,0 @@ -- import_tasks: install.yml - when: ansible_distribution == "Ubuntu" and ansible_distribution_version == "22.04" diff --git a/roles/desktop/tasks/arch.yml b/roles/desktop/tasks/arch.yml new file mode 100644 index 0000000..66130f5 --- /dev/null +++ b/roles/desktop/tasks/arch.yml @@ -0,0 +1,67 @@ +--- +- name: install basic system + become: yes + community.general.pacman: + name: + - dhcpdcd + - efibootmgr + - grub + - lightdm + - lightdm-gtk-greeter + - pipewire + - pipewire-alsa + - pipewire-audio + - helvum + +- name: "Enable service" + become: yes + ansible.builtin.systemd: + name: lightdm + state: started + enabled: yes + +- name: install terminal packages [Arch] + become: yes + community.general.pacman: + name: + - bind + - graphviz + - htop + - net-tools + - neofetch + - screen + - tmux + - traceroute + - vim + +- name: install terminal packages [AUR] + shell: + cmd: + yay -S --needed --noconfirm \ + epson-inkjet-printer-escpr + pm-utils + +- name: install gui packages + become: yes + community.general.pacman: + name: + - flameshot + - gnome-backgrounds + - gsimplecal + - numlockx + - pavucontrol + - pasystray + - picom + - redshift + +- name: install flatpak + become: yes + community.general.pacman: + name: + - flatpak + +- name: install the smile emoji picker + community.general.flatpak: + state: present + name: it.mijorus.smile + diff --git a/roles/desktop/tasks/main.yml b/roles/desktop/tasks/main.yml new file mode 100644 index 0000000..97284fc --- /dev/null +++ b/roles/desktop/tasks/main.yml @@ -0,0 +1,6 @@ +--- +- import_tasks: ubuntu.yml + when: ansible_distribution == "Ubuntu" + +- import_tasks: arch.yml + when: ansible_distribution == "Archlinux" diff --git a/roles/ubuntu/tasks/packages.yml b/roles/desktop/tasks/ubuntu.yml similarity index 92% rename from roles/ubuntu/tasks/packages.yml rename to roles/desktop/tasks/ubuntu.yml index 5d5eea3..b1e02b8 100644 --- a/roles/ubuntu/tasks/packages.yml +++ b/roles/desktop/tasks/ubuntu.yml @@ -12,7 +12,6 @@ apt: pkg: - vim-gtk3 - - git - htop - tmux - graphviz @@ -42,18 +41,13 @@ - pavucontrol - pasystray - flameshot + - gsimplecal - name: install the smile emoji picker community.general.flatpak: state: present name: it.mijorus.smile -- name: install git - become: yes - apt: - pkg: - - git - - name: install gui apps become: yes apt: diff --git a/roles/docker/tasks/install-arch.yml b/roles/docker/tasks/install-arch.yml new file mode 100644 index 0000000..7a6dbd9 --- /dev/null +++ b/roles/docker/tasks/install-arch.yml @@ -0,0 +1,7 @@ +- name: install docker + become: yes + community.general.pacman: + update_cache: yes + name: + - docker + - docker-compose diff --git a/roles/docker/tasks/install-docker-io.yml b/roles/docker/tasks/install-ubuntu.yml similarity index 100% rename from roles/docker/tasks/install-docker-io.yml rename to roles/docker/tasks/install-ubuntu.yml diff --git a/roles/docker/tasks/main.yml b/roles/docker/tasks/main.yml index 7eddbd9..5ee9384 100644 --- a/roles/docker/tasks/main.yml +++ b/roles/docker/tasks/main.yml @@ -1,4 +1,7 @@ --- -- import_tasks: install-docker-io.yml - when: ansible_distribution == "Ubuntu" and ansible_distribution_version != "18.04" +- import_tasks: install-ubuntu.yml + when: ansible_distribution == "Ubuntu" + +- import_tasks: install-arch.yml + when: ansible_distribution == "Archlinux" diff --git a/roles/dotfiles/tasks/main.yml b/roles/dotfiles/tasks/main.yml index 630f705..92bae03 100644 --- a/roles/dotfiles/tasks/main.yml +++ b/roles/dotfiles/tasks/main.yml @@ -1,12 +1,4 @@ --- -- name: install required packages - become: yes - apt: - update_cache: yes - pkg: - - git - - make - - name: checkout dotfiles git: repo: "{{ dotfiles.repo }}" diff --git a/roles/dwm/tasks/dwm.yml b/roles/dwm/tasks/dwm.yml index 4054a63..4adf06a 100644 --- a/roles/dwm/tasks/dwm.yml +++ b/roles/dwm/tasks/dwm.yml @@ -4,8 +4,6 @@ apt: update_cache: yes pkg: - - git - - make - build-essential - gcc - libx11-dev @@ -14,6 +12,20 @@ - libxcb-res0-dev - libx11-xcb-dev - libyajl-dev + when: ansible_distribution == "Ubuntu" + +- name: install required packages for dwm + become: yes + community.general.pacman: + name: + - gcc + - base-devel + - libx11 + - libxft + - libxinerama + - libxcb + - yajl + when: ansible_distribution == "Archlinux" - name: checkout dwm git: @@ -70,12 +82,3 @@ make: chdir: "{{ desktop_src_dir }}/dwm" target: install - -- name: debug - debug: msg="{{ make.stdout }}" - -- name: install additional packages - become: yes - apt: - pkg: - - gsimplecal diff --git a/roles/dwm/tasks/dwmstatus.yml b/roles/dwm/tasks/dwmstatus.yml deleted file mode 100644 index df966b6..0000000 --- a/roles/dwm/tasks/dwmstatus.yml +++ /dev/null @@ -1,29 +0,0 @@ ---- -- name: install required packages for dwmstatus - become: yes - apt: - update_cache: yes - pkg: - - git - - make - -- name: checkout dwmstatus - git: - repo: "{{ dwmstatus.repo }}" - dest: "{{ desktop_src_dir }}/dwmstatus" - clone: yes - update: yes - -- name: build dwmstatus - make: - chdir: "{{ desktop_src_dir }}/dwmstatus" - -- name: install dwmstatus - become: yes - register: make - make: - chdir: "{{ desktop_src_dir }}/dwmstatus" - target: install - -- name: debug - debug: msg="{{ make.stdout }}" diff --git a/roles/dwm/tasks/polybar.yml b/roles/dwm/tasks/polybar.yml index 4e5e547..6a2394e 100644 --- a/roles/dwm/tasks/polybar.yml +++ b/roles/dwm/tasks/polybar.yml @@ -4,8 +4,6 @@ apt: update_cache: yes pkg: - - git - - make - cmake - libcairo2-dev - libcurl4-openssl-dev @@ -21,6 +19,25 @@ - python3-sphinx - libjsoncpp-dev - libuv1-dev + when: ansible_distribution == "Ubuntu" + +- name: "polybar: install required packages" + become: yes + community.general.pacman: + name: + - cmake + - cairo + - dbus-python + - libcurl-compat + - libxcb + - xcb-proto + - xcb-util-cursor + - xcb-util-image + - xcb-util-wm + - python-sphinx + - jsoncpp + - libuv + when: ansible_distribution == "Archlinux" - name: "polybar: create src dir" file: diff --git a/roles/dwm/tasks/setup.yml b/roles/dwm/tasks/setup.yml index 3a82998..e321c6e 100644 --- a/roles/dwm/tasks/setup.yml +++ b/roles/dwm/tasks/setup.yml @@ -10,6 +10,19 @@ - dunst - arandr - fonts-font-awesome + when: ansible_distribution == "Ubuntu" + +- name: install necessary software + become: yes + community.general.pacman: + name: + - i3lock + - dmenu + - feh + - dunst + - arandr + - ttf-font-awesome + when: ansible_distribution == "Archlinux" - name: override dmenu_run become: yes diff --git a/roles/dwm/tasks/st-term.yml b/roles/dwm/tasks/st-term.yml index b3444c1..1616609 100644 --- a/roles/dwm/tasks/st-term.yml +++ b/roles/dwm/tasks/st-term.yml @@ -1,14 +1,27 @@ --- -- name: install required packages for st +- name: install required packages for st [Ubuntu] become: yes apt: update_cache: yes pkg: - - git - - make - fonts-firacode - fonts-symbola - libharfbuzz-dev + when: ansible_distribution == "Ubuntu" + +- name: install required packages for st [Arch] + become: yes + community.general.pacman: + name: + - ttf-fira-code + - harfbuzz + when: ansible_distribution == "Archlinux" + +- name: install required packages for st [AUR] + shell: + cmd: + yay -S --needed --noconfirm fonts-symbola + when: ansible_distribution == "Archlinux" - name: checkout st git: diff --git a/roles/ego/tasks/main.yml b/roles/ego/tasks/main.yml index bec0617..e742e7b 100644 --- a/roles/ego/tasks/main.yml +++ b/roles/ego/tasks/main.yml @@ -4,7 +4,6 @@ apt: update_cache: yes pkg: - - git - rust-all - cargo - libacl1-dev diff --git a/roles/flutter/tasks/main.yml b/roles/flutter/tasks/main.yml index fd7c575..44c424c 100644 --- a/roles/flutter/tasks/main.yml +++ b/roles/flutter/tasks/main.yml @@ -1,9 +1,3 @@ -- name: install jmespath for json_query - become: yes - apt: - pkg: - - python3-jmespath - - name: Check if android-sdk has been installed stat: path: "{{ android.dir }}" diff --git a/roles/intellij/tasks/install.yml b/roles/intellij/tasks/install.yml index 2789332..528e380 100644 --- a/roles/intellij/tasks/install.yml +++ b/roles/intellij/tasks/install.yml @@ -1,10 +1,3 @@ -- name: install jmespath for json_query - become: yes - apt: - update_cache: yes - pkg: - - python3-jmespath - - name: "Get IntelliJ version" uri: url: https://data.services.jetbrains.com/products/releases?code=IIU diff --git a/roles/java/tasks/main.yml b/roles/java/tasks/main.yml deleted file mode 100644 index 22594bb..0000000 --- a/roles/java/tasks/main.yml +++ /dev/null @@ -1,6 +0,0 @@ ---- -- import_tasks: openjdk-8.yml - -- import_tasks: openjdk-11.yml - -- import_tasks: openjdk-17.yml diff --git a/roles/laptop/tasks/asusctl-build.yml b/roles/laptop/tasks/asusctl-build.yml new file mode 100644 index 0000000..73edb99 --- /dev/null +++ b/roles/laptop/tasks/asusctl-build.yml @@ -0,0 +1,40 @@ +- name: install required packages for asusctl + become: yes + apt: + update_cache: yes + pkg: + - cmake + - libayatana-appindicator3-1 + - libclang-dev + - libgtk-3-dev + - libglib2.0-dev + - libgdk-pixbuf-2.0-dev + - libpango1.0-dev + - libudev-dev + - make + - rust-all + when: ansible_distribution == "Ubuntu" + +- name: checkout asusctl repo + git: + repo: "{{ asusctl.repo }}" + dest: "{{ desktop_src_dir }}/asusctl" + clone: yes + update: yes + +- name: build asusctl + make: + chdir: "{{ desktop_src_dir }}/asusctl" + +- name: install asusctl + become: yes + make: + chdir: "{{ desktop_src_dir }}/asusctl" + target: install + +- name: "Enable service" + become: yes + ansible.builtin.systemd: + name: asusd + state: started + enabled: yes \ No newline at end of file diff --git a/roles/laptop/tasks/asusctl.yml b/roles/laptop/tasks/asusctl.yml index e4d04e0..1581f74 100644 --- a/roles/laptop/tasks/asusctl.yml +++ b/roles/laptop/tasks/asusctl.yml @@ -1,39 +1,9 @@ -- name: install required packages for asusctl - become: yes - apt: - update_cache: yes - pkg: - - cmake - - libayatana-appindicator3-1 - - libclang-dev - - libgtk-3-dev - - libglib2.0-dev - - libgdk-pixbuf-2.0-dev - - libpango1.0-dev - - libudev-dev - - make - - rust-all - -- name: checkout asusctl repo - git: - repo: "{{ asusctl.repo }}" - dest: "{{ desktop_src_dir }}/asusctl" - clone: yes - update: yes - -- name: build asusctl - make: - chdir: "{{ desktop_src_dir }}/asusctl" +- import_tasks: asusctl-build.yml + when: ansible_distribution == "Ubuntu" - name: install asusctl - become: yes - make: - chdir: "{{ desktop_src_dir }}/asusctl" - target: install + shell: + cmd: + yay -S --needed --noconfirm asusctl + when: ansible_distribution == "Archlinux" -- name: "Enable service" - become: yes - ansible.builtin.systemd: - name: asusd - state: started - enabled: yes \ No newline at end of file diff --git a/roles/laptop/tasks/powersave.yml b/roles/laptop/tasks/powersave.yml index 4bc01ef..1baa2e0 100644 --- a/roles/laptop/tasks/powersave.yml +++ b/roles/laptop/tasks/powersave.yml @@ -1,10 +1,18 @@ -- name: install required packages for script +- name: install required packages for script [Ubuntu] become: yes apt: update_cache: yes pkg: - linux-tools-common - linux-tools-generic + when: ansible_distribution == "Ubuntu" + +- name: install required packages for script [Arch] + become: yes + community.general.pacman: + name: + - cpupower + when: ansible_distribution == "Archlinux" - name: copy scripts become: yes diff --git a/roles/laptop/tasks/supergfxctl-build.yml b/roles/laptop/tasks/supergfxctl-build.yml new file mode 100644 index 0000000..eeae4eb --- /dev/null +++ b/roles/laptop/tasks/supergfxctl-build.yml @@ -0,0 +1,24 @@ +- name: install required packages for supergfxctl + become: yes + apt: + update_cache: yes + pkg: + - curl + when: ansible_distribution == "Ubuntu" + +- name: checkout supergfxctl repo + git: + repo: "{{ supergfxctl.repo }}" + dest: "{{ desktop_src_dir }}/supergfxctl" + clone: yes + update: yes + +- name: build supergfxctl + make: + chdir: "{{ desktop_src_dir }}/supergfxctl" + +- name: install supergfxctl + become: yes + make: + chdir: "{{ desktop_src_dir }}/supergfxctl" + target: install diff --git a/roles/laptop/tasks/supergfxctl.yml b/roles/laptop/tasks/supergfxctl.yml index f4f585d..9ff840e 100644 --- a/roles/laptop/tasks/supergfxctl.yml +++ b/roles/laptop/tasks/supergfxctl.yml @@ -1,26 +1,9 @@ -- name: install required packages for supergfxctl - become: yes - apt: - update_cache: yes - pkg: - - curl - - git - - build-essential - - make - -- name: checkout supergfxctl repo - git: - repo: "{{ supergfxctl.repo }}" - dest: "{{ desktop_src_dir }}/supergfxctl" - clone: yes - update: yes - -- name: build supergfxctl - make: - chdir: "{{ desktop_src_dir }}/supergfxctl" +- import_tasks: supergfxctl-build.yml + when: ansible_distribution == "Ubuntu" - name: install supergfxctl - become: yes - make: - chdir: "{{ desktop_src_dir }}/supergfxctl" - target: install + shell: + cmd: + yay -S --needed --noconfirm supergfxctl + when: ansible_distribution == "Archlinux" + diff --git a/roles/prepare/tasks/arch.yml b/roles/prepare/tasks/arch.yml new file mode 100644 index 0000000..f6dcef2 --- /dev/null +++ b/roles/prepare/tasks/arch.yml @@ -0,0 +1,41 @@ +- name: install jmespath for json_query + become: yes + community.general.pacman: + name: python-jmespath + +- name: install packages for building + become: yes + community.general.pacman: + name: + - make + +- name: install packages for building + become: yes + community.general.pacman: + extra_args: --needed + name: + - git + - base-devel + - fakeroot + +- name: create arch source dir + file: + path: "{{ arch_src_dir }}" + state: directory + +- name: checkout yay + git: + repo: https://aur.archlinux.org/yay.git + dest: "{{ arch_src_dir }}/yay" + clone: yes + update: yes + +- name: install yay + command: + chdir: "{{ arch_src_dir }}/yay" + cmd: + makepkg -si + +- name: update yay cache + shell: + cmd: yay -Y --gendb diff --git a/roles/prepare/tasks/main.yml b/roles/prepare/tasks/main.yml new file mode 100644 index 0000000..97284fc --- /dev/null +++ b/roles/prepare/tasks/main.yml @@ -0,0 +1,6 @@ +--- +- import_tasks: ubuntu.yml + when: ansible_distribution == "Ubuntu" + +- import_tasks: arch.yml + when: ansible_distribution == "Archlinux" diff --git a/roles/prepare/tasks/ubuntu.yml b/roles/prepare/tasks/ubuntu.yml new file mode 100644 index 0000000..e100fed --- /dev/null +++ b/roles/prepare/tasks/ubuntu.yml @@ -0,0 +1,15 @@ +- name: install jmespath for json_query + become: yes + apt: + update_cache: yes + pkg: + - python3-jmespath + +- name: install packages for builds + become: yes + apt: + update_cache: yes + pkg: + - git + - make + - build-essential diff --git a/roles/prusa-slicer/tasks/install-program.yml b/roles/prusa-slicer/tasks/install-program.yml index 23e167c..d205315 100644 --- a/roles/prusa-slicer/tasks/install-program.yml +++ b/roles/prusa-slicer/tasks/install-program.yml @@ -1,10 +1,3 @@ -- name: install jmespath for json_query - become: yes - apt: - update_cache: yes - pkg: - - python3-jmespath - - name: "Get PrusaSlicer version" uri: url: https://api.github.com/repos/prusa3d/PrusaSlicer/releases/latest diff --git a/roles/signal/tasks/arch.yml b/roles/signal/tasks/arch.yml new file mode 100644 index 0000000..05c722a --- /dev/null +++ b/roles/signal/tasks/arch.yml @@ -0,0 +1,5 @@ +- name: install signal-desktop + become: yes + community.general.pacman: + update_cache: yes + name: signal-desktop diff --git a/roles/signal/tasks/main.yml b/roles/signal/tasks/main.yml index 10616ca..97284fc 100644 --- a/roles/signal/tasks/main.yml +++ b/roles/signal/tasks/main.yml @@ -1,19 +1,6 @@ --- -- become: yes - block: - - name: add signal gpg key - apt_key: - url: https://updates.signal.org/desktop/apt/keys.asc - state: present +- import_tasks: ubuntu.yml + when: ansible_distribution == "Ubuntu" - - name: add signal repo - apt_repository: - repo: deb [arch=amd64] https://updates.signal.org/desktop/apt xenial main - state: present - filename: signal-xenial - - - name: install signal-desktop - apt: - update_cache: yes - pkg: - - signal-desktop \ No newline at end of file +- import_tasks: arch.yml + when: ansible_distribution == "Archlinux" diff --git a/roles/signal/tasks/ubuntu.yml b/roles/signal/tasks/ubuntu.yml new file mode 100644 index 0000000..10616ca --- /dev/null +++ b/roles/signal/tasks/ubuntu.yml @@ -0,0 +1,19 @@ +--- +- become: yes + block: + - name: add signal gpg key + apt_key: + url: https://updates.signal.org/desktop/apt/keys.asc + state: present + + - name: add signal repo + apt_repository: + repo: deb [arch=amd64] https://updates.signal.org/desktop/apt xenial main + state: present + filename: signal-xenial + + - name: install signal-desktop + apt: + update_cache: yes + pkg: + - signal-desktop \ No newline at end of file diff --git a/roles/ubuntu-java/tasks/main.yml b/roles/ubuntu-java/tasks/main.yml new file mode 100644 index 0000000..991ec08 --- /dev/null +++ b/roles/ubuntu-java/tasks/main.yml @@ -0,0 +1,9 @@ +--- +- import_tasks: openjdk-8.yml + when: ansible_distribution == "Ubuntu" + +- import_tasks: openjdk-11.yml + when: ansible_distribution == "Ubuntu" + +- import_tasks: openjdk-17.yml + when: ansible_distribution == "Ubuntu" diff --git a/roles/java/tasks/openjdk-11.yml b/roles/ubuntu-java/tasks/openjdk-11.yml similarity index 100% rename from roles/java/tasks/openjdk-11.yml rename to roles/ubuntu-java/tasks/openjdk-11.yml diff --git a/roles/java/tasks/openjdk-17.yml b/roles/ubuntu-java/tasks/openjdk-17.yml similarity index 100% rename from roles/java/tasks/openjdk-17.yml rename to roles/ubuntu-java/tasks/openjdk-17.yml diff --git a/roles/java/tasks/openjdk-8.yml b/roles/ubuntu-java/tasks/openjdk-8.yml similarity index 100% rename from roles/java/tasks/openjdk-8.yml rename to roles/ubuntu-java/tasks/openjdk-8.yml diff --git a/roles/chromium/files/etc/apt/preferences.d/mint-chromium b/roles/ubuntu/files/etc/apt/preferences.d/mint-chromium similarity index 100% rename from roles/chromium/files/etc/apt/preferences.d/mint-chromium rename to roles/ubuntu/files/etc/apt/preferences.d/mint-chromium diff --git a/roles/no-snap/files/etc/apt/preferences.d/no-snap b/roles/ubuntu/files/etc/apt/preferences.d/no-snap similarity index 100% rename from roles/no-snap/files/etc/apt/preferences.d/no-snap rename to roles/ubuntu/files/etc/apt/preferences.d/no-snap diff --git a/roles/chromium/tasks/install.yml b/roles/ubuntu/tasks/firefox.yml similarity index 100% rename from roles/chromium/tasks/install.yml rename to roles/ubuntu/tasks/firefox.yml diff --git a/roles/ubuntu/tasks/main.yml b/roles/ubuntu/tasks/main.yml index ff166ff..fffc4eb 100644 --- a/roles/ubuntu/tasks/main.yml +++ b/roles/ubuntu/tasks/main.yml @@ -1,12 +1,21 @@ --- - import_tasks: rearrange-folders.yml + when: ansible_distribution == "Ubuntu" -#- import_tasks: cleanup.yml -# -#- import_tasks: timezone.yml -# -#- import_tasks: packages.yml -# -#- import_tasks: set-type.yml -# -#- import_tasks: dconf.yml \ No newline at end of file +- import_tasks: cleanup.yml + when: ansible_distribution == "Ubuntu" + +- import_tasks: timezone.yml + when: ansible_distribution == "Ubuntu" + +- import_tasks: set-type.yml + when: ansible_distribution == "Ubuntu" + +- import_tasks: unsnap.yml + when: ansible_distribution == "Ubuntu" + +- import_tasks: firefox.yml + when: ansible_distribution == "Ubuntu" + +- import_tasks: dconf.yml + when: ansible_distribution == "Ubuntu" diff --git a/roles/no-snap/tasks/main.yml b/roles/ubuntu/tasks/unsnap.yml similarity index 100% rename from roles/no-snap/tasks/main.yml rename to roles/ubuntu/tasks/unsnap.yml