config: use profiles

This commit is contained in:
lelgenio 2022-02-27 13:29:29 -03:00
parent 09aa0c141a
commit 9bdc810d75
9 changed files with 205 additions and 68 deletions

View File

@ -23,7 +23,6 @@ variables:
bar_pos: top bar_pos: top
tmux: false tmux: false
starship: false starship: false
supervisor: runit
accent_fg: '#ffffff' accent_fg: '#ffffff'
@ -164,10 +163,10 @@ profiles:
############################################################### ###############################################################
# Main profile # Os profiles
############################################################### ###############################################################
main: common:
variables: variables:
# gtk_theme: "Mint-Y{{@@ '-Dark' if color.type == 'dark' else '' @@}}-{{@@ accent_color_name.capitalize() @@}}" # gtk_theme: "Mint-Y{{@@ '-Dark' if color.type == 'dark' else '' @@}}-{{@@ accent_color_name.capitalize() @@}}"
gtk_theme: "Orchis-{{@@ accent_color_name.lower() @@}}-{{@@ 'dark' if color.type == 'dark' else 'light' @@}}" gtk_theme: "Orchis-{{@@ accent_color_name.lower() @@}}-{{@@ 'dark' if color.type == 'dark' else 'light' @@}}"
@ -177,14 +176,106 @@ profiles:
cursor_theme: "Breeze_Obsidian" cursor_theme: "Breeze_Obsidian"
# cursor_theme: "Breeze_Snow" # cursor_theme: "Breeze_Snow"
# cursor_theme: "capitaine-cursors" # cursor_theme: "capitaine-cursors"
dotfiles:
- ALL
include: include:
- "{{@@ key_layout @@}}" - "{{@@ key_layout @@}}"
- "{{@@ color_type @@}}" - "{{@@ color_type @@}}"
- "accent_{{@@ accent_color_name @@}}" - "accent_{{@@ accent_color_name @@}}"
dotfiles:
- alacritty
- backgrounds
- bat
- blender
- clang-format
- code-oss
- crontab
- dav
- deemix
- firefox
- fish
- fonts
- foot
- fusuma
- git
- gpg-agent
- i3
- imv
- kak-lsp
- kakoune
- kanshi
- kitty
- lesskey
- mako
- mangohud
- mime
- mpd
- mpv
- mutt
- mypy
- nvim
- pqivrc
- prettierrc
- qutebrowser
- ranger
- rclone
- rustfmt
- scripts
- starship
- sway
- swaylock
- telegram-theme
- theme
- thunar
- tmux
- waybar
- wofi
- xdpw
- zathura
voidlinux:
include:
- "common"
variables:
supervisor: runit
runit_enable:
- fusuma
- gammastep
- kanshi
- kdeconnect-indicator
- kdeconnectd
- mako
- mpDris2
- mpd
- notify-mail
- pipewire
- pipewire-media-session
- pulseaudio
- swayidle
- syncthing
- telegram
- udiskie
- waybar
- xdpw
- xsettingsd
dotfiles:
- services
artixlinux:
include:
- "common"
dotfiles:
- arch-packages
- paru
variables:
supervisor: runit
archlinux:
include:
- "common"
dotfiles:
- arch-packages
- paru
variables:
supervisor: scripts
############################################################### ###############################################################
config: config:
@ -266,16 +357,12 @@ actions:
https://github.com/alexanderjeurissen/ranger_devicons https://github.com/alexanderjeurissen/ranger_devicons
~/.config/ranger/plugins/ranger_devicons ~/.config/ranger/plugins/ranger_devicons
start_services: > enable_runit_services: _runit_config "{{@@ _dotfile_abs_dst @@}}" {{@@ ' '.join(runit_enable) @@}}
_runit_config "{{@@ _dotfile_abs_dst @@}}"
fusuma gammastep mako xsettingsd mpd mpDris2 telegram pipewire
pipewire-media-session xdpw pulseaudio kdeconnectd kdeconnect-indicator
kanshi swayidle waybar syncthing udiskie notify-mail
# bootstrap scripts # bootstrap scripts
pam_gpg: _pam-gpg-strap pam_gpg: _pam-gpg-strap
make_theme: _make_theme make_theme: _make_theme
install_meta: install_meta install_arch_meta: install_arch_meta
install_mpv: _mpv_install install_mpv: _mpv_install
filter_backgrounds: _backgrouds_filter filter_backgrounds: _backgrouds_filter
@ -401,7 +488,7 @@ dotfiles: # Just a bunch of paths and action mappings
src: runit_sv src: runit_sv
dst: ~/.config/runit/sv dst: ~/.config/runit/sv
actions: actions:
- start_services - enable_runit_services
deemix: deemix:
src: deemix src: deemix
@ -451,11 +538,11 @@ dotfiles: # Just a bunch of paths and action mappings
actions: actions:
- pam_gpg - pam_gpg
packages: arch-packages:
src: meta.PKGBUILD src: meta.PKGBUILD
dst: ~/.local/share/metapkg/PKGBUILD dst: ~/.local/share/metapkg/PKGBUILD
actions: actions:
- install_meta - install_arch_meta
kak-lsp: kak-lsp:
src: kak-lsp.toml src: kak-lsp.toml

