home

commit 0c04166428eeb366ffbf59850827e6e0fe022440
parent 8c922730b7306a22241cffe17ce1d542d6d946de
Author: Vincent Demeester <vincent@sbr.pm>
Date:   Mon, 25 May 2020 11:46:02 +0200

nix: remove emacs-overlay submodule and use niv

Signed-off-by: Vincent Demeester <vincent@sbr.pm>

Diffstat:
M
.gitmodules
 | 
3
---
M
modules/profiles/nix-config.nixos.nix
 | 
2
+-
M
nix/default.nix
 | 
1
+
M
nix/sources.json
 | 
12
++++++++++++
D
overlays/emacs-overlay
 | 
1
-
M
systems/hokkaido.nix
 | 
2
+-
M
systems/wakasu.nix
 | 
2
+-

7 files changed, 16 insertions(+), 7 deletions(-)
diff --git a/.gitmodules b/.gitmodules
@@ -1,6 +1,3 @@
-[submodule "overlays/emacs-overlay"]
-	path = overlays/emacs-overlay
-	url = https://github.com/nix-community/emacs-overlay.git
 [submodule "tools/emacs/lisp/modus-themes"]
 	path = tools/emacs/lisp/modus-themes
 	url = https://gitlab.com/protesilaos/modus-themes.git
diff --git a/modules/profiles/nix-config.nixos.nix b/modules/profiles/nix-config.nixos.nix
@@ -75,7 +75,7 @@ in
       overlays = [
         (import ../../overlays/sbr.nix)
         (import ../../overlays/unstable.nix)
-        (import ../../overlays/emacs-overlay)
+        (import ../nix).emacs
       ];
       config = {
         allowUnfree = true;
diff --git a/nix/default.nix b/nix/default.nix
@@ -8,4 +8,5 @@ rec {
   lib-unstable = import (sources.nixos-unstable + "/lib");
   pkgs-unstable = import sources.nixos-unstable;
   nixpkgs = import sources.nixpkgs;
+  emacs = import source.emacs-overlay;
 }
diff --git a/nix/sources.json b/nix/sources.json
@@ -1,4 +1,16 @@
 {
+    "emacs-overlay": {
+        "branch": "master",
+        "description": "Bleeding edge emacs overlay [maintainer=@adisbladis] ",
+        "homepage": "",
+        "owner": "nix-community",
+        "repo": "emacs-overlay",
+        "rev": "29a3da701b7f30fbfbdc27681343335d68156c3e",
+        "sha256": "0rwg6w36i2w414qnghy8hln56hxjghp6rpvr2hgiv6h0vf8wa2b1",
+        "type": "tarball",
+        "url": "https://github.com/nix-community/emacs-overlay/archive/29a3da701b7f30fbfbdc27681343335d68156c3e.tar.gz",
+        "url_template": "https://github.com/<owner>/<repo>/archive/<rev>.tar.gz"
+    },
     "home-manager": {
         "branch": "master",
         "description": "Manage a user environment using Nix",
diff --git a/overlays/emacs-overlay b/overlays/emacs-overlay
@@ -1 +0,0 @@
-Subproject commit ce00df75bad88d4bfef344ff6f7d856b42a72b4a
diff --git a/systems/hokkaido.nix b/systems/hokkaido.nix
@@ -60,7 +60,7 @@ in
     overlays = [
       (import ../overlays/sbr.nix)
       (import ../overlays/unstable.nix)
-      (import ../overlays/emacs-overlay)
+      (import ../nix).emacs
     ];
     config = {
       allowUnfree = true;
diff --git a/systems/wakasu.nix b/systems/wakasu.nix
@@ -38,7 +38,7 @@ in
     overlays = [
       (import ../overlays/sbr.nix)
       (import ../overlays/unstable.nix)
-      (import ../overlays/emacs-overlay)
+      (import ../nix).emacs
     ];
     config = {
       allowUnfree = true;