diff --git a/configuration.nix b/configuration.nix index 4599985..0565de2 100644 --- a/configuration.nix +++ b/configuration.nix @@ -67,14 +67,6 @@ "ssh-ed25519 AAAAC3NzaC1lZDI1NTE5AAAAIE40ISu3ydCqfdpb26JYD5cIN0Fu0id/FDS+xjB5zpqu" ]; - users.users.jet = { - isNormalUser = true; - extraGroups = [ "wheel" ]; - openssh.authorizedKeys.keys = [ - "ssh-ed25519 AAAAC3NzaC1lZDI1NTE5AAAAIE40ISu3ydCqfdpb26JYD5cIN0Fu0id/FDS+xjB5zpqu" - ]; - }; - # SSH - Secure it services.openssh = { enable = true; @@ -128,13 +120,8 @@ "nix-command" "flakes" ]; - nix.settings.trusted-users = [ - "root" - "jet" - ]; nix.settings.max-jobs = "auto"; nix.settings.cores = 0; - security.sudo.wheelNeedsPassword = false; services.postgresql.package = pkgs.postgresql_15; nixpkgs.config.allowUnfree = true; # Allow unfree packages (Minecraft, etc.) diff --git a/flake.lock b/flake.lock index 6afede4..45a2139 100644 --- a/flake.lock +++ b/flake.lock @@ -422,11 +422,11 @@ "rust-overlay": "rust-overlay_2" }, "locked": { - "lastModified": 1774387217, - "narHash": "sha256-bhMs1DdFqFoeXwWOLx+1MU0ltGIYPf7OA33cvzFI9C0=", + "lastModified": 1774306596, + "narHash": "sha256-6K/06QYWQsUmNqHwGPPf7/NjtEGNhnSL1IPXdPM+uOg=", "ref": "refs/heads/main", - "rev": "adb929227b9640285754b6a04774ab0587e5771b", - "revCount": 60, + "rev": "50468db20b3c1606c6fb1d3d027c309a09bc469d", + "revCount": 52, "type": "git", "url": "https://git.extremist.software/jet/noisebell" }, diff --git a/flake.nix b/flake.nix index f227be9..f2f7ca1 100644 --- a/flake.nix +++ b/flake.nix @@ -51,7 +51,7 @@ let pkgs = nixpkgs.legacyPackages.x86_64-linux; deploy = pkgs.writeShellScriptBin "nhs" '' - nh os switch --hostname extremist-software --target-host jet@extremist-software path:. "$@" + nh os switch --hostname extremist-software --target-host root@extremist-software path:. "$@" ''; check-secrets = pkgs.writeShellScriptBin "check-secrets" '' set -euo pipefail diff --git a/modules/noisebell.nix b/modules/noisebell.nix index 83574e2..d288078 100644 --- a/modules/noisebell.nix +++ b/modules/noisebell.nix @@ -11,10 +11,6 @@ url = "http://127.0.0.1:3004/webhook"; secretFile = config.age.secrets.noisebell-discord-webhook-secret.path; } - { - url = "http://noisebell-pi:8090/webhook"; - secretFile = config.age.secrets.noisebell-relay-webhook-secret.path; - } ]; };