nix: remove dgop input; expose quickshell package (#1183)

* nix: remove dgop input

* nix: update quickshell

* nix: expose quickshell in outputs

distro/nix/common.nix

@@ -12,7 +12,7 @@ in
   packages = [
     dmsPkgs.dms-shell
   ]
-  ++ lib.optional cfg.enableSystemMonitoring dmsPkgs.dgop
+  ++ lib.optional cfg.enableSystemMonitoring cfg.dgop.package
   ++ lib.optionals cfg.enableVPN [
     pkgs.glib
     pkgs.networkmanager

distro/nix/options.nix

@@ -1,6 +1,7 @@
 {
   lib,
   dmsPkgs,
+  pkgs,
   ...
 }:
 let
@@ -25,6 +26,7 @@ in
 
   options.programs.dank-material-shell = {
     enable = lib.mkEnableOption "DankMaterialShell";
+
     systemd = {
       enable = lib.mkEnableOption "DankMaterialShell systemd startup";
       restartIfChanged = lib.mkOption {
@@ -33,34 +35,44 @@ in
         description = "Auto-restart dms.service when dank-material-shell changes";
       };
     };
+
+    dgop = {
+      package = lib.mkPackageOption pkgs "dgop";
+    };
+
     enableSystemMonitoring = lib.mkOption {
       type = types.bool;
       default = true;
       description = "Add needed dependencies to use system monitoring widgets";
     };
+
     enableVPN = lib.mkOption {
       type = types.bool;
       default = true;
       description = "Add needed dependencies to use the VPN widget";
     };
+
     enableDynamicTheming = lib.mkOption {
       type = types.bool;
       default = true;
       description = "Add needed dependencies to have dynamic theming support";
     };
+
     enableAudioWavelength = lib.mkOption {
       type = types.bool;
       default = true;
       description = "Add needed dependencies to have audio wavelength support";
     };
+
     enableCalendarEvents = lib.mkOption {
       type = types.bool;
       default = true;
       description = "Add calendar events support via khal";
     };
+
     quickshell = {
       package = lib.mkPackageOption dmsPkgs "quickshell" {
-        extraDescription = "The quickshell package to use (defaults to be built from source, in the commit 26531f due to unreleased features used by DMS).";
+        extraDescription = "The quickshell package to use (defaults to be built from source, due to unreleased features used by DMS).";
       };
     };
 

flake.lock

@@ -1,25 +1,5 @@
 {
   "nodes": {
-    "dgop": {
-      "inputs": {
-        "nixpkgs": [
-          "nixpkgs"
-        ]
-      },
-      "locked": {
-        "lastModified": 1765838956,
-        "narHash": "sha256-A3a2ZfvjirX8VIdIPI+nAyukWs6vx4vet3fU0mpr7lU=",
-        "owner": "AvengeMedia",
-        "repo": "dgop",
-        "rev": "0ff697a4e3418966caa714c838fc73f1ef6ba59b",
-        "type": "github"
-      },
-      "original": {
-        "owner": "AvengeMedia",
-        "repo": "dgop",
-        "type": "github"
-      }
-    },
     "nixpkgs": {
       "locked": {
         "lastModified": 1766651565,
@@ -43,23 +23,22 @@
         ]
       },
       "locked": {
-        "lastModified": 1766386896,
-        "narHash": "sha256-1uql4y229Rh+/2da99OVNe6DfsjObukXkf60TYRCvhI=",
+        "lastModified": 1766725085,
+        "narHash": "sha256-O2aMFdDUYJazFrlwL7aSIHbUSEm3ADVZjmf41uBJfHs=",
         "ref": "refs/heads/master",
-        "rev": "3918290c1bcd93ed81291844d9f1ed146672dbfc",
-        "revCount": 714,
+        "rev": "41828c4180fb921df7992a5405f5ff05d2ac2fff",
+        "revCount": 715,
         "type": "git",
         "url": "https://git.outfoxxed.me/quickshell/quickshell"
       },
       "original": {
-        "rev": "3918290c1bcd93ed81291844d9f1ed146672dbfc",
+        "rev": "41828c4180fb921df7992a5405f5ff05d2ac2fff",
         "type": "git",
         "url": "https://git.outfoxxed.me/quickshell/quickshell"
       }
     },
     "root": {
       "inputs": {
-        "dgop": "dgop",
         "nixpkgs": "nixpkgs",
         "quickshell": "quickshell"
       }

flake.nix

@@ -3,12 +3,8 @@
 
   inputs = {
     nixpkgs.url = "github:nixos/nixpkgs/nixos-unstable";
-    dgop = {
-      url = "github:AvengeMedia/dgop";
-      inputs.nixpkgs.follows = "nixpkgs";
-    };
     quickshell = {
-      url = "git+https://git.outfoxxed.me/quickshell/quickshell?rev=3918290c1bcd93ed81291844d9f1ed146672dbfc";
+      url = "git+https://git.outfoxxed.me/quickshell/quickshell?rev=41828c4180fb921df7992a5405f5ff05d2ac2fff";
       inputs.nixpkgs.follows = "nixpkgs";
     };
   };
@@ -17,7 +13,6 @@
     {
       self,
       nixpkgs,
-      dgop,
       quickshell,
       ...
     }:
@@ -29,15 +24,14 @@
         );
       buildDmsPkgs = pkgs: {
         dms-shell = self.packages.${pkgs.stdenv.hostPlatform.system}.default;
-        inherit (dgop.packages.${pkgs.stdenv.hostPlatform.system}) dgop;
         quickshell = quickshell.packages.${pkgs.stdenv.hostPlatform.system}.default;
       };
       mkModuleWithDmsPkgs =
-        path:
+        modulePath:
         args@{ pkgs, ... }:
         {
           imports = [
-            (import path (args // { dmsPkgs = buildDmsPkgs pkgs; }))
+            (import modulePath (args // { dmsPkgs = buildDmsPkgs pkgs; }))
           ];
         };
       mkQmlImportPath =
@@ -145,6 +139,8 @@
             }
           );
 
+          quickshell = quickshell.packages.${system}.default;
+
           default = self.packages.${system}.dms-shell;
         }
       );