removed system_tools

This commit is contained in:
2025-11-10 09:59:40 -05:00
parent de9348432c
commit e99cd8e54a
5 changed files with 10 additions and 14 deletions

View File

@@ -1,5 +1,4 @@
{ {
inputs,
pkgs, pkgs,
lib, lib,
config, config,
@@ -35,11 +34,12 @@ in
requires = [ "zfs-import.target" ]; requires = [ "zfs-import.target" ];
after = [ "zfs-import.target" ]; after = [ "zfs-import.target" ];
path = [ pkgs.zfs ]; path = [ pkgs.zfs ];
environment = {
PYTHONPATH = "/home/richie/dotfiles";
};
serviceConfig = { serviceConfig = {
Type = "oneshot"; Type = "oneshot";
ExecStart = "${ ExecStart = "${pkgs.my_python}/bin/python -m python.tools.snapshot_manager ${lib.escapeShellArg cfg.path}";
inputs.system_tools.packages.${pkgs.system}.default
}/bin/snapshot_manager ${lib.escapeShellArg cfg.path}";
} }
// lib.optionalAttrs (cfg.EnvironmentFile != null) { // lib.optionalAttrs (cfg.EnvironmentFile != null) {
EnvironmentFile = cfg.EnvironmentFile; EnvironmentFile = cfg.EnvironmentFile;

View File

@@ -31,11 +31,6 @@
inputs.nixpkgs.follows = "nixpkgs"; inputs.nixpkgs.follows = "nixpkgs";
}; };
system_tools = {
url = "github:RichieCahill/system_tools";
inputs.nixpkgs.follows = "nixpkgs";
};
sops-nix = { sops-nix = {
url = "github:Mic92/sops-nix"; url = "github:Mic92/sops-nix";
inputs.nixpkgs.follows = "nixpkgs"; inputs.nixpkgs.follows = "nixpkgs";

View File

@@ -1,5 +1,4 @@
{ {
inputs,
pkgs, pkgs,
... ...
}: }:
@@ -22,10 +21,13 @@ in
wantedBy = [ "multi-user.target" ]; wantedBy = [ "multi-user.target" ];
description = "validates startup"; description = "validates startup";
path = [ pkgs.zfs ]; path = [ pkgs.zfs ];
environment = {
PYTHONPATH = "/home/richie/dotfiles";
};
serviceConfig = { serviceConfig = {
EnvironmentFile = "${vars.secrets}/services/server-validation"; EnvironmentFile = "${vars.secrets}/services/server-validation";
Type = "oneshot"; 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}'";
}; };
}; };
}; };

View File

@@ -1,4 +1,4 @@
{ pkgs, inputs, ... }: { pkgs, ... }:
{ {
home.packages = with pkgs; [ home.packages = with pkgs; [
# cli # cli

View File

@@ -1,4 +1,4 @@
{ pkgs, inputs, ... }: { pkgs, ... }:
{ {
home.packages = with pkgs; [ home.packages = with pkgs; [
# cli # cli
@@ -58,6 +58,5 @@
nix-tree nix-tree
nixfmt-rfc-style nixfmt-rfc-style
treefmt treefmt
inputs.system_tools.packages.x86_64-linux.default
]; ];
} }