View File

@ -17,9 +17,6 @@ function calias
abbr -g mpn ncmpcpp abbr -g mpn ncmpcpp
abbr -g dot "dotdrop install -f" abbr -g dot "dotdrop install -f"
set -l root_cfg (dirname $DOTDROP_CONFIG)/root
alias rootdrop 'sudo dotdrop install -f -c "$root_cfg"'
cabbr p emerge cabbr p emerge
if command -qs xbps-install if command -qs xbps-install
@ -32,7 +29,6 @@ cabbr p yay
cabbr p paru cabbr p paru
################################################################ ################################################################
# Editor # Editor
################################################################ ################################################################

View File

@ -39,7 +39,9 @@ function esway
# this should not be necessary, but whatever # this should not be necessary, but whatever
if not pidof sway &> /dev/null if not pidof sway &> /dev/null
{%@@ if profile in ["voidlinux"] @@%}
pkill -HUP -u "$USER" runsvdir pkill -HUP -u "$USER" runsvdir
{%@@ endif @@%}
exec dbus-launch --exit-with-session sway exec dbus-launch --exit-with-session sway
end end
end end

View File

@ -41,14 +41,14 @@ include modes
include assigns include assigns
{%@@ if supervisor == "scripts" @@%} {%@@ if profile in ["voidlinux"] @@%}
include daemons set $user_svd "$HOME/.config/runit/runsvdir/default"
{%@@ elif supervisor == "runit" @@%} exec_always pgrep -u "$USER" "^runsvdir$" || runsvdir $user_svd
set $user_svd "$HOME/.config/runit/runsvdir/default" exec_always env SVDIR=$user_svd sv hup kanshi
exec_always pgrep -u "$USER" "^runsvdir$" || runsvdir $user_svd exec_always env SVDIR=$user_svd sv hup waybar
exec_always env SVDIR=$user_svd sv hup kanshi exec_always _gpg-unlock
exec_always env SVDIR=$user_svd sv hup waybar {%@@ else @@%}
exec_always _gpg-unlock include daemons
{%@@ endif @@%} {%@@ endif @@%}
exec dbus-update-activation-environment DISPLAY XAUTHORITY SWAYSOCK I3SOCK WAYLAND_DISPLAY exec dbus-update-activation-environment DISPLAY XAUTHORITY SWAYSOCK I3SOCK WAYLAND_DISPLAY

View File

