diff --git a/flake.lock b/flake.lock index 5523caf..ecf7147 100644 --- a/flake.lock +++ b/flake.lock @@ -117,11 +117,11 @@ ] }, "locked": { - "lastModified": 1703113038, - "narHash": "sha256-oxkyzjpD+mNT7arzU/zHrkNHLuY9tKwmnD2MNaZiSDw=", + "lastModified": 1702195709, + "narHash": "sha256-+zRjWkm5rKqQ57PuLZ3JF3xi3vPMiOJzItb1m/43Cq4=", "owner": "nix-community", "repo": "home-manager", - "rev": "0c2353d5d930c3d93724df6858aef064a31b3c00", + "rev": "6761b8188b860f374b457eddfdb05c82eef9752f", "type": "github" }, "original": { @@ -158,17 +158,17 @@ }, "logseq-fix-nixpkgs": { "locked": { - "lastModified": 1703658985, - "narHash": "sha256-18uCV9E+PiDC6ak1lmEeHCWFbt0GlfKpBL2zieoTn3c=", + "lastModified": 1702543070, + "narHash": "sha256-6zBMHVRv9TpJIhr2x2GY4KWhSespFq4htZOog0KI/xA=", "owner": "kilianar", "repo": "nixpkgs", - "rev": "8de164c9152a31d7b5e510df1546d257a64a4374", + "rev": "c0b7ea6c09c44ba2fc90fd4274de1248ad2cfc8a", "type": "github" }, "original": { "owner": "kilianar", "repo": "nixpkgs", - "rev": "8de164c9152a31d7b5e510df1546d257a64a4374", + "rev": "c0b7ea6c09c44ba2fc90fd4274de1248ad2cfc8a", "type": "github" } }, @@ -206,11 +206,11 @@ }, "nixos-unstable": { "locked": { - "lastModified": 1703013332, - "narHash": "sha256-+tFNwMvlXLbJZXiMHqYq77z/RfmpfpiI3yjL6o/Zo9M=", + "lastModified": 1702312524, + "narHash": "sha256-gkZJRDBUCpTPBvQk25G0B7vfbpEYM5s5OZqghkjZsnE=", "owner": "NixOS", "repo": "nixpkgs", - "rev": "54aac082a4d9bb5bbc5c4e899603abfb76a3f6d6", + "rev": "a9bf124c46ef298113270b1f84a164865987a91c", "type": "github" }, "original": { @@ -254,11 +254,11 @@ }, "nixpkgs_2": { "locked": { - "lastModified": 1703068421, - "narHash": "sha256-WSw5Faqlw75McIflnl5v7qVD/B3S2sLh+968bpOGrWA=", + "lastModified": 1702346276, + "narHash": "sha256-eAQgwIWApFQ40ipeOjVSoK4TEHVd6nbSd9fApiHIw5A=", "owner": "NixOS", "repo": "nixpkgs", - "rev": "d65bceaee0fb1e64363f7871bc43dc1c6ecad99f", + "rev": "cf28ee258fd5f9a52de6b9865cdb93a1f96d09b7", "type": "github" }, "original": { @@ -270,11 +270,11 @@ }, "nur": { "locked": { - "lastModified": 1703159048, - "narHash": "sha256-TcW0kf7nd/OEZwwxPs1y07YU4oZe18ezolScRbXXWZA=", + "lastModified": 1702651414, + "narHash": "sha256-3fdXL3k6Zgr6RSbtVWzbuYbbNJazdM3WMfX93EOKFvQ=", "owner": "nix-community", "repo": "NUR", - "rev": "9ef37017837733a76fe18680264fcd815df1eea6", + "rev": "e6fd729dc38b71be419d464b4b515d1270ba8d97", "type": "github" }, "original": { diff --git a/flake.nix b/flake.nix index b03bfc7..583e49f 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=8de164c9152a31d7b5e510df1546d257a64a4374"; + logseq-fix-nixpkgs.url = "github:kilianar/nixpkgs?rev=c0b7ea6c09c44ba2fc90fd4274de1248ad2cfc8a"; nixos-unstable.url = "github:NixOS/nixpkgs/nixos-unstable"; nixos-hardware.url = "github:NixOS/nixos-hardware/master"; home-manager = { diff --git a/home/home.nix b/home/home.nix index bb3ad9c..5d019d9 100644 --- a/home/home.nix +++ b/home/home.nix @@ -34,6 +34,7 @@ let pdfpc quaternion nheko + gpx-viewer gpxsee subsurface yate diff --git a/nixos/configuration.nix b/nixos/configuration.nix index 999c472..d551488 100644 --- a/nixos/configuration.nix +++ b/nixos/configuration.nix @@ -105,46 +105,7 @@ in # Or disable the firewall altogether. # networking.firewall.enable = false; - 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"; - }; - }; - }; -}; + networking.networkmanager.enable = true; services.avahi.enable = true;