From e99cd8e54a469735fe5e8f36c87e2a5060ccd833 Mon Sep 17 00:00:00 2001 From: Richie Cahill Date: Mon, 10 Nov 2025 09:59:40 -0500 Subject: [PATCH] removed system_tools --- common/global/snapshot_manager.nix | 8 ++++---- flake.nix | 5 ----- systems/jeeves/services/systemd.nix | 6 ++++-- users/elise/home/programs.nix | 2 +- users/richie/home/programs.nix | 3 +-- 5 files changed, 10 insertions(+), 14 deletions(-) diff --git a/common/global/snapshot_manager.nix b/common/global/snapshot_manager.nix index 7f0f71f..c2fd0df 100644 --- a/common/global/snapshot_manager.nix +++ b/common/global/snapshot_manager.nix @@ -1,5 +1,4 @@ { - inputs, pkgs, lib, config, @@ -35,11 +34,12 @@ in requires = [ "zfs-import.target" ]; after = [ "zfs-import.target" ]; path = [ pkgs.zfs ]; + environment = { + PYTHONPATH = "/home/richie/dotfiles"; + }; serviceConfig = { Type = "oneshot"; - ExecStart = "${ - inputs.system_tools.packages.${pkgs.system}.default - }/bin/snapshot_manager ${lib.escapeShellArg cfg.path}"; + ExecStart = "${pkgs.my_python}/bin/python -m python.tools.snapshot_manager ${lib.escapeShellArg cfg.path}"; } // lib.optionalAttrs (cfg.EnvironmentFile != null) { EnvironmentFile = cfg.EnvironmentFile; diff --git a/flake.nix b/flake.nix index efa5cac..0d673cb 100644 --- a/flake.nix +++ b/flake.nix @@ -31,11 +31,6 @@ inputs.nixpkgs.follows = "nixpkgs"; }; - system_tools = { - url = "github:RichieCahill/system_tools"; - inputs.nixpkgs.follows = "nixpkgs"; - }; - sops-nix = { url = "github:Mic92/sops-nix"; inputs.nixpkgs.follows = "nixpkgs"; diff --git a/systems/jeeves/services/systemd.nix b/systems/jeeves/services/systemd.nix index 1d4c704..0f863f5 100644 --- a/systems/jeeves/services/systemd.nix +++ b/systems/jeeves/services/systemd.nix @@ -1,5 +1,4 @@ { - inputs, pkgs, ... }: @@ -22,10 +21,13 @@ in wantedBy = [ "multi-user.target" ]; description = "validates startup"; path = [ pkgs.zfs ]; + environment = { + PYTHONPATH = "/home/richie/dotfiles"; + }; serviceConfig = { EnvironmentFile = "${vars.secrets}/services/server-validation"; Type = "oneshot"; - ExecStart = "${inputs.system_tools.packages.x86_64-linux.default}/bin/validate_system '${./validate_system.toml}'"; + ExecStart = "${pkgs.my_python}/bin/python -m python.tools.validate_system '${./validate_system.toml}'"; }; }; }; diff --git a/users/elise/home/programs.nix b/users/elise/home/programs.nix index 1410941..a76211e 100644 --- a/users/elise/home/programs.nix +++ b/users/elise/home/programs.nix @@ -1,4 +1,4 @@ -{ pkgs, inputs, ... }: +{ pkgs, ... }: { home.packages = with pkgs; [ # cli diff --git a/users/richie/home/programs.nix b/users/richie/home/programs.nix index 7f6132d..46e8eb5 100644 --- a/users/richie/home/programs.nix +++ b/users/richie/home/programs.nix @@ -1,4 +1,4 @@ -{ pkgs, inputs, ... }: +{ pkgs, ... }: { home.packages = with pkgs; [ # cli @@ -58,6 +58,5 @@ nix-tree nixfmt-rfc-style treefmt - inputs.system_tools.packages.x86_64-linux.default ]; }