From a236f88d02a9e0d5ce55f4fc3e7450fd7da0e991 Mon Sep 17 00:00:00 2001 From: Daniel Flanagan Date: Tue, 7 May 2024 01:00:06 -0500 Subject: [PATCH] Remove api.lyte.dev --- flake.lock | 87 +++++++++------------------------------------- flake.nix | 8 ++--- nixos/beefcake.nix | 29 ---------------- 3 files changed, 18 insertions(+), 106 deletions(-) diff --git a/flake.lock b/flake.lock index ca250f6..78f9690 100644 --- a/flake.lock +++ b/flake.lock @@ -1,26 +1,5 @@ { "nodes": { - "api-lyte-dev": { - "inputs": { - "next-ls": "next-ls", - "nixpkgs": [ - "nixpkgs" - ] - }, - "locked": { - "lastModified": 1712951291, - "narHash": "sha256-oR14zhHh2zDUnyIbU06F+umHefilozDrGB0aJgwhlK4=", - "ref": "refs/heads/master", - "rev": "ac5cf58712a472b19627d47a02ad9c9a8624a16e", - "revCount": 83, - "type": "git", - "url": "ssh://gitea@git.lyte.dev/lytedev/api.lyte.dev.git" - }, - "original": { - "type": "git", - "url": "ssh://gitea@git.lyte.dev/lytedev/api.lyte.dev.git" - } - }, "crane": { "inputs": { "nixpkgs": [ @@ -155,7 +134,7 @@ "inputs": { "crane": "crane", "flake-utils": "flake-utils", - "nixpkgs": "nixpkgs_2", + "nixpkgs": "nixpkgs", "rust-overlay": "rust-overlay" }, "locked": { @@ -229,7 +208,7 @@ "hyprland-protocols": "hyprland-protocols", "hyprlang": "hyprlang", "hyprwayland-scanner": "hyprwayland-scanner", - "nixpkgs": "nixpkgs_3", + "nixpkgs": "nixpkgs_2", "systems": "systems_2", "wlroots": "wlroots", "xdph": "xdph" @@ -323,34 +302,17 @@ "type": "github" } }, - "next-ls": { - "inputs": { - "nixpkgs": "nixpkgs" - }, - "locked": { - "lastModified": 1712942028, - "narHash": "sha256-phbwcLDv6Cl95Lk0QMTkthxonLAs+5hRwz2tkovLITY=", - "owner": "elixir-tools", - "repo": "next-ls", - "rev": "306f512db9872746f6c71939114788325a520513", - "type": "github" - }, - "original": { - "owner": "elixir-tools", - "repo": "next-ls", - "type": "github" - } - }, "nixpkgs": { "locked": { - "narHash": "sha256-5tPUpZlCpgqDQVUDlmhDhKn1h0A68jba8/DYie+yNC4=", - "owner": "NixOS", + "lastModified": 1709479366, + "narHash": "sha256-n6F0n8UV6lnTZbYPl1A9q1BS0p4hduAv1mGAP17CVd0=", + "owner": "nixos", "repo": "nixpkgs", - "rev": "592a779f3c5e7bce1a02027abe11b7996816223f", + "rev": "b8697e57f10292a6165a20f03d2f42920dfaf973", "type": "github" }, "original": { - "owner": "NixOS", + "owner": "nixos", "ref": "nixos-unstable", "repo": "nixpkgs", "type": "github" @@ -406,15 +368,15 @@ }, "nixpkgs_2": { "locked": { - "lastModified": 1709479366, - "narHash": "sha256-n6F0n8UV6lnTZbYPl1A9q1BS0p4hduAv1mGAP17CVd0=", - "owner": "nixos", + "lastModified": 1714253743, + "narHash": "sha256-mdTQw2XlariysyScCv2tTE45QSU9v/ezLcHJ22f0Nxc=", + "owner": "NixOS", "repo": "nixpkgs", - "rev": "b8697e57f10292a6165a20f03d2f42920dfaf973", + "rev": "58a1abdbae3217ca6b702f03d3b35125d88a2994", "type": "github" }, "original": { - "owner": "nixos", + "owner": "NixOS", "ref": "nixos-unstable", "repo": "nixpkgs", "type": "github" @@ -424,35 +386,19 @@ "locked": { "lastModified": 1714253743, "narHash": "sha256-mdTQw2XlariysyScCv2tTE45QSU9v/ezLcHJ22f0Nxc=", - "owner": "NixOS", + "owner": "nixos", "repo": "nixpkgs", "rev": "58a1abdbae3217ca6b702f03d3b35125d88a2994", "type": "github" }, "original": { - "owner": "NixOS", + "owner": "nixos", "ref": "nixos-unstable", "repo": "nixpkgs", "type": "github" } }, "nixpkgs_4": { - "locked": { - "lastModified": 1714253743, - "narHash": "sha256-mdTQw2XlariysyScCv2tTE45QSU9v/ezLcHJ22f0Nxc=", - "owner": "nixos", - "repo": "nixpkgs", - "rev": "58a1abdbae3217ca6b702f03d3b35125d88a2994", - "type": "github" - }, - "original": { - "owner": "nixos", - "ref": "nixos-unstable", - "repo": "nixpkgs", - "type": "github" - } - }, - "nixpkgs_5": { "locked": { "lastModified": 1711703276, "narHash": "sha256-iMUFArF0WCatKK6RzfUJknjem0H9m4KgorO/p3Dopkk=", @@ -494,13 +440,12 @@ }, "root": { "inputs": { - "api-lyte-dev": "api-lyte-dev", "disko": "disko", "hardware": "hardware", "helix": "helix", "home-manager": "home-manager", "hyprland": "hyprland", - "nixpkgs": "nixpkgs_4", + "nixpkgs": "nixpkgs_3", "nixpkgs-stable": "nixpkgs-stable", "nixpkgsForIosevka": "nixpkgsForIosevka", "pre-commit-hooks": "pre-commit-hooks", @@ -574,7 +519,7 @@ }, "ssbm": { "inputs": { - "nixpkgs": "nixpkgs_5", + "nixpkgs": "nixpkgs_4", "slippi-desktop": "slippi-desktop" }, "locked": { diff --git a/flake.nix b/flake.nix index d867420..f9dea16 100644 --- a/flake.nix +++ b/flake.nix @@ -29,9 +29,6 @@ hyprland.url = "github:hyprwm/Hyprland"; - api-lyte-dev.url = "git+ssh://gitea@git.lyte.dev/lytedev/api.lyte.dev.git"; - api-lyte-dev.inputs.nixpkgs.follows = "nixpkgs"; - ssbm.url = "github:lytedev/ssbm-nix"; }; @@ -43,7 +40,6 @@ home-manager, hardware, pre-commit-hooks, - api-lyte-dev, ... } @ inputs: let # TODO: make @ inputs unnecessary by making arguments explicit in all modules? @@ -127,7 +123,7 @@ inherit inputs outputs hardware; }; # extraSpecialArgs = { - # inherit inputs outputs system api-lyte-dev; + # inherit inputs outputs system; # }; modules = [ @@ -140,7 +136,7 @@ beefcake = nixpkgs.lib.nixosSystem { system = "x86_64-linux"; specialArgs = { - inherit inputs outputs api-lyte-dev hardware; + inherit inputs outputs hardware; }; modules = [self.nixosModules.common ./nixos/beefcake.nix]; }; diff --git a/nixos/beefcake.nix b/nixos/beefcake.nix index ed09283..ee4cbb1 100644 --- a/nixos/beefcake.nix +++ b/nixos/beefcake.nix @@ -11,7 +11,6 @@ sudo nix run nixpkgs#ipmitool -- raw 0x30 0x30 0x02 0xff 0x00 # inputs, # outputs, lib, - api-lyte-dev, config, pkgs, ... @@ -86,14 +85,6 @@ sudo nix run nixpkgs#ipmitool -- raw 0x30 0x30 0x02 0xff 0x00 # subdirectory # "myservice/my_subdir/my_secret" = { }; - "api.lyte.dev" = { - # path = "${config.services.api-lyte-dev.stateDir}/secrets.json"; - # TODO: would be cool to assert that it's correctly-formatted JSON? probably should be done in a pre-commit hook? - mode = "0440"; - owner = config.services.api-lyte-dev.user; - group = config.services.api-lyte-dev.group; - }; - "jland.env" = { path = "/var/lib/jland/jland.env"; # TODO: would be cool to assert that it's correctly-formatted JSON? probably should be done in a pre-commit hook? @@ -230,25 +221,6 @@ sudo nix run nixpkgs#ipmitool -- raw 0x30 0x30 0x02 0xff 0x00 6667 ]; } - { - services.api-lyte-dev = rec { - enable = true; - port = 5757; - stateDir = "/var/lib/api-lyte-dev"; - configFile = config.sops.secrets."api.lyte.dev".path; - user = "api-lyte-dev"; - group = user; - }; - systemd.services.api-lyte-dev.environment = { - RELEASE_HOST = lib.mkForce "api.lyte.dev"; - LOG_LEVEL = "debug"; - }; - services.caddy.virtualHosts."api.lyte.dev" = { - extraConfig = '' - reverse_proxy :${toString config.services.api-lyte-dev.port} - ''; - }; - } { # samba users.users.guest = { @@ -989,7 +961,6 @@ sudo nix run nixpkgs#ipmitool -- raw 0x30 0x30 0x02 0xff 0x00 26966 ]; } - api-lyte-dev.nixosModules.api-lyte-dev ]; # TODO: non-root processes and services that access secrets need to be part of