nix: move config to separate file

matrix-construct · May 13, 2020 · 9428f4b · 9428f4b
1 parent b69562b
commit 9428f4b
Show file tree

Hide file tree

Showing 4 changed files with 435 additions and 424 deletions.
diff --git a/flake.nix b/flake.nix
@@ -10,7 +10,7 @@
         inherit (prev) lib linkFarm;
         srcFilter = n: t: (lib.hasSuffix ".cc" n || lib.hasSuffix ".h" n || lib.hasSuffix ".S" n
         || lib.hasSuffix ".md" n || t == "directory");
-        repo = lib.cleanSourceWith { filter = srcFilter; src = lib.cleanSource "./."; };
+        repo = lib.cleanSourceWith { filter = srcFilter; src = lib.cleanSource ./.; };
 
         buildFileWith = root: name: type: rec {
           inherit name; file = "${root}/${name}";

diff --git a/nix/module/default.nix b/nix/module/default.nix
@@ -1,4 +1,4 @@
-self: { config, system, pkgs, lib, ... }:
+self: { config, pkgs, lib, ... }:
 
 let
   cfg = config.services.matrix-construct;
@@ -35,7 +35,7 @@ in {
 
     package = mkOption {
       type = types.package;
-      default = self.packages.${system}.matrix-construct;
+      default = self.packages.${pkgs.system}.matrix-construct;
       defaultText = "pkgs.matrix-construct";
       description = ''
         Guix package to use.
@@ -55,7 +55,7 @@ in {
   config = lib.mkIf cfg.enable {
     environment.systemPackages = [ cfg.package ] ++ lib.optional cfg.useScreen pkgs.screen;
 
-    systemd.services.construct = {
+    systemd.services.matrix-construct = {
       description = "Matrix Construct";
       wantedBy = [ "multi-user.target" ];