From 4e8681fad02f5db09460a1fa32a0350cca475dc4 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Geoffrey=20=E2=80=9CFrogeye=E2=80=9D=20Preud=27homme?= Date: Sat, 19 Jun 2021 12:25:38 +0200 Subject: [PATCH] Moved some desktop environment stuff to Ansible --- config/Xresources/configure | 8 ----- .../roles/desktop_environment/tasks/main.yml | 31 ++++++++++++++++++- .../snippets/pm_desktop_environment.j2 | 2 ++ config/scripts/crepuscule | 3 +- config/scripts/install-prefs | 10 +----- config/scripts/jour | 3 +- config/scripts/nuit | 3 +- 7 files changed, 36 insertions(+), 24 deletions(-) delete mode 100755 config/Xresources/configure diff --git a/config/Xresources/configure b/config/Xresources/configure deleted file mode 100755 index be91226..0000000 --- a/config/Xresources/configure +++ /dev/null @@ -1,8 +0,0 @@ -#!/usr/bin/env bash - -mkdir -p $HOME/.local/share/fonts -echo $(for i in "" "%20Bold" "%20Oblique" "%20Bold%20Oblique"; do - cd $HOME/.local/share/fonts - wget -c http://raw.githubusercontent.com/powerline/fonts/master/DejaVuSansMono/DejaVu%20Sans%20Mono$i%20for%20Powerline.ttf -done) -wget -c "https://raw.githubusercontent.com/FortAwesome/Font-Awesome/a8386aae19e200ddb0f6845b5feeee5eb7013687/fonts/fontawesome-webfont.ttf" -O $HOME/.local/share/fonts/fontawesome-webfont.ttf diff --git a/config/automatrop/roles/desktop_environment/tasks/main.yml b/config/automatrop/roles/desktop_environment/tasks/main.yml index d397d35..4f269a2 100644 --- a/config/automatrop/roles/desktop_environment/tasks/main.yml +++ b/config/automatrop/roles/desktop_environment/tasks/main.yml @@ -1,14 +1,38 @@ - name: Ensure directories for theme are present file: state: directory - path: "{{ ansible_env.HOME }}/{{ item }}" + path: "{{ ansible_user_dir }}/{{ item }}" + mode: "u=rwx,g=rx,o=rx" with_items: - ".config/Xresources" - ".config/rofi" - ".local/bin" + - ".local/share/fonts" - ".config/qutebrowser" - ".config/tridactyl/themes" +# Download fonts +- name: Download terminal fonts + get_url: + url: "http://raw.githubusercontent.com/powerline/fonts/master/DejaVuSansMono/{{ item | urlencode }}" + dest: "{{ ansible_user_dir }}/.local/share/fonts/{{ item }}" + mode: "u=rw,g=r,o=r" + loop: + - DejaVu Sans Mono Bold for Powerline.ttf + - DejaVu Sans Mono Bold Oblique for Powerline.ttf + - DejaVu Sans Mono for Powerline.ttf + - DejaVu Sans Mono Oblique for Powerline.ttf + +- name: Download icon fonts + get_url: + url: "https://raw.githubusercontent.com/FortAwesome/Font-Awesome/a8386aae19e200ddb0f6845b5feeee5eb7013687/fonts/fontawesome-webfont.ttf" + dest: "{{ ansible_user_dir }}/.local/share/fonts/fontawesome-webfont.ttf" + mode: "u=rw,g=r,o=r" + +- name: Install python dependencies for lemonbar + pip: + requirements: "{{ ansible_user_dir }}/.dotfiles/config/lemonbar/requirements.txt" + # Build a single color scheme and template and assign it to a variable - base16_builder: scheme: "{{ base16_scheme }}" @@ -35,6 +59,8 @@ mode: "u+rw,g=r,o=r" # Alacritty has live config reload, so no command to execute # However, it doesn't work with yaml includes, hence the template + tags: + - color - name: Set base16 theme for Xresources copy: @@ -45,6 +71,7 @@ - xrdb-reload tags: - color + when: display_server == 'x11' - name: Download base16 theme for qutebrowser copy: @@ -75,6 +102,7 @@ - i3-reload tags: - color + when: display_server == 'x11' - name: Set base16 theme for rofi copy: @@ -94,6 +122,7 @@ mode: "u+rw,g=r,o=r" tags: - color + when: display_server == 'x11' - name: Download base16 theme for fzf copy: diff --git a/config/automatrop/roles/software/templates/snippets/pm_desktop_environment.j2 b/config/automatrop/roles/software/templates/snippets/pm_desktop_environment.j2 index c2d8cbc..f042a59 100644 --- a/config/automatrop/roles/software/templates/snippets/pm_desktop_environment.j2 +++ b/config/automatrop/roles/software/templates/snippets/pm_desktop_environment.j2 @@ -55,6 +55,8 @@ wireless_tools {% else %} lemonbar {% endif %} +{# lemonbar dependency #} +notmuch autorandr keynav sct diff --git a/config/scripts/crepuscule b/config/scripts/crepuscule index 0181334..ebd3d53 100755 --- a/config/scripts/crepuscule +++ b/config/scripts/crepuscule @@ -2,7 +2,6 @@ # TODO De-hardcode -cd ~/.dotfiles/config/automatrop echo 30000 | sudo tee /sys/class/backlight/intel_backlight/brightness xrandr --output HDMI-0 --brightness 1 -ansible-playbook playbooks/default.yml -e base16_scheme=solarized-dark --tags color --connection local --limit $HOSTNAME +automatrop -e base16_scheme=solarized-dark --tags color diff --git a/config/scripts/install-prefs b/config/scripts/install-prefs index b95e4df..c8c9d4d 100755 --- a/config/scripts/install-prefs +++ b/config/scripts/install-prefs @@ -10,17 +10,9 @@ mkdir -p $HOME/.cache mkdir -p $HOME/.cache/zsh mkdir -p $HOME/.cache/mpd mkdir -p $HOME/.ssh -mkdir -p $HOME/.local/bin - -. $HOME/.config/scripts/softwareList +# mkdir -p $HOME/.local/bin echo "Doing stuff cuz" -if command -v Xorg > /dev/null -then - $HOME/.config/Xresources/configure - pip install --user --requirement $HOME/.config/lemonbar/requirements.txt -fi -changeColors monokai vim +PlugUpgrade +PlugUpdate +PlugInstall +qall systemctl enable pulseaudio --user --now diff --git a/config/scripts/jour b/config/scripts/jour index 18aa828..f251dd7 100755 --- a/config/scripts/jour +++ b/config/scripts/jour @@ -2,7 +2,6 @@ # TODO De-hardcode -cd ~/.dotfiles/config/automatrop echo 30000 | sudo tee /sys/class/backlight/intel_backlight/brightness xrandr --output HDMI-0 --brightness 1 -ansible-playbook playbooks/default.yml -e base16_scheme=solarized-light --tags color --connection local --limit $HOSTNAME +automatrop -e base16_scheme=solarized-light --tags color diff --git a/config/scripts/nuit b/config/scripts/nuit index 1d4f7b9..e6a4954 100755 --- a/config/scripts/nuit +++ b/config/scripts/nuit @@ -2,7 +2,6 @@ # TODO De-hardcode -cd ~/.dotfiles/config/automatrop echo 1 | sudo tee /sys/class/backlight/intel_backlight/brightness xrandr --output HDMI-0 --brightness 0.5 -ansible-playbook playbooks/default.yml -e base16_scheme=solarized-dark --tags color --connection local --limit $HOSTNAME +automatrop -e base16_scheme=solarized-dark --tags color