Compare commits
7 Commits
99d14f5f6b
...
ecdbedf4b2
| Author | SHA1 | Date | |
|---|---|---|---|
| ecdbedf4b2 | |||
| fff382e5fa | |||
| 3371d03421 | |||
| 1f27aee39c | |||
| 5dd7cfc6af | |||
| 2b62592bdf | |||
| c66d39fa5a |
@@ -21,7 +21,7 @@ env:
|
|||||||
# each instance of Alacritty. If it is not present, alacritty will
|
# each instance of Alacritty. If it is not present, alacritty will
|
||||||
# check the local terminfo database and use `alacritty` if it is
|
# check the local terminfo database and use `alacritty` if it is
|
||||||
# available, otherwise `xterm-256color` is used.
|
# available, otherwise `xterm-256color` is used.
|
||||||
TERM: xterm-256color
|
TERM: alacritty
|
||||||
|
|
||||||
window:
|
window:
|
||||||
# Window dimensions (changes require restart)
|
# Window dimensions (changes require restart)
|
||||||
@@ -150,7 +150,7 @@ font:
|
|||||||
style: Bold Italic
|
style: Bold Italic
|
||||||
|
|
||||||
# Point size
|
# Point size
|
||||||
size: {{ machine.font_size }}
|
size: {{ machine.font_size - 3 }}
|
||||||
|
|
||||||
# Offset is the extra space around each character. `offset.y` can be thought
|
# Offset is the extra space around each character. `offset.y` can be thought
|
||||||
# of as modifying the line spacing, and `offset.x` as modifying the letter
|
# of as modifying the line spacing, and `offset.x` as modifying the letter
|
||||||
|
|||||||
@@ -52,7 +52,7 @@ _install() {
|
|||||||
_package="$1" ; shift
|
_package="$1" ; shift
|
||||||
if [[ $NAME == "Ubuntu" ]] ; then
|
if [[ $NAME == "Ubuntu" ]] ; then
|
||||||
if ! (( cache_updated )) ; then
|
if ! (( cache_updated )) ; then
|
||||||
apt-get update
|
sudowrap apt-get update
|
||||||
cache_updated=1
|
cache_updated=1
|
||||||
fi
|
fi
|
||||||
sudowrap apt-get install --assume-yes "${_package}"
|
sudowrap apt-get install --assume-yes "${_package}"
|
||||||
@@ -87,7 +87,3 @@ if [[ $NAME == "Ubuntu" ]] ; then
|
|||||||
fi
|
fi
|
||||||
|
|
||||||
cd "$DOTDIR" && make
|
cd "$DOTDIR" && make
|
||||||
|
|
||||||
# fix permissions of the directory
|
|
||||||
sudowrap chgrp -R dotfiles "${DOTDIR}"
|
|
||||||
sudowrap chmod g+wX "${DOTDIR}"
|
|
||||||
|
|||||||
99
playbook.yml
99
playbook.yml
@@ -102,6 +102,59 @@
|
|||||||
when: distro == 'archlinux'
|
when: distro == 'archlinux'
|
||||||
tags: [system-update]
|
tags: [system-update]
|
||||||
|
|
||||||
|
- block:
|
||||||
|
- name: create dotfiles group
|
||||||
|
group:
|
||||||
|
name: dotfiles
|
||||||
|
state: present
|
||||||
|
become: true
|
||||||
|
become_user: root
|
||||||
|
|
||||||
|
- name: create dotfiles user
|
||||||
|
user:
|
||||||
|
name: dotfiles
|
||||||
|
group: dotfiles
|
||||||
|
home: /var/lib/dotfiles
|
||||||
|
create_home: false
|
||||||
|
shell: /bin/bash
|
||||||
|
system: true
|
||||||
|
become: true
|
||||||
|
become_user: root
|
||||||
|
|
||||||
|
- name: create dotfiles directory
|
||||||
|
file:
|
||||||
|
state: directory
|
||||||
|
path: /var/lib/dotfiles
|
||||||
|
owner: dotfiles
|
||||||
|
group: dotfiles
|
||||||
|
mode: '0775' # group needs write access!
|
||||||
|
become: true
|
||||||
|
become_user: root
|
||||||
|
|
||||||
|
- name: fix permissions for dotfiles directory
|
||||||
|
shell: |
|
||||||
|
cd /var/lib/dotfiles
|
||||||
|
if [[ -e .git ]] ; then
|
||||||
|
# There is no sane way to specify the global .gitconfig to use, so we
|
||||||
|
# actually have to override HOME so git looks into ~/.gitconfig
|
||||||
|
export HOME="$(mktemp -d)"
|
||||||
|
set -o pipefail
|
||||||
|
set -o errexit
|
||||||
|
git config --global --add safe.directory /var/lib/dotfiles
|
||||||
|
git ls-tree -z --name-only HEAD | xargs --null chown --changes --recursive dotfiles:dotfiles
|
||||||
|
git ls-tree -z --name-only HEAD | xargs --null chmod --changes --recursive g+wX
|
||||||
|
else
|
||||||
|
chown --changes --recursive dotfiles:dotfiles .
|
||||||
|
chmod --changes --recursive g+wX .
|
||||||
|
fi
|
||||||
|
args:
|
||||||
|
executable: /bin/bash
|
||||||
|
register: dotfiles_permission_change
|
||||||
|
become: true
|
||||||
|
become_user: root
|
||||||
|
changed_when: dotfiles_permission_change.stdout_lines|length > 0
|
||||||
|
tags: [dotfiles-directory]
|
||||||
|
|
||||||
- block:
|
- block:
|
||||||
- name: install sudo
|
- name: install sudo
|
||||||
package:
|
package:
|
||||||
@@ -804,52 +857,6 @@
|
|||||||
|
|
||||||
tags: [spotify]
|
tags: [spotify]
|
||||||
|
|
||||||
- name: create dotfiles group
|
|
||||||
group:
|
|
||||||
name: dotfiles
|
|
||||||
state: present
|
|
||||||
become: true
|
|
||||||
become_user: root
|
|
||||||
|
|
||||||
- name: create dotfiles user
|
|
||||||
user:
|
|
||||||
name: dotfiles
|
|
||||||
group: dotfiles
|
|
||||||
home: /var/lib/dotfiles
|
|
||||||
create_home: false
|
|
||||||
shell: /bin/bash
|
|
||||||
system: true
|
|
||||||
become: true
|
|
||||||
become_user: root
|
|
||||||
|
|
||||||
- name: create dotfiles directory
|
|
||||||
file:
|
|
||||||
state: directory
|
|
||||||
path: /var/lib/dotfiles
|
|
||||||
owner: dotfiles
|
|
||||||
group: dotfiles
|
|
||||||
mode: '0775' # group needs write access!
|
|
||||||
become: true
|
|
||||||
become_user: root
|
|
||||||
|
|
||||||
- name: fix permissions for dotfiles directory
|
|
||||||
shell: |
|
|
||||||
# There is no sane way to specify the global .gitconfig to use, so we
|
|
||||||
# actually have to override HOME so git looks into ~/.gitconfig
|
|
||||||
export HOME="$(mktemp -d)"
|
|
||||||
set -o pipefail
|
|
||||||
set -o errexit
|
|
||||||
cd /var/lib/dotfiles
|
|
||||||
git config --global --add safe.directory /var/lib/dotfiles
|
|
||||||
git ls-tree -z --name-only HEAD | xargs --null chown --changes --recursive dotfiles:dotfiles
|
|
||||||
git ls-tree -z --name-only HEAD | xargs --null chmod --changes --recursive g+wX /var/lib/dotfiles
|
|
||||||
args:
|
|
||||||
executable: /bin/bash
|
|
||||||
register: dotfiles_permission_change
|
|
||||||
become: true
|
|
||||||
become_user: root
|
|
||||||
changed_when: dotfiles_permission_change.stdout_lines|length > 0
|
|
||||||
|
|
||||||
- set_fact:
|
- set_fact:
|
||||||
users: "{{ machine.users }}"
|
users: "{{ machine.users }}"
|
||||||
tags:
|
tags:
|
||||||
|
|||||||
@@ -29,7 +29,7 @@ set-option -g status-justify left
|
|||||||
# https://wiki.archlinux.org/title/tmux#256_colors
|
# https://wiki.archlinux.org/title/tmux#256_colors
|
||||||
set-option -g -a terminal-overrides ",alacritty:Tc"
|
set-option -g -a terminal-overrides ",alacritty:Tc"
|
||||||
|
|
||||||
set-option -g pane-border-status bottom
|
set-option -g pane-border-status off
|
||||||
set-option -g pane-border-format ''
|
set-option -g pane-border-format ''
|
||||||
set-option -g -q pane-border-lines double;
|
set-option -g -q pane-border-lines double;
|
||||||
set-option -g -q pane-border-indicators colour;
|
set-option -g -q pane-border-indicators colour;
|
||||||
|
|||||||
Reference in New Issue
Block a user