From f4996b71e48f456535233c92e6bb5e5533d76147 Mon Sep 17 00:00:00 2001 From: Richie Cahill Date: Mon, 10 Nov 2025 23:44:32 -0500 Subject: [PATCH] updating to inputs.self --- systems/bob/default.nix | 28 +++++++++---------- systems/brain/default.nix | 18 ++++++------ systems/jeeves/default.nix | 20 ++++++------- .../docker/great_cloud_of_witnesses.nix | 1 - systems/leviathan/default.nix | 18 ++++++------ systems/rhapsody-in-green/default.nix | 20 ++++++------- 6 files changed, 52 insertions(+), 53 deletions(-) diff --git a/systems/bob/default.nix b/systems/bob/default.nix index c3953d8..9f00df5 100644 --- a/systems/bob/default.nix +++ b/systems/bob/default.nix @@ -1,19 +1,19 @@ -{ self, ... }: +{ inputs, ... }: { imports = [ - "${self}/users/richie" - "${self}/users/gaming" - "${self}/common/global" - "${self}/common/optional/desktop.nix" - "${self}/common/optional/docker.nix" - "${self}/common/optional/scanner.nix" - "${self}/common/optional/steam.nix" - "${self}/common/optional/syncthing_base.nix" - "${self}/common/optional/systemd-boot.nix" - "${self}/common/optional/update.nix" - "${self}/common/optional/yubikey.nix" - "${self}/common/optional/zerotier.nix" - "${self}/common/optional/nvidia.nix" + "${inputs.self}/users/richie" + "${inputs.self}/users/gaming" + "${inputs.self}/common/global" + "${inputs.self}/common/optional/desktop.nix" + "${inputs.self}/common/optional/docker.nix" + "${inputs.self}/common/optional/scanner.nix" + "${inputs.self}/common/optional/steam.nix" + "${inputs.self}/common/optional/syncthing_base.nix" + "${inputs.self}/common/optional/systemd-boot.nix" + "${inputs.self}/common/optional/update.nix" + "${inputs.self}/common/optional/yubikey.nix" + "${inputs.self}/common/optional/zerotier.nix" + "${inputs.self}/common/optional/nvidia.nix" ./hardware.nix ./syncthing.nix ./llms.nix diff --git a/systems/brain/default.nix b/systems/brain/default.nix index 4139c92..902a00b 100644 --- a/systems/brain/default.nix +++ b/systems/brain/default.nix @@ -1,14 +1,14 @@ -{ inputs, self, ... }: +{ inputs, ... }: { imports = [ - "${self}/users/richie" - "${self}/common/global" - "${self}/common/optional/docker.nix" - "${self}/common/optional/ssh_decrypt.nix" - "${self}/common/optional/syncthing_base.nix" - "${self}/common/optional/systemd-boot.nix" - "${self}/common/optional/update.nix" - "${self}/common/optional/zerotier.nix" + "${inputs.self}/users/richie" + "${inputs.self}/common/global" + "${inputs.self}/common/optional/docker.nix" + "${inputs.self}/common/optional/ssh_decrypt.nix" + "${inputs.self}/common/optional/syncthing_base.nix" + "${inputs.self}/common/optional/systemd-boot.nix" + "${inputs.self}/common/optional/update.nix" + "${inputs.self}/common/optional/zerotier.nix" ./docker ./hardware.nix ./programs.nix diff --git a/systems/jeeves/default.nix b/systems/jeeves/default.nix index c5352a1..c5bc059 100644 --- a/systems/jeeves/default.nix +++ b/systems/jeeves/default.nix @@ -1,18 +1,18 @@ -{ self, ... }: +{ inputs, ... }: let vars = import ./vars.nix; in { imports = [ - "${self}/users/richie" - "${self}/users/math" - "${self}/users/dov" - "${self}/common/global" - "${self}/common/optional/docker.nix" - "${self}/common/optional/ssh_decrypt.nix" - "${self}/common/optional/syncthing_base.nix" - "${self}/common/optional/update.nix" - "${self}/common/optional/zerotier.nix" + "${inputs.self}/users/richie" + "${inputs.self}/users/math" + "${inputs.self}/users/dov" + "${inputs.self}/common/global" + "${inputs.self}/common/optional/docker.nix" + "${inputs.self}/common/optional/ssh_decrypt.nix" + "${inputs.self}/common/optional/syncthing_base.nix" + "${inputs.self}/common/optional/update.nix" + "${inputs.self}/common/optional/zerotier.nix" ./docker ./services ./hardware.nix diff --git a/systems/jeeves/docker/great_cloud_of_witnesses.nix b/systems/jeeves/docker/great_cloud_of_witnesses.nix index 3d259ad..b143e70 100644 --- a/systems/jeeves/docker/great_cloud_of_witnesses.nix +++ b/systems/jeeves/docker/great_cloud_of_witnesses.nix @@ -1,7 +1,6 @@ { config, pkgs, - lib, ... }: diff --git a/systems/leviathan/default.nix b/systems/leviathan/default.nix index 52a64c8..29b1b56 100644 --- a/systems/leviathan/default.nix +++ b/systems/leviathan/default.nix @@ -1,14 +1,14 @@ -{ inputs, self, ... }: +{ inputs, ... }: { imports = [ - "${self}/users/elise" - "${self}/users/richie" - "${self}/common/global" - "${self}/common/optional/desktop.nix" - "${self}/common/optional/steam.nix" - "${self}/common/optional/systemd-boot.nix" - "${self}/common/optional/update.nix" - "${self}/common/optional/zerotier.nix" + "${inputs.self}/users/elise" + "${inputs.self}/users/richie" + "${inputs.self}/common/global" + "${inputs.self}/common/optional/desktop.nix" + "${inputs.self}/common/optional/steam.nix" + "${inputs.self}/common/optional/systemd-boot.nix" + "${inputs.self}/common/optional/update.nix" + "${inputs.self}/common/optional/zerotier.nix" ./hardware.nix inputs.nixos-hardware.nixosModules.framework-13-7040-amd ]; diff --git a/systems/rhapsody-in-green/default.nix b/systems/rhapsody-in-green/default.nix index 030bd95..4aedafe 100644 --- a/systems/rhapsody-in-green/default.nix +++ b/systems/rhapsody-in-green/default.nix @@ -1,15 +1,15 @@ -{ inputs, self, ... }: +{ inputs, ... }: { imports = [ - "${self}/users/richie" - "${self}/common/global" - "${self}/common/optional/desktop.nix" - "${self}/common/optional/docker.nix" - "${self}/common/optional/steam.nix" - "${self}/common/optional/syncthing_base.nix" - "${self}/common/optional/systemd-boot.nix" - "${self}/common/optional/yubikey.nix" - "${self}/common/optional/zerotier.nix" + "${inputs.self}/users/richie" + "${inputs.self}/common/global" + "${inputs.self}/common/optional/desktop.nix" + "${inputs.self}/common/optional/docker.nix" + "${inputs.self}/common/optional/steam.nix" + "${inputs.self}/common/optional/syncthing_base.nix" + "${inputs.self}/common/optional/systemd-boot.nix" + "${inputs.self}/common/optional/yubikey.nix" + "${inputs.self}/common/optional/zerotier.nix" ./hardware.nix ./llms.nix ./syncthing.nix