From 8258e828913cbe704acc2d1f11d887a88e648610 Mon Sep 17 00:00:00 2001 From: Bryan Ramos Date: Wed, 28 Feb 2024 21:27:03 -0500 Subject: [PATCH] cont --- src/system/machines/desktop/home.nix | 1 - src/system/machines/server/home.nix | 1 - src/system/machines/wsl/home.nix | 1 - src/system/modules/bitcoin/default.nix | 4 +-- .../modules/core-lightning/default.nix | 32 +++++++++++++++---- .../core-lightning/modules/default.nix | 0 .../modules/sparrow-server/default.nix | 4 +-- src/system/modules/default.nix | 2 +- src/user/default.nix | 6 ++++ .../modules/alacritty/config/alacritty.nix | 0 .../modules/alacritty/default.nix | 0 .../modules/browsers/default.nix | 0 .../modules/corn/default.nix | 0 .../modules/default.nix | 0 .../modules/fun/default.nix | 0 .../modules/neovim/config/lazyvim/init.lua | 0 .../config/lazyvim/lua/config/autocmds.lua | 0 .../config/lazyvim/lua/config/keymaps.lua | 0 .../neovim/config/lazyvim/lua/config/lazy.lua | 0 .../config/lazyvim/lua/config/options.lua | 0 .../config/lazyvim/lua/plugins/core.lua | 0 .../modules/neovim/config/servers.nix | 0 .../modules/neovim/default.nix | 0 .../modules/utils/default.nix | 0 .../modules/writing/default.nix | 0 25 files changed, 36 insertions(+), 15 deletions(-) create mode 100644 src/system/modules/bitcoin/modules/core-lightning/modules/default.nix create mode 100644 src/user/default.nix rename src/user/modules/gui/{desktopEnvironments => }/modules/alacritty/config/alacritty.nix (100%) rename src/user/modules/gui/{desktopEnvironments => }/modules/alacritty/default.nix (100%) rename src/user/modules/gui/{desktopEnvironments => }/modules/browsers/default.nix (100%) rename src/user/modules/gui/{desktopEnvironments => }/modules/corn/default.nix (100%) rename src/user/modules/gui/{desktopEnvironments => }/modules/default.nix (100%) rename src/user/modules/gui/{desktopEnvironments => }/modules/fun/default.nix (100%) rename src/user/modules/gui/{desktopEnvironments => }/modules/neovim/config/lazyvim/init.lua (100%) rename src/user/modules/gui/{desktopEnvironments => }/modules/neovim/config/lazyvim/lua/config/autocmds.lua (100%) rename src/user/modules/gui/{desktopEnvironments => }/modules/neovim/config/lazyvim/lua/config/keymaps.lua (100%) rename src/user/modules/gui/{desktopEnvironments => }/modules/neovim/config/lazyvim/lua/config/lazy.lua (100%) rename src/user/modules/gui/{desktopEnvironments => }/modules/neovim/config/lazyvim/lua/config/options.lua (100%) rename src/user/modules/gui/{desktopEnvironments => }/modules/neovim/config/lazyvim/lua/plugins/core.lua (100%) rename src/user/modules/gui/{desktopEnvironments => }/modules/neovim/config/servers.nix (100%) rename src/user/modules/gui/{desktopEnvironments => }/modules/neovim/default.nix (100%) rename src/user/modules/gui/{desktopEnvironments => }/modules/utils/default.nix (100%) rename src/user/modules/gui/{desktopEnvironments => }/modules/writing/default.nix (100%) diff --git a/src/system/machines/desktop/home.nix b/src/system/machines/desktop/home.nix index 1b21dcc..50a2669 100644 --- a/src/system/machines/desktop/home.nix +++ b/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; diff --git a/src/system/machines/server/home.nix b/src/system/machines/server/home.nix index 3fa0be1..815d1b8 100644 --- a/src/system/machines/server/home.nix +++ b/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; diff --git a/src/system/machines/wsl/home.nix b/src/system/machines/wsl/home.nix index a4c18a7..80f34b1 100644 --- a/src/system/machines/wsl/home.nix +++ b/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; diff --git a/src/system/modules/bitcoin/default.nix b/src/system/modules/bitcoin/default.nix index fda6a50..59852fe 100644 --- a/src/system/modules/bitcoin/default.nix +++ b/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 diff --git a/src/system/modules/bitcoin/modules/core-lightning/default.nix b/src/system/modules/bitcoin/modules/core-lightning/default.nix index 2629928..912e8cb 100644 --- a/src/system/modules/bitcoin/modules/core-lightning/default.nix +++ b/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" ]; - wantedBy = [ "multi-user.target" ]; + Description = "Core Lightning daemon"; + Requires = [ "bitcoind.service" ]; + After = [ "bitcoind.service" "network-online.target" ]; + Wants = [ "network-online.target" ]; }; Service = { - ExecStart = "${pkgs.clightning}/bin/lightningd --conf=..."; - Restart = "always"; + ExecStartPre = "/usr/bin/sleep 10"; + 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" ]; }; }; }; diff --git a/src/system/modules/bitcoin/modules/core-lightning/modules/default.nix b/src/system/modules/bitcoin/modules/core-lightning/modules/default.nix new file mode 100644 index 0000000..e69de29 diff --git a/src/system/modules/bitcoin/modules/sparrow-server/default.nix b/src/system/modules/bitcoin/modules/sparrow-server/default.nix index 4a7450f..ca6ff75 100644 --- a/src/system/modules/bitcoin/modules/sparrow-server/default.nix +++ b/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 diff --git a/src/system/modules/default.nix b/src/system/modules/default.nix index 79cd10e..7af4fab 100644 --- a/src/system/modules/default.nix +++ b/src/system/modules/default.nix @@ -1,6 +1,6 @@ { imports = [ - ./corn + ./bitcoin ./security ]; } diff --git a/src/user/default.nix b/src/user/default.nix new file mode 100644 index 0000000..da87894 --- /dev/null +++ b/src/user/default.nix @@ -0,0 +1,6 @@ +{ + imports = [ + ./configs + ./modules + ]; +} diff --git a/src/user/modules/gui/desktopEnvironments/modules/alacritty/config/alacritty.nix b/src/user/modules/gui/modules/alacritty/config/alacritty.nix similarity index 100% rename from src/user/modules/gui/desktopEnvironments/modules/alacritty/config/alacritty.nix rename to src/user/modules/gui/modules/alacritty/config/alacritty.nix diff --git a/src/user/modules/gui/desktopEnvironments/modules/alacritty/default.nix b/src/user/modules/gui/modules/alacritty/default.nix similarity index 100% rename from src/user/modules/gui/desktopEnvironments/modules/alacritty/default.nix rename to src/user/modules/gui/modules/alacritty/default.nix diff --git a/src/user/modules/gui/desktopEnvironments/modules/browsers/default.nix b/src/user/modules/gui/modules/browsers/default.nix similarity index 100% rename from src/user/modules/gui/desktopEnvironments/modules/browsers/default.nix rename to src/user/modules/gui/modules/browsers/default.nix diff --git a/src/user/modules/gui/desktopEnvironments/modules/corn/default.nix b/src/user/modules/gui/modules/corn/default.nix similarity index 100% rename from src/user/modules/gui/desktopEnvironments/modules/corn/default.nix rename to src/user/modules/gui/modules/corn/default.nix diff --git a/src/user/modules/gui/desktopEnvironments/modules/default.nix b/src/user/modules/gui/modules/default.nix similarity index 100% rename from src/user/modules/gui/desktopEnvironments/modules/default.nix rename to src/user/modules/gui/modules/default.nix diff --git a/src/user/modules/gui/desktopEnvironments/modules/fun/default.nix b/src/user/modules/gui/modules/fun/default.nix similarity index 100% rename from src/user/modules/gui/desktopEnvironments/modules/fun/default.nix rename to src/user/modules/gui/modules/fun/default.nix diff --git a/src/user/modules/gui/desktopEnvironments/modules/neovim/config/lazyvim/init.lua b/src/user/modules/gui/modules/neovim/config/lazyvim/init.lua similarity index 100% rename from src/user/modules/gui/desktopEnvironments/modules/neovim/config/lazyvim/init.lua rename to src/user/modules/gui/modules/neovim/config/lazyvim/init.lua diff --git a/src/user/modules/gui/desktopEnvironments/modules/neovim/config/lazyvim/lua/config/autocmds.lua b/src/user/modules/gui/modules/neovim/config/lazyvim/lua/config/autocmds.lua similarity index 100% rename from src/user/modules/gui/desktopEnvironments/modules/neovim/config/lazyvim/lua/config/autocmds.lua rename to src/user/modules/gui/modules/neovim/config/lazyvim/lua/config/autocmds.lua diff --git a/src/user/modules/gui/desktopEnvironments/modules/neovim/config/lazyvim/lua/config/keymaps.lua b/src/user/modules/gui/modules/neovim/config/lazyvim/lua/config/keymaps.lua similarity index 100% rename from src/user/modules/gui/desktopEnvironments/modules/neovim/config/lazyvim/lua/config/keymaps.lua rename to src/user/modules/gui/modules/neovim/config/lazyvim/lua/config/keymaps.lua diff --git a/src/user/modules/gui/desktopEnvironments/modules/neovim/config/lazyvim/lua/config/lazy.lua b/src/user/modules/gui/modules/neovim/config/lazyvim/lua/config/lazy.lua similarity index 100% rename from src/user/modules/gui/desktopEnvironments/modules/neovim/config/lazyvim/lua/config/lazy.lua rename to src/user/modules/gui/modules/neovim/config/lazyvim/lua/config/lazy.lua diff --git a/src/user/modules/gui/desktopEnvironments/modules/neovim/config/lazyvim/lua/config/options.lua b/src/user/modules/gui/modules/neovim/config/lazyvim/lua/config/options.lua similarity index 100% rename from src/user/modules/gui/desktopEnvironments/modules/neovim/config/lazyvim/lua/config/options.lua rename to src/user/modules/gui/modules/neovim/config/lazyvim/lua/config/options.lua diff --git a/src/user/modules/gui/desktopEnvironments/modules/neovim/config/lazyvim/lua/plugins/core.lua b/src/user/modules/gui/modules/neovim/config/lazyvim/lua/plugins/core.lua similarity index 100% rename from src/user/modules/gui/desktopEnvironments/modules/neovim/config/lazyvim/lua/plugins/core.lua rename to src/user/modules/gui/modules/neovim/config/lazyvim/lua/plugins/core.lua diff --git a/src/user/modules/gui/desktopEnvironments/modules/neovim/config/servers.nix b/src/user/modules/gui/modules/neovim/config/servers.nix similarity index 100% rename from src/user/modules/gui/desktopEnvironments/modules/neovim/config/servers.nix rename to src/user/modules/gui/modules/neovim/config/servers.nix diff --git a/src/user/modules/gui/desktopEnvironments/modules/neovim/default.nix b/src/user/modules/gui/modules/neovim/default.nix similarity index 100% rename from src/user/modules/gui/desktopEnvironments/modules/neovim/default.nix rename to src/user/modules/gui/modules/neovim/default.nix diff --git a/src/user/modules/gui/desktopEnvironments/modules/utils/default.nix b/src/user/modules/gui/modules/utils/default.nix similarity index 100% rename from src/user/modules/gui/desktopEnvironments/modules/utils/default.nix rename to src/user/modules/gui/modules/utils/default.nix diff --git a/src/user/modules/gui/desktopEnvironments/modules/writing/default.nix b/src/user/modules/gui/modules/writing/default.nix similarity index 100% rename from src/user/modules/gui/desktopEnvironments/modules/writing/default.nix rename to src/user/modules/gui/modules/writing/default.nix