diff --git a/flake.nix b/flake.nix
index f67a5b2..2aafb5b 100644
--- a/flake.nix
+++ b/flake.nix
@@ -49,6 +49,11 @@
     #   inputs.nixpkgs.follows = "nixpkgs";
     # };
 
+    solaar = {
+      url = "github:Svenum/Solaar-Flake";
+      inputs.nixpkgs.follows = "nixpkgs";
+    };
+
     snapraid-aio = {
       # url = "git+https://git.ryot.foo/toph/snapraid-aio.nix.git";
       url = "git+https://git.ryot.foo/toph/snapraid-aio.nix.git";
diff --git a/home/global/common/gnome/dconf.nix b/home/global/common/gnome/dconf.nix
index 316d9da..51396ee 100644
--- a/home/global/common/gnome/dconf.nix
+++ b/home/global/common/gnome/dconf.nix
@@ -131,6 +131,7 @@ with lib.hm.gvariant;
         "quicksettings-audio-devices-renamer@marcinjahn.com"
         "undecorate@sun.wxg@gmail.com"
         "user-theme@gnome-shell-extensions.gcampax.github.com"
+        "solaar-extension@sidevesh"
         "Vitals@CoreCoding.com"
       ];
       favorite-apps = lib.mkDefault [
diff --git a/home/hosts/gojo/default.nix b/home/hosts/gojo/default.nix
index c1ad6dc..1481943 100644
--- a/home/hosts/gojo/default.nix
+++ b/home/hosts/gojo/default.nix
@@ -40,6 +40,7 @@
       ## Tools ##
       bitwarden-desktop
       inspector
+      solaar
 
       ## Productivity ##
       gimp
diff --git a/home/hosts/haze/default.nix b/home/hosts/haze/default.nix
index b8323a7..8d19873 100644
--- a/home/hosts/haze/default.nix
+++ b/home/hosts/haze/default.nix
@@ -34,6 +34,7 @@
       ## Tools ##
       bitwarden-desktop
       inspector
+      solaar
 
       ## Productivity ##
       gimp
diff --git a/home/hosts/rune/default.nix b/home/hosts/rune/default.nix
index 19e0ade..9794fac 100644
--- a/home/hosts/rune/default.nix
+++ b/home/hosts/rune/default.nix
@@ -37,6 +37,7 @@
       bitwarden-desktop
       inspector
       remmina
+      solaar
       vial # KB setup
 
       ## Productivity ##
diff --git a/hosts/global/common/solaar.nix b/hosts/global/common/solaar.nix
new file mode 100644
index 0000000..6660301
--- /dev/null
+++ b/hosts/global/common/solaar.nix
@@ -0,0 +1,18 @@
+{ pkgs, inputs, ... }:
+{
+  imports = [
+    inputs.solaar.nixosModules.default
+  ];
+
+  services.solaar = {
+    enable = true; # Enable the service
+    package = pkgs.solaar; # The package to use
+    window = "hide"; # Show the window on startup (show, *hide*, only [window only])
+    batteryIcons = "symbolic"; # Which battery icons to use (*regular*, symbolic, solaar)
+    extraArgs = ""; # Extra arguments to pass to solaar on startup
+  };
+
+  environment.systemPackages = with pkgs; [
+    gnomeExtensions.solaar-extension
+  ];
+}
diff --git a/hosts/nixos/gojo/default.nix b/hosts/nixos/gojo/default.nix
index d989ee3..2dccf7c 100644
--- a/hosts/nixos/gojo/default.nix
+++ b/hosts/nixos/gojo/default.nix
@@ -40,6 +40,7 @@ in
       "hosts/global/common/gnome.nix"
       "hosts/global/common/nvtop.nix" # GPU monitor (not available in home-manager)
       "hosts/global/common/plymouth.nix" # fancy boot screen
+      "hosts/global/common/solaar.nix" # Logitech Unifying Receiver support
     ])
   ];
 
diff --git a/hosts/nixos/haze/default.nix b/hosts/nixos/haze/default.nix
index 60c5729..24993da 100644
--- a/hosts/nixos/haze/default.nix
+++ b/hosts/nixos/haze/default.nix
@@ -40,6 +40,7 @@ in
       "hosts/global/common/gnome.nix"
       "hosts/global/common/nvtop.nix" # GPU monitor (not available in home-manager)
       "hosts/global/common/plymouth.nix" # fancy boot screen
+      "hosts/global/common/solaar.nix" # Logitech Unifying Receiver support
     ])
   ];
 
diff --git a/hosts/nixos/rune/default.nix b/hosts/nixos/rune/default.nix
index 1f20055..5defb54 100644
--- a/hosts/nixos/rune/default.nix
+++ b/hosts/nixos/rune/default.nix
@@ -42,6 +42,7 @@ in
       "hosts/global/common/libvirt.nix" # vm tools
       "hosts/global/common/nvtop.nix" # GPU monitor (not available in home-manager)
       "hosts/global/common/plymouth.nix" # fancy boot screen
+      "hosts/global/common/solaar.nix" # Logitech Unifying Receiver support
       "hosts/global/common/vial.nix" # KB setup
     ])
   ];