From 588fdbd9f2409acbabd4fbbc61891df419403c3f Mon Sep 17 00:00:00 2001 From: foehammer127 Date: Wed, 4 Jun 2025 01:13:22 -0500 Subject: [PATCH] Restructure to focus on nix. --- {nixos/common => common}/backups/restic.nix | 0 {nixos/common => common}/caddy.nix | 0 {nixos/common => common}/nix.nix | 0 {nixos/common => common}/nixos.nix | 0 .../services/vaultwarden.nix | 0 {nixos/common => common}/sudo.nix | 0 {nixos/common => common}/tailscale.nix | 0 {nixos/common => common}/users/admin.nix | 0 nixos/flake.lock => flake.lock | 0 nixos/flake.nix => flake.nix | 2 +- {nixos/keys => keys}/foehammer.nix | 0 {nixos/lib => lib}/default.nix | 0 {nixos/lib => lib}/keys.nix | 0 {nixos/lib => lib}/nixos.nix | 0 {nixos/lib => lib}/packages.nix | 0 {nixos/lib => lib}/utils.nix | 0 machines/lebesgue/flake.lock | 4 ++-- machines/lebesgue/flake.nix | 2 +- nixos/packages/gpodder/default.nix | 21 ------------------- 19 files changed, 4 insertions(+), 25 deletions(-) rename {nixos/common => common}/backups/restic.nix (100%) rename {nixos/common => common}/caddy.nix (100%) rename {nixos/common => common}/nix.nix (100%) rename {nixos/common => common}/nixos.nix (100%) rename {nixos/common => common}/services/vaultwarden.nix (100%) rename {nixos/common => common}/sudo.nix (100%) rename {nixos/common => common}/tailscale.nix (100%) rename {nixos/common => common}/users/admin.nix (100%) rename nixos/flake.lock => flake.lock (100%) rename nixos/flake.nix => flake.nix (94%) rename {nixos/keys => keys}/foehammer.nix (100%) rename {nixos/lib => lib}/default.nix (100%) rename {nixos/lib => lib}/keys.nix (100%) rename {nixos/lib => lib}/nixos.nix (100%) rename {nixos/lib => lib}/packages.nix (100%) rename {nixos/lib => lib}/utils.nix (100%) delete mode 100644 nixos/packages/gpodder/default.nix diff --git a/nixos/common/backups/restic.nix b/common/backups/restic.nix similarity index 100% rename from nixos/common/backups/restic.nix rename to common/backups/restic.nix diff --git a/nixos/common/caddy.nix b/common/caddy.nix similarity index 100% rename from nixos/common/caddy.nix rename to common/caddy.nix diff --git a/nixos/common/nix.nix b/common/nix.nix similarity index 100% rename from nixos/common/nix.nix rename to common/nix.nix diff --git a/nixos/common/nixos.nix b/common/nixos.nix similarity index 100% rename from nixos/common/nixos.nix rename to common/nixos.nix diff --git a/nixos/common/services/vaultwarden.nix b/common/services/vaultwarden.nix similarity index 100% rename from nixos/common/services/vaultwarden.nix rename to common/services/vaultwarden.nix diff --git a/nixos/common/sudo.nix b/common/sudo.nix similarity index 100% rename from nixos/common/sudo.nix rename to common/sudo.nix diff --git a/nixos/common/tailscale.nix b/common/tailscale.nix similarity index 100% rename from nixos/common/tailscale.nix rename to common/tailscale.nix diff --git a/nixos/common/users/admin.nix b/common/users/admin.nix similarity index 100% rename from nixos/common/users/admin.nix rename to common/users/admin.nix diff --git a/nixos/flake.lock b/flake.lock similarity index 100% rename from nixos/flake.lock rename to flake.lock diff --git a/nixos/flake.nix b/flake.nix similarity index 94% rename from nixos/flake.nix rename to flake.nix index d123342..b6fa1d8 100644 --- a/nixos/flake.nix +++ b/flake.nix @@ -26,7 +26,7 @@ overlays = [self.overlays.default]; }; - packages = import ./lib/packages.nix pkgs; + # packages = import ./lib/packages.nix pkgs; }; flake = { diff --git a/nixos/keys/foehammer.nix b/keys/foehammer.nix similarity index 100% rename from nixos/keys/foehammer.nix rename to keys/foehammer.nix diff --git a/nixos/lib/default.nix b/lib/default.nix similarity index 100% rename from nixos/lib/default.nix rename to lib/default.nix diff --git a/nixos/lib/keys.nix b/lib/keys.nix similarity index 100% rename from nixos/lib/keys.nix rename to lib/keys.nix diff --git a/nixos/lib/nixos.nix b/lib/nixos.nix similarity index 100% rename from nixos/lib/nixos.nix rename to lib/nixos.nix diff --git a/nixos/lib/packages.nix b/lib/packages.nix similarity index 100% rename from nixos/lib/packages.nix rename to lib/packages.nix diff --git a/nixos/lib/utils.nix b/lib/utils.nix similarity index 100% rename from nixos/lib/utils.nix rename to lib/utils.nix diff --git a/machines/lebesgue/flake.lock b/machines/lebesgue/flake.lock index b32b680..05c1106 100644 --- a/machines/lebesgue/flake.lock +++ b/machines/lebesgue/flake.lock @@ -6,11 +6,11 @@ "nixpkgs": "nixpkgs" }, "locked": { - "path": "../../nixos", + "path": "../..", "type": "path" }, "original": { - "path": "../../nixos", + "path": "../..", "type": "path" }, "parent": [] diff --git a/machines/lebesgue/flake.nix b/machines/lebesgue/flake.nix index 8f008bb..7392f46 100644 --- a/machines/lebesgue/flake.nix +++ b/machines/lebesgue/flake.nix @@ -1,6 +1,6 @@ { inputs = { - common.url = "path:../../nixos"; + common.url = "path:../.."; nixpkgs.url = "github:nixos/nixpkgs/nixos-25.05"; diff --git a/nixos/packages/gpodder/default.nix b/nixos/packages/gpodder/default.nix deleted file mode 100644 index 6803ffe..0000000 --- a/nixos/packages/gpodder/default.nix +++ /dev/null @@ -1,21 +0,0 @@ -{ - buildGoModule, - fetchFromGitHub, -}: -buildGoModule rec { - pname = "gpodder2go"; - version = "0.2.0"; - - src = fetchFromGitHub { - owner = "oxtyped"; - repo = "gpodder2go"; - rev = "v${version}"; - hash = "sha256-DLUVANrePlnzEGmyjmrtQbus8zjPytBJUIg2MSqD8go="; - }; - - checkPhase = false; - - vendorHash = "sha256-7VkpRyoqWFfZODrNq5YjgHFKM3/7u/4G5b/930aoqyA="; - - CGO_ENABLED = 0; -}