Switch from deprecated hw.opengl to hw.graphics

home/ssh/config.nix

@@ -0,0 +1,35 @@
+{ pkgs, lib, ... }:
+let
+  eduroam-active = pkgs.writeShellApplication {
+    name = "eduroam-active";
+    runtimeInputs = with pkgs; [
+      networkmanager
+    ];
+    text = ''
+      nmcli -g GENERAL.STATE c s interface|grep -q -E '\bactiv'
+    '';
+  };
+in
+{
+  programs.ssh = {
+    enable = true;
+    controlMaster = "auto";
+
+    matchBlocks = {
+      "bmo.uio.no-on-eduroam" = lib.hm.dag.entryBefore [ "bmo.uio.no" ] {
+        match = "host bmo.uio.no exec \"nmcli -g GENERAL.STATE c s eduroam|grep -q -E '\\bactiv'\"";
+        hostname = "bmo.uio.no";
+        forwardAgent = false;
+      };
+
+      "bmo.uio.no" = {
+        setEnv = {
+          # TERM = "xterm-256color";
+        };
+        hostname = "bmo.uio.no";
+        forwardAgent = false;
+        proxyJump = "torjus@rlogin.uio.no";
+      };
+    };
+  };
+}

home/ssh/default.nix

@@ -1 +1 @@
-{ imports = [ ./gunter.nix ]; }
+{ imports = [ ./config.nix ]; }

home/ssh/gunter.nix

@@ -1,16 +0,0 @@
-{ pkgs, ... }:
-{
-  programs.ssh = {
-    enable = true;
-    controlMaster = "auto";
-
-    matchBlocks."bmo.uio.no" = {
-      setEnv = {
-        # TERM = "xterm-256color";
-      };
-      hostname = "bmo.uio.no";
-      forwardAgent = false;
-      proxyJump = "torjus@rlogin.uio.no";
-    };
-  };
-}

hosts/magicman/configuration.nix

@@ -50,7 +50,7 @@
   time.timeZone = "Europe/Oslo";
 
   # Enable opengl
-  hardware.opengl = {
+  hardware.graphics = {
     enable = true;
     extraPackages = with pkgs; [
       intel-media-driver