reorganize, and some small fixes

1 files changed, 8 insertions, 8 deletions

diff --git a/linux.nix b/linux.nix
index 9201647..3d3dbd5 100644
--- a/linux.nix
+++ b/linux.nix
@@ -2,7 +2,7 @@
 
 let
   homedir = builtins.getEnv "HOME";
-  gitCommitTemplate = ./git-commit-template;
+  gitCommitTemplate = ./lib/git-commit-template;
   gpgid = "D09299626FA78AF8";
   cmdtree = pkgs.stdenv.mkDerivation {
     name = "cmdtree";
@@ -12,7 +12,7 @@ let
       rev = "5606078e8fa02462f0208d9f9cad98c7673812e6";
     };
     buildPhase = ''
-      cp ${./cfg.def.h} ./cfg.def.h
+      cp ${./lib/cfg.def.h} ./cfg.def.h
       make
     '';
     installPhase = ''
@@ -53,17 +53,17 @@ let
   };
 in
 {
-  imports = [ ./common.nix ./email.nix ];
+  imports = [ ./lib/common.nix ./lib/email.nix ];
   home = {
     keyboard.options = [ "caps:ctrl_modifier" ];
     file = {
       mutt = {
-        text = (builtins.readFile ./muttrc) +
-          (builtins.readFile ./mutt/solarized.muttrc);
+        text = (builtins.readFile ./lib/muttrc) +
+          (builtins.readFile ./lib/mutt/solarized.muttrc);
         target = ".muttrc";
       };
       mailcap = {
-        source = ./mailcap;
+        source = ./lib/mailcap;
         target = ".mailcap";
       };
     };
@@ -352,7 +352,7 @@ in
           #hpkgs.taffybar
         ];
         enableContribAndExtras = true;
-        config = ./xmonad.hs;
+        config = ./lib/xmonad.hs;
       };
     };
   };
@@ -389,7 +389,7 @@ in
 
     emacs = {
       enable = true;
-      extraPackages = epkgs: import ./emacs-packages.nix { inherit epkgs; };
+      extraPackages = epkgs: import ./lib/emacs-packages.nix { inherit epkgs; };
     };
 
     firefox = {