Streamline push etckeeper and os update

The os update and backup now include etckeeper as its part of the
workflow.
The os updates now have the same name on all systems. That should reduce
friction, same command for same workflow, just different implementation.

home/packages.nix

@@ -98,5 +98,4 @@ with pkgs; [
   # hikari 2
 
   (callPackage ./packages/custom/update-ubuntu-system { })
-  (callPackage ./packages/custom/push-etckeeper { })
 ])

home/packages/custom/backup/default.nix

@@ -1,8 +1,9 @@
 {
-  writeShellApplication,
+  writeShellApplication
-  borgbackup,
+  , borgbackup
-  git,
+  , git
-  rsync
+  , rsync
+  , callPackage
 }:
 
 writeShellApplication {
@@ -12,6 +13,7 @@ writeShellApplication {
     borgbackup
     rsync
     git
+    (callPackage ../push-etckeeper { })
   ];
 
   text = ''
@@ -29,5 +31,6 @@ writeShellApplication {
     sudo chown daniels:daniels -R /media/daniels/Backup/etc/
     cd /media/daniels/Backup/etc/
     git reset --hard master
+    custom-push-etckeeper
   '';
 }

home/packages/custom/update-nixos-system/default.nix

@@ -1,7 +1,7 @@
 { writeShellApplication }:
 
 writeShellApplication {
-  name = "custom-update-nixos-system";
+  name = "custom-update-operating-system";
 
   text = ''
     sudo nixos-rebuild switch --upgrade-all

home/packages/custom/update-ubuntu-system/default.nix

@@ -1,7 +1,14 @@
-{ writeShellApplication }:
+{
+  writeShellApplication
+  , callPackage
+}:
 
 writeShellApplication {
-  name = "custom-update-ubuntu-system";
+  name = "custom-update-operating-system";
+
+  runtimeInputs = [
+    (callPackage ../push-etckeeper { })
+  ];
 
   text = ''
     sudo apt update
@@ -9,6 +16,8 @@ writeShellApplication {
     sudo apt upgrade -V -y
     sudo apt autoremove -y
 
+    custom-push-etckeeper
+
     sudo fwupdmgr refresh
     sudo fwupdmgr get-updates
     fwupdmgr update -y