From d8a10263103cde311b58bb041464e15ecbc86de5 Mon Sep 17 00:00:00 2001 From: Alexander Kassouni Date: Mon, 2 Nov 2026 21:21:15 -0800 Subject: drop linkding, update flake --- configuration.nix | 4 +++- flake.lock | 18 +++++++++--------- justfile | 2 +- nix/linkding.nix | 19 ------------------- 4 files changed, 13 insertions(+), 30 deletions(-) delete mode 100644 nix/linkding.nix diff --git a/configuration.nix b/configuration.nix index c02e389..ae1ae4b 100644 --- a/configuration.nix +++ b/configuration.nix @@ -4,7 +4,6 @@ ./nix/hardware-configuration.nix ./nix/minecraft.nix ./nix/options.nix - ./nix/linkding.nix ./nix/ssh.nix ./nix/web.nix ]; @@ -22,12 +21,15 @@ "flakes" ]; + nix.settings.trusted-users = [ "kassouni" ]; + networking.hostName = "chariot"; networking.networkmanager.enable = true; users.users.kassouni = { extraGroups = [ "wheel" ]; isNormalUser = true; + openssh.authorizedKeys.keys = config.my.adminKeys; }; diff --git a/flake.lock b/flake.lock index d901d28..640c62f 100644 --- a/flake.lock +++ b/flake.lock @@ -7,11 +7,11 @@ ] }, "locked": { - "lastModified": 1790898470, - "narHash": "sha256-zTwuwezD0w3hpga6a6P8emidzAZFyWqlNeRBlpWOOl8=", + "lastModified": 1793576659, + "narHash": "sha256-V1h85lUaJBQoHFrB2vpXZOE0Ju1MYSnIpsehoVZYlDo=", "owner": "hercules-ci", "repo": "flake-parts", - "rev": "024633cd702b10285db5cb19b40ad48d2399ba60", + "rev": "ea2630b7470978622c7689a1ff75d2b389175399", "type": "github" }, "original": { @@ -22,11 +22,11 @@ }, "nixpkgs": { "locked": { - "lastModified": 1792503283, - "narHash": "sha256-vhe2jyvRCgufWPqDuDq1S3t3ypE+ka46IFutV02xKso=", + "lastModified": 1793633738, + "narHash": "sha256-tItrb9M8eYA6WhFgmT9tpGKueri3+wRuVA952o/2xSU=", "owner": "nixos", "repo": "nixpkgs", - "rev": "cd4ea8d57de16f4810bc5f14207bac45fbf19f67", + "rev": "7dcdd87373d72e7a2173e4db02e20d3d7f495cfd", "type": "github" }, "original": { @@ -38,11 +38,11 @@ }, "nixpkgs-unstable": { "locked": { - "lastModified": 1792502884, - "narHash": "sha256-IoNisKcGbUjdd45qCqywGMCYmZ5EnkxezvLII0FWwNA=", + "lastModified": 1793540411, + "narHash": "sha256-fiPJ88izTVucjeo2EQ3jk4aWmLg03I1D4vxnX2QjEgE=", "owner": "nixos", "repo": "nixpkgs", - "rev": "02c087f3fe673c9e317f206a627cb6b910336dbe", + "rev": "0bb2eedc20e4739f29e8045034f2828ad7054f8f", "type": "github" }, "original": { diff --git a/justfile b/justfile index 276b3d8..0bca0ec 100644 --- a/justfile +++ b/justfile @@ -6,7 +6,7 @@ rcon_port := "25575" rcon_password := "mooshroom" deploy: - nixos-rebuild switch --flake .#{{config}} --target-host {{host}} --build-host {{host}} --use-substitutes --sudo --ask-sudo-password + nixos-rebuild switch --flake .#{{config}} --target-host {{host}} --use-substitutes --sudo --ask-sudo-password ssh: TERM=xterm ssh {{host}} diff --git a/nix/linkding.nix b/nix/linkding.nix deleted file mode 100644 index 36a6521..0000000 --- a/nix/linkding.nix +++ /dev/null @@ -1,19 +0,0 @@ -{ config, ... }: -let - domain = "links.kassouni.net"; -in -{ - services.linkding = { - enable = true; - environmentFile = "/var/lib/linkding/creds.env"; - settings.LD_CSRF_TRUSTED_ORIGINS = "https://${domain}"; - }; - - services.nginx.virtualHosts.${domain} = { - forceSSL = true; - enableACME = true; - locations."/" = { - proxyPass = "http://127.0.0.1:${toString config.services.linkding.port}"; - }; - }; -} -- cgit v1.3.1