Johan Rong 1 месяц назад
Родитель
Сommit
dd590b3da4
3 измененных файлов с 11 добавлено и 39 удалено
  1. 1 39
      flake.lock
  2. 4 0
      flake.nix
  3. 6 0
      nixos/modules/greeter/dank-greeter/common.nix

+ 1 - 39
flake.lock

@@ -1,26 +1,5 @@
 {
   "nodes": {
-    "dank-greeter": {
-      "inputs": {
-        "dank-qml-common": "dank-qml-common",
-        "nixpkgs": [
-          "nixpkgs"
-        ]
-      },
-      "locked": {
-        "lastModified": 1788455394,
-        "narHash": "sha256-Qjpv8Oq255lsCsm/rCFFr73W2euvw2HTbNnZ2xnf2jk=",
-        "owner": "AvengeMedia",
-        "repo": "dank-greeter",
-        "rev": "54e41b9d97938ca055bf090ab08e2684b5030989",
-        "type": "github"
-      },
-      "original": {
-        "owner": "AvengeMedia",
-        "repo": "dank-greeter",
-        "type": "github"
-      }
-    },
     "dank-qml-common": {
       "flake": false,
       "locked": {
@@ -37,25 +16,9 @@
         "type": "github"
       }
     },
-    "dank-qml-common_2": {
-      "flake": false,
-      "locked": {
-        "lastModified": 1788376015,
-        "narHash": "sha256-/tT8rTznLADndTwLBzdgzzgfJH1ZhYQibYo5v/F8U+U=",
-        "owner": "AvengeMedia",
-        "repo": "dank-qml-common",
-        "rev": "26396ce432d6c71c3f5367438f96f4a8d667e160",
-        "type": "github"
-      },
-      "original": {
-        "owner": "AvengeMedia",
-        "repo": "dank-qml-common",
-        "type": "github"
-      }
-    },
     "dms": {
       "inputs": {
-        "dank-qml-common": "dank-qml-common_2",
+        "dank-qml-common": "dank-qml-common",
         "flake-compat": "flake-compat",
         "nixpkgs": [
           "nixpkgs"
@@ -147,7 +110,6 @@
     },
     "root": {
       "inputs": {
-        "dank-greeter": "dank-greeter",
         "dms": "dms",
         "home-manager": "home-manager",
         "nix-flatpak": "nix-flatpak",

+ 4 - 0
flake.nix

@@ -12,6 +12,10 @@
       url = "github:AvengeMedia/DankMaterialShell/stable";
       inputs.nixpkgs.follows = "nixpkgs";
     };
+    dank-greeter = {
+      url = "github:AvengeMedia/dank-greeter";
+      inputs.nixpkgs.follows = "nixpkgs";
+    };
   };
 
   outputs =

+ 6 - 0
nixos/modules/greeter/dank-greeter/common.nix

@@ -4,6 +4,10 @@ let
   users = import ./../../../../config/users.nix;
 in
 {
+  imports = [
+    inputs.dms.nixosModules.greeter
+  ];
+
   services.displayManager.dms-greeter = {
     enable = true;
 
@@ -22,4 +26,6 @@ in
     fprintAuth = true;
     u2fAuth = true;
   };
+
+  package = inputs.dank-greeter.packages.${pkgs.stdenv.hostPlatform.system}.default;
 }