diff --git a/flake.lock b/flake.lock index c9a364d..442ffb2 100644 --- a/flake.lock +++ b/flake.lock @@ -7,11 +7,11 @@ ] }, "locked": { - "lastModified": 1708463499, - "narHash": "sha256-GvqU+Z3cZkgMXf41vfMELLKPk+EVUl1UMW56Gz5ccrU=", + "lastModified": 1708573384, + "narHash": "sha256-l4MSfNXfPdY1hPtKwsAvqMuIhnjDqgmE2Bq6J8h5wyw=", "ref": "refs/heads/master", - "rev": "e3f0cae4f75101706bc8b9a822f7d90b03a91702", - "revCount": 80, + "rev": "4d7f82fe9b5d7d3881455577f7477049d1db130c", + "revCount": 81, "type": "git", "url": "ssh://gitea@git.lyte.dev/lytedev/api.lyte.dev.git" }, diff --git a/nixos/beefcake.nix b/nixos/beefcake.nix index 609799f..e355d5c 100644 --- a/nixos/beefcake.nix +++ b/nixos/beefcake.nix @@ -8,10 +8,9 @@ sudo nix run nixpkgs#ipmitool -- raw 0x30 0x30 0x01 0x00 sudo nix run nixpkgs#ipmitool -- raw 0x30 0x30 0x02 0xff 0x00 */ { - api-lyte-dev, # inputs, # outputs, - # api-lyte-dev, + api-lyte-dev, config, pkgs, ... @@ -24,16 +23,13 @@ in { ../modules/nixos/fonts.nix ] ++ [ - # api-lyte-dev.nixosModules.api-lyte-dev - # nix-minecraft.nixosModules.minecraft-servers - api-lyte-dev.nixosModules.${system}.api-lyte-dev - # inputs.nix-minecraft.nixosModules.minecraft-servers + api-lyte-dev.nixosModules.api-lyte-dev # inputs.nix-minecraft.nixosModules.minecraft-servers ]; nixpkgs.overlays = [ - # nix-minecraft.overlay + # inputs.nix-minecraft.overlay ]; boot.initrd.availableKernelModules = ["ehci_pci" "megaraid_sas" "usbhid" "uas" "sd_mod"]; @@ -111,8 +107,8 @@ in { # 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; + owner = config.services.api-lyte-dev.user; + group = config.services.api-lyte-dev.group; }; "jland.env" = { @@ -136,12 +132,6 @@ in { owner = config.systemd.services.plausible.serviceConfig.User; group = config.systemd.services.plausible.serviceConfig.Group; }; - # nextcloud-admin-password = { - # path = "/var/lib/nextcloud/admin-password"; - # mode = "0440"; - # owner = config.services.nextcloud.serviceConfig.User; - # group = config.services.nextcloud.serviceConfig.Group; - # }; nextcloud-admin-password = { path = "/var/lib/nextcloud/admin-password"; mode = "0440"; @@ -441,12 +431,12 @@ in { baseUrl = "http://beefcake.hare-cod.ts.net:8899"; disableRegistration = true; port = 8899; - secretKeybaseFile = config.sops.secrets.plausible-secret-key-base.path; + # secretKeybaseFile = config.sops.secrets.plausible-secret-key-base.path; }; adminUser = { activate = false; email = "daniel@lyte.dev"; - passwordFile = config.sops.secrets.plausible-admin-password.path; + # passwordFile = config.sops.secrets.plausible-admin-password.path; }; };