From bcb2e56d9a86c1cf137d68f2296a8fa17f30e12d Mon Sep 17 00:00:00 2001
From: Thilo Billerbeck <thilo.billerbeck@officerent.de>
Date: Sat, 18 May 2024 01:55:48 +0200
Subject: [PATCH 1/2] flake.lock: Update
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

Flake lock file updates:

• Updated input 'home-manager':
    'github:nix-community/home-manager/44677a1c96810a8e8c4ffaeaad10c842402647c1' (2024-05-12)
  → 'github:nix-community/home-manager/e3ad5108f54177e6520535768ddbf1e6af54b59d' (2024-05-17)
• Updated input 'nix-alien':
    'github:thiagokokada/nix-alien/db5d6107d3c72d5eb0b7a02a30b87b1f0076fcc5' (2024-04-15)
  → 'github:thiagokokada/nix-alien/ea6ebda03c5537eebbb93af57ca6f2c2979981be' (2024-05-15)
• Updated input 'nix-alien/nix-index-database':
    'github:nix-community/nix-index-database/93aed67288be60c9ef6133ba2f8de128f4ef265c' (2024-04-14)
  → 'github:nix-community/nix-index-database/f9027322f48b427da23746aa359a6510dfcd0228' (2024-05-12)
• Updated input 'nix-alien/nix-index-database/nixpkgs':
    'github:nixos/nixpkgs/1042fd8b148a9105f3c0aca3a6177fd1d9360ba5' (2024-04-10)
  → 'github:nixos/nixpkgs/f1010e0469db743d14519a1efd37e23f8513d714' (2024-05-09)
• Updated input 'nixpkgs':
    'github:NixOS/nixpkgs/2057814051972fa1453ddfb0d98badbea9b83c06' (2024-05-12)
  → 'github:NixOS/nixpkgs/33d1e753c82ffc557b4a585c77de43d4c922ebb5' (2024-05-15)
---
 flake.lock | 30 +++++++++++++++---------------
 1 file changed, 15 insertions(+), 15 deletions(-)

diff --git a/flake.lock b/flake.lock
index 19dab71..5fe82b1 100644
--- a/flake.lock
+++ b/flake.lock
@@ -93,11 +93,11 @@
         ]
       },
       "locked": {
-        "lastModified": 1715486357,
-        "narHash": "sha256-4pRuzsHZOW5W4CsXI9uhKtiJeQSUoe1d2M9mWU98HC4=",
+        "lastModified": 1715930644,
+        "narHash": "sha256-W9pyM3/vePxrffHtzlJI6lDS3seANQ+Nqp+i58O46LI=",
         "owner": "nix-community",
         "repo": "home-manager",
-        "rev": "44677a1c96810a8e8c4ffaeaad10c842402647c1",
+        "rev": "e3ad5108f54177e6520535768ddbf1e6af54b59d",
         "type": "github"
       },
       "original": {
@@ -161,11 +161,11 @@
         ]
       },
       "locked": {
-        "lastModified": 1713164845,
-        "narHash": "sha256-6X0H56qGmN/LoEdcBcwm3+apHLEe7r4caO719q1/KMI=",
+        "lastModified": 1715754082,
+        "narHash": "sha256-2hAydsdMk6QmDar+16ryyn+pVksxudwC5vRiatJbysM=",
         "owner": "thiagokokada",
         "repo": "nix-alien",
-        "rev": "db5d6107d3c72d5eb0b7a02a30b87b1f0076fcc5",
+        "rev": "ea6ebda03c5537eebbb93af57ca6f2c2979981be",
         "type": "github"
       },
       "original": {
@@ -194,11 +194,11 @@
         "nixpkgs": "nixpkgs"
       },
       "locked": {
-        "lastModified": 1713067146,
-        "narHash": "sha256-9D20xjblGKEVRVCnM3qWhiizEa9i6OpK6xQJajwcwOQ=",
+        "lastModified": 1715483403,
+        "narHash": "sha256-WMDuQj7J5jbpXI/X/E6FZRKgBFGcaSTvYyVxPnKE6KU=",
         "owner": "nix-community",
         "repo": "nix-index-database",
-        "rev": "93aed67288be60c9ef6133ba2f8de128f4ef265c",
+        "rev": "f9027322f48b427da23746aa359a6510dfcd0228",
         "type": "github"
       },
       "original": {
@@ -250,11 +250,11 @@
     },
     "nixpkgs": {
       "locked": {
-        "lastModified": 1712791164,
-        "narHash": "sha256-3sbWO1mbpWsLepZGbWaMovSO7ndZeFqDSdX0hZ9nVyw=",
+        "lastModified": 1715266358,
+        "narHash": "sha256-doPgfj+7FFe9rfzWo1siAV2mVCasW+Bh8I1cToAXEE4=",
         "owner": "nixos",
         "repo": "nixpkgs",
-        "rev": "1042fd8b148a9105f3c0aca3a6177fd1d9360ba5",
+        "rev": "f1010e0469db743d14519a1efd37e23f8513d714",
         "type": "github"
       },
       "original": {
@@ -303,11 +303,11 @@
     },
     "nixpkgs_2": {
       "locked": {
-        "lastModified": 1715534503,
-        "narHash": "sha256-5ZSVkFadZbFP1THataCaSf0JH2cAH3S29hU9rrxTEqk=",
+        "lastModified": 1715787315,
+        "narHash": "sha256-cYApT0NXJfqBkKcci7D9Kr4CBYZKOQKDYA23q8XNuWg=",
         "owner": "NixOS",
         "repo": "nixpkgs",
-        "rev": "2057814051972fa1453ddfb0d98badbea9b83c06",
+        "rev": "33d1e753c82ffc557b4a585c77de43d4c922ebb5",
         "type": "github"
       },
       "original": {

From 3644f9353c3631f8cc7cd34517dfa6f66d3f428b Mon Sep 17 00:00:00 2001
From: Thilo Billerbeck <thilo.billerbeck@officerent.de>
Date: Sat, 18 May 2024 14:24:03 +0200
Subject: [PATCH 2/2] fix nix env availability

---
 home-manager/modules/packages.nix  | 1 +
 home-manager/programs/topgrade.nix | 4 ++--
 2 files changed, 3 insertions(+), 2 deletions(-)

diff --git a/home-manager/modules/packages.nix b/home-manager/modules/packages.nix
index 23744c0..fe19cfa 100644
--- a/home-manager/modules/packages.nix
+++ b/home-manager/modules/packages.nix
@@ -18,6 +18,7 @@ in
 
     home.packages = with pkgs;
       [
+        pkgs.nixVersions.latest # because remotely invoked updates are fun ;)
         up
         htop
         rustc
diff --git a/home-manager/programs/topgrade.nix b/home-manager/programs/topgrade.nix
index c496e07..03d1fd1 100644
--- a/home-manager/programs/topgrade.nix
+++ b/home-manager/programs/topgrade.nix
@@ -1,4 +1,4 @@
-{ config, ... }:
+{ config, pkgs,  ... }:
 
 let
   configPath = if config.machine.isGeneric then
@@ -22,7 +22,7 @@ in {
       firmware = { upgrade = true; };
       pre_commands = {
         flakeUpgrade =
-          "cd ${configPath} && nix flake update --commit-lock-file --verbose --repair";
+          "cd ${configPath} && ${pkgs.nixVersions.latest}/bin/nix flake update --commit-lock-file --verbose --repair";
       };
     };
   };