diff --git a/base/default.nix b/base/default.nix index 8219a23..1abc654 100644 --- a/base/default.nix +++ b/base/default.nix @@ -16,7 +16,6 @@ ./flake-input-exporter.nix ./services/acme.nix - ./services/uptimed.nix ./services/auto-upgrade.nix ./services/dbus.nix ./services/fwupd.nix @@ -28,8 +27,10 @@ ./services/prometheus-node-exporter.nix ./services/prometheus-systemd-exporter.nix ./services/promtail.nix + ./services/roowho2.nix ./services/smartd.nix ./services/thermald.nix + ./services/uptimed.nix ./services/userborn.nix ./services/userdbd.nix ]; diff --git a/base/services/roowho2.nix b/base/services/roowho2.nix new file mode 100644 index 0000000..025e797 --- /dev/null +++ b/base/services/roowho2.nix @@ -0,0 +1,4 @@ +{ ... }: +{ + services.roowho2.enable = true; +} diff --git a/flake.lock b/flake.lock index 9b810d4..41bff67 100644 --- a/flake.lock +++ b/flake.lock @@ -381,9 +381,32 @@ "nixpkgs-unstable": "nixpkgs-unstable", "pvv-calendar-bot": "pvv-calendar-bot", "pvv-nettsiden": "pvv-nettsiden", + "roowho2": "roowho2", "sops-nix": "sops-nix" } }, + "roowho2": { + "inputs": { + "nixpkgs": [ + "nixpkgs" + ], + "rust-overlay": "rust-overlay_3" + }, + "locked": { + "lastModified": 1767631532, + "narHash": "sha256-cDUHAGjfkH3G/lxXhfEzHOZrt8JDSGOGa2M25jJtrMg=", + "ref": "main", + "rev": "fa789c43a667f50c14fa8238c51af5bcd7ab5aa7", + "revCount": 26, + "type": "git", + "url": "https://git.pvv.ntnu.no/Projects/roowho2.git" + }, + "original": { + "ref": "main", + "type": "git", + "url": "https://git.pvv.ntnu.no/Projects/roowho2.git" + } + }, "rust-overlay": { "inputs": { "nixpkgs": [ @@ -426,6 +449,27 @@ "type": "github" } }, + "rust-overlay_3": { + "inputs": { + "nixpkgs": [ + "roowho2", + "nixpkgs" + ] + }, + "locked": { + "lastModified": 1767322002, + "narHash": "sha256-yHKXXw2OWfIFsyTjduB4EyFwR0SYYF0hK8xI9z4NIn0=", + "owner": "oxalica", + "repo": "rust-overlay", + "rev": "03c6e38661c02a27ca006a284813afdc461e9f7e", + "type": "github" + }, + "original": { + "owner": "oxalica", + "repo": "rust-overlay", + "type": "github" + } + }, "sops-nix": { "inputs": { "nixpkgs": [ diff --git a/flake.nix b/flake.nix index 9327189..3d3b1d2 100644 --- a/flake.nix +++ b/flake.nix @@ -29,6 +29,9 @@ minecraft-heatmap.url = "git+https://git.pvv.ntnu.no/Projects/minecraft-heatmap.git?ref=main"; minecraft-heatmap.inputs.nixpkgs.follows = "nixpkgs"; + roowho2.url = "git+https://git.pvv.ntnu.no/Projects/roowho2.git?ref=main"; + roowho2.inputs.nixpkgs.follows = "nixpkgs"; + greg-ng.url = "git+https://git.pvv.ntnu.no/Grzegorz/greg-ng.git?ref=main"; greg-ng.inputs.nixpkgs.follows = "nixpkgs"; gergle.url = "git+https://git.pvv.ntnu.no/Grzegorz/gergle.git?ref=main"; @@ -93,6 +96,7 @@ modules = [ configurationPath sops-nix.nixosModules.sops + inputs.roowho2.nixosModules.default ] ++ extraArgs.modules or []; pkgs = import nixpkgs { @@ -104,6 +108,7 @@ ]; overlays = [ # Global overlays go here + inputs.roowho2.overlays.default ] ++ extraArgs.overlays or [ ]; }; })