fix: make syncthingtray wait for tray

This commit is contained in:
Swarsel 2024-08-11 01:19:43 +02:00
parent 220451e8ac
commit 7b22970507
Signed by: swarsel
GPG key ID: 26A54C31F2A4FD84
8 changed files with 62 additions and 49 deletions

1
.gitignore vendored
View file

@ -1,3 +1,4 @@
secrets/keys/pubring.kbx secrets/keys/pubring.kbx
secrets/keys/private-keys-v1.d/ secrets/keys/private-keys-v1.d/
result result
*.~undo-tree~

View file

@ -5527,6 +5527,7 @@ Mostly used to install some compilers and lsp's that I want to have available wh
# pinentry # pinentry
dbus dbus
swaylock-effects swaylock-effects
syncthingtray-minimal
# secure boot # secure boot
sbctl sbctl
@ -5666,22 +5667,22 @@ Do not touch this.
folders = { folders = {
"Default Folder" = { "Default Folder" = {
path = "/home/swarsel/Sync"; path = "/home/swarsel/Sync";
devices = [ "sync (@oracle) magicant" ]; devices = [ "sync (@oracle)" "magicant" ];
id = "default"; id = "default";
}; };
"Obsidian" = { "Obsidian" = {
path = "/home/swarsel/Nextcloud/Obsidian"; path = "/home/swarsel/Nextcloud/Obsidian";
devices = [ "sync (@oracle) magicant" ]; devices = [ "sync (@oracle)" "magicant" ];
id = "yjvni-9eaa7"; id = "yjvni-9eaa7";
}; };
"Org" = { "Org" = {
path = "/home/swarsel/Nextcloud/Org"; path = "/home/swarsel/Nextcloud/Org";
devices = [ "sync (@oracle) magicant" ]; devices = [ "sync (@oracle)" "magicant" ];
id = "a7xnl-zjj3d"; id = "a7xnl-zjj3d";
}; };
"Vpn" = { "Vpn" = {
path = "/home/swarsel/Vpn"; path = "/home/swarsel/Vpn";
devices = [ "sync (@oracle) magicant" ]; devices = [ "sync (@oracle)" "magicant" ];
id = "hgp9s-fyq3p"; id = "hgp9s-fyq3p";
}; };
}; };
@ -6603,7 +6604,6 @@ This holds packages that I can use as provided, or with small modifications (as
# gnome.gnome-clocks # gnome.gnome-clocks
# wlogout # wlogout
# jdiskreport # jdiskreport
syncthingtray
# monitor # monitor
#keychain #keychain
@ -6951,6 +6951,10 @@ As for the `home.sessionVariables`, it should be noted that environment variable
source = ../../../programs/git/.gitmessage; source = ../../../programs/git/.gitmessage;
target = ".gitmessage"; target = ".gitmessage";
}; };
"swayidle/config" = {
source = ../../../programs/swayidle/config;
target = ".config/swayidle/config";
};
}; };
#+end_src #+end_src
@ -8342,7 +8346,7 @@ Currently, I am too lazy to explain every option here, but most of it is very se
} }
exec systemctl --user import-environment exec systemctl --user import-environment
exec swayidle -w
${swayfxSettings} ${swayfxSettings}

View file

@ -120,7 +120,6 @@
# gnome.gnome-clocks # gnome.gnome-clocks
# wlogout # wlogout
# jdiskreport # jdiskreport
syncthingtray
# monitor # monitor
#keychain #keychain

View file

@ -273,7 +273,7 @@ in
} }
exec systemctl --user import-environment exec systemctl --user import-environment
exec swayidle -w
${swayfxSettings} ${swayfxSettings}

View file

@ -18,6 +18,10 @@ _:
source = ../../../programs/git/.gitmessage; source = ../../../programs/git/.gitmessage;
target = ".gitmessage"; target = ".gitmessage";
}; };
"swayidle/config" = {
source = ../../../programs/swayidle/config;
target = ".config/swayidle/config";
};
}; };
xdg.configFile = { xdg.configFile = {

View file

@ -21,6 +21,7 @@
# pinentry # pinentry
dbus dbus
swaylock-effects swaylock-effects
syncthingtray-minimal
# secure boot # secure boot
sbctl sbctl

View file

@ -21,22 +21,22 @@ _:
folders = { folders = {
"Default Folder" = { "Default Folder" = {
path = "/home/swarsel/Sync"; path = "/home/swarsel/Sync";
devices = [ "sync (@oracle) magicant" ]; devices = [ "sync (@oracle)" "magicant" ];
id = "default"; id = "default";
}; };
"Obsidian" = { "Obsidian" = {
path = "/home/swarsel/Nextcloud/Obsidian"; path = "/home/swarsel/Nextcloud/Obsidian";
devices = [ "sync (@oracle) magicant" ]; devices = [ "sync (@oracle)" "magicant" ];
id = "yjvni-9eaa7"; id = "yjvni-9eaa7";
}; };
"Org" = { "Org" = {
path = "/home/swarsel/Nextcloud/Org"; path = "/home/swarsel/Nextcloud/Org";
devices = [ "sync (@oracle) magicant" ]; devices = [ "sync (@oracle)" "magicant" ];
id = "a7xnl-zjj3d"; id = "a7xnl-zjj3d";
}; };
"Vpn" = { "Vpn" = {
path = "/home/swarsel/Vpn"; path = "/home/swarsel/Vpn";
devices = [ "sync (@oracle) magicant" ]; devices = [ "sync (@oracle)" "magicant" ];
id = "hgp9s-fyq3p"; id = "hgp9s-fyq3p";
}; };
}; };

4
programs/swayidle/config Normal file
View file

@ -0,0 +1,4 @@
timeout 300 'swaylock -f --screenshots --clock --effect-blur 7x5 --effect-vignette 0.5:0.5 --fade-in 0.2 --daemonize '
timeout 600 'swaymsg "output * power off"'
after-resume 'swaymsg "output * power on"'
before-sleep 'swaylock -f --screenshots --clock --effect-blur 7x5 --effect-vignette 0.5:0.5 --fade-in 0.2 --daemonize -'