From e5bd8d80f100cdf78ec7be50f5d87c0b905afe99 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Jonas=20R=C3=B6ger?= <jonas.roeger@tu-dortmund.de>
Date: Mon, 22 Apr 2024 16:55:24 +0200
Subject: [PATCH] Generation  101   2024-04-22 16:55:23   (current)

---
 flake.nix                   | 19 -------------------
 modules/bin/nix-scripts.nix |  8 ++++----
 2 files changed, 4 insertions(+), 23 deletions(-)

diff --git a/flake.nix b/flake.nix
index 5474887..9f5bdc1 100644
--- a/flake.nix
+++ b/flake.nix
@@ -51,17 +51,6 @@
             ...
           }: {nixpkgs.overlays = [overlay-unstable];})
           ./hosts/comfy-station/configuration.nix
-          home-manager.nixosModules.home-manager
-          {
-            home-manager.extraSpecialArgs = {inherit inputs;};
-            home-manager.useGlobalPkgs = true;
-            home-manager.useUserPackages = true;
-            home-manager.sharedModules = [
-              plasma-manager.homeManagerModules.plasma-manager
-              inputs.sops-nix.homeManagerModules.sops
-            ];
-            home-manager.users.jonas = import ./home/jonas/home.nix;
-          }
         ];
       };
       vm = nixpkgs.lib.nixosSystem {
@@ -71,14 +60,6 @@
         };
         modules = [
           ./hosts/vm/configuration.nix
-          home-manager.nixosModules.home-manager
-          {
-            home-manager.extraSpecialArgs = {inherit inputs;};
-            home-manager.useGlobalPkgs = true;
-            home-manager.useUserPackages = true;
-            home-manager.sharedModules = [plasma-manager.homeManagerModules.plasma-manager];
-            home-manager.users.jonas = import ./home/jonas/home.nix;
-          }
         ];
       };
     };
diff --git a/modules/bin/nix-scripts.nix b/modules/bin/nix-scripts.nix
index 848f731..93a0688 100644
--- a/modules/bin/nix-scripts.nix
+++ b/modules/bin/nix-scripts.nix
@@ -12,7 +12,7 @@
       ${pkgs.git}/bin/git diff -U0
       echo "NixOS Rebuilding..."
       ${pkgs.unstable.nh}/bin/nh home switch ~/.nixos
-      gen=$(home-manager generations | head -n1 | ${pkgs.gawk}/bin/awk '{print "Gen" $5 " @ " $1}')
+      gen=$(home-manager generations | head -n1 | ${pkgs.gawk}/bin/awk '{print "Gen" $5 " @ " $1 "-" $2}')
       ${pkgs.git}/bin/git commit --no-gpg-sign -am "Home $gen"
       popd
     '';
@@ -25,8 +25,8 @@
       ${pkgs.git}/bin/git diff -U0
       echo "NixOS Rebuilding..."
       ${pkgs.unstable.nh}/bin/nh os switch ~/.nixos
-      gen=$(sudo nix-env --list-generations --profile /nix/var/nix/profiles/system | ${pkgs.gnugrep}/bin/grep current)
-      ${pkgs.git}/bin/git commit --no-gpg-sign -am "Generation $gen"
+      gen=$(sudo nix-env --list-generations --profile /nix/var/nix/profiles/system | ${pkgs.gnugrep}/bin/grep current | ${pkgs.gawk}/bin/awk '{print "Gen" $1 " @ " $2 "-" $3}')
+      ${pkgs.git}/bin/git commit --no-gpg-sign -am "System $gen"
       popd
     '';
   upgrade =
@@ -42,7 +42,7 @@
       nix flake update .
       echo "NixOS Rebuilding..."
       ${pkgs.unstable.nh}/bin/nh os switch ~/.nixos
-      gen=$(sudo nix-env --list-generations --profile /nix/var/nix/profiles/system | ${pkgs.gnugrep}/bin/grep current)
+      gen=$(sudo nix-env --list-generations --profile /nix/var/nix/profiles/system | ${pkgs.gnugrep}/bin/grep current | ${pkgs.gawk}/bin/awk '{print "Gen" $1 " @ " $2 "-" $3}')
       ${pkgs.git}/bin/git commit --no-gpg-sign -am "Upgrade $gen"
       popd
     '';