diff --git a/systems/x86_64-linux/navis/default.nix b/systems/x86_64-linux/navis/default.nix
index 10105f8..876651b 100644
--- a/systems/x86_64-linux/navis/default.nix
+++ b/systems/x86_64-linux/navis/default.nix
@@ -51,7 +51,7 @@
     rtkit.enable = true;
 
     pam = {
-      services.cosmic-greeter-daemon.kwallet.enable = true;
+      services.login.enableGnomeKeyring = true;
 
       loginLimits = [
         {
@@ -410,6 +410,7 @@
     ddccontrol.enable = true;
     flatpak.enable = true;
     getty.autologinUser = "marshall";
+    gnome.gnome-keyring.enable = true;
     openssh.enable = true;
     spice-vdagentd.enable = true;
     udisks2.enable = true;
diff --git a/systems/x86_64-linux/navis/facter.json b/systems/x86_64-linux/navis/facter.json
index c014d69..d134d3e 100644
--- a/systems/x86_64-linux/navis/facter.json
+++ b/systems/x86_64-linux/navis/facter.json
@@ -2005,18 +2005,18 @@
         "model": "Logitech USB Receiver",
         "sysfs_id": "/devices/pci0000:00/0000:00:14.0/usb3/3-3/3-3.2/3-3.2.1/3-3.2.1:1.1",
         "sysfs_bus_id": "3-3.2.1:1.1",
-        "unix_device_name": "/dev/input/event9",
+        "unix_device_name": "/dev/input/event11",
         "unix_device_number": {
           "type": 99,
           "major": 13,
-          "minor": 73,
+          "minor": 75,
           "range": 1
         },
         "unix_device_names": [
           "/dev/input/by-id/usb-Logitech_USB_Receiver-if01-event-kbd",
           "/dev/input/by-path/pci-0000:00:14.0-usb-0:3.2.1:1.1-event-kbd",
           "/dev/input/by-path/pci-0000:00:14.0-usbv2-0:3.2.1:1.1-event-kbd",
-          "/dev/input/event9"
+          "/dev/input/event11"
         ],
         "resources": [
           {
@@ -2933,71 +2933,6 @@
     "network_interface": [
       {
         "index": 74,
-        "attached_to": 36,
-        "class_list": [
-          "network_interface"
-        ],
-        "base_class": {
-          "hex": "0107",
-          "name": "Network Interface",
-          "value": 263
-        },
-        "sub_class": {
-          "hex": "000a",
-          "name": "WLAN",
-          "value": 10
-        },
-        "model": "WLAN network interface",
-        "sysfs_id": "/class/net/wlan0",
-        "sysfs_device_link": "/devices/pci0000:00/0000:00:1c.0/0000:04:00.0",
-        "unix_device_name": "wlan0",
-        "unix_device_names": [
-          "wlan0"
-        ],
-        "resources": [
-          {
-            "type": "hwaddr",
-            "address": 54
-          },
-          {
-            "type": "phwaddr",
-            "address": 54
-          }
-        ],
-        "driver": "iwlwifi",
-        "driver_module": "iwlwifi",
-        "drivers": [
-          "iwlwifi"
-        ],
-        "driver_modules": [
-          "iwlwifi"
-        ]
-      },
-      {
-        "index": 75,
-        "attached_to": 0,
-        "class_list": [
-          "network_interface"
-        ],
-        "base_class": {
-          "hex": "0107",
-          "name": "Network Interface",
-          "value": 263
-        },
-        "sub_class": {
-          "hex": "0000",
-          "name": "Loopback",
-          "value": 0
-        },
-        "model": "Loopback network interface",
-        "sysfs_id": "/class/net/lo",
-        "unix_device_name": "lo",
-        "unix_device_names": [
-          "lo"
-        ]
-      },
-      {
-        "index": 76,
         "attached_to": 32,
         "class_list": [
           "network_interface"
@@ -3037,6 +2972,71 @@
         "driver_modules": [
           "r8169"
         ]
+      },
+      {
+        "index": 75,
+        "attached_to": 0,
+        "class_list": [
+          "network_interface"
+        ],
+        "base_class": {
+          "hex": "0107",
+          "name": "Network Interface",
+          "value": 263
+        },
+        "sub_class": {
+          "hex": "0000",
+          "name": "Loopback",
+          "value": 0
+        },
+        "model": "Loopback network interface",
+        "sysfs_id": "/class/net/lo",
+        "unix_device_name": "lo",
+        "unix_device_names": [
+          "lo"
+        ]
+      },
+      {
+        "index": 76,
+        "attached_to": 36,
+        "class_list": [
+          "network_interface"
+        ],
+        "base_class": {
+          "hex": "0107",
+          "name": "Network Interface",
+          "value": 263
+        },
+        "sub_class": {
+          "hex": "000a",
+          "name": "WLAN",
+          "value": 10
+        },
+        "model": "WLAN network interface",
+        "sysfs_id": "/class/net/wlan0",
+        "sysfs_device_link": "/devices/pci0000:00/0000:00:1c.0/0000:04:00.0",
+        "unix_device_name": "wlan0",
+        "unix_device_names": [
+          "wlan0"
+        ],
+        "resources": [
+          {
+            "type": "hwaddr",
+            "address": 54
+          },
+          {
+            "type": "phwaddr",
+            "address": 54
+          }
+        ],
+        "driver": "iwlwifi",
+        "driver_module": "iwlwifi",
+        "drivers": [
+          "iwlwifi"
+        ],
+        "driver_modules": [
+          "iwlwifi"
+        ]
       }
     ],
     "pci": [
@@ -5098,6 +5098,9 @@
           "range": 1
         },
         "unix_device_names": [
+          "/dev/input/by-id/usb-SteelSeries_SteelSeries_Arctis_7-event-if05",
+          "/dev/input/by-path/pci-0000:00:14.0-usb-0:3.1:1.5-event",
+          "/dev/input/by-path/pci-0000:00:14.0-usbv2-0:3.1:1.5-event",
           "/dev/input/event13"
         ],
         "resources": [