diff --git a/modules/nixos/services/cloudflared.nix b/modules/nixos/services/cloudflared.nix deleted file mode 100644 index 01764a7..0000000 --- a/modules/nixos/services/cloudflared.nix +++ /dev/null @@ -1,28 +0,0 @@ -{ lib, config, pkgs, inputs, ... }: -{ - imports = [ - ../../../secrets/secrets.nix - ]; - - services.cloudflared = { - enable = true; - }; - - users.users.cloudflared = { - group = "cloudflared"; - isSystemUser = true; - }; - users.groups.cloudflared = { }; - - systemd.services.my_tunnel = { - wantedBy = [ "multi-user.target" ]; - after = [ "network-online.target" "systemd-resolved.service" ]; - serviceConfig = { - ExecStart = "${pkgs.cloudflared}/bin/cloudflared tunnel --no-autoupdate run --token=${sops.secrets.cloudflared.nyx.token}"; - Restart = "always"; - User = "cloudflared"; - Group = "cloudflared"; - }; - }; - -} diff --git a/modules/nixos/services/default.nix b/modules/nixos/services/default.nix index 6f99037..ff6356e 100644 --- a/modules/nixos/services/default.nix +++ b/modules/nixos/services/default.nix @@ -1,7 +1,6 @@ { ... }: { imports = [ - # ./cloudflared.nix ./vpn.nix ./pipewire.nix ]; diff --git a/secrets/secrets.nix b/secrets/secrets.nix index 0e5e705..ac2de43 100644 --- a/secrets/secrets.nix +++ b/secrets/secrets.nix @@ -1,5 +1,4 @@ -{ inputs, lib, ... }: -{ +{ inputs, config, ... }: { imports = [ inputs.sops-nix.nixosModules.sops ]; sops = { @@ -8,7 +7,7 @@ age.keyFile = "/home/pingu/.config/sops/age/keys.txt"; secrets = { - cloudflared.nyx.token = {}; + searx = {}; }; }; } diff --git a/secrets/secrets.yaml b/secrets/secrets.yaml index ec95b63..150d540 100644 --- a/secrets/secrets.yaml +++ b/secrets/secrets.yaml @@ -1,6 +1,7 @@ cloudflared: nyx: - token: ENC[AES256_GCM,data:WqwknTZwdxjlGbCbbU2S34L8IjX+qVhTbA6NgPcLdEl6bGOlqZSMVCcICiR/X5R5gikz/iJoTJ4T1ECP+clSKuc124VJrCfB9AggB8CXTEgzdCWXyzpP9svcZjmJlkTwc6pHdeM3SgolXS8E05EY535rt4E2mT4xd9PhUfD4CE7Im9ct8aV917iFc68Zg0JhTXsZtxiciDPakHJfe50Ix/GdDSS1d0CJPK9hOop6rB7f9Qwz0lmIKQ==,iv:MySjVlFbj52J0geGlFBL2GAtRZzb0ImtewADTkgtp6w=,tag:hWccRob0R/n8bbNA3PdADg==,type:str] + token: ENC[AES256_GCM,data:UnxScVl7WHLvdiRkcdyaCcIZR04IdIABVni2QY4vf8nfB87L1NP0sswIdKjo8Yt+nSyJKeLDec8iO1R0logISEMnXSTZXnXnTXx73HsPfXN0szzhDeQL1GliqrIUWfGThuL59MDcfTGlP01z2pR55CWOSLyNNYihYCeVstPlNwN5WLDwXRoMFQcciAloWSkK1S7cIotpkTm9nJYz5dEHv8LDTcXaH5LMzblSElMizjFy/1tqyj4kHg==,iv:nHvg9PvnRaDIbVfymz6gzZtXn+y3lG4MpEY3GhJzDyg=,tag:Q1G9DoxeeOlE4ESI7f08sw==,type:str] +searx: ENC[AES256_GCM,data:hiXF//Xz0FEQ8cfaaWTeDWwgqflAFjFd6Mxxj5dQrvLOmWwa5BsAHnPZEhlLtH8r//ZnDZDfpyIx+hvkqOzvuQ==,iv:rIguplTqxLrVikDljLW5wM13+Z4Amn1zTuvUNedI7ck=,tag:RKGmhEo+BYqhhWwxqYgSMA==,type:str] sops: kms: [] gcp_kms: [] @@ -16,8 +17,8 @@ sops: dERTMHFTUHBXNkczcVcrb0lTVXdTcDQKcgynRtVEs27vbtstdYj323Jn85U8o5Fd fxGFj88mpFaipMU9IT9xXjzJhqKOmKqOVVw/M8tD8oEh8Chtj8y3PQ== -----END AGE ENCRYPTED FILE----- - lastmodified: "2024-10-25T12:15:03Z" - mac: ENC[AES256_GCM,data:lZhWh6CUtbCV73Iued+i4HcokDUjFb4NpdG3UH2lzOJ+MigYUX7QiRPavjfI5x7hXm0aNB+kKlZvGyklYJJ7yskYR82MfcWaCsZau0j1y/sIQEGSEK7dPoE39PnttG+m2KbH/ln9Df604NiiB4TUu68x6yhXZK53lGUBF9hk+T4=,iv:GpdU/VY+OZmoWap/s404t6xCug7OXBnqHljljXOE2a4=,tag:Q7lSt+MBANzQa202oIjrMA==,type:str] + lastmodified: "2024-11-12T17:59:51Z" + mac: ENC[AES256_GCM,data:MTFQsm/4srshP8cPD5L2GqXc+1Y8u2IwQH/BS/LVT6buN7iGWhssbZjjDLQ2bmgvYygtzpRwv8F54Fjy0BrcoYL6BET1fi4IG1HcFFk2orV3+A9x6/5NLdfkD9sxW4vZn216jWxqAZGArAN4cd5ELmormHPajO5qdNfCpM2F0mE=,iv:Y6bPgMYeYwfP/4+idlmIpSD7/pJF07AkE5vmqxg1xx8=,tag:rLf+vVAU8vyBIIUjPphijQ==,type:str] pgp: [] unencrypted_suffix: _unencrypted version: 3.9.1