Skip to content

Commit

Permalink
Update ansible roles
Browse files Browse the repository at this point in the history
  • Loading branch information
A committed Jun 9, 2024
1 parent abe2aba commit 5f98fa5
Show file tree
Hide file tree
Showing 7 changed files with 115 additions and 53 deletions.
4 changes: 2 additions & 2 deletions ansible.cfg
Original file line number Diff line number Diff line change
@@ -1,8 +1,8 @@
[defaults]
host_key_checking = False
inventory = hosts.yml
stdout_callback = unixy
display_ok_hosts = false
stdout_callback = yaml
display_ok_hosts = true
display_skipped_hosts = false
transport = local
local_tmp = /var/tmp/.ansible
Expand Down
100 changes: 66 additions & 34 deletions host_vars/archlinux.yml
Original file line number Diff line number Diff line change
@@ -1,4 +1,6 @@
---
ansible_python_interpreter: /usr/bin/python3

pacman_packages:
- name: acpi
state: latest
Expand Down Expand Up @@ -44,6 +46,7 @@ pacman_packages:
state: latest
- name: hyprpaper
state: latest

- name: network-manager-applet
state: latest
- name: udiskie
Expand All @@ -70,10 +73,6 @@ pacman_packages:
pacman_gui_packages:
- name: telegram-desktop
state: latest
# - name: nitrogen
# state: latest
# - name: code
# state: latest
- name: zathura
state: latest
- name: zathura-pdf-mupdf
Expand All @@ -84,11 +83,12 @@ pacman_gui_packages:
state: latest
- name: dolphin
state: latest
# - name: rofi
# state: latest
# - name: rofi-calc



# - name: nitrogen
# state: latest
# - name: flatpak
# - name: code
# state: latest
# - name: xmonad
# state: latest
Expand Down Expand Up @@ -122,6 +122,33 @@ aur_packages:
state: latest
- name: blueman-git
state: latest
- name: commitlint
state: latest
- name: efm-langserver
state: latest
- name: fixjson
state: latest
- name: gitlint
state: latest

- name: hpuld
state: latest

# DEADBEEF
- name: deadbeef
state: latest
- name: deadbeef-mpris2-plugin
state: latest
- name: deadbeef-plugin-fb-gtk3-git
state: latest
- name: deadbeef-plugin-headerbar-gtk3-git
state: latest

# Missed kernel firmwares
- name: aic94xx-firmware
state: latest
- name: ast-firmware
state: latest

aur_gui_packages:
- name: slack-desktop
Expand Down Expand Up @@ -222,19 +249,6 @@ dotfiles:

- src: "{{ dotfiles_source_dir }}/ripgrep/ripgreprc"
dest: "{{ configs_home }}/ripgrep/ripgreprc"

- src: "{{ dotfiles_source_dir }}/i3/config"
dest: "{{ configs_home }}/i3/config"

- src: "{{ dotfiles_source_dir }}/alacritty/alacritty.yml"
dest: "{{ configs_home }}/alacritty/alacritty.yml"

- src: "{{ dotfiles_source_dir }}/picom/picom.conf"
dest: "{{ configs_home }}/picom/picom.conf"

- src: "{{ dotfiles_source_dir }}/conky/conky.conf"
dest: "{{ configs_home }}/conky/conky.conf"

- src: "{{ playbook_dir }}/bin"
dest: "{{ ansible_env.HOME }}/.bin"

Expand All @@ -244,6 +258,21 @@ dotfiles:
- src: "{{ dotfiles_source_dir }}/newsboat/config"
dest: "{{ configs_home }}/newsboat/config"

- src: "{{ dotfiles_source_dir }}/hypr"
dest: "{{ configs_home }}/hypr"

- src: "{{ dotfiles_source_dir }}/waybar"
dest: "{{ configs_home }}/waybar"

- src: "{{ dotfiles_source_dir }}/wlogout"
dest: "{{ configs_home }}/wlogout"

- src: "{{ dotfiles_source_dir }}/kitty/kitty.conf"
dest: "{{ configs_home }}/kitty/kitty.conf"

- src: "{{ dotfiles_source_dir }}/kitty/themes"
dest: "{{ configs_home }}/kitty/themes"

#- src: "{{ dotfiles_source_dir }}/xmonad/xmonad.hs"
# dest: "{{ ansible_env.HOME }}/.xmonad/xmonad.hs"

Expand All @@ -259,20 +288,23 @@ dotfiles:
# - src: "{{ dotfiles_source_dir }}/xmonad/scripts"
# dest: "{{ ansible_env.HOME }}/.xmonad/scripts"

- src: "{{ dotfiles_source_dir }}/hypr"
dest: "{{ configs_home }}/hypr"

- src: "{{ dotfiles_source_dir }}/waybar"
dest: "{{ configs_home }}/waybar"
# - src: "{{ dotfiles_source_dir }}/i3/config"
# dest: "{{ configs_home }}/i3/config"
# state: absent
#
# - src: "{{ dotfiles_source_dir }}/feeds"
# dest: "{{ configs_home }}/feeds"
# state: absent

- src: "{{ dotfiles_source_dir }}/wlogout"
dest: "{{ configs_home }}/wlogout"
- src: "{{ dotfiles_source_dir }}/alacritty/alacritty.yml"
dest: "{{ configs_home }}/alacritty/alacritty.yml"
state: absent

- src: "{{ dotfiles_source_dir }}/kitty/kitty.conf"
dest: "{{ configs_home }}/kitty/kitty.conf"
- src: "{{ dotfiles_source_dir }}/picom/picom.conf"
dest: "{{ configs_home }}/picom/picom.conf"
state: absent

- src: "{{ dotfiles_source_dir }}/kitty/themes"
dest: "{{ configs_home }}/kitty/themes"
- src: "{{ dotfiles_source_dir }}/conky/conky.conf"
dest: "{{ configs_home }}/conky/conky.conf"
state: absent

- src: "{{ dotfiles_source_dir }}/feeds"
dest: "{{ configs_home }}/feeds"
10 changes: 5 additions & 5 deletions roles/dotfiles/tasks/link_file.yml
Original file line number Diff line number Diff line change
@@ -1,12 +1,12 @@
---
- name: Ensure {{ dest | dirname }} directory exists
- name: Ensure {{ item.dest | dirname }} directory exists
file:
path: "{{ dest | dirname }}"
path: "{{ item.dest | dirname }}"
state: directory

- name: Ensure {{ dest }} is linked
- name: Ensure {{ item.dest }} is linked
file:
src: "{{ src }}"
dest: "{{ dest }}"
src: "{{ item.src }}"
dest: "{{ item.dest }}"
state: link
force: True
22 changes: 14 additions & 8 deletions roles/dotfiles/tasks/main.yml
Original file line number Diff line number Diff line change
Expand Up @@ -2,11 +2,17 @@
- debug:
msg: "{{ configs_home }}"

#- name: Ensure {{ configs_home }} exists
# file:
# path: "{{ configs_home }}"
# state: directory
#
#- name: Ensure dotfiles are managed
# include: link_file.yml src={{ item.src }} dest={{ item.dest }}
# with_items: "{{ dotfiles }}"
- name: Ensure directory {{ configs_home }} exists
file:
path: "{{ configs_home }}"
state: directory

- name: Ensure dotfiles are linked
include_tasks: link_file.yml
with_items: "{{ dotfiles }}"
when: item.state is not defined or item.state == "present"

- name: Ensure dotfiles are unlinked
include_tasks: unlink_file.yml
with_items: "{{ dotfiles }}"
when: item.state is defined and item.state == "absent"
11 changes: 11 additions & 0 deletions roles/dotfiles/tasks/unlink_file.yml
Original file line number Diff line number Diff line change
@@ -0,0 +1,11 @@
---
- name: Ensure {{ item.dest }} file is a link to dotfiles directory
stat:
path: "{{ item.dest }}"
register: dotfiles_dest

- name: Ensure {{ item.dest }} is unlinked
file:
path: "{{ item.dest }}"
state: absent
when: dotfiles_dest.stat.exists and dotfiles_dest.stat.lnk_source == item.src
15 changes: 11 additions & 4 deletions roles/rust/tasks/main.yml
Original file line number Diff line number Diff line change
@@ -1,8 +1,15 @@
---
- name: install rust by rustup
shell: curl https://sh.rustup.rs -sSf | sh -s -- -y
# - name: install rust by rustup
# shell: curl https://sh.rustup.rs -sSf | sh -s -- -y
#
#rustup
- name: role rust | manage pacman packages
include_role: name=meta_pacman
vars:
pacman_packages: "{{ rust_pacman_packages }}"

- name: Ensure {{ cargo_packages | map(attribute='name') }} cargo packages are managed

- name: Ensure {{ cargo_packages | map(attribute='name') }} cargo packages are installed
shell: cargo install {{ item.name }};
with_items: "{{ cargo_packages }}"
changed_when:
Expand All @@ -11,7 +18,7 @@
register: cargo_install_log
when: item.state == "present"

- name: Ensure {{ cargo_packages | map(attribute='name') }} cargo packages are managed
- name: Ensure {{ cargo_packages | map(attribute='name') }} cargo packages are uninstalled
shell: cargo uninstall {{ item.name }}
with_items: "{{ cargo_packages }}"
register: cargo_uninstall_log
Expand Down
6 changes: 6 additions & 0 deletions roles/rust/vars/main.yml
Original file line number Diff line number Diff line change
@@ -0,0 +1,6 @@
---
rust_pacman_packages:
- name: rust
state: present
# - name: rustup
# state: present

0 comments on commit 5f98fa5

Please sign in to comment.