aboutsummaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorKatharina Fey <kookie@spacekookie.de>2019-10-06 18:37:34 +0000
committerKatharina Fey <kookie@spacekookie.de>2019-10-06 18:37:34 +0000
commita9c661ac0d05669f072733dc673527bed6d98e3a (patch)
tree1cbb679276228cb731da23c43f85db8386c63efc
parent029100bf230606303e5669c01ffbed192d06c0fd (diff)
<>/git: moving module from workstation to base
-rw-r--r--modules/base/default.nix1
-rw-r--r--modules/base/git/default.nix9
-rw-r--r--modules/workstation/default.nix1
-rw-r--r--modules/workstation/git/default.nix9
4 files changed, 10 insertions, 10 deletions
diff --git a/modules/base/default.nix b/modules/base/default.nix
index 3c135ad5f30..af9b1868f57 100644
--- a/modules/base/default.nix
+++ b/modules/base/default.nix
@@ -3,6 +3,7 @@
{
imports = [
./fish
+ ./git
./user.nix
];
}
diff --git a/modules/base/git/default.nix b/modules/base/git/default.nix
new file mode 100644
index 00000000000..9392f56f3dc
--- /dev/null
+++ b/modules/base/git/default.nix
@@ -0,0 +1,9 @@
+{ config, pkgs, ... }:
+
+let
+ git = (pkgs.git.override { svnSupport = true; sendEmailSupport = true; });
+in
+{
+ environment.systemPackages = [ git ]
+ ++ (with pkgs; [ gitAndTools.hub ]);
+}
diff --git a/modules/workstation/default.nix b/modules/workstation/default.nix
index 2b9543dc5f5..a965fe1d2a9 100644
--- a/modules/workstation/default.nix
+++ b/modules/workstation/default.nix
@@ -18,7 +18,6 @@
./chat
./devel
./emacs
- ./git
./pass
];
};
diff --git a/modules/workstation/git/default.nix b/modules/workstation/git/default.nix
deleted file mode 100644
index c5a6d854850..00000000000
--- a/modules/workstation/git/default.nix
+++ /dev/null
@@ -1,9 +0,0 @@
-{ pkgs, ... }:
-
-let
- git = (pkgs.git.override { svnSupport = true; sendEmailSupport = true; });
-in
-{
- home.packages = [ git ]
- ++ (with pkgs; [ gitAndTools.hub ]);
-}