From 540131289e8bd99891b7da719bce8fe56a1d7ee0 Mon Sep 17 00:00:00 2001
From: Ingolf Wagner <contact@ingolf-wagner.de>
Date: Sat, 17 Apr 2021 16:43:33 +0200
Subject: [PATCH] updates

---
 shell.nix                       | 4 ++--
 system/desktop/home-manager.nix | 7 +++++--
 2 files changed, 7 insertions(+), 4 deletions(-)

diff --git a/shell.nix b/shell.nix
index 03aef46..56c7a54 100644
--- a/shell.nix
+++ b/shell.nix
@@ -109,8 +109,8 @@ let
 
       #home-manager.file = toString ~/dev/home-manager;
       home-manager.git = {
-        url = "https://github.com/rycee/home-manager.git";
-        ref = "7b6ebf2785cfc9dd6fc2b101cbbb2152eb68d45c";
+        url = "https://github.com/nix-community/home-manager.git";
+        ref = "2aa20ae969f2597c4df10a094440a66e9d7f8c86";
       };
 
       background-image-generators.git = {
diff --git a/system/desktop/home-manager.nix b/system/desktop/home-manager.nix
index d3d5043..3802450 100644
--- a/system/desktop/home-manager.nix
+++ b/system/desktop/home-manager.nix
@@ -86,8 +86,11 @@ in {
         key = "42AC51C9482D0834CF488AF1389EC2D64AC71EAC";
         signByDefault = true;
       };
-      ignores = [ "*.swp" "*~" ".idea" ];
-
+      ignores = [ "*.swp" "*~" ".idea" ".*penis.*" ];
+      extraConfig = {
+        init.defaultBranch = "main";
+        pull.ff = "only";
+      };
     };
 
     programs.gpg = {