cont

src/system/machines/desktop/home.nix

@@ -6,7 +6,6 @@
   home-manager.users.${config.user.name} = {
     imports = [
       ../../../user
-      ../../../user/modules
     ];
 
     programs.home-manager.enable = true;

src/system/machines/server/home.nix

@@ -6,7 +6,6 @@
   home-manager.users.${config.user.name} = {
     imports = [
       ../../../user
-      ../../../user/modules
     ];
 
     programs.home-manager.enable = true;

src/system/machines/wsl/home.nix

@@ -6,7 +6,6 @@
   home-manager.users.${config.user.name} = {
     imports = [
       ../../../user
-      ../../../user/modules
     ];
 
     programs.home-manager.enable = true;

src/system/modules/bitcoin/default.nix

@@ -2,10 +2,10 @@
 
 with lib;
 let
-  cfg = config.modules.bitcoin;
+  cfg = config.modules.system.bitcoin;
 
 in
-{ options.modules.bitcoin = { enable = mkEnableOption "bitcoin"; };
+{ options.modules.system.bitcoin = { enable = mkEnableOption "system.bitcoin"; };
 
   imports = [
     ./core-lightning

src/system/modules/bitcoin/modules/core-lightning/default.nix

@@ -1,11 +1,12 @@
 { lib, pkgs, config, ... }:
 
 with lib;
-  let cfg = config.modules.bitcoin.core-lightning;
+  let cfg = config.modules.system.bitcoin.core-lightning;
 
 in
-{ options.modules.bitcoin.core-lightning = { enable = mkEnableOption "bitcoin.core-lightning"; };
+{ options.modules.system.bitcoin.core-lightning = { enable = mkEnableOption "system.bitcoin.core-lightning"; };
   config = mkIf cfg.enable {
+    imports = [  ./modules ];
     programs.bash.shellAliases = {
       cln = "lightningd";
     };
@@ -24,16 +25,33 @@ in
       };
     };
 
-    systemd.services.clightning = {
+    systemd.services.lightningd = {
       Unit = {
-        after = [ "network.target" "bitcoind.service" ];
+        Description = "Core Lightning daemon";
-        wantedBy = [ "multi-user.target" ];
+        Requires = [ "bitcoind.service" ];
+        After = [ "bitcoind.service" "network-online.target" ];
+        Wants = [ "network-online.target" ];
       };
       Service = {
-        ExecStart = "${pkgs.clightning}/bin/lightningd --conf=...";
+        ExecStartPre = "/usr/bin/sleep 10";
-        Restart = "always";
+        ExecStart = "${pkgs.clightning}/bin/lightningd --conf=/var/lib/clightning/.lightning/config";
+
+        RuntimeDirectory = "lightningd";
+
         User = "clightning";
         Group = "bitcoin";
+
+        Type = "forking";
+        PIDFile = "/run/lightningd/lightningd.pid";
+        Restart = "on-failute";
+
+        PrivateTmp = true;
+        ProtectSystem = "full";
+        NoNetPrivileges = true;
+        PrivateDevies = true;
+      };
+      Install = {
+        WantedBy = [ "multi-user.target" ];
       };
     };
   };

src/system/modules/bitcoin/modules/sparrow-server/default.nix

@@ -2,10 +2,10 @@
 
 with lib;
   let
-    cfg = config.modules.bitcoin.sparrow-server;
+    cfg = config.modules.gui.bitcoin.sparrow-server;
     sparrow-server = import ./derivation.nix { inherit pkgs; };
 in
-{ options.modules.bitcoin.sparrow-server = { enable = mkEnableOption "bitcoin.sparrow-server"; };
+{ options.modules.gui.bitcoin.sparrow-server = { enable = mkEnableOption "gui.bitcoin.sparrow-server"; };
   config = mkIf cfg.enable {
     home.packages = with pkgs; [
       sparrow-server

src/system/modules/default.nix

@@ -1,6 +1,6 @@
 {
   imports = [
-    ./corn
+    ./bitcoin
     ./security
   ];
 }

src/user/default.nix

@@ -0,0 +1,6 @@
+{
+  imports = [
+    ./configs
+    ./modules
+  ];
+}