Commit 67a72b31d165

Vincent Demeester <vincent@sbr.pm>
2020-12-18 15:58:10
nix: move overlays to nix/overlays
Signed-off-by: Vincent Demeester <vincent@sbr.pm>
main
1 parent b4b70b3
Changed files (10)
nix
overlays
compat
overlays.nix
emacs
builder.nix
mkSecret.nix
sbr.nix
unstable.nix
packages
patches
.gitkeep
clean-env.patch
tramp-detect-wrapped-gvfsd.patch
default.nix
systems
modules
core
nix.nix
overlays/compat/overlays.nix → nix/overlays/compat/overlays.nix
File renamed without changes
overlays/emacs/builder.nix → nix/overlays/emacs/builder.nix
File renamed without changes
overlays/mkSecret.nix → nix/overlays/mkSecret.nix
File renamed without changes
overlays/sbr.nix → nix/overlays/sbr.nix
@@ -3,18 +3,18 @@ let
   compileEmacsFiles = super.callPackage ./emacs/builder.nix;
 in
 rec {
-  scripts = import ../nix/packages/my/scripts {
+  scripts = import ../packages/my/scripts {
     inherit (self) stdenv;
   };
-  vrsync = import ../nix/packages/my/vrsync {
+  vrsync = import ../packages/my/vrsync {
     inherit (self) stdenv lib;
   };
-  vde-thinkpad = import ../nix/packages/my/vde-thinkpad {
+  vde-thinkpad = import ../packages/my/vde-thinkpad {
     inherit (self) stdenv lib;
   };
-  bekind = super.callPackage ../tools/bekind { };
+  bekind = super.callPackage ../../tools/bekind { };
 
-  my = import ../nix/packages {
+  my = import ../packages {
     inherit (self) pkgs;
   };
overlays/unstable.nix → nix/overlays/unstable.nix
@@ -1,6 +1,6 @@
 _: _:
 let
-  unstable = (import ./nix).pkgs-unstable { };
+  unstable = (import ../.).pkgs-unstable { };
 in
 {
   inherit (unstable)
overlays/patches/.gitkeep → nix/packages/patches/.gitkeep
File renamed without changes
overlays/patches/clean-env.patch → nix/packages/patches/clean-env.patch
File renamed without changes
overlays/patches/tramp-detect-wrapped-gvfsd.patch → nix/packages/patches/tramp-detect-wrapped-gvfsd.patch
File renamed without changes
nix/packages/default.nix
@@ -25,7 +25,7 @@ let
       ];
       buildInputs = old.buildInputs ++ [ pkgs.jansson ];
       patches = [
-        ../overlays/patches/clean-env.patch
+        ./patches/clean-env.patch
       ];
     }
   );
systems/modules/core/nix.nix
@@ -89,9 +89,9 @@ in
 
     nixpkgs = {
       overlays = [
-        (import ../../../overlays/mkSecret.nix)
-        (import ../../../overlays/sbr.nix)
-        (import ../../../overlays/unstable.nix)
+        (import ../../../nix/overlays/mkSecret.nix)
+        (import ../../../nix/overlays/sbr.nix)
+        (import ../../../nix/overlays/unstable.nix)
         (import ../../../nix).emacs
       ];
       config = {
@@ -101,7 +101,7 @@ in
     system = {
       extraSystemBuilderCmds = ''
         ln -sv ${pkgs.path} $out/nixpkgs
-        ln -sv ${../../../overlays} $out/overlays
+        ln -sv ${../../../nix/overlays} $out/overlays
       '';
 
       stateVersion = "20.03";