root: fix separation

config.yaml

@@ -10,8 +10,9 @@ variables:
 ###############################################################
 
     username: lelgenio
-    cursor_size: 24
+    shell: fish
     editor: kak
+    cursor_size: 24
     tabs: false
     indent_width: 4
     key_layout: colemak
@@ -213,6 +214,7 @@ actions:
     reload_mako: pkill -SIGHUP mako
     reload_waybar: env SVDIR=$HOME/.config/runit/sv sv hup waybar
     reload_xsettingsd: env SVDIR=$HOME/.config/runit/sv sv hup xsettingsd
+    groups_install: _groups_install
     lesskey: lesskey
     reload_fish: pkill -SIGHUP fish
 
@@ -378,6 +380,7 @@ dotfiles: # Just a bunch of paths and action mappings
         dst: ~/.local/bin
         actions:
         - make_theme
+        - groups_install
 
     services:
         src: runit_sv

dotfiles/scripts/_gpg-unlock

@@ -6,6 +6,6 @@ done
 
 KEYGRIP=$(cat "$HOME/.pam-gnupg")
 
-sudo cat /etc/.passwd |
+echo '{{@@ main_password @@}}' |
     base64 -d |
     /usr/lib/gnupg/gpg-preset-passphrase --preset "$KEYGRIP"

dotfiles/scripts/_groups_install

@@ -1,5 +1,5 @@
 #!/bin/sh
 
 for g in docker video input audio wheel; do
-    usermod "{{@@ env['USER'] @@}}" -aG "$g"
+    sudo usermod "{{@@ env['USER'] @@}}" -aG "$g"
 done

root/config.yaml

@@ -16,10 +16,11 @@ config:
     link_on_import: nolink
     dotpath: .
     func_file:
-    - "{{@@ _dotdrop_dotpath @@}}/../funcs.py"
+    - "../funcs.py"
     filter_file:
-    - "{{@@ _dotdrop_dotpath @@}}/../funcs.py"
-
+    - "../funcs.py"
+    import_configs:
+    - ../config.yaml
 
 
 ###############################################################
@@ -53,19 +54,17 @@ actions:
     greetd_install: _greetd_install
     grub_install: update-grub
     locale_install: locale-gen
-    groups_install: sh ~/.local/share/groups
     pacman_install: |
         pacman-key --init
         pacman-key --populate
     sv_update: |
-        sv restart "{{@@ '_dotfile_key' | var @@}}" ||
-        rc-service "{{@@ '_dotfile_key' | var @@}}" restart
+        sv restart "{{@@ '_dotfile_key' @@}}" ||
+        rc-service "{{@@ '_dotfile_key' @@}}" restart
 
     create_subvolumes: _create-subvolumes
     create_swapfile: _create-swapfile
     mount_partitions: mount -a
     dbus_uuidgen: dbus-uuidgen --ensure
-    passwd: chmod 600 /etc/.passwd
     sysctl_apply: sysctl -a
     mkinitcpio: mkinitcpio -P
     start_services: >
@@ -100,12 +99,6 @@ dotfiles:
         actions:
         - greetd_install
 
-    passwd:
-        src: passwd
-        dst: /etc/.passwd
-        actions:
-        - passwd
-
     elogind:
         src: elogind.conf
         dst: /etc/elogind/logind.conf
@@ -162,16 +155,6 @@ dotfiles:
         src: earlyoom
         dst: /etc/default/earlyoom
 
-    groups:
-        src: groups
-        dst: ~/.local/share/groups
-        actions:
-        - groups_install
-
-    usr_scripts:
-        src: "{{@@ env['HOME'] @@}}/.local/bin"
-        dst: /usr/local/bin
-
     services:
         src: runit_sv
         dst: /etc/runit/sv

root/fstab

@@ -1,4 +1,4 @@
-{{@@ 'non_templated(_dotfile_abs_dst)' | var @@}}
+{{@@ non_templated(_dotfile_abs_dst) @@}}
 ##### Dotdrop-start #####
 
 {#@@<filesystem> <dir> <type> <options> <dump> <pass> @@#}

root/greetd/config.toml

@@ -21,5 +21,5 @@ command = "sway --config /etc/greetd/sway-config"
 user = "greeter"
 
 [initial_session]
-command = "{{@@ env['SHELL'] @@}}"
-user = "{{@@ env['USER'] @@}}"
+command = "{{@@ shell @@}}"
+user = "{{@@ username @@}}"

root/greetd/sway-config

@@ -5,10 +5,10 @@ exec "gtkgreet -l --command fish; swaymsg exit"
 bindsym Mod4+control+z exec systemctl suspend || loginctl suspend
 bindsym Mod4+control+e exec systemctl poweroff || loginctl poweroff
 
-{%@@ include _dotdrop_dotpath + '/sway/input' @@%}
-{%@@ include _dotdrop_dotpath + '/sway/visual' @@%}
+{%@@ include _dotdrop_dotpath + '/../dotfiles/sway/input' @@%}
+{%@@ include _dotdrop_dotpath + '/../dotfiles/sway/visual' @@%}
 bar swaybar_command true
-output * bg "{{@@ color.bg @@}}" solid_color
+output * bg "#000000" solid_color
 
 include /etc/sway/config.d/*
 

root/passwd

@@ -1 +0,0 @@
-{{@@ main_password @@}}