diff --git a/hosts/inspiron/secrets.yaml b/hosts/inspiron/secrets.yaml index a1057af..b28aaba 100644 --- a/hosts/inspiron/secrets.yaml +++ b/hosts/inspiron/secrets.yaml @@ -1,6 +1,5 @@ seb-password: ENC[AES256_GCM,data:LlW1njlY0tVfYne/NFM2KJbAPb4eAQgy0mPMIZAIPH5mdr7cSCaPYhc+WF5ZlrlL//mh8WHhsHbEBuA6P7oabSeP6ZczCmTV6w==,iv:oWQj47oxjxR3DBHhFwUD/Emj5ziZHwcbXzD69ChRmHU=,tag:cuTloyd4HW6behF8fmWdxw==,type:str] tailscale-auth-key: ENC[AES256_GCM,data:LMdVjikAV/A1PAHWuwrYwB5TasbtIJdwCo6njIeTE6i/nGFaLEbSpsvWAO+eSkDOm2RbujCRYVLuKsHJhA==,iv:Trw54w1Wbz+jqT0bx9vwKkSXhTmvauXc87+o0d6lXzs=,tag:9eW8eTBro+w3kkdCTHEacQ==,type:str] -geolocation-api-key: ENC[AES256_GCM,data:LQgB/VEVlKhvaGowNjdmlLq14+VTTE6tZJVrUoYuy6fFUX0jykoj,iv:40TPjSxkycF9K7eC+eJaXf+wN7DjUJJ5L7ES93o7Oyk=,tag:C9D3/fj0vBLnMFz0rsHLqw==,type:str] wlan: WLAN-233151: key: ENC[AES256_GCM,data:/DAuYEU6tUisLxz/9TkdB4Yk/vQ=,iv:Ubj28yyfOqcXQyUs9e0iPq0BscHjfB2vRQd14x8L4Cg=,tag:vf9FITNJZxEzLo5+ZInD5Q==,type:str] @@ -37,8 +36,8 @@ sops: WlU1TjFDSHFzVU9TVWlNZVBJNkZabTQKkkgMlCEN84e1Syf9wB06CwToxZoE3CZi h369oefzYx06hEde06tU9UP7FtXRP0ktgZps4d+Fx4IkNJxoP6Ucuw== -----END AGE ENCRYPTED FILE----- - lastmodified: "2024-12-13T13:21:50Z" - mac: ENC[AES256_GCM,data:MIe1MDulreZkTUFflpvGra7KQEFsgEW7YPRpkajFRxQpLsrOp5zq+Xuu/7NFAEkK0tS8lJKLWfK3ZwNDGezgeBHudjk2esQwD4LZj0Wm3A0my6YnwHoKPmaxVwRhDT2ay2U9DJ8moqIdrtVCI3JGnFwf3zFw0ODV6RwWLnuQPh8=,iv:mT5LN5oXxqmaw8cgBrBe+2ikRWFJWJMNpkr44I9O6G8=,tag:A1j1BkXVZ4oEn3c7XF5oHQ==,type:str] + lastmodified: "2025-02-25T22:02:56Z" + mac: ENC[AES256_GCM,data:FoK1jEVus4y0zJiNsnZ+ucx/jHUcESUrOH8GFxPF7CMb62Xsg/av3HNhcdJbCJSLA2f+GGLfsByo24eVZDqtCIXsM+4yQn2oKXKJPHYLfo3DKvqWUbJAr6JCFU9sgQEj8s+NibjtSt83fidanX8uO0VtC1CzMwHnTZHnpiEL/U8=,iv:FhfE2LWF58Dm2aHd5lL3+WvX9D0mcTRm1fnUSI1LBXY=,tag:n2j204W4jEJIGvcTjpvbcw==,type:str] pgp: [] unencrypted_suffix: _unencrypted - version: 3.9.2 + version: 3.9.4 diff --git a/hosts/north/secrets.yaml b/hosts/north/secrets.yaml index 0314fbc..e2b4afd 100644 --- a/hosts/north/secrets.yaml +++ b/hosts/north/secrets.yaml @@ -1,6 +1,5 @@ seb-password: ENC[AES256_GCM,data:vZml/awD9ieBCQQwYs9zZveqjDDzMxFH1PFKQ8qLlaiUgaWL2BmKf4RbuS/pkjNLHr/UkPM3d3rlW6WAlNvhZiMRE+naGwD1Mw==,iv:vORmRgBgZvdafRa8vFF4LL3fw44yZV3yNq3L8eOcQRI=,tag:B7jX2LV/vKpzFlvG0bnCVA==,type:str] tailscale-auth-key: ENC[AES256_GCM,data:zm3JR5idvwbkJpsha1PAE9BFxqFIJw9EPnLQ0cf3TNwS576tVHWRRogKCPymJ5WkVuzaUMxizSQ+ckiqh0U=,iv:3dYXUQ5nb8Ja9/IZtsu/pdl2bgcAm6zk9dq+/8LUFQs=,tag:4dfNch0DDUEmXObMD2Xxgg==,type:str] -geolocation-api-key: ENC[AES256_GCM,data:sq2W2xdyHkSk465fK7sWHcewCdh03K3z01WM/U4OwcjISr59gkR8,iv:sdGZRGL+DIzax22EyPgTi+Zrqac8hmLK6isqdsW6E/g=,tag:oeBHPgfdcdgAANfjTtDCLw==,type:str] sops: kms: [] gcp_kms: [] @@ -25,8 +24,8 @@ sops: S04zMkpXT21GYTBSRFI2c1gyalZCK1UKtD6FA5BLLqnMAtVqYIujkM5qqMD524ck GipN/XwBhXSL98xrgaNmnN+Q46SNX0s41maGO624xvZMKZhObjxHIw== -----END AGE ENCRYPTED FILE----- - lastmodified: "2024-12-13T13:21:06Z" - mac: ENC[AES256_GCM,data:MoozRVTaNq7c9mXjNAiIg8w8FJb9Kjefp+UwERl6iNvfhE4J2xB4P3qIfrrMWJfxxhM0YUz/NHLtiKOzuZ81yshlnIrzBLQOGm1xCpIUgiiXa4rYeJcdeKS4Xg8zSdveb2k42EZo9ttdQfSKOXU2TsGXgfVCTeZfMA64F4hoIVo=,iv:0JqQ97N5Q6vcgJqzvgeln7FVAT4rBz/04mNmE39QSeM=,tag:1v4EjhJOxZDe+QnnoOSx1g==,type:str] + lastmodified: "2025-02-25T22:02:36Z" + mac: ENC[AES256_GCM,data:D2CLaUTNaY1GMP7Ct5wLIpLromJzRRatuOzeJqVjmFFsHPKsk12bQLLxVMlCB764E1QEBLy5Wgh8fX1DudbdW8OHFe5CJudmFHwCe5dI32ftVuYx4i3LTV7kSY2b14GiwwAOxuBR8DD7c/ZVghbDXTG5rvBjUJry7K4eUrC/cOI=,iv:5xFBBLNOoTI855+aTpTpRhUBGYoLcEt5d40Zmgw3/5w=,tag:Exxz75cnRwBVuPCUvGN/dw==,type:str] pgp: [] unencrypted_suffix: _unencrypted - version: 3.9.2 + version: 3.9.4 diff --git a/modules/system/geoclue.nix b/modules/system/geoclue.nix index a0b21a4..bf71d90 100644 --- a/modules/system/geoclue.nix +++ b/modules/system/geoclue.nix @@ -3,23 +3,10 @@ options.myConfig.geoclue.enable = lib.mkEnableOption ""; config = lib.mkIf config.myConfig.geoclue.enable { - sops = { - secrets."geolocation-api-key" = { }; - - templates."geoclue-location-service.conf" = { - owner = "geoclue"; - path = "/etc/geoclue/conf.d/location-service.conf"; - content = '' - [wifi] - url=https://www.googleapis.com/geolocation/v1/geolocate?key=${ - config.sops.placeholder."geolocation-api-key" - } - ''; - }; - }; - services.geoclue2 = { enable = true; + geoProviderUrl = "https://beacondb.net/v1/geolocate"; + appConfig.gammastep = { isAllowed = true; isSystem = false;