Compare commits
No commits in common. "81337dc1b8066f12631cd66126fe87ceef67886a" and "af25d342e86e1e9d582e9c7e199cbaa3ddaf3334" have entirely different histories.
81337dc1b8
...
af25d342e8
3
.gitmodules
vendored
3
.gitmodules
vendored
|
@ -1,6 +1,3 @@
|
||||||
[submodule "config/automatrop/roles/mnussbaum.base16-builder-ansible"]
|
[submodule "config/automatrop/roles/mnussbaum.base16-builder-ansible"]
|
||||||
path = config/automatrop/roles/mnussbaum.base16-builder-ansible
|
path = config/automatrop/roles/mnussbaum.base16-builder-ansible
|
||||||
url = https://github.com/GeoffreyFrogeye/base16-builder-ansible.git
|
url = https://github.com/GeoffreyFrogeye/base16-builder-ansible.git
|
||||||
[submodule "config/automatrop/plugins/modules/aur"]
|
|
||||||
path = config/automatrop/plugins/modules/aur
|
|
||||||
url = https://github.com/kewlfft/ansible-aur.git
|
|
||||||
|
|
|
@ -2,7 +2,6 @@
|
||||||
inventory=hosts
|
inventory=hosts
|
||||||
roles_path=roles
|
roles_path=roles
|
||||||
interpreter_python=auto
|
interpreter_python=auto
|
||||||
library=plugins/modules
|
|
||||||
|
|
||||||
[ssh_connection]
|
[ssh_connection]
|
||||||
pipelining = True # does not work with requiretty in /etc/sudoers
|
pipelining = True # does not work with requiretty in /etc/sudoers
|
||||||
|
|
|
@ -1,3 +1 @@
|
||||||
curacao.geoffrey.frogeye.fr
|
localhost
|
||||||
triffle.geoffrey.frogeye.fr
|
|
||||||
bufobufo.frogeye.nl
|
|
||||||
|
|
|
@ -1,10 +1,7 @@
|
||||||
- name: Default
|
- name: Default
|
||||||
hosts: all
|
hosts: localhost
|
||||||
|
connection: local
|
||||||
roles:
|
roles:
|
||||||
- role: software
|
|
||||||
tags: software
|
|
||||||
- role: mnussbaum.base16-builder-ansible # Required for color
|
- role: mnussbaum.base16-builder-ansible # Required for color
|
||||||
tags: color
|
|
||||||
- role: color
|
- role: color
|
||||||
tags: color
|
|
||||||
|
|
||||||
|
|
|
@ -1 +0,0 @@
|
||||||
Subproject commit 592c6d9841674211f904cf9ea2a951fca3fd5a80
|
|
|
@ -26,14 +26,6 @@
|
||||||
- dunst
|
- dunst
|
||||||
register: base16_schemes
|
register: base16_schemes
|
||||||
|
|
||||||
- name: Configure Alacritty
|
|
||||||
template:
|
|
||||||
src: "{{ ansible_env.HOME }}/.config/alacritty/alacritty.yml.j2"
|
|
||||||
dest: "{{ ansible_env.HOME }}/.config/alacritty/alacritty.yml"
|
|
||||||
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
|
|
||||||
|
|
||||||
- name: Set base16 theme for Xresources
|
- name: Set base16 theme for Xresources
|
||||||
copy:
|
copy:
|
||||||
content: "{{ base16_schemes['schemes'][base16_scheme]['xresources']['xresources']['base16-' + base16_scheme + '-256.Xresources'] }}"
|
content: "{{ base16_schemes['schemes'][base16_scheme]['xresources']['xresources']['base16-' + base16_scheme + '-256.Xresources'] }}"
|
||||||
|
@ -42,22 +34,6 @@
|
||||||
notify:
|
notify:
|
||||||
- xrdb-reload
|
- xrdb-reload
|
||||||
|
|
||||||
- name: Download base16 theme for qutebrowser
|
|
||||||
copy:
|
|
||||||
content: "{{ base16_schemes['schemes'][base16_scheme]['qutebrowser']['themes/minimal']['base16-' + base16_scheme + '.config.py'] }}"
|
|
||||||
dest: "{{ ansible_env.HOME }}/.config/qutebrowser/theme.py"
|
|
||||||
mode: "u+rw,g=r,o=r"
|
|
||||||
notify:
|
|
||||||
- qutebrowser-reload
|
|
||||||
|
|
||||||
- name: Download base16 theme for Tridactyl
|
|
||||||
copy:
|
|
||||||
content: "{{ base16_schemes['schemes'][base16_scheme]['tridactyl']['base16-' + base16_scheme + '.config.py'] }}"
|
|
||||||
# url: "https://raw.githubusercontent.com/bezmi/base16-tridactyl/master/base16-{{ base16_scheme }}.css"
|
|
||||||
dest: "{{ ansible_env.HOME }}/.config/tridactyl/themes/theme.css"
|
|
||||||
mode: "u+rw,g=r,o=r"
|
|
||||||
when: False # Not currently used
|
|
||||||
|
|
||||||
- name: Configure i3
|
- name: Configure i3
|
||||||
template:
|
template:
|
||||||
src: "{{ ansible_env.HOME }}/.config/i3/config.j2"
|
src: "{{ ansible_env.HOME }}/.config/i3/config.j2"
|
||||||
|
@ -75,20 +51,6 @@
|
||||||
- rasi
|
- rasi
|
||||||
- config
|
- config
|
||||||
|
|
||||||
- name: Configure Dunst
|
|
||||||
template:
|
|
||||||
src: "{{ ansible_env.HOME }}/.config/dunst/dunstrc.j2"
|
|
||||||
dest: "{{ ansible_env.HOME }}/.config/dunst/dunstrc"
|
|
||||||
mode: "u+rw,g=r,o=r"
|
|
||||||
|
|
||||||
- name: Download base16 theme for fzf
|
|
||||||
copy:
|
|
||||||
content: "{{ base16_schemes['schemes'][base16_scheme]['fzf']['bash']['base16-' + base16_scheme + '.config'] }}"
|
|
||||||
dest: "{{ ansible_env.HOME }}/.local/bin/colorSchemeApplyFzf"
|
|
||||||
mode: "u+rw,g=r,o=r"
|
|
||||||
notify:
|
|
||||||
- fzf-reload
|
|
||||||
|
|
||||||
- name: Download base16 theme for Termux
|
- name: Download base16 theme for Termux
|
||||||
copy:
|
copy:
|
||||||
content: "{{ base16_schemes['schemes'][base16_scheme]['termux']['colors']['base16-' + base16_scheme + '.properties'] }}"
|
content: "{{ base16_schemes['schemes'][base16_scheme]['termux']['colors']['base16-' + base16_scheme + '.properties'] }}"
|
||||||
|
@ -96,6 +58,14 @@
|
||||||
mode: "u+rw,g=r,o=r"
|
mode: "u+rw,g=r,o=r"
|
||||||
# TODO Only on Termux
|
# TODO Only on Termux
|
||||||
|
|
||||||
|
- name: Configure Alacritty
|
||||||
|
template:
|
||||||
|
src: "{{ ansible_env.HOME }}/.config/alacritty/alacritty.yml.j2"
|
||||||
|
dest: "{{ ansible_env.HOME }}/.config/alacritty/alacritty.yml"
|
||||||
|
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
|
||||||
|
|
||||||
- name: Download base16 theme for shell
|
- name: Download base16 theme for shell
|
||||||
copy:
|
copy:
|
||||||
content: "{{ base16_schemes['schemes'][base16_scheme]['shell']['script']['base16-' + base16_scheme + '.sh'] }}"
|
content: "{{ base16_schemes['schemes'][base16_scheme]['shell']['script']['base16-' + base16_scheme + '.sh'] }}"
|
||||||
|
@ -105,6 +75,14 @@
|
||||||
- shell-reload
|
- shell-reload
|
||||||
when: False # Not currently used
|
when: False # Not currently used
|
||||||
|
|
||||||
|
- name: Download base16 theme for fzf
|
||||||
|
copy:
|
||||||
|
content: "{{ base16_schemes['schemes'][base16_scheme]['fzf']['bash']['base16-' + base16_scheme + '.config'] }}"
|
||||||
|
dest: "{{ ansible_env.HOME }}/.local/bin/colorSchemeApplyFzf"
|
||||||
|
mode: "u+rw,g=r,o=r"
|
||||||
|
notify:
|
||||||
|
- fzf-reload
|
||||||
|
|
||||||
- name: Set used base16 theme for vim
|
- name: Set used base16 theme for vim
|
||||||
copy:
|
copy:
|
||||||
path: "{{ ansible_env.HOME }}/.config/vim/colorscheme.vim"
|
path: "{{ ansible_env.HOME }}/.config/vim/colorscheme.vim"
|
||||||
|
@ -112,6 +90,28 @@
|
||||||
content: "colorscheme base16-{{ base16_scheme }}"
|
content: "colorscheme base16-{{ base16_scheme }}"
|
||||||
when: False # Not currently used
|
when: False # Not currently used
|
||||||
|
|
||||||
|
- name: Download base16 theme for qutebrowser
|
||||||
|
copy:
|
||||||
|
content: "{{ base16_schemes['schemes'][base16_scheme]['qutebrowser']['themes/minimal']['base16-' + base16_scheme + '.config.py'] }}"
|
||||||
|
dest: "{{ ansible_env.HOME }}/.config/qutebrowser/theme.py"
|
||||||
|
mode: "u+rw,g=r,o=r"
|
||||||
|
notify:
|
||||||
|
- qutebrowser-reload
|
||||||
|
|
||||||
|
- name: Download base16 theme for Tridactyl
|
||||||
|
copy:
|
||||||
|
content: "{{ base16_schemes['schemes'][base16_scheme]['tridactyl']['base16-' + base16_scheme + '.config.py'] }}"
|
||||||
|
# url: "https://raw.githubusercontent.com/bezmi/base16-tridactyl/master/base16-{{ base16_scheme }}.css"
|
||||||
|
dest: "{{ ansible_env.HOME }}/.config/tridactyl/themes/theme.css"
|
||||||
|
mode: "u+rw,g=r,o=r"
|
||||||
|
when: False # Not currently used
|
||||||
|
|
||||||
|
- name: Configure Dunst
|
||||||
|
template:
|
||||||
|
src: "{{ ansible_env.HOME }}/.config/dunst/dunstrc.j2"
|
||||||
|
dest: "{{ ansible_env.HOME }}/.config/dunst/dunstrc"
|
||||||
|
mode: "u+rw,g=r,o=r"
|
||||||
|
|
||||||
# TODO bar (might change bar in the future, so...)
|
# TODO bar (might change bar in the future, so...)
|
||||||
# TODO highlight (there IS a template but the colors look different from vim and mostly the same from when there's no config)
|
# TODO highlight (there IS a template but the colors look different from vim and mostly the same from when there's no config)
|
||||||
# TODO https://github.com/makuto/auto-base16-theme ? :P
|
# TODO https://github.com/makuto/auto-base16-theme ? :P
|
||||||
|
|
|
@ -1 +1 @@
|
||||||
Subproject commit a977bb298fb9e1c057e0b2587dbd4d047e13f5bd
|
Subproject commit f63161458533d5dc1a75529fb4e1fb04bc6885e6
|
|
@ -1,55 +0,0 @@
|
||||||
- name: Install base shell packages (Pacman)
|
|
||||||
pacman:
|
|
||||||
name:
|
|
||||||
- base
|
|
||||||
- coreutils
|
|
||||||
- bash
|
|
||||||
- grep
|
|
||||||
- sed
|
|
||||||
- tar
|
|
||||||
- openssl # Used for machines script
|
|
||||||
when: arch
|
|
||||||
|
|
||||||
- name: Install base shell packages (Apt)
|
|
||||||
apt:
|
|
||||||
name:
|
|
||||||
- coreutils
|
|
||||||
- bash
|
|
||||||
- grep
|
|
||||||
- sed
|
|
||||||
- tar
|
|
||||||
- openssl
|
|
||||||
when: apt
|
|
||||||
|
|
||||||
- name: Install extended shell packages (Pacman)
|
|
||||||
pacman:
|
|
||||||
name:
|
|
||||||
- moreutils
|
|
||||||
- tmux
|
|
||||||
- bash-completion
|
|
||||||
- fzf
|
|
||||||
- highlight
|
|
||||||
- powerline-go-bin
|
|
||||||
when: arch
|
|
||||||
|
|
||||||
- name: Install extended shell packages (Debian)
|
|
||||||
pacman:
|
|
||||||
name:
|
|
||||||
- moreutils
|
|
||||||
- tmux
|
|
||||||
- bash-completion
|
|
||||||
- fzf
|
|
||||||
- highlight
|
|
||||||
- powerline-go
|
|
||||||
when: debian
|
|
||||||
|
|
||||||
- name: Install extended shell packages (Termux)
|
|
||||||
pacman:
|
|
||||||
name:
|
|
||||||
- moreutils
|
|
||||||
- tmux
|
|
||||||
- bash-completion
|
|
||||||
- fzf
|
|
||||||
# - highlight
|
|
||||||
# - powerline-go
|
|
||||||
when: termux
|
|
|
@ -1,96 +0,0 @@
|
||||||
- name: Set variables
|
|
||||||
set_fact:
|
|
||||||
arch: "{{ ansible_distribution == 'Archlinux' }}"
|
|
||||||
termux: "{{ ansible_distribution == 'OtherLinux' and ansible_python.executable == '/data/data/com.termux/files/usr/bin/python' }}"
|
|
||||||
debian: "{{ ansible_distribution == 'Debian' or ansible_distribution == 'Ubuntu' }}"
|
|
||||||
|
|
||||||
- name: Set secondary variables
|
|
||||||
set_fact:
|
|
||||||
pacman: "{{ arch }}"
|
|
||||||
apt: "{{ termux or debian }}"
|
|
||||||
sudo: "{{ not termux }}"
|
|
||||||
|
|
||||||
# TODO Install python if not done
|
|
||||||
|
|
||||||
- name: Install python-apt dependency for Termux
|
|
||||||
block:
|
|
||||||
# TODO Check if the correct version
|
|
||||||
- name: Check for DistUtilsExtra (Termux)
|
|
||||||
command: python -c 'import DistUtilsExtra'
|
|
||||||
changed_when: False
|
|
||||||
rescue:
|
|
||||||
- name: Create temporarty folder for DistUtilsExtra (Termux)
|
|
||||||
tempfile:
|
|
||||||
state: directory
|
|
||||||
suffix: python-distutils-extra
|
|
||||||
# path: /data/data/com.termux/files/usr/tmp/
|
|
||||||
register: pde_tempdir
|
|
||||||
|
|
||||||
- name: Download DistUtilsExtra (Termux)
|
|
||||||
get_url:
|
|
||||||
url: "https://launchpad.net/python-distutils-extra/trunk/{{ version }}/+download/python-distutils-extra-{{ version }}.tar.gz"
|
|
||||||
dest: "{{ pde_tempdir.path }}/python-distutils-extra.tar.gz"
|
|
||||||
|
|
||||||
- name: Extract DistUtilsExtra (Termux)
|
|
||||||
unarchive:
|
|
||||||
src: "{{ pde_tempdir.path }}/python-distutils-extra.tar.gz"
|
|
||||||
remote_src: yes
|
|
||||||
dest: "{{ pde_tempdir.path }}"
|
|
||||||
|
|
||||||
- name: Install DistUtilsExtra (Termux)
|
|
||||||
command:
|
|
||||||
cmd: python3 setup.py install
|
|
||||||
chdir: "{{ pde_tempdir.path }}/python-distutils-extra-{{ version }}"
|
|
||||||
when: termux
|
|
||||||
vars:
|
|
||||||
version: 2.39
|
|
||||||
|
|
||||||
- name: Install python-apt (Termux)
|
|
||||||
pip:
|
|
||||||
name: python-apt
|
|
||||||
when: termux
|
|
||||||
|
|
||||||
# Collecting python-apt
|
|
||||||
# Using cached python-apt-0.7.8.tar.bz2 (49 kB)
|
|
||||||
# ERROR: Command errored out with exit status 1:
|
|
||||||
# command: /data/data/com.termux/files/usr/bin/python3 -c 'import sys, setuptools, tokenize; sys.argv[0] = '"'"'/data/data/com.termux/files/usr/tmp/pip-install-dsga__i7/python-apt/setup.py'"'"'; __file__='"'"'/data/data/com.termux/files/usr/tmp/pip-install-dsga__i7/python-apt/setup.py'"'"';f=getattr(tokenize, '"'"'open'"'"', open)(__file__);code=f.read().replace('"'"'\r\n'"'"', '"'"'\n'"'"');f.close();exec(compile(code, __file__, '"'"'exec'"'"'))' egg_info --egg-base /data/data/com.termux/files/usr/tmp/pip-pip-egg-info-ptpprl0m
|
|
||||||
# cwd: /data/data/com.termux/files/usr/tmp/pip-install-dsga__i7/python-apt/
|
|
||||||
# Complete output (5 lines):
|
|
||||||
# Traceback (most recent call last):
|
|
||||||
# File "<string>", line 1, in <module>
|
|
||||||
# File "/data/data/com.termux/files/usr/tmp/pip-install-dsga__i7/python-apt/setup.py", line 11, in <module>
|
|
||||||
# string.split(parse_makefile("python/makefile")["APT_PKG_SRC"]))
|
|
||||||
# AttributeError: module 'string' has no attribute 'split'
|
|
||||||
# ----------------------------------------
|
|
||||||
# ERROR: Command errored out with exit status 1: python setup.py egg_info Check the logs for full command output.
|
|
||||||
# WARNING: You are using pip version 20.2.3; however, version 20.3.3 is available.
|
|
||||||
# You should consider upgrading via the '/data/data/com.termux/files/usr/bin/python3 -m pip install --upgrade pip' command.
|
|
||||||
|
|
||||||
# Install alternative package managers
|
|
||||||
- name: Install AUR package manager
|
|
||||||
aur:
|
|
||||||
name: yay-bin
|
|
||||||
when: arch
|
|
||||||
|
|
||||||
- name: Install python pip (Pacman)
|
|
||||||
pacman:
|
|
||||||
name: python-pip
|
|
||||||
when: arch
|
|
||||||
become: "{{ sudo }}"
|
|
||||||
become_user: root
|
|
||||||
|
|
||||||
- name: Install python pip (Debian)
|
|
||||||
apt:
|
|
||||||
name: python3-pip
|
|
||||||
when: debian
|
|
||||||
become: "{{ sudo }}"
|
|
||||||
become_user: root
|
|
||||||
|
|
||||||
# Termux: pip is included with Python
|
|
||||||
|
|
||||||
- name: Install base packages
|
|
||||||
include_tasks:
|
|
||||||
file: base.yml
|
|
||||||
apply:
|
|
||||||
become: "{{ sudo }}"
|
|
||||||
become_user: root
|
|
|
@ -5,4 +5,4 @@
|
||||||
cd ~/.dotfiles/config/automatrop
|
cd ~/.dotfiles/config/automatrop
|
||||||
echo 30000 | sudo tee /sys/class/backlight/intel_backlight/brightness
|
echo 30000 | sudo tee /sys/class/backlight/intel_backlight/brightness
|
||||||
xrandr --output HDMI-0 --brightness 1
|
xrandr --output HDMI-0 --brightness 1
|
||||||
ansible-playbook playbooks/default.yml -e base16_scheme=solarized-dark --tags color --inventory 'localhost'
|
ansible-playbook playbooks/default.yml -e base16_scheme=solarized-dark
|
||||||
|
|
|
@ -5,4 +5,4 @@
|
||||||
cd ~/.dotfiles/config/automatrop
|
cd ~/.dotfiles/config/automatrop
|
||||||
echo 30000 | sudo tee /sys/class/backlight/intel_backlight/brightness
|
echo 30000 | sudo tee /sys/class/backlight/intel_backlight/brightness
|
||||||
xrandr --output HDMI-0 --brightness 1
|
xrandr --output HDMI-0 --brightness 1
|
||||||
ansible-playbook playbooks/default.yml -e base16_scheme=solarized-light --tags color --inventory 'localhost'
|
ansible-playbook playbooks/default.yml -e base16_scheme=solarized-light
|
||||||
|
|
|
@ -5,4 +5,4 @@
|
||||||
cd ~/.dotfiles/config/automatrop
|
cd ~/.dotfiles/config/automatrop
|
||||||
echo 1 | sudo tee /sys/class/backlight/intel_backlight/brightness
|
echo 1 | sudo tee /sys/class/backlight/intel_backlight/brightness
|
||||||
xrandr --output HDMI-0 --brightness 0.5
|
xrandr --output HDMI-0 --brightness 0.5
|
||||||
ansible-playbook playbooks/default.yml -e base16_scheme=solarized-dark --tags color --inventory 'localhost'
|
ansible-playbook playbooks/default.yml -e base16_scheme=solarized-dark
|
||||||
|
|
Loading…
Reference in a new issue