From 4143610c0f484cc79f19d18ceac062d56fa0cf58 Mon Sep 17 00:00:00 2001
From: Root <root@fudo.org>
Date: Thu, 25 Feb 2021 22:48:01 +0000
Subject: [PATCH] Added configuration.nix, added git config for root & niten

---
 .gitignore             |  1 -
 configuration.nix      | 22 ++++++++++++++++++++++
 home-manager/niten.nix |  6 ++++++
 home-manager/root.nix  |  6 ++++++
 4 files changed, 34 insertions(+), 1 deletion(-)
 create mode 100644 configuration.nix

diff --git a/.gitignore b/.gitignore
index e0f8ae3..ef6d806 100644
--- a/.gitignore
+++ b/.gitignore
@@ -1,3 +1,2 @@
-configuration.nix
 *~
 hardware-configuration.nix
diff --git a/configuration.nix b/configuration.nix
new file mode 100644
index 0000000..166ffce
--- /dev/null
+++ b/configuration.nix
@@ -0,0 +1,22 @@
+{ config, lib, pkgs, ... }:
+
+let
+  local = import ../host-config.nix;
+  initialize = import ./initialize.nix;
+
+    # (import "${builtins.fetchTarball https://github.com/rycee/home-manager/archive/master.tar.gz}/nixos")
+
+in {  
+  imports = [
+    (initialize {
+      hostname = local.hostname;
+      profile = local.profile;
+      site = local.site;
+      domain = local.domain;
+      home-manager-package = builtins.fetchGit {
+        url = "https://github.com/nix-community/home-manager.git";
+	ref = "release-20.09";
+      };
+    })
+  ];
+}
diff --git a/home-manager/niten.nix b/home-manager/niten.nix
index f62858b..9776a32 100644
--- a/home-manager/niten.nix
+++ b/home-manager/niten.nix
@@ -62,6 +62,12 @@ in {
       enable = true;
       userName = name;
       userEmail = email;
+      ignores = [ "*~" ];
+      extraConfig = {
+        pull = {
+          rebase = false;
+        };
+      };
     };
   };
 
diff --git a/home-manager/root.nix b/home-manager/root.nix
index ad5db06..85253a7 100644
--- a/home-manager/root.nix
+++ b/home-manager/root.nix
@@ -10,6 +10,12 @@ in {
       enable = true;
       userName = name;
       userEmail = email;
+      ignores = [ "*~" ];
+      extraConfig = {
+        pull = {
+          rebase = false;
+        };
+      };
     };
   };