From 3cd97b522c1a0da8987ee3b7c03e8a441d65248b Mon Sep 17 00:00:00 2001 From: Colin Date: Thu, 20 Jun 2024 11:04:49 +0000 Subject: [PATCH] ols: enable still some more work to do to really integrate this with geoclue --- hosts/common/programs/default.nix | 1 + hosts/common/programs/geoclue2/geoclue.conf | 7 +-- hosts/common/programs/ols.nix | 16 +++++++ secrets/common/ols.toml.bin | 52 +++++++++++++++++++++ 4 files changed, 73 insertions(+), 3 deletions(-) create mode 100644 hosts/common/programs/ols.nix create mode 100644 secrets/common/ols.toml.bin diff --git a/hosts/common/programs/default.nix b/hosts/common/programs/default.nix index e00bdfb9..6e834042 100644 --- a/hosts/common/programs/default.nix +++ b/hosts/common/programs/default.nix @@ -101,6 +101,7 @@ ./objdump.nix ./obsidian.nix ./offlineimap.nix + ./ols.nix ./open-in-mpv.nix ./pactl.nix ./pidof.nix diff --git a/hosts/common/programs/geoclue2/geoclue.conf b/hosts/common/programs/geoclue2/geoclue.conf index fcfb2c45..ef1df34c 100644 --- a/hosts/common/programs/geoclue2/geoclue.conf +++ b/hosts/common/programs/geoclue2/geoclue.conf @@ -36,8 +36,9 @@ users=1000 [wifi] enable=true -submission-nick=geoclue -submission-url=https://location.services.mozilla.com/v1/submit?key=geoclue +# submission-nick=geoclue +# submission-url=https://location.services.mozilla.com/v1/submit?key=geoclue submit-data=false # url=https://location.services.mozilla.com/v1/geolocate?key=geoclue - +# ols is at http://127.0.0.1:8088/v1/geolocate +url=http://127.0.0.1:8088/v1/geolocate diff --git a/hosts/common/programs/ols.nix b/hosts/common/programs/ols.nix new file mode 100644 index 00000000..952191c0 --- /dev/null +++ b/hosts/common/programs/ols.nix @@ -0,0 +1,16 @@ +# OLS: Offline Location Service: +{ ... }: +{ + sane.programs.ols = { + persist.byStore.private = [ + ".local/share/ols" + ]; + + secrets.".config/ols/ols.toml" = ../../../secrets/common/ols.toml.bin; + + services.ols = { + description = "ols: Offline Location Service"; + command = "ols -d debug"; + }; + }; +} diff --git a/secrets/common/ols.toml.bin b/secrets/common/ols.toml.bin new file mode 100644 index 00000000..a2985c7a --- /dev/null +++ b/secrets/common/ols.toml.bin @@ -0,0 +1,52 @@ +{ + "data": "ENC[AES256_GCM,data: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,iv:xI/aYuJk9GSQlKmRxkmWpBCtqZlhbeRYAdHXALlUMZg=,tag:LdRBaxtL1wXPmjCGSwWYvw==,type:str]", + "sops": { + "kms": null, + "gcp_kms": null, + "azure_kv": null, + "hc_vault": null, + "age": [ + { + "recipient": "age1tnl4jfgacwkargzeqnhzernw29xx8mkv73xh6ufdyde6q7859slsnzf24x", + "enc": "-----BEGIN AGE ENCRYPTED FILE-----\nYWdlLWVuY3J5cHRpb24ub3JnL3YxCi0+IFgyNTUxOSBwQU9melI3VDB1aEtOYW5E\nbDRDL1BWMExsbjlxckFYZWtWMTlPZ29yR25BCjV5a0VyNHdQbXpMVGljZENxM2hl\nRlBRYTZoWnE4VVNQb05MTm1pcGsrVk0KLS0tIFFhOTE2S1luLzMxWnlmbGlzbEh5\nS1dFZU1JRG8vdDFjL3g5eEJ3ckZKNEkK1S1FMhvKCNbWlmDdOIgnn3+uAcK9bs9G\nvlfoV6xzAdAJDlckPLDipfS0x6HKUkN9PdA2K+SYJJ9673xegZ/xeQ==\n-----END AGE ENCRYPTED FILE-----\n" + }, + { + "recipient": "age1j2pqnl8j0krdzk6npe93s4nnqrzwx978qrc0u570gzlamqpnje9sc8le2g", + "enc": "-----BEGIN AGE ENCRYPTED FILE-----\nYWdlLWVuY3J5cHRpb24ub3JnL3YxCi0+IFgyNTUxOSBHWkZva1JreGpGWTBzcVBz\nSXlxakpjVk5ycndQRnUzYm9ZMXRXcFZTK3c0CmRBUFowNDlTMEgwVkpkOEQvNms4\nY2NRZ3g2SnJhdEJjbDlKZzlmVjFFL1EKLS0tIEFlL3VoUGJUaGY2SzFPT09QSXNS\ndElTQ2ZnNzJIRG51NmNjWldZYVFLV0EKOMJvXC9HjtNDuJELLfbByES0yVpliAnq\n7sWQRkY3K/J/F6cW5++LepZWMmMY7YmnKzIphreBeZncYUYx4JuzUQ==\n-----END AGE ENCRYPTED FILE-----\n" + }, + { + "recipient": "age1z8fauff34cdecr6sjkre260luzxcca05kpcwvhx988d306tpcejsp63znu", + "enc": "-----BEGIN AGE ENCRYPTED FILE-----\nYWdlLWVuY3J5cHRpb24ub3JnL3YxCi0+IFgyNTUxOSBTMmVSU1ByanlMYUR4TlFN\nYml4SjU4b1ZRR3VDazFlN3p2ZndacFZXUmo0CkhhTWtzVyszaUR4dG9nWmhoSHFn\nSWNtaGN2SzhtVWNkSkdUUEdqWmNyWTQKLS0tIHJnblV3Z082dVNLRUtNN216eTJL\nRXlKRVd0UGE3SE1rdUQ1NVlCSUFjL1UKf6Y6lvki5rFjqrPCLCL8SulHh3yg0Cns\nDdMsZgqLql1O3Cua4CHjSi+08hsz0RT9qqzcNr798Bqj5JnvFSTUPw==\n-----END AGE ENCRYPTED FILE-----\n" + }, + { + "recipient": "age1zsrsvd7j6l62fjxpfd2qnhqlk8wk4p8r0dtxpe4sdgnh2474095qdu7xj9", + "enc": "-----BEGIN AGE ENCRYPTED FILE-----\nYWdlLWVuY3J5cHRpb24ub3JnL3YxCi0+IFgyNTUxOSBpZGs5MHZqOFVoSzQxdEFC\nem1yVzZCditGekRMYzFCcWsvVk0vYlBubEJVCmV2ZHZqR3BMTW9Pa1RGWXVFdkV4\nbnNlKy9PUSswTVlETmxjMDAxakp2cmsKLS0tIFJDZlZzYmwwaFlua2FGeTdTUGtZ\nUXNoVFpwT21uR0NpcTFzZEgzby9YR0UKmZFKfm6ypb9SZBW0vTtw6SDL6TgZnsp3\ns41G4S4PS/8XyAHKrLlgGiJK/Fv3bMULG54D2TKQSbuYRhKXT9nWoA==\n-----END AGE ENCRYPTED FILE-----\n" + }, + { + "recipient": "age1hl50ufuxnqy0jnk8fqeu4tclh4vte2xn2d59pxff0gun20vsmv5sp78chj", + "enc": "-----BEGIN AGE ENCRYPTED FILE-----\nYWdlLWVuY3J5cHRpb24ub3JnL3YxCi0+IFgyNTUxOSB2Y3Frc2RleThrK1NmRTcx\nUkxvV29GNXllU0tXOWQ2YVkwSTloUjFCaUZFCk5iaVpJLy8vVUh5cGJBODVNWXNG\nRmtZYTZKK044S0VpSGdhSVBZZlZGY0kKLS0tIDg5c0IyTjNlU2FRYy9ueVYxbXIz\nZjZ0MGoweEtwQ2lUWDlqcEZvdThzYjQKMi0m7wyRoCoIbS/HBl6xaVEeK4TvYzkW\ny/rDK0IZuBAr9I1/avdDGM8LWo2EBSmqEqW6jooMmdrkkjwJE6lwVA==\n-----END AGE ENCRYPTED FILE-----\n" + }, + { + "recipient": "age1vnw7lnfpdpjn62l3u5nyv5xt2c965k96p98kc43mcnyzpetrts9q54mc9v", + "enc": "-----BEGIN AGE ENCRYPTED FILE-----\nYWdlLWVuY3J5cHRpb24ub3JnL3YxCi0+IFgyNTUxOSBMc0grUDVodGp5YWtpb1RS\nVUpweUUzcGxIbVpPYTJma3RaSDUwM2MvUlRJCmdacFE3OEQ1am53Q2hzYjRRaFRI\nSXlrbzVacDVlMnp1YlgrckExSG1yWTQKLS0tIE55R1QxOUJyN0N5Vmh1cG1iN2xC\nclNrWUF6TFRsTlBIUE9mNFZmQXNrMnMKVTrGgIrxA0pAjGOZyHJpwl6TBPBqXbGz\nUPgPFUUfLpUA+soyAQGE+/4bD4WFWwnro8B9zj0ahZYj1GvC8ddbig==\n-----END AGE ENCRYPTED FILE-----\n" + }, + { + "recipient": "age1w7mectcjku6x3sd8plm8wkn2qfrhv9n6zhzlf329e2r2uycgke8qkf9dyn", + "enc": "-----BEGIN AGE ENCRYPTED FILE-----\nYWdlLWVuY3J5cHRpb24ub3JnL3YxCi0+IFgyNTUxOSBtT3NIUE1ZeXN1ZnkxaXJ4\nUzJNRFZWMHg0WWNJeFJ0NUlITGMwYVlLajEwCkd4WGJXbjdwcnJPeDdrZEFyaDds\nZjR2eEtkc1ZpdzVFeG9LajBIcVVNTVEKLS0tIEwzd1ppa3EvSHNYdUhjcHVnZ3Fh\ncWJwUkZVM1QwTHp6a1N2MzVQcUFSeGMK0PFJNAkpQEKQiNarb9dDr7MwtvGZeke6\n7vBhMsJ1lmCMu0TshNNbOmQpre2J6ZnGDnvOrpy8IQukym2py9KvXQ==\n-----END AGE ENCRYPTED FILE-----\n" + }, + { + "recipient": "age1tzlyex2z6t88tg9h82943e39shxhmqeyr7ywhlwpdjmyqsndv3qq27x0rf", + "enc": "-----BEGIN AGE ENCRYPTED FILE-----\nYWdlLWVuY3J5cHRpb24ub3JnL3YxCi0+IFgyNTUxOSBzSkFLMnF0ZGdQV056VTdw\neUhyYnhGbzJORTh2ZlhXM0RzaWNjL3VybGlNCmNBVGlxSHIwWkxhZEg0ZXI3RFN0\nSk1XU0dTbFJ5NENGUnh0K3NRUCtzY1kKLS0tIGh2TnhuSERKb3B2c0oramhPelhm\nT1BBODhUaDVJbjg2Nlh3dnNPOUtvWmMKDyrOAsUZXp/hhXWczlf+VZRcz4mzaYZF\n3bW7w/nkojmMfKwKWvEYsunNPJSV+In1CTkvv8e8E1aIq5jithYe6Q==\n-----END AGE ENCRYPTED FILE-----\n" + }, + { + "recipient": "age18vq5ktwgeaysucvw9t67drqmg5zd5c5k3le34yqxckkfj7wqdqgsd4ejmt", + "enc": "-----BEGIN AGE ENCRYPTED FILE-----\nYWdlLWVuY3J5cHRpb24ub3JnL3YxCi0+IFgyNTUxOSBGVmZEU2ozMjBNTmVMU1NG\ndFIzSndXcmZQVWphU1BWSURCVGhGQVhPUDE4CmZMS1dFU1BxL3FYQ25ETDJJWjhu\nTWwrd2VzemxoWGhJTzFXUzh4d0o2c2sKLS0tIEt1cmg1WHFQWjV6UlRvWEJhQVFh\nQjV0MU5zYm1US1Y0dUR1RldZeUxkcmcKgbhTfvnP+krgib2xcZ85szzH/EvgxAwH\nqKlmN5J8DmllxR+O97hwCdDMu3vC5Vx+lp7Rxs85xFHu2quw37liGw==\n-----END AGE ENCRYPTED FILE-----\n" + } + ], + "lastmodified": "2024-06-20T11:03:04Z", + "mac": "ENC[AES256_GCM,data:nbXthm8gaR3YkGxMHGJIgduACvSJaXFh9WYyK0lDZs0wb1EvFmiIUdSdZ3GoX9wLyouYVWvqrIScUc1rcHjtWJTD3xpcCml5fPK+qdWuUfxlF7CKrCJavPcXrDUvqPKsa96w1SblG4pXLF83g//atc2skVy0bx1Ts/5PH54sepU=,iv:8GOMrSNoHkMiICHaLam82Sbu29Hh6q0SF5AFCo0VvL0=,tag:kYH8deRxlIgXSa9g/7mE4g==,type:str]", + "pgp": null, + "unencrypted_suffix": "_unencrypted", + "version": "3.8.1" + } +} \ No newline at end of file