diff --git a/common/flakes/solaar-master/flake.nix b/common/flakes/solaar-master/flake.nix
deleted file mode 100644
index 5658839..0000000
--- a/common/flakes/solaar-master/flake.nix
+++ /dev/null
@@ -1,70 +0,0 @@
-{
-  description = "Solaar built from GitHub master branch";
-
-  inputs = {
-    nixpkgs.url = "github:NixOS/nixpkgs/nixos-unstable";
-    flake-utils.url = "github:numtide/flake-utils";
-
-    solaar-src = {
-      url = "github:pwr-Solaar/Solaar/master";
-      flake = false;
-    };
-  };
-
-  outputs =
-    {
-      self,
-      nixpkgs,
-      flake-utils,
-      solaar-src,
-    }:
-    flake-utils.lib.eachDefaultSystem (
-      system:
-      let
-        pkgs = nixpkgs.legacyPackages.${system};
-        pythonPackages = pkgs.python3Packages;
-      in
-      {
-        packages.default = pythonPackages.buildPythonApplication rec {
-          pname = "solaar";
-          version = "master-${solaar-src.shortRev or "dirty"}";
-          src = solaar-src;
-          pyproject = true;
-
-          nativeBuildInputs =
-            with pkgs;
-            [
-              gobject-introspection
-              wrapGAppsHook3
-              pkg-config
-            ]
-            ++ (with pythonPackages; [
-              setuptools
-              wheel
-            ]);
-
-          propagatedBuildInputs = with pythonPackages; [
-            pyudev
-            psutil
-            xlib
-            pyyaml
-            evdev
-            dbus-python
-            pygobject3
-            typing-extensions
-
-            pkgs.gtk3
-            pkgs.libnotify
-            pkgs.libayatana-appindicator
-          ];
-
-          postInstall = ''
-            install -Dm644 rules.d/42-logitech-unify-permissions.rules \
-              $out/lib/udev/rules.d/42-logitech-unify-permissions.rules
-          '';
-
-          doCheck = false;
-        };
-      }
-    );
-}
diff --git a/common/modules/packages.nix b/common/modules/packages.nix
index 22e163f..bbee45a 100644
--- a/common/modules/packages.nix
+++ b/common/modules/packages.nix
@@ -126,7 +126,7 @@
     protonup-qt
     rquickshare
     saber
-    solaar-master.packages.${pkgs.stdenv.hostPlatform.system}.default
+    solaar
     logitech-udev-rules
     scrcpy
     screen
diff --git a/flake.lock b/flake.lock
index b0bf914..8fe0776 100644
--- a/flake.lock
+++ b/flake.lock
@@ -88,24 +88,6 @@
         "type": "github"
       }
     },
-    "flake-utils_2": {
-      "inputs": {
-        "systems": "systems_2"
-      },
-      "locked": {
-        "lastModified": 1731533236,
-        "narHash": "sha256-l0KFg5HjrsfsO/JpG+r7fRrqm12kzFHyUHqHCVpMMbI=",
-        "owner": "numtide",
-        "repo": "flake-utils",
-        "rev": "11707dc2f618dd54ca8739b309ec4fc024de578b",
-        "type": "github"
-      },
-      "original": {
-        "owner": "numtide",
-        "repo": "flake-utils",
-        "type": "github"
-      }
-    },
     "naersk": {
       "inputs": {
         "fenix": "fenix",
@@ -191,29 +173,12 @@
         "type": "github"
       }
     },
-    "nixpkgs_4": {
-      "locked": {
-        "lastModified": 1771369470,
-        "narHash": "sha256-0NBlEBKkN3lufyvFegY4TYv5mCNHbi5OmBDrzihbBMQ=",
-        "owner": "NixOS",
-        "repo": "nixpkgs",
-        "rev": "0182a361324364ae3f436a63005877674cf45efb",
-        "type": "github"
-      },
-      "original": {
-        "owner": "NixOS",
-        "ref": "nixos-unstable",
-        "repo": "nixpkgs",
-        "type": "github"
-      }
-    },
     "root": {
       "inputs": {
         "czkawka-master": "czkawka-master",
         "fet": "fet",
         "nix-flatpak": "nix-flatpak",
-        "nixpkgs": "nixpkgs_3",
-        "solaar-master": "solaar-master"
+        "nixpkgs": "nixpkgs_3"
       }
     },
     "rust-analyzer-src": {
@@ -233,39 +198,6 @@
         "type": "github"
       }
     },
-    "solaar-master": {
-      "inputs": {
-        "flake-utils": "flake-utils_2",
-        "nixpkgs": "nixpkgs_4",
-        "solaar-src": "solaar-src"
-      },
-      "locked": {
-        "path": "./common/flakes/solaar-master",
-        "type": "path"
-      },
-      "original": {
-        "path": "./common/flakes/solaar-master",
-        "type": "path"
-      },
-      "parent": []
-    },
-    "solaar-src": {
-      "flake": false,
-      "locked": {
-        "lastModified": 1770306649,
-        "narHash": "sha256-IEGTggLf2UzXAqCZQm4R0ogohQJHm+sKXEnJJVhM1r8=",
-        "owner": "pwr-Solaar",
-        "repo": "Solaar",
-        "rev": "42e0e391b525695a3c959351df48c92e8171585c",
-        "type": "github"
-      },
-      "original": {
-        "owner": "pwr-Solaar",
-        "ref": "master",
-        "repo": "Solaar",
-        "type": "github"
-      }
-    },
     "systems": {
       "locked": {
         "lastModified": 1681028828,
@@ -280,21 +212,6 @@
         "repo": "default",
         "type": "github"
       }
-    },
-    "systems_2": {
-      "locked": {
-        "lastModified": 1681028828,
-        "narHash": "sha256-Vy1rq5AaRuLzOxct8nz4T6wlgyUR7zLU309k9mBC768=",
-        "owner": "nix-systems",
-        "repo": "default",
-        "rev": "da67096a3b9bf56a91d16901293e51ba5b49a27e",
-        "type": "github"
-      },
-      "original": {
-        "owner": "nix-systems",
-        "repo": "default",
-        "type": "github"
-      }
     }
   },
   "root": "root",
diff --git a/flake.nix b/flake.nix
index 8daa575..8b205a4 100644
--- a/flake.nix
+++ b/flake.nix
@@ -3,7 +3,6 @@
     nixpkgs.url = "github:NixOS/nixpkgs/nixos-unstable-small";
     nix-flatpak.url = "github:gmodena/nix-flatpak";
     czkawka-master.url = "path:./common/flakes/czkawka-master";
-    solaar-master.url = "path:./common/flakes/solaar-master";
     fet.url = "path:./common/flakes/fet";
   };
 
@@ -15,7 +14,7 @@
       ...
     }@inputs:
     let
-      specialArgs = { inherit (inputs) czkawka-master solaar-master fet; };
+      specialArgs = { inherit (inputs) czkawka-master fet; };
     in
     {
       nixosConfigurations = {