move some configuration from nodes to bundle:arch-with-gui
Some checks failed
kunsi/bundlewrap/pipeline/head There was a failure building this commit

This commit is contained in:
Franzi 2022-03-10 20:59:55 +01:00
parent e181be3fc6
commit 15ae3b7a0b
Signed by: kunsi
GPG key ID: 12E3D2136B818350
5 changed files with 35 additions and 69 deletions

View file

@ -1,3 +1,3 @@
[Autologin]
User=${username}
Session=${session}
User=${user}
Session=i3.desktop

View file

@ -20,7 +20,7 @@ actions = {
'i3pystatus_install': {
'command': ' && '.join([
'cd /opt/i3pystatus/src',
'/opt/i3pystatus/venv/bin/pip install --upgrade pip {}'.format(' '.join(sorted(node.metadata.get('arch-with-gui/i3pystatus/deps', set())))),
'/opt/i3pystatus/venv/bin/pip install --upgrade pip colour netifaces basiciw',
'/opt/i3pystatus/venv/bin/pip install --upgrade -e .',
]),
'needs': {
@ -85,9 +85,11 @@ for filename in listdir(join(repo.path, 'data', 'arch-with-gui', 'files', 'fonts
**attrs,
}
if node.metadata.get('arch-with-gui/autologin', {}):
if node.metadata.get('arch-with-gui/autologin_as', None):
files['/etc/sddm.conf.d/autologin.conf'] = {
'context': node.metadata.get('arch-with-gui/autologin'),
'context': {
'user': node.metadata.get('arch-with-gui/autologin_as'),
},
'content_type': 'mako',
'before': {
'svc_systemd:sddm',

View file

@ -6,6 +6,9 @@ defaults = {
'/etc/netctl',
},
},
'icinga_options': {
'exclude_from_monitoring': True,
},
'pacman': {
'packages': {
# fonts
@ -26,8 +29,10 @@ defaults = {
'wpa_actiond': {},
# shell and other gui stuff
'dunst': {},
'fish': {},
'kitty': {},
'libnotify': {}, # provides notify-send
'light': {},
'redshift': {},
'rofi': {},
@ -42,6 +47,10 @@ defaults = {
'i3lock': {},
'xss-lock': {},
# i3pystatus dependencies
'iw': {},
'wireless_tools': {},
# Xorg
'xf86-input-libinput': {},
'xorg-server': {},
@ -51,10 +60,27 @@ defaults = {
'xorg-xset': {},
# all them apps
'browserpass': {},
'browserpass-firefox': {},
'firefox': {},
'maim': {},
'mosh': {},
'mpv': {},
'pass': {},
'pass-otp': {},
'pdftk': {},
'pwgen': {},
'qpdfview': {},
'the_silver_searcher': {},
'thermald': {},
'tlp': {},
'xclip': {},
'xdotool': {}, # needed for maim window selection
},
},
'systemd-networkd': {
'enable-resolved': True,
},
}
@metadata_reactor.provides(