Update my network configuration
diff --git a/modules/networking.nix b/modules/networking.nix
index a247571..2b90ebb 100644
--- a/modules/networking.nix
+++ b/modules/networking.nix
@@ -18,10 +18,6 @@
ssid HRSFC Guest
static ip_address=10.0.48.79/8
static routers=10.0.0.1
-
- ssid eduroam
- static ip_address=10.0.48.79/8
- static routers=10.0.0.1
'';
};
hostName = "python";
@@ -34,21 +30,9 @@
userControlled.enable = true;
networks = {
/* "HRSFC-LAN".psk = "@hrsfcStaffPass@"; */
- eduroam = {
- auth = ''
- scan_ssid=1
- proto=WPA2
- key_mgmt=WPA-EAP
- eap=PEAP
- pairwise=CCMP
-
- identity="@eduroamUser@"
- password="@eduroamPass@"
-
- phase2="auth=MSCHAPV2"
- '';
- };
"HRSFC Wi-Fi".psk = "@hrsfcGuestPass@";
+ "UniOfCam-Guest" = {};
+ "Premier Inn Free Wi-Fi" = {};
adelie10 = {
psk = "@adelie10Pass@";
priority = 500;
@@ -59,6 +43,7 @@
"RoboCon2023-Will".psk = "@robocon2023Will@";
"robot-HRS69420".psk = "@srRobotPassword@";
"newadelie24".psk = "@newadelie24Pass@";
+ "Lord".psk = "@lordPass@";
} // lib.pipe (lib.range 1 21) [
(builtins.map builtins.toString)
(builtins.map (team: {
diff --git a/secrets/wireless.env.bin b/secrets/wireless.env.bin
index 056be42..20b86ae 100644
--- a/secrets/wireless.env.bin
+++ b/secrets/wireless.env.bin
@@ -1,13 +1,13 @@
{
- "data": "ENC[AES256_GCM,data:tJAlgOnuC6lCrMWC7tgxgTj6RPUjxr2t7IkoFwrfnwP/KeDvO8MbV+D92ybfrNIR2ASE9z0X+8JZdp2sWZzmyMFHyarQvE0yUpvTFT+W0Uzs4aRvhcvGYJfkDi/d7mx/ZzsrIqMOGrj2xxMF+/Y36y/0CXEe7nLdtO48XtWy1gXUZHZ6Gyw6AqF7KaFM+hFgYYSKzDvZBXAqYZk+hpvmQeQvxXgwAnIP/5uw6atEQDS8qFbnvZknuOH+NxmmIjZuqAkNIZ+wWdNPe2ezfDe8yGtNTVfPKJrJYtxWPIlZd+PKUnp3Zuvgpw1LMV8RufsCukqXJo8ZBn4S1pkwqNppbamQXowEqinxCrdOI8egbYUa42JScySF9eLLC2MrAc1GDFaAM9iUSIUEzdsRtI/23RpbQ/Ess6c4A7d9wi1ULFQF0zjNvly8ifhaKP/k8ta8ePaSpMwANRCVVuUDfuTV4bxrLCnvzFw5emTqo/CXPL7YKOhuy6EDHavUzSVqe4jycBS0cJLrv2VPoGFva152m7skmxaVWZHAK9NnsRJkJRP+DuHig1tygbnnbagOF6B0Cq/75EndIMenu+UeOZWInOVe4cV+mFklccVEqVXvW4kcD91SApUSK9KPqZyfOODoI0BG+ixzAHdYkfLN/8S237hFRWnEvREnnwMhdf9G2QyiGSGoNDI1o5o7uO4KTr7s51VEahQWVApk/6KyOPopu1+2DKRUepk2VX33NxZFZ0COBn6ej8mV7R4/kVzQPNRQpGfwnyzENNpZDrzL8Z99FR3ZUX7ajZEN55B95+3GICEbJke0S5S1ooE7V4qAcsT+yXD54vKYOWUFIql9vCvpqVKUe0eKp+z1ztWEP8V88mAoo02r90v8RhmoY2Nis6mtojYGqauHLFdx18/R2v+qpx29rAO1b/pBFUoP7tbpIgJqOpMtXDTP3q6RYJ76Gbhe0uMhB/s5u20epqoRH+vDluQcGVTrppRXGZwLAS2X+Bh2ckMA2QXdhGlRbe0VFGkSooMgcjDVR63HRuSYibtzUUqOt/tDBMsiLgROvIotjb8M7QqXzD/sXuEFmvCbqYuCEj6j4/oc1koFPyxBeA6r0jxZn2FqW1lqQnQDN5DB18S3k/4kIf594aCcbHCHByDhIFW28XZ73hl0devbzTDvSauLrIhNs7Nre3Sok/q1qhDFKYVI0GunyLJoqul5lLYMH2eE+XCS2rxh,iv:I8seBJl1idkLeQ0K4gkcZHLxlTl1G0Zcxa8+dQKp9FM=,tag:PlZuVzZOEgoTlrwxndCZ2Q==,type:str]",
+ "data": "ENC[AES256_GCM,data:NHXUrKjah41QC0r3tWggQyrSve0A8//ADhoUxE2IJMBwEDHgZ5cHeh/KNQyp8/U0P6b6mpFcF2iREjKNHx/OPVr2vqSMmxp223e+f5EKvHKfAI7PIBaLYOZzKdLiJkddQGuJyjCl/XcUSobKAVWL+uEBzi3Wd1XiK04iyZ8osI496M9vzPVPEkt2D0qOh5v1P4F2yU7dXIZsGfdJAcu0QP37rA90qWeTnfd3BKzwjcbYmFaL8nsi5xfSUFrAyhTl7iZbxCYHR0j5wthRvCprL2lQ+de6SMUmUXou3FXLCFhrCBr3kMKLpo9kWSduLizuAUZGXlDXTzBG9Ag9opo7r5PiabatmMuAy8WqfoTEUSLZbvSQ5rDB6N613RcCLQFKKHcLaHYRo3rSbGi6GR+BVm/xJQmJwpARbCxEbvPGLfXFp3EHzQlb1Z3c0MNJBm9vncYJ5wAanfRv9oLAIEJBCrHYcQNyJ4zx6aDk59cYIKrtp34sika4RYPkupS+8H9DE5BkDQ+467Sq+a0cVqdpPIIyE/iCsoljz91XEy0acWBby6IauBQMehvQHRvIHhz6zL8N07Z1ye474lPXZlJtnl+HLQ68LKw9uG9YgujBx5ikqMbJeir0iAk+BOtbF67TcIkUqJn69+ABG+W/eN5EOwhanyDx+qDYHC7EBcFK9BHLxf/9IO8mNWDO08AJTBXM+V9Pk4Yz0j/QqvnIIDOxoZVGG5L1o+uPmceY1RUWIC+e1Mlh64G+Ne4xEMm567FyEWd3ZE9n0w4lL+o76/tkpzkOHVVmp3LNs1BAFJFyesuJ1acLu+WDC/TgNrNcJW8vLIZddW2ydvuQvWfwo14EvHDcO8b1EGAwCE/6KPvErEvyo3LaasFde+M+0cYRsTbvEeUyf3piK9CCCdH8EuE/5hHIopWcALng0OP+jvU4GdcTXK8pipMmYuA7TXxBQfqmap+j7XxrYocw9Tyy71pJjQZ2rlQK8ndgdPz26W5ddcvLHOiQlgt9Qv/8koqrVU4QT85UurniTcHNmykQU9++G7f/IWQI8Jb7BMlUYycrVdLmEmsH2GMOfK8jkrANYfiLKLRX/5/NC+6UgwUsYIjCkRzhtjEhCMgqIWWf5Guw/1ehMwlGipa50HkcP4tDbgD9hzXFtiyEYXlzIyKNjbm8myW+SpTpIJmctDhswdtHLWeE22MWMwN8Jz4pnG7jjf75ZeFtoL4pJR1jwQcMjDxLxtpN7a3RrQ==,iv:RBLhZ/QL0hasiWKG3GLA8TsIddJsmVJeftgyOiKJJrs=,tag:Q31UTlSaSEyrMeho2FSM9Q==,type:str]",
"sops": {
"kms": null,
"gcp_kms": null,
"azure_kv": null,
"hc_vault": null,
"age": null,
- "lastmodified": "2023-02-12T18:47:10Z",
- "mac": "ENC[AES256_GCM,data:1Zc7P37mxEOdD+jUnw8e1iDSxOStDENjkm99PAPt4tnP5dfxCPi3q4TOcpRyP/dEJMmtwkZU+oYuVZPE3yMONf6ULUsnGDepQQamSzFHQLPaf9XTLCZO3WGNHY7JDMPTAaqQqDTUUKM5dcM8qCO9YzYqGU4E9bHIzZda8bvJEoM=,iv:SnZTGNlhF/+BYeRbONA+95nmZhiFxT8YmNQ290NT4Vs=,tag:NlR0VjplcA9VBj30VHqrtA==,type:str]",
+ "lastmodified": "2023-04-04T12:15:57Z",
+ "mac": "ENC[AES256_GCM,data:Tq6vvSlC8tKGrLffMRlO5Dixx/Ey3CMCYuEUesk6wML0O4kPHvc5evBeD+ywYLa1BqQk9yMbEnHOAp1b6KxhSXRA5E1/qSaNHkJ3GXmfepoyrB7NbSrb7Ktq7mTPiDB8UtEQt9a3OxXWHxxYhr2guJYYIuOkxA3ugxOqRCQGIfA=,iv:7w3IYsUyXUaoPkxtd1Qlq78RFDL4zvdIy7vaCRQsJfU=,tag:S4LnfqaezZvL6XoOx4FzPA==,type:str]",
"pgp": [
{
"created_at": "2022-09-17T12:30:46Z",