@ -28,7 +28,7 @@ config:
actions: actions:
############################################################### ###############################################################
greetd_install: _greetd_install # greetd_install: _greetd_install
grub_install: update-grub grub_install: update-grub
locale_install: locale-gen locale_install: locale-gen
libc_locale_install: xbps-reconfigure -f glibc-locales libc_locale_install: xbps-reconfigure -f glibc-locales
@ -40,26 +40,65 @@ actions:
rc-service "{{@@ '_dotfile_key' @@}}" restart rc-service "{{@@ '_dotfile_key' @@}}" restart
create_swapfile: _create-swapfile create_swapfile: _create-swapfile
mount_partitions: mount -a
dbus_uuidgen: dbus-uuidgen --ensure dbus_uuidgen: dbus-uuidgen --ensure
sysctl_apply: sysctl -a sysctl_apply: sysctl -a
# mkinitcpio: mkinitcpio -P mkinitcpio: mkinitcpio -P
# start_services: > enable_runit_services: _runit_config "{{@@ _dotfile_abs_dst @@}}" {{@@ ' '.join(runit_autostart) @@}}
# _runit_config "{{@@ _dotfile_abs_dst @@}}"
# apache ###############################################################
# cronie profiles:
# dbus ###############################################################
# dhcpcd
# docker common:
# earlyoom dotfiles:
# elogind - grub
# greetd - pam
# iwd - bluez
# bluetoothd - locale
# mariadb - fstab
# preload - sysctl
# syslog-ng - kernel_modules
# tlp - udev_rules
- vconsole
voidlinux:
variables:
runit_autostart:
- acpid
- bluetoothd
- crond
- dbus
- dhcpcd
- docker
- iwd
- ntpd
- rundird
- seatd
- socklog-unix
- tlp
include:
- "common"
dotfiles:
- elogind
- libc_locales
- runit_services
artixlinux:
include:
- "common"
dotfiles:
- elogind
- mkinitcpio
- pacman-artix
archlinux:
include:
- "common"
dotfiles:
- logind
- mkinitcpio
- pacman-arch
############################################################### ###############################################################
@ -72,6 +111,12 @@ dotfiles:
# actions: # actions:
# - greetd_install # - greetd_install
logind:
src: elogind.conf
dst: /etc/logind/logind.conf
actions:
- dbus_uuidgen
elogind: elogind:
src: elogind.conf src: elogind.conf
dst: /etc/elogind/logind.conf dst: /etc/elogind/logind.conf
@ -88,17 +133,23 @@ dotfiles:
src: pam-local-login src: pam-local-login
dst: /etc/pam.d/system-local-login dst: /etc/pam.d/system-local-login
# mkinitcpio: mkinitcpio:
# src: mkinitcpio.conf src: mkinitcpio.conf
# dst: /etc/mkinitcpio.conf dst: /etc/mkinitcpio.conf
# actions: actions:
# - mkinitcpio - mkinitcpio
# pacman: pacman-artix:
# src: pacman.conf src: pacman-artix.conf
# dst: /etc/pacman.conf dst: /etc/pacman.conf
# actions: actions:
# - pacman_install - pacman_install
pacman-arch:
src: pacman-arch.conf
dst: /etc/pacman.conf
actions:
- pacman_install
bluez: bluez:
src: bluetooth.conf src: bluetooth.conf
@ -121,7 +172,6 @@ dotfiles:
dst: /etc/fstab dst: /etc/fstab
actions: actions:
- create_swapfile - create_swapfile
- mount_partitions
sysctl: sysctl:
src: sysctl src: sysctl
@ -145,16 +195,10 @@ dotfiles:
# src: earlyoom # src: earlyoom
# dst: /etc/default/earlyoom # dst: /etc/default/earlyoom
# services: runit_services:
# src: runit_sv src: runit_sv
# dst: /etc/runit/sv dst: /etc/runit/sv
# actions: actions:
# - start_services - enable_runit_services
###############################################################
profiles:
###############################################################
main:
dotfiles:
- ALL

View File

@ -5,4 +5,6 @@ account include system-login
password include system-login password include system-login
session include system-login session include system-login
{%@@ if profile in ["voidlinux"] @@%}
-session optional pam_rundird.so -session optional pam_rundird.so
{%@@ endif @@%}

View File

@ -4,6 +4,7 @@ Thunar
Vulkan-Tools Vulkan-Tools
Waybar Waybar
alacritty alacritty
alsa-lib-devel
apache apache
atool atool
bamf-devel bamf-devel
@ -19,6 +20,7 @@ breeze-obsidian-cursor-theme
caffeine-ng caffeine-ng
cargo-edit cargo-edit
chromium chromium
clang
clyrics clyrics
cmake cmake
cmatrix cmatrix
@ -61,6 +63,8 @@ gst-plugins-ugly1
gtk+-devel gtk+-devel
gtk+3-devel gtk+3-devel
gtk3-nocsd gtk3-nocsd
gvfs
gvfs-mtp
htop htop
inetutils inetutils
inkscape inkscape
@ -78,6 +82,7 @@ kak-lsp
kakoune kakoune
kanshi kanshi
kdeconnect kdeconnect
kdenlive
khal khal
khard khard
kitty kitty
@ -92,6 +97,7 @@ libpipewire0.2
libreoffice libreoffice
light light
linux linux
lld
lutris lutris
lxappearance lxappearance
lynx lynx