m 2 awesomecfg -> m 5 awesomecfg

4 files changed, 8 insertions, 2 deletions

diff --git a/makefu/2configs/base-gui.nix b/makefu/2configs/base-gui.nix
index 3dd225359..30e4c735e 100644
--- a/makefu/2configs/base-gui.nix
+++ b/makefu/2configs/base-gui.nix
@@ -13,6 +13,7 @@
 with lib;
 let
   mainUser = config.krebs.build.user.name;
+  awesomecfg = pkgs.awesomecfg.full;
 in
 {
   imports = [ ];
@@ -34,9 +35,8 @@ in
   };
   nixpkgs.config.packageOverrides = pkgs: rec {
     awesome = pkgs.stdenv.lib.overrideDerivation pkgs.awesome (oldAttrs : {
-      awesomecfg = ./awesome/rc.lua;
       postInstall = ''
-      cp $awesomecfg $out/etc/xdg/awesome/rc.lua
+      cp ${awesomecfg}  $out/etc/xdg/awesome/rc.lua
       '';
     });
   };
diff --git a/makefu/5pkgs/awesomecfg/default.nix b/makefu/5pkgs/awesomecfg/default.nix
new file mode 100644
index 000000000..a636db78b
--- /dev/null
+++ b/makefu/5pkgs/awesomecfg/default.nix
@@ -0,0 +1,5 @@
+_:
+
+{
+  full = ./cfg/full.cfg;
+}
diff --git a/makefu/2configs/awesome/rc.lua b/makefu/5pkgs/awesomecfg/full.cfg
index b3f94e655..b3f94e655 100644
--- a/makefu/2configs/awesome/rc.lua
+++ b/makefu/5pkgs/awesomecfg/full.cfg
diff --git a/makefu/5pkgs/default.nix b/makefu/5pkgs/default.nix
index b78183a2a..7945b6ebd 100644
--- a/makefu/5pkgs/default.nix
+++ b/makefu/5pkgs/default.nix
@@ -8,4 +8,5 @@ in
   alsa-hdspconf = callPackage ./alsa-tools { alsaToolTarget="hdspconf";};
   alsa-hdsploader = callPackage ./alsa-tools { alsaToolTarget="hdsploader";};
   tinc_graphs = callPackage ./tinc_graphs {};
+  awesomecfg = callPackage ./awesomecfg {};
 }