flake.lock

@@ -216,11 +216,11 @@
         ]
       },
       "locked": {
-        "lastModified": 1713479476,
+        "lastModified": 1713453913,
-        "narHash": "sha256-kTww3Hd+R95AB6J+Y1zvXrhUScgMzf0vV5hN6+wFPXE=",
+        "narHash": "sha256-vbXq52VRlL1defMHrwhsoeHm95O3mFefsSSJyNEghbA=",
         "owner": "nix-community",
         "repo": "home-manager",
-        "rev": "ffc3600f4009ca39b6cb63b24127ca4f93792854",
+        "rev": "178e26895b3aef028a00a32fb7e7ed0fc660645c",
         "type": "github"
       },
       "original": {
@@ -332,11 +332,11 @@
     },
     "nixpkgs": {
       "locked": {
-        "lastModified": 1713297878,
+        "lastModified": 1713248628,
-        "narHash": "sha256-hOkzkhLT59wR8VaMbh1ESjtZLbGi+XNaBN6h49SPqEc=",
+        "narHash": "sha256-NLznXB5AOnniUtZsyy/aPWOk8ussTuePp2acb9U+ISA=",
         "owner": "NixOS",
         "repo": "nixpkgs",
-        "rev": "66adc1e47f8784803f2deb6cacd5e07264ec2d5c",
+        "rev": "5672bc9dbf9d88246ddab5ac454e82318d094bb8",
         "type": "github"
       },
       "original": {
@@ -447,6 +447,24 @@
         "type": "sourcehut"
       }
     },
+    "river": {
+      "flake": false,
+      "locked": {
+        "lastModified": 1713357595,
+        "narHash": "sha256-LGqP2HBrMKGGTnqFDjmZRKXN88SQMgfLm2plVAzan8c=",
+        "ref": "refs/heads/master",
+        "rev": "6b86af4f85f66697a0ffc504c4fcc1db05bfbb80",
+        "revCount": 1246,
+        "submodules": true,
+        "type": "git",
+        "url": "https://codeberg.org/river/river"
+      },
+      "original": {
+        "submodules": true,
+        "type": "git",
+        "url": "https://codeberg.org/river/river"
+      }
+    },
     "root": {
       "inputs": {
         "agenix": "agenix",
@@ -459,6 +477,7 @@
         "nixpkgs": "nixpkgs",
         "pfersel": "pfersel",
         "purge": "purge",
+        "river": "river",
         "trucksimulatorbot": "trucksimulatorbot"
       }
     },

flake.nix

@@ -45,6 +45,14 @@
       url = "github:nix-community/lanzaboote/v0.3.0";
       inputs.nixpkgs.follows = "nixpkgs";
     };
+
+    river = {
+      url = "https://codeberg.org/river/river";
+      flake = false;
+      type = "git";
+      submodules = true;
+    };
+
   };
 
   outputs =

hosts/nuc/modules/networks/default.nix

@@ -29,12 +29,8 @@
     };
     networks."10-wired" = {
       matchConfig.Name = "eno1";
-      address = [ "192.168.42.2/24" ];
-      routes = [{
-        routeConfig.Gateway = "192.168.42.1";
-      }];
       networkConfig = {
-        DNS = "192.168.42.1";
+        DHCP = "yes";
         LLDP = true;
         EmitLLDP = "nearest-bridge";
         DNSSEC = false;

hosts/thinkpad/modules/networks/uni.nix

@@ -38,7 +38,6 @@
           identity="r5"
           password="@AGDSN_WIFI_AUTH@"
           phase2="auth=PAP"
-          bssid_ignore=b8:3a:5a:8b:96:c2
         '';
         authProtocols = [ "WPA-EAP" ];
       };

users/rouven/modules/wayland/river.nix

@@ -1,7 +1,15 @@
-{ pkgs, lib, ... }:
+{ pkgs, lib, river, ... }:
 {
   wayland.windowManager.river = {
     enable = true;
+    package = with pkgs; pkgs.river.overrideAttrs (old: {
+      src = river;
+      buildInputs = lib.lists.remove wlroots_0_16 old.buildInputs ++ [
+        (wlroots.overrideAttrs (_: {
+          version = "0.17.2";
+        }))
+      ];
+    });
     systemd. extraCommands = [ "systemctl --user start river-session.target" ];
     settings = {
       focus-follows-cursor = "always";