summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorCrazazy2022-01-31 13:07:13 +0100
committerCrazazy2022-02-10 16:13:34 +0100
commit35a87fce3535b9f9b1e57118ee6d0fe51480bd30 (patch)
tree3668428f6cccf4ddcbf1fa2b888a2392d04cd4f2
parent7f4ed33bc6de8c9cebebab7b33c9dc3da671dbd9 (diff)
final set of fixes
-rw-r--r--emacs.org7
-rw-r--r--nixos.org2
2 files changed, 3 insertions, 6 deletions
diff --git a/emacs.org b/emacs.org
index 555c7b0..a1234eb 100644
--- a/emacs.org
+++ b/emacs.org
@@ -11,13 +11,10 @@ Also, if you just stumbled accross this at random, there is an easy tangle butto
do any emacs configuring by ourselves
#+begin_src nix :tangle emacs.nix
let
- sources = import ./nix/sources.nix
+ sources = import ./nix/sources.nix;
in
- sources.emacs { configDir = ./emacsconfig; }
+ import sources.emacs { configDir = ./emacsconfig; }
#+end_src
-
- This file will load in a emacs configuration framework that will take care of all our dependencies.
- Kind of like an automatic =(setq use-package-ensure t)= without use having to set that ourselves
* Emacs configuring
Now the real configuring begins!
for some backwards compat purposes I have decided to but different config subjects into different files
diff --git a/nixos.org b/nixos.org
index 75339bc..52159d3 100644
--- a/nixos.org
+++ b/nixos.org
@@ -128,7 +128,7 @@ stuff
default = "/nix/persist";
};
};
- config = mkIf (config.homeBinds != [ ]) {
+ config = with lib; mkIf (config.homeBinds != [ ]) {
fileSystems = genAttrs (map (loc: "/home/${config.mainUser}/${loc}") config.homeBinds)
(loc: {
device = "${config.persistRoot}${loc}";