aboutsummaryrefslogtreecommitdiffstats
path: root/ansible/tasks
diff options
context:
space:
mode:
authorEugene Triguba <eugenetriguba@gmail.com>2022-05-11 20:17:02 -0500
committerEugene Triguba <eugenetriguba@gmail.com>2022-05-11 20:17:02 -0500
commit083edc09178e5fd8522469c2d540ce922e031cdb (patch)
treed2c3d9dcca34b7f86c0acb295e81451050f5be98 /ansible/tasks
parentUpdate zsh prompt (diff)
downloaddotfiles-083edc09178e5fd8522469c2d540ce922e031cdb.zip
Add dnf packages and clean up ansible scripts
Diffstat (limited to 'ansible/tasks')
-rw-r--r--ansible/tasks/desktop.yaml17
-rw-r--r--ansible/tasks/dnf_packages.yaml54
-rw-r--r--ansible/tasks/link_dotfiles.yaml27
-rw-r--r--ansible/tasks/packages.yaml19
-rw-r--r--ansible/tasks/pkg_packages.yaml51
5 files changed, 142 insertions, 26 deletions
diff --git a/ansible/tasks/desktop.yaml b/ansible/tasks/desktop.yaml
index 9992648..e9abdc2 100644
--- a/ansible/tasks/desktop.yaml
+++ b/ansible/tasks/desktop.yaml
@@ -1,14 +1,15 @@
---
-- name: Include desktop files
- include_vars: vars/desktop.yaml
-
- name: Link user files
file:
src: "{{ item.value.src }}"
dest: "{{ item.value.dest }}"
state: link
with_dict: "{{user_desktop_files}}"
-
+ vars:
+ user_desktop_files:
+ xinitrc:
+ src: "{{playbook_dir}}/../configs/desktop/home/.xinitrc"
+ dest: "{{ lookup('env', 'HOME') }}/.xinitrc"
- name: Link system files
become: true
@@ -21,4 +22,12 @@
group: wheel
mode: u=rw,g=r,o=r
with_dict: "{{system_desktop_files}}"
+ vars:
+ system_desktop_files:
+ etc-rc:
+ src: "{{playbook_dir}}/../configs/desktop/etc/rc.conf"
+ dest: "/etc/rc.conf"
+ boot-loader:
+ src: "{{playbook_dir}}/../configs/desktop/boot/loader.conf"
+ dest: "/boot/loader.conf"
diff --git a/ansible/tasks/dnf_packages.yaml b/ansible/tasks/dnf_packages.yaml
new file mode 100644
index 0000000..e2fca69
--- /dev/null
+++ b/ansible/tasks/dnf_packages.yaml
@@ -0,0 +1,54 @@
+---
+- name: Import 1Password key
+ become: yes
+ ansible.builtin.rpm_key:
+ state: present
+ key: https://downloads.1password.com/linux/keys/1password.asc
+
+- name: Add 1Password YUM Repo
+ become: yes
+ yum_repository:
+ name: 1password
+ description: 1Password Stable Channel
+ baseurl: https://downloads.1password.com/linux/rpm/stable/$basearch
+ enabled: yes
+ gpgcheck: yes
+ repo_gpgcheck: yes
+ gpgkey: https://downloads.1password.com/linux/keys/1password.asc
+ state: present
+
+- name: Install dnf packages
+ become: yes
+
+ dnf:
+ name: "{{ item.key }}"
+ state: "{{ item.value.state | default('present') }}"
+
+ with_dict: "{{dnf}}"
+ vars:
+ dnf:
+ "@Development tools":
+ 1password:
+ alacritty:
+ dmenu:
+ vim:
+ feh:
+ firefox:
+ fzf:
+ git:
+ go:
+ hack-fonts:
+ i3-gaps:
+ i3lock:
+ i3status:
+ jq:
+ neofetch:
+ neovim:
+ openssl:
+ python:
+ redshift:
+ ripgrep:
+ rsync:
+ scrot:
+ wget:
+ zsh:
diff --git a/ansible/tasks/link_dotfiles.yaml b/ansible/tasks/link_dotfiles.yaml
index bf2f5d0..454c3a7 100644
--- a/ansible/tasks/link_dotfiles.yaml
+++ b/ansible/tasks/link_dotfiles.yaml
@@ -1,11 +1,32 @@
---
-- name: Include dotfiles
- include_vars: vars/dotfiles.yaml
-
- name: Link shared dotfiles
file:
src: "{{ item.value.src }}"
dest: "{{ item.value.dest }}"
state: link
with_dict: "{{dotfiles}}"
+ vars:
+ dotfiles:
+ zshrc:
+ src: "{{playbook_dir}}/../configs/shared/.zshrc"
+ dest: "{{ lookup('env', 'HOME') }}/.zshrc"
+
+ gitconfig:
+ src: "{{playbook_dir}}/../configs/shared/.gitconfig"
+ dest: "{{ lookup('env', 'HOME') }}/.gitconfig"
+
+ gdbinit:
+ src: "{{playbook_dir}}/../configs/shared/.gdbinit"
+ dest: "{{ lookup('env', 'HOME') }}/.gdbinit"
+
+ vimrc:
+ src: "{{playbook_dir}}/../configs/shared/.vimrc"
+ dest: "{{ lookup('env', 'HOME') }}/.config/nvim/init.vim"
+
+ tmux:
+ src: "{{playbook_dir}}/../configs/shared/.tmux.conf"
+ dest: "{{ lookup('env', 'HOME') }}/.tmux.conf"
+ alacritty:
+ src: "{{playbook_dir}}/../configs/shared/alacritty.yml"
+ dest: "{{ lookup('env', 'HOME') }}/.config/alacritty/alacritty.yml"
diff --git a/ansible/tasks/packages.yaml b/ansible/tasks/packages.yaml
deleted file mode 100644
index 7f117dc..0000000
--- a/ansible/tasks/packages.yaml
+++ /dev/null
@@ -1,19 +0,0 @@
----
-- name: Include FreeBSD packages
- include_vars: vars/pkg.yaml
- tags:
- - pkg
-
-- block:
- - name: Install packages
- become: yes
- become_method: su
- when: ansible_os_family == "FreeBSD"
- with_dict: "{{pkg}}"
- tags:
- - pkg
-
- community.general.pkgng:
- name: "{{ item.key }}"
- state: "{{ item.value.state | default('present') }}"
-
diff --git a/ansible/tasks/pkg_packages.yaml b/ansible/tasks/pkg_packages.yaml
new file mode 100644
index 0000000..033af58
--- /dev/null
+++ b/ansible/tasks/pkg_packages.yaml
@@ -0,0 +1,51 @@
+---
+- name: Install pkg packages
+ become: yes
+ become_method: su
+
+ community.general.pkgng:
+ name: "{{ item.key }}"
+ state: "{{ item.value.state | default('present') }}"
+
+ with_dict: "{{pkg}}"
+ vars:
+ pkg:
+ 1password-client2:
+ audio/virtual_oss:
+ alacritty:
+ brlaser:
+ devcpu-data:
+ devel/xdg-user-dirs:
+ dmenu:
+ drm-kmod:
+ editors/vim:
+ editors/vscode:
+ en-freebsd-doc:
+ feh:
+ firefox:
+ fzf:
+ git:
+ go:
+ hack-font:
+ i3-gaps:
+ i3lock:
+ i3status:
+ jq:
+ neovim:
+ openssl:
+ pfetch:
+ pkg:
+ poudriere:
+ editors/py-pynvim:
+ python:
+ redshift:
+ ripgrep:
+ rsync:
+ rust-analyzer:
+ scrot:
+ spotify-tui:
+ spotifyd:
+ wget:
+ x11/xclip:
+ x11/xorg:
+ zsh: