From cc874ab34fc46e428b1ddc197afd1b44d1fc98f8 Mon Sep 17 00:00:00 2001 From: oqyude Date: Tue, 16 Sep 2025 20:12:01 +0300 Subject: [PATCH] 123 --- homeConfigurations/modules/packages.nix | 1 + nixosModules/essentials/tty.nix | 1 + nixosModules/options.nix | 2 +- nixosModules/services/zapret.nix | 14 +++++++------- 4 files changed, 10 insertions(+), 8 deletions(-) diff --git a/homeConfigurations/modules/packages.nix b/homeConfigurations/modules/packages.nix index b634d6f..0791b88 100755 --- a/homeConfigurations/modules/packages.nix +++ b/homeConfigurations/modules/packages.nix @@ -52,6 +52,7 @@ in vscodium ayugram-desktop vesktop + discord gramps kdePackages.filelight localsend diff --git a/nixosModules/essentials/tty.nix b/nixosModules/essentials/tty.nix index 3e2a741..f1adf83 100755 --- a/nixosModules/essentials/tty.nix +++ b/nixosModules/essentials/tty.nix @@ -27,6 +27,7 @@ # shell ff = "clear && fastfetch"; l = "ls -l"; + st = "systemctl-tui"; # ssh s-1 = "ssh sapphira-1"; diff --git a/nixosModules/options.nix b/nixosModules/options.nix index 38edaa2..34b9414 100755 --- a/nixosModules/options.nix +++ b/nixosModules/options.nix @@ -37,7 +37,7 @@ }; user-services = lib.mkOption { type = lib.types.str; - default = "${config.xlib.dirs.user-home}/Misc/Devices/Services"; + default = "${config.xlib.dirs.user-home}/.other"; description = "User services directory."; }; user-storage = lib.mkOption { diff --git a/nixosModules/services/zapret.nix b/nixosModules/services/zapret.nix index 3f1decc..5dc9654 100644 --- a/nixosModules/services/zapret.nix +++ b/nixosModules/services/zapret.nix @@ -17,16 +17,16 @@ iproute2 coreutils ]; + unitConfig = { + After = [ "network-online.target" ]; + Wants = [ "network-online.target" ]; + }; serviceConfig = { Type = "simple"; - WorkingDirectory = "${xlib.dirs.user-services}/Misc/Devices/Services/zapret/137"; + WorkingDirectory = "${xlib.dirs.user-services}/zapret"; User = "root"; - ExecStart = '' - ${pkgs.bash}/bin/bash ${xlib.dirs.user-services}/Misc/Devices/Services/zapret/main_script.sh -nointeractive - ''; - ExecStop = '' - ${pkgs.bash}/bin/bash ${xlib.dirs.user-services}/Misc/Devices/Services/zapret/stop_and_clean_nft.sh - ''; + ExecStart = "${pkgs.bash}/bin/bash ${xlib.dirs.user-services}/zapret/main_script.sh -nointeractive"; + ExecStop = "${pkgs.bash}/bin/bash ${xlib.dirs.user-services}/zapret/stop_and_clean_nft.sh"; ExecStopPost = '' ${pkgs.coreutils}/bin/echo "Сервис завершён" '';