From fcfb3e50b17560dce622518c55928f21a59cdaea Mon Sep 17 00:00:00 2001
From: Rouven Seifert <rouven@rfive.de>
Date: Mon, 13 May 2024 14:22:08 +0200
Subject: [PATCH] vm : another systemd test

---
 flake.lock         | 32 ++++++++++++++++++++++++--------
 flake.nix          |  5 +++--
 shared/systemd.nix |  4 ++--
 3 files changed, 29 insertions(+), 12 deletions(-)

diff --git a/flake.lock b/flake.lock
index ea0187c..a9c3792 100644
--- a/flake.lock
+++ b/flake.lock
@@ -332,18 +332,17 @@
     },
     "nixpkgs": {
       "locked": {
-        "lastModified": 1714430104,
-        "narHash": "sha256-TGCTDeE8lEm/HC92Ev5ql2vx6Z4iUOwF2vsmLn/UjkM=",
-        "owner": "nikstur",
+        "lastModified": 1715447595,
+        "narHash": "sha256-VsVAUQOj/cS1LCOmMjAGeRksXIAdPnFIjCQ0XLkCsT0=",
+        "owner": "NixOS",
         "repo": "nixpkgs",
-        "rev": "12215c110b0f3a652953d215e827fd4b56e0f536",
+        "rev": "062ca2a9370a27a35c524dc82d540e6e9824b652",
         "type": "github"
       },
       "original": {
-        "owner": "nikstur",
-        "ref": "systemd-256",
-        "repo": "nixpkgs",
-        "type": "github"
+        "id": "nixpkgs",
+        "ref": "nixos-unstable",
+        "type": "indirect"
       }
     },
     "nixpkgs-lib": {
@@ -377,6 +376,22 @@
         "type": "github"
       }
     },
+    "nixpkgs-systemd-256": {
+      "locked": {
+        "lastModified": 1714430104,
+        "narHash": "sha256-TGCTDeE8lEm/HC92Ev5ql2vx6Z4iUOwF2vsmLn/UjkM=",
+        "owner": "nikstur",
+        "repo": "nixpkgs",
+        "rev": "12215c110b0f3a652953d215e827fd4b56e0f536",
+        "type": "github"
+      },
+      "original": {
+        "owner": "nikstur",
+        "ref": "systemd-256",
+        "repo": "nixpkgs",
+        "type": "github"
+      }
+    },
     "pfersel": {
       "inputs": {
         "nixpkgs": [
@@ -458,6 +473,7 @@
         "nix-colors": "nix-colors",
         "nix-index-database": "nix-index-database",
         "nixpkgs": "nixpkgs",
+        "nixpkgs-systemd-256": "nixpkgs-systemd-256",
         "pfersel": "pfersel",
         "purge": "purge",
         "trucksimulatorbot": "trucksimulatorbot"
diff --git a/flake.nix b/flake.nix
index 958cca7..87bfb00 100644
--- a/flake.nix
+++ b/flake.nix
@@ -2,8 +2,8 @@
   description = "My nix setup";
   inputs = {
 
-    # nixpkgs.url = "nixpkgs/nixos-unstable";
-    nixpkgs.url = "github:nikstur/nixpkgs/systemd-256";
+    nixpkgs.url = "nixpkgs/nixos-unstable";
+    nixpkgs-systemd-256.url = "github:nikstur/nixpkgs/systemd-256";
 
     nix-index-database = {
       url = "github:nix-community/nix-index-database";
@@ -51,6 +51,7 @@
   outputs =
     { self
     , nixpkgs
+    , nixpkgs-systemd-256
     , home-manager
     , dns
     , nix-index-database
diff --git a/shared/systemd.nix b/shared/systemd.nix
index 45193d8..cb53f89 100644
--- a/shared/systemd.nix
+++ b/shared/systemd.nix
@@ -1,9 +1,9 @@
-{ pkgs, lib, ... }:
+{ pkgs, lib, nixpkgs-systemd-256, ... }:
 
 {
   systemd = {
 
-    package = lib.mkDefault (pkgs.systemd.override { withHomed = false; });
+    package = lib.mkDefault (nixpkgs-systemd-256.legacyPackages.x86_64-linux.systemd.override { withHomed = false; });
     sleep.extraConfig = ''
       HibernateDelaySec=2h
     '';