lytedev/nix
1
0
Fork 1
Code Issues Pull requests 1 Actions Packages Projects Releases Wiki Activity

Merge remote-tracking branch 'beefcake/beefcake-good2'

Browse source
This commit is contained in:
Daniel Flanagan 2024-02-21 22:07:39 -06:00
parent f2c0b533cf 8a24e59c78
commit a5bff82fb2
Signed by: lytedev
GPG key ID: 5B2020A0F9921EF4
2 changed files with 11 additions and 21 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

8
flake.lock
View file

@ -7,11 +7,11 @@
] ]
}, },
"locked": { "locked": {
"lastModified": 1708463499, "lastModified": 1708573384,
"narHash": "sha256-GvqU+Z3cZkgMXf41vfMELLKPk+EVUl1UMW56Gz5ccrU=", "narHash": "sha256-l4MSfNXfPdY1hPtKwsAvqMuIhnjDqgmE2Bq6J8h5wyw=",
"ref": "refs/heads/master", "ref": "refs/heads/master",
"rev": "e3f0cae4f75101706bc8b9a822f7d90b03a91702", "rev": "4d7f82fe9b5d7d3881455577f7477049d1db130c",
"revCount": 80, "revCount": 81,
"type": "git", "type": "git",
"url": "ssh://gitea@git.lyte.dev/lytedev/api.lyte.dev.git" "url": "ssh://gitea@git.lyte.dev/lytedev/api.lyte.dev.git"
}, },

24
nixos/beefcake.nix
View file

@ -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 sudo nix run nixpkgs#ipmitool -- raw 0x30 0x30 0x02 0xff 0x00
*/ */
{ {
api-lyte-dev,
# inputs, # inputs,
# outputs, # outputs,
# api-lyte-dev, api-lyte-dev,
config, config,
pkgs, pkgs,
... ...
@ -24,16 +23,13 @@ in {
../modules/nixos/fonts.nix ../modules/nixos/fonts.nix
] ]
++ [ ++ [
# api-lyte-dev.nixosModules.api-lyte-dev 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
# inputs.nix-minecraft.nixosModules.minecraft-servers # inputs.nix-minecraft.nixosModules.minecraft-servers
]; ];
nixpkgs.overlays = [ nixpkgs.overlays = [
# nix-minecraft.overlay # inputs.nix-minecraft.overlay
]; ];
boot.initrd.availableKernelModules = ["ehci_pci" "megaraid_sas" "usbhid" "uas" "sd_mod"]; 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"; # 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? # TODO: would be cool to assert that it's correctly-formatted JSON? probably should be done in a pre-commit hook?
mode = "0440"; mode = "0440";
# owner = config.services.api-lyte-dev.user; owner = config.services.api-lyte-dev.user;
# group = config.services.api-lyte-dev.group; group = config.services.api-lyte-dev.group;
}; };
"jland.env" = { "jland.env" = {
@ -136,12 +132,6 @@ in {
owner = config.systemd.services.plausible.serviceConfig.User; owner = config.systemd.services.plausible.serviceConfig.User;
group = config.systemd.services.plausible.serviceConfig.Group; 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 = { nextcloud-admin-password = {
path = "/var/lib/nextcloud/admin-password"; path = "/var/lib/nextcloud/admin-password";
mode = "0440"; mode = "0440";
@ -441,12 +431,12 @@ in {
baseUrl = "http://beefcake.hare-cod.ts.net:8899"; baseUrl = "http://beefcake.hare-cod.ts.net:8899";
disableRegistration = true; disableRegistration = true;
port = 8899; port = 8899;
secretKeybaseFile = config.sops.secrets.plausible-secret-key-base.path; # secretKeybaseFile = config.sops.secrets.plausible-secret-key-base.path;
}; };
adminUser = { adminUser = {
activate = false; activate = false;
email = "daniel@lyte.dev"; email = "daniel@lyte.dev";
passwordFile = config.sops.secrets.plausible-admin-password.path; # passwordFile = config.sops.secrets.plausible-admin-password.path;
}; };
}; };