From af90a0934b2ff296cbba8338112c26602fdbb460 Mon Sep 17 00:00:00 2001
From: Ingolf Wagner <contact@ingolf-wagner.de>
Date: Wed, 29 Sep 2021 22:42:48 +0200
Subject: [PATCH] add home-manager-utils

---
 nixos/flake.lock                      | 47 +++++++++++++++++++++++----
 nixos/flake.nix                       | 12 +++++--
 nixos/pkgs/default.nix                |  1 -
 nixos/system/desktop/home-manager.nix |  8 +++++
 4 files changed, 57 insertions(+), 11 deletions(-)

diff --git a/nixos/flake.lock b/nixos/flake.lock
index cbcdd40..c055ada 100644
--- a/nixos/flake.lock
+++ b/nixos/flake.lock
@@ -250,6 +250,26 @@
         "type": "github"
       }
     },
+    "home-manager-utils": {
+      "inputs": {
+        "home-manager": [
+          "home-manager"
+        ]
+      },
+      "locked": {
+        "lastModified": 1632947926,
+        "narHash": "sha256-dgHY+6K7i+5R8g2/VISn4rBGxyRjSVEdPS41YQltjWI=",
+        "owner": "mrvandalo",
+        "repo": "home-manager-utils",
+        "rev": "dcf13bd1633d5225e278d6dafcdecbf37c3726a4",
+        "type": "github"
+      },
+      "original": {
+        "owner": "mrvandalo",
+        "repo": "home-manager-utils",
+        "type": "github"
+      }
+    },
     "krops-lib": {
       "flake": false,
       "locked": {
@@ -316,6 +336,20 @@
       }
     },
     "nixpkgs_2": {
+      "locked": {
+        "lastModified": 1632855891,
+        "narHash": "sha256-crW76mt9/kbUBiKy/KiSnsQ9JEYgD3StDuYAMVkTbM0=",
+        "owner": "NixOS",
+        "repo": "nixpkgs",
+        "rev": "73086069ebd402e85eaa39c06aef33c2b917f532",
+        "type": "github"
+      },
+      "original": {
+        "id": "nixpkgs",
+        "type": "indirect"
+      }
+    },
+    "nixpkgs_3": {
       "locked": {
         "lastModified": 1625223284,
         "narHash": "sha256-jjLcDSU1rRiJb+n3uez23XAa7kbnPcGZTa6jIKh1GMQ=",
@@ -430,9 +464,7 @@
     "polygon-art": {
       "inputs": {
         "flake-utils": "flake-utils_2",
-        "nixpkgs": [
-          "nixpkgs"
-        ]
+        "nixpkgs": "nixpkgs_2"
       },
       "locked": {
         "lastModified": 1632864707,
@@ -470,6 +502,7 @@
         "cluster-module": "cluster-module",
         "doom-emacs-nix": "doom-emacs-nix",
         "home-manager": "home-manager",
+        "home-manager-utils": "home-manager-utils",
         "krops-lib": "krops-lib",
         "nixpkgs": "nixpkgs",
         "nixpkgs-unstable": "nixpkgs-unstable",
@@ -495,14 +528,14 @@
     },
     "sops-nix": {
       "inputs": {
-        "nixpkgs": "nixpkgs_2"
+        "nixpkgs": "nixpkgs_3"
       },
       "locked": {
-        "lastModified": 1632832687,
-        "narHash": "sha256-y7Us3d32vJl2TRQXUDQqSmLIP+k2z1Sn4vTaKL7VE44=",
+        "lastModified": 1632896262,
+        "narHash": "sha256-eglwV73HOaeCWOSyUSw2/OHISefMevk1814jENZymNw=",
         "owner": "Mic92",
         "repo": "sops-nix",
-        "rev": "8c5c313b562edee5a6ec2e118256a72710cc08b2",
+        "rev": "ae84c313c5250a832d61dae9e1e659b27542c47b",
         "type": "github"
       },
       "original": {
diff --git a/nixos/flake.nix b/nixos/flake.nix
index 03b5416..da4e128 100644
--- a/nixos/flake.nix
+++ b/nixos/flake.nix
@@ -5,7 +5,6 @@
     nixpkgs.url = "github:nixos/nixpkgs/nixos-21.05";
     nixpkgs-unstable.url = "github:nixos/nixpkgs/nixos-unstable";
     polygon-art = {
-      #url = "path:/home/palo/dev/polygon-art";
       url = "git+https://git.ingolf-wagner.de/palo/polygon-art.git";
       #inputs.nixpkgs.follows = "nixpkgs";
     };
@@ -17,6 +16,10 @@
       url = "github:nix-community/home-manager/release-21.05";
       inputs.nixpkgs.follows = "nixpkgs";
     };
+    home-manager-utils = {
+      url = "github:mrvandalo/home-manager-utils";
+      inputs.home-manager.follows = "home-manager";
+    };
     backup-module = {
       url = "git+https://git.ingolf-wagner.de/nix-modules/backup.git";
       flake = false;
@@ -32,7 +35,7 @@
     };
   };
 
-  outputs = { self, sops-nix, nixpkgs, home-manager, doom-emacs-nix
+  outputs = { self, sops-nix, nixpkgs, home-manager, home-manager-utils, doom-emacs-nix
     , backup-module, nixpkgs-unstable, krops-lib, cluster-module, polygon-art, ... }:
 
     let
@@ -64,7 +67,10 @@
         home-manager.nixosModules.home-manager
         {
           home-manager.users.mainUser = {
-            imports = [ doom-emacs-nix.hmModule ];
+            imports = [
+              doom-emacs-nix.hmModule
+              home-manager-utils.hmModule
+            ];
           };
           home-manager.useGlobalPkgs = true;
           home-manager.useUserPackages = true;
diff --git a/nixos/pkgs/default.nix b/nixos/pkgs/default.nix
index 23b5bbc..1e0a006 100644
--- a/nixos/pkgs/default.nix
+++ b/nixos/pkgs/default.nix
@@ -11,7 +11,6 @@ in {
   landingpage = callPackage ./landingpage { };
   light-control = callPackage ./light-control { };
   otpmenu = callPackage ./otpmenu { };
-  #polygon-art = super.callPackage ./polygon-art { };
   sononym = callPackage ./sononym { };
   sononym-crawler = callPackage ./sononym-crawler { };
   taskwarrior-hooks = callPackage ./taskwarrior-hooks { };
diff --git a/nixos/system/desktop/home-manager.nix b/nixos/system/desktop/home-manager.nix
index 02b74bb..04d5489 100644
--- a/nixos/system/desktop/home-manager.nix
+++ b/nixos/system/desktop/home-manager.nix
@@ -40,6 +40,14 @@ in {
 
   home-manager.users.mainUser = {
 
+    home.git-pull.enable = true;
+    home.git-pull.repositories = [
+      {
+        source = "git@github.com:mrVanDalo/home-manager-utils.git";
+        target = "~/dev/home-manager-utils";
+      }
+    ];
+
     home.file.".config/bugwarrior/bugwarriorrc".text = ''
       [general]
       targets = terranix