From 6c923b264d052a2da1f75d5aa4c287f306123972 Mon Sep 17 00:00:00 2001 From: Rouven Seifert Date: Fri, 14 Apr 2023 11:14:53 +0200 Subject: [PATCH] eduroam is kinda broken, fixing with pxl hotspot --- flake.lock | 31 ++++++++++----------- flake.nix | 4 +-- hosts/thinkpad/default.nix | 4 +++ hosts/thinkpad/modules/networks/default.nix | 4 +++ hosts/thinkpad/modules/networks/uni.nix | 7 +++-- secrets/thinkpad.yaml | 6 ++-- users/rouven/modules/neovim/default.nix | 3 ++ 7 files changed, 36 insertions(+), 23 deletions(-) diff --git a/flake.lock b/flake.lock index 2afb1e2..2b7f568 100644 --- a/flake.lock +++ b/flake.lock @@ -120,11 +120,11 @@ ] }, "locked": { - "lastModified": 1681250798, - "narHash": "sha256-fQMROyKzPFBPqJy9J4ffywm02ZuqAI0GW1O1QibVpdQ=", + "lastModified": 1681457346, + "narHash": "sha256-9cDHr8CRhcH7zdDpcHL5f/Cks7ecezlbGxqhHuhZTvs=", "owner": "nix-community", "repo": "home-manager", - "rev": "28698126bd825aff21cae9ffd15cf83e169051b0", + "rev": "8631c0441614587a10c9e10372f85561211a4bb8", "type": "github" }, "original": { @@ -143,11 +143,11 @@ ] }, "locked": { - "lastModified": 1681333239, - "narHash": "sha256-FDv4fkN67tD1l9fd8AljcbTrdVWm6m9KtBuuDVxzaws=", + "lastModified": 1681432975, + "narHash": "sha256-y1YM/fBDiEdXnR23E8vTj7Wei5aYBjyoTsTXjQ1XIpY=", "owner": "hyprwm", "repo": "Hyprland", - "rev": "4bc3f9adbe7563817a9e1c6eac6f5e435f7db957", + "rev": "011600ac6e7f6d52f69d0890bffba519a9d81e3f", "type": "github" }, "original": { @@ -244,11 +244,11 @@ ] }, "locked": { - "lastModified": 1679224439, - "narHash": "sha256-QkvcuC4b67FUkkxlMsLTMPbwoD7yZr0UvJpu6jkFuLo=", + "lastModified": 1681460490, + "narHash": "sha256-uA5IvXUPV3LboIyjGrPYvNuaShxWR7hDjZC6aXY5z4o=", "owner": "Mic92", "repo": "nix-index-database", - "rev": "2f5e6e915d70c04d673a8930f94591595c73eb84", + "rev": "375ed1ce48ee67f528fda03acdf99fd542df41c6", "type": "github" }, "original": { @@ -451,16 +451,15 @@ ] }, "locked": { - "lastModified": 1681388319, - "narHash": "sha256-vyZKyXkF/EvgHa3V9eh0RcFr+GpryX8BTp39X8xw6qw=", + "lastModified": 1681409937, + "narHash": "sha256-judTs8U+4kNqCrANtv+grkwr7oVC1T/jlqjXo26s8zo=", "owner": "therealr5", "repo": "purge", - "rev": "706233355bb912a0a41654773bce1e64a92aef0c", + "rev": "277c29f054f902a64fe66b3afbeb3cde61c0a273", "type": "github" }, "original": { "owner": "therealr5", - "ref": "nix", "repo": "purge", "type": "github" } @@ -556,11 +555,11 @@ "nixpkgs": "nixpkgs_3" }, "locked": { - "lastModified": 1681127512, - "narHash": "sha256-vklOOhBj5W8fii6yN4L2WY5ZeifBmsq3+mJ2wC1Pk9U=", + "lastModified": 1681416853, + "narHash": "sha256-JLmpeHo6rBWSXkr1REE2DkHDFYcRcUMEvHSayhDoxaA=", "owner": "hyprwm", "repo": "xdg-desktop-portal-hyprland", - "rev": "04f579377a32781ce57c9cf4ba2a5bcb7f53fa97", + "rev": "2366b4d415900b72c4001770ed8456bcfff569f4", "type": "github" }, "original": { diff --git a/flake.nix b/flake.nix index 11080c6..444d209 100644 --- a/flake.nix +++ b/flake.nix @@ -57,9 +57,9 @@ flake-utils.follows = "flake-utils"; }; }; - + purge = { - url = github:therealr5/purge/nix; + url = github:therealr5/purge; inputs.nixpkgs.follows = "nixpkgs"; }; }; diff --git a/hosts/thinkpad/default.nix b/hosts/thinkpad/default.nix index b62f2d9..86d62a8 100755 --- a/hosts/thinkpad/default.nix +++ b/hosts/thinkpad/default.nix @@ -154,6 +154,10 @@ unzip nvme-cli intel-gpu-tools + + # rust + rustc + cargo ]; programs.java.enable = true; diff --git a/hosts/thinkpad/modules/networks/default.nix b/hosts/thinkpad/modules/networks/default.nix index 641e4a5..6018281 100644 --- a/hosts/thinkpad/modules/networks/default.nix +++ b/hosts/thinkpad/modules/networks/default.nix @@ -28,6 +28,10 @@ psk = "@DORM_PSK@"; authProtocols = [ "WPA-PSK" ]; }; + "@PIXEL_SSID@" = { + psk = "@PIXEL_PSK@"; + authProtocols = [ "WPA-PSK" ]; + }; }; }; }; diff --git a/hosts/thinkpad/modules/networks/uni.nix b/hosts/thinkpad/modules/networks/uni.nix index f2860fb..22822c7 100644 --- a/hosts/thinkpad/modules/networks/uni.nix +++ b/hosts/thinkpad/modules/networks/uni.nix @@ -5,13 +5,16 @@ wireless.networks = { eduroam = { auth = '' - eap=PEAP + eap=TTLS anonymous_identity="anonymous@tu-dresden.de" ca_cert="/etc/ssl/certs/ca-certificates.crt" domain_suffix_match="radius-eduroam.zih.tu-dresden.de" identity="rose159e@tu-dresden.de" password="@EDUROAM_AUTH@" - phase2="auth=MSCHAPV2" + phase2="auth=PAP" + ''; + extraConfig = '' + scan_ssid=1 ''; authProtocols = [ "WPA-EAP" ]; }; diff --git a/secrets/thinkpad.yaml b/secrets/thinkpad.yaml index aa69527..395f5c4 100644 --- a/secrets/thinkpad.yaml +++ b/secrets/thinkpad.yaml @@ -1,4 +1,4 @@ -wireless-env: ENC[AES256_GCM,data:Nzc6LP2QkXny5C6c4bqLlVxmGrTwLSG6AZV9lnwBVk4/PWkOjCQdxbTYk+yLYHIbd7mETyAip4/Mob209OHpQdlphcKBxy3v7WZq3Kz/KizqLu41RbITDbR0lTwKB4Skh8CdpzVeNe+qzsxfVLgw10E2eWZk+XShOqdoP3KINoATTbHEODKFmg6b0Nl6hLh8fUJIzlTpsOzriFzioOgPb6PhUPUHxagitTkvHrxolpR4EJ+HXWYPrfTbwAW88YDLg4eIC1unBTnG0zHQk/MlHsGDBwQ=,iv:z8oI1hZGNlLKW/cXUbBWDmvdE4eXm2gujyj+neXHn2Y=,tag:52GyUWVbsJikgk8Rp6ClaA==,type:str] +wireless-env: ENC[AES256_GCM,data:F8UA86v+sxZ2T16qCf0tqmmcl8ZX+ApN/yxU796Y7hZGxmBqIS5p6+HURhVjeODjvu7PRX5KbHrhjns3JW4vLeE1ZW3QNutJY7uwl37bz9fSHcTpd+csyz5+WfLAwmfH9hvaLINkf68LlOHGlPJtL4TsFjmHSHlHtJw4Ea0ESywMOqujEpNUSF1TCZo9JwwzIgBmdIkiAskhodlCNoyT6dbKI0SYmUMp1dJlkJbxNCP/yjfEhUtrTPiIW4YU6mpCDgB9ET3ErEaNlpq9m4t5HYfOAJlRxVKdLIuz+AZMiDCwalc0ms/MpiVyt9xmZcyuBPWVUKYGbutQew==,iv:3UiVmkoT39FScLD/m559LMdqrUJehwZ/Q8MRkju3TG4=,tag:P91YJFioMVdC3Ab6wHXoww==,type:str] uni: zih: ENC[AES256_GCM,data:KoiT/w5SsUEFAC5beCs3R5o=,iv:qQRZfdtbiAIWUAkdgrpdR8AWDdedn9yl9NcRm0ymE2A=,tag:uyhy5n40PgsWuaEofJjmog==,type:str] wireguard: @@ -20,8 +20,8 @@ sops: d1J5UHJDYjlZWEV1aEVDSmxhWDB0anMKMNzyd465AdMyX0o9NxF+hcLyROcd8xoJ 39K5xIDzcqpu6HfoZk1kZ/TT1DS2Xiw0rDuJHWdfpnS8zNe6DL3a7Q== -----END AGE ENCRYPTED FILE----- - lastmodified: "2023-03-10T14:38:35Z" - mac: ENC[AES256_GCM,data:JQwYsoIW1af17Xn4wXk2vGzaaFIZLufFHHSjbs5tgV3bZbbdi0bXtpK+2NXCSFKlf0H+7T7k1puBk64OLRtx3gOKfb445Y8yPDERzVAMbofih4MRw6MessTCAPXuKD+TIN9kw8CACqIrAn0zyStzZV6pg0ohNrk2SuAS/khCo7U=,iv:HhoG40c0lP00jYdPzsKPJ5A3M2HrU7DA8wi7bJ9//cA=,tag:7ynuu5WMBbpucDrxHTe0FA==,type:str] + lastmodified: "2023-04-14T08:11:45Z" + mac: ENC[AES256_GCM,data:htH8ETxKS88poYBoI4GxaCveK69XW0+Uq41ESmuRl2KKVAxGwkmgycWqZbbowcY0YHnUn8yh2hb+9zE1MHgdAnDq5VWvzzjo8s2xfRq+9rpOsFBVKwhi94vzfsCHAOs+eez0Dlz0xVjs2lnsVNUl7HIk0K1qqT8v6yEhIi5NnjU=,iv:zQp4yLwRyi3razD9TMO3MYDEM7eE+dvej2PovuUSx5M=,tag:Cy6z0LPQ03itFjdOE7b3Rw==,type:str] pgp: - created_at: "2023-02-16T20:53:51Z" enc: |- diff --git a/users/rouven/modules/neovim/default.nix b/users/rouven/modules/neovim/default.nix index ad1caf2..eb32a76 100644 --- a/users/rouven/modules/neovim/default.nix +++ b/users/rouven/modules/neovim/default.nix @@ -106,6 +106,9 @@ clangd = { enable = true; }; + rust-analyzer = { + enable = true; + }; }; }; null-ls = {