diff --git a/system/default.nix b/system/default.nix
index c28b3be..7785ef8 100644
--- a/system/default.nix
+++ b/system/default.nix
@@ -38,7 +38,7 @@
       inputs.matugen.packages.${pkgs.system}.default
     ]
     ++ lib.optionals (logitech-hardware.enable == true) [
-      logiops
+      solaar
     ];
   boot.loader.systemd-boot.enable = true;
   boot.loader.efi.canTouchEfiVariables = true;
diff --git a/system/desktop/misc.nix b/system/desktop/misc.nix
index 62eecc9..744d24c 100644
--- a/system/desktop/misc.nix
+++ b/system/desktop/misc.nix
@@ -1,79 +1,3 @@
 {pkgs, ...}: {
   services.printing.enable = true;
-
-  # Install logiops package
-  environment.systemPackages = [pkgs.logiops];
-
-  # Create systemd service
-  systemd.services.logiops = {
-    description = "An unofficial userspace driver for HID++ Logitech devices";
-    serviceConfig = {
-      Type = "simple";
-      ExecStart = "${pkgs.logiops}/bin/logid";
-    };
-  };
-
-  # Configuration for logiops
-  environment.etc."logid.cfg".text = ''
-    devices: ({
-      name: "Wireless Mouse MX Master 3";
-      smartshift: {
-        on: true;
-        threshold: 12;
-      };
-      hiresscroll: {
-        hires: true;
-        target: false;
-      };
-      dpi: 1200;
-      buttons: ({
-        cid: 0xc3;
-        action = {
-          type: "Gestures";
-          gestures: ({
-            direction: "Left";
-            mode: "OnRelease";
-            action = {
-              type = "Keypress";
-              keys: ["KEY_F15"];
-            };
-          }, {
-            direction: "Right";
-            mode: "OnRelease";
-            action = {
-              type = "Keypress";
-              keys: ["KEY_F16"];
-            };
-          }, {
-            direction: "Down";
-            mode: "OnRelease";
-            action = {
-              type: "Keypress";
-              keys: ["KEY_F17"];
-            };
-          }, {
-            direction: "Up";
-            mode: "OnRelease";
-            action = {
-              type: "Keypress";
-              keys: ["KEY_F18"];
-            };
-          }, {
-            direction: "None";
-            mode: "OnRelease";
-            action = {
-              type = "Keypress";
-              keys: ["KEY_PLAYPAUSE"];
-            };
-          });
-        };
-      }, {
-        cid: 0xc4;
-        action = {
-          type: "Keypress";
-          keys: ["KEY_F19"];
-        };
-      });
-    });
-  '';
 }
diff --git a/system/users.nix b/system/users.nix
index 447ce35..25836c8 100644
--- a/system/users.nix
+++ b/system/users.nix
@@ -6,10 +6,10 @@
 }: {
   users.users.${username} = {
     isNormalUser = true;
-    extraGroups = ["wheel" "networkmanager" "plugdev" "input"];
+    extraGroups = ["wheel" "networkmanager" "input"];
     initialHashedPassword = "$6$Qab6SSvEJM2YRtVA$7Oyl7E3pp/FKtCC.2Tb2tyzp3yp7BFHFAKngUYJssQJ.v1Q2mqsgW9m7njpaKNcka2vyCwrnmw1R.YPlFqR0p1";
-    # shell = pkgs.zsh;
-    shell = pkgs.${terminal.termShell};
+    shell = pkgs.zsh;
+    # shell = pkgs.${terminal.termShell};
     packages = [
     ];
   };