From dfb5c711bfbcd069790d5e23cb550b51ed4d5a9f Mon Sep 17 00:00:00 2001 From: Trolli Schmittlauch Date: Sun, 17 Dec 2023 15:09:14 +0100 Subject: [PATCH 1/3] spx-viewer: remove due to being broken and not displaying some tracks --- home/home.nix | 1 - 1 file changed, 1 deletion(-) diff --git a/home/home.nix b/home/home.nix index 5d019d9..bb3ad9c 100644 --- a/home/home.nix +++ b/home/home.nix @@ -34,7 +34,6 @@ let pdfpc quaternion nheko - gpx-viewer gpxsee subsurface yate From 158753fba44bafb0486f5bd953aeed3ac9e82d89 Mon Sep 17 00:00:00 2001 From: Trolli Schmittlauch Date: Sat, 30 Dec 2023 20:11:57 +0100 Subject: [PATCH 2/3] networkmanager: add 37C3 WLAN config via ensureProfiles mainly keep this in there as a starting point and future reference, once I have secrets management and modularised configs --- nixos/configuration.nix | 41 ++++++++++++++++++++++++++++++++++++++++- 1 file changed, 40 insertions(+), 1 deletion(-) diff --git a/nixos/configuration.nix b/nixos/configuration.nix index d551488..999c472 100644 --- a/nixos/configuration.nix +++ b/nixos/configuration.nix @@ -105,7 +105,46 @@ in # Or disable the firewall altogether. # networking.firewall.enable = false; - networking.networkmanager.enable = true; + networking.networkmanager = { + enable = true; + # FIXME: move into own file, use SOPS for secrets + ensureProfiles.profiles = { + "37C3" = { + connection = { + id = "37C3"; + type = "wifi"; + interface-name = "wlan0"; + }; + wifi = { + mode = "infrastructure"; + ssid = "37C3"; + }; + wifi-security = { + auth-alg = "open"; + key-mgmt = "wpa-eap"; + }; + "802-1x" = { + anonymous-identity = "37C3"; + eap = "ttls;"; + identity = "37C3"; + password = "37C3"; + phase2-auth = "pap"; + altsubject-matches = "DNS:radius.c3noc.net"; + ca-cert = "${builtins.fetchurl { + url = "https://letsencrypt.org/certs/isrgrootx1.pem"; + sha256 = "sha256:1la36n2f31j9s03v847ig6ny9lr875q3g7smnq33dcsmf2i5gd92"; + }}"; + }; + ipv4 = { + method = "auto"; + }; + ipv6 = { + addr-gen-mode = "default"; + method = "auto"; + }; + }; + }; +}; services.avahi.enable = true; From 0639633b0d46d08dfbf4b095b90490f1d1c827c6 Mon Sep 17 00:00:00 2001 From: Trolli Schmittlauch Date: Sat, 30 Dec 2023 20:59:44 +0100 Subject: [PATCH 3/3] fixup! logseq: temporarily use PR274180 flake input to fix insecure electron --- flake.lock | 32 ++++++++++++++++---------------- flake.nix | 2 +- 2 files changed, 17 insertions(+), 17 deletions(-) diff --git a/flake.lock b/flake.lock index ecf7147..5523caf 100644 --- a/flake.lock +++ b/flake.lock @@ -117,11 +117,11 @@ ] }, "locked": { - "lastModified": 1702195709, - "narHash": "sha256-+zRjWkm5rKqQ57PuLZ3JF3xi3vPMiOJzItb1m/43Cq4=", + "lastModified": 1703113038, + "narHash": "sha256-oxkyzjpD+mNT7arzU/zHrkNHLuY9tKwmnD2MNaZiSDw=", "owner": "nix-community", "repo": "home-manager", - "rev": "6761b8188b860f374b457eddfdb05c82eef9752f", + "rev": "0c2353d5d930c3d93724df6858aef064a31b3c00", "type": "github" }, "original": { @@ -158,17 +158,17 @@ }, "logseq-fix-nixpkgs": { "locked": { - "lastModified": 1702543070, - "narHash": "sha256-6zBMHVRv9TpJIhr2x2GY4KWhSespFq4htZOog0KI/xA=", + "lastModified": 1703658985, + "narHash": "sha256-18uCV9E+PiDC6ak1lmEeHCWFbt0GlfKpBL2zieoTn3c=", "owner": "kilianar", "repo": "nixpkgs", - "rev": "c0b7ea6c09c44ba2fc90fd4274de1248ad2cfc8a", + "rev": "8de164c9152a31d7b5e510df1546d257a64a4374", "type": "github" }, "original": { "owner": "kilianar", "repo": "nixpkgs", - "rev": "c0b7ea6c09c44ba2fc90fd4274de1248ad2cfc8a", + "rev": "8de164c9152a31d7b5e510df1546d257a64a4374", "type": "github" } }, @@ -206,11 +206,11 @@ }, "nixos-unstable": { "locked": { - "lastModified": 1702312524, - "narHash": "sha256-gkZJRDBUCpTPBvQk25G0B7vfbpEYM5s5OZqghkjZsnE=", + "lastModified": 1703013332, + "narHash": "sha256-+tFNwMvlXLbJZXiMHqYq77z/RfmpfpiI3yjL6o/Zo9M=", "owner": "NixOS", "repo": "nixpkgs", - "rev": "a9bf124c46ef298113270b1f84a164865987a91c", + "rev": "54aac082a4d9bb5bbc5c4e899603abfb76a3f6d6", "type": "github" }, "original": { @@ -254,11 +254,11 @@ }, "nixpkgs_2": { "locked": { - "lastModified": 1702346276, - "narHash": "sha256-eAQgwIWApFQ40ipeOjVSoK4TEHVd6nbSd9fApiHIw5A=", + "lastModified": 1703068421, + "narHash": "sha256-WSw5Faqlw75McIflnl5v7qVD/B3S2sLh+968bpOGrWA=", "owner": "NixOS", "repo": "nixpkgs", - "rev": "cf28ee258fd5f9a52de6b9865cdb93a1f96d09b7", + "rev": "d65bceaee0fb1e64363f7871bc43dc1c6ecad99f", "type": "github" }, "original": { @@ -270,11 +270,11 @@ }, "nur": { "locked": { - "lastModified": 1702651414, - "narHash": "sha256-3fdXL3k6Zgr6RSbtVWzbuYbbNJazdM3WMfX93EOKFvQ=", + "lastModified": 1703159048, + "narHash": "sha256-TcW0kf7nd/OEZwwxPs1y07YU4oZe18ezolScRbXXWZA=", "owner": "nix-community", "repo": "NUR", - "rev": "e6fd729dc38b71be419d464b4b515d1270ba8d97", + "rev": "9ef37017837733a76fe18680264fcd815df1eea6", "type": "github" }, "original": { diff --git a/flake.nix b/flake.nix index 583e49f..b03bfc7 100644 --- a/flake.nix +++ b/flake.nix @@ -3,7 +3,7 @@ inputs = { nixpkgs.url = "github:NixOS/nixpkgs/nixos-23.11"; - logseq-fix-nixpkgs.url = "github:kilianar/nixpkgs?rev=c0b7ea6c09c44ba2fc90fd4274de1248ad2cfc8a"; + logseq-fix-nixpkgs.url = "github:kilianar/nixpkgs?rev=8de164c9152a31d7b5e510df1546d257a64a4374"; nixos-unstable.url = "github:NixOS/nixpkgs/nixos-unstable"; nixos-hardware.url = "github:NixOS/nixos-hardware/master"; home-manager = {