From 036db0b3b9db68a4fda6f55d12e34c1311852586 Mon Sep 17 00:00:00 2001 From: Bryan Ramos Date: Wed, 28 Feb 2024 10:15:08 -0500 Subject: [PATCH 01/26] initial server work --- src/modules/system/corn/default.nix | 38 +++++++ .../corn/modules/core-lightning/default.nix | 25 +++++ src/modules/system/corn/modules/default.nix | 6 + .../system/corn/modules/electrs/default.nix | 0 .../corn/modules/sparrow-cli/default.nix | 14 +++ .../corn/modules/sparrow-cli/derivation.nix | 24 ++++ src/modules/system/default.nix | 5 + src/modules/{ => user}/bash/config/alias.nix | 0 .../{ => user}/bash/config/bashprofile.nix | 0 src/modules/{ => user}/bash/config/bashrc.nix | 0 src/modules/{ => user}/bash/config/prompt.nix | 0 src/modules/{ => user}/bash/default.nix | 0 src/modules/{ => user}/default.nix | 0 src/modules/{ => user}/git/default.nix | 0 src/modules/{ => user}/gpg/default.nix | 0 src/modules/{ => user}/gui/default.nix | 0 .../gui/desktopEnvironments/default.nix | 0 .../modules/alacritty/config/alacritty.nix | 0 .../modules/alacritty/default.nix | 0 .../modules/browsers/default.nix | 0 .../modules/corn/default.nix | 0 .../desktopEnvironments/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 .../desktopEnvironments/sway/config/rofi.nix | 0 .../sway/config/shellHook.nix | 0 .../desktopEnvironments/sway/config/sway.nix | 0 .../gui/desktopEnvironments/sway/default.nix | 0 .../{ => user}/gui/wallpapers/mountains.jpg | Bin src/modules/{ => user}/utils/default.nix | 0 .../{ => user}/utils/modules/default.nix | 0 .../{ => user}/utils/modules/dev/default.nix | 0 .../utils/modules/email/config/aerc.conf | 0 .../utils/modules/email/config/binds.conf | 0 .../utils/modules/email/default.nix | 0 .../{ => user}/utils/modules/irc/default.nix | 0 .../{ => user}/utils/modules/vim/config/vimrc | 0 .../{ => user}/utils/modules/vim/default.nix | 0 src/systems/desktop/home.nix | 2 +- src/systems/desktop/system.nix | 8 -- src/systems/server/default.nix | 10 +- src/systems/server/system.nix | 104 ++++++++++++++++++ src/systems/wsl/home.nix | 2 +- src/systems/wsl/system.nix | 1 + 53 files changed, 228 insertions(+), 11 deletions(-) create mode 100644 src/modules/system/corn/default.nix create mode 100644 src/modules/system/corn/modules/core-lightning/default.nix create mode 100644 src/modules/system/corn/modules/default.nix create mode 100644 src/modules/system/corn/modules/electrs/default.nix create mode 100644 src/modules/system/corn/modules/sparrow-cli/default.nix create mode 100644 src/modules/system/corn/modules/sparrow-cli/derivation.nix create mode 100644 src/modules/system/default.nix rename src/modules/{ => user}/bash/config/alias.nix (100%) rename src/modules/{ => user}/bash/config/bashprofile.nix (100%) rename src/modules/{ => user}/bash/config/bashrc.nix (100%) rename src/modules/{ => user}/bash/config/prompt.nix (100%) rename src/modules/{ => user}/bash/default.nix (100%) rename src/modules/{ => user}/default.nix (100%) rename src/modules/{ => user}/git/default.nix (100%) rename src/modules/{ => user}/gpg/default.nix (100%) rename src/modules/{ => user}/gui/default.nix (100%) rename src/modules/{ => user}/gui/desktopEnvironments/default.nix (100%) rename src/modules/{ => user}/gui/desktopEnvironments/modules/alacritty/config/alacritty.nix (100%) rename src/modules/{ => user}/gui/desktopEnvironments/modules/alacritty/default.nix (100%) rename src/modules/{ => user}/gui/desktopEnvironments/modules/browsers/default.nix (100%) rename src/modules/{ => user}/gui/desktopEnvironments/modules/corn/default.nix (100%) rename src/modules/{ => user}/gui/desktopEnvironments/modules/default.nix (100%) rename src/modules/{ => user}/gui/desktopEnvironments/modules/fun/default.nix (100%) rename src/modules/{ => user}/gui/desktopEnvironments/modules/neovim/config/lazyvim/init.lua (100%) rename src/modules/{ => user}/gui/desktopEnvironments/modules/neovim/config/lazyvim/lua/config/autocmds.lua (100%) rename src/modules/{ => user}/gui/desktopEnvironments/modules/neovim/config/lazyvim/lua/config/keymaps.lua (100%) rename src/modules/{ => user}/gui/desktopEnvironments/modules/neovim/config/lazyvim/lua/config/lazy.lua (100%) rename src/modules/{ => user}/gui/desktopEnvironments/modules/neovim/config/lazyvim/lua/config/options.lua (100%) rename src/modules/{ => user}/gui/desktopEnvironments/modules/neovim/config/lazyvim/lua/plugins/core.lua (100%) rename src/modules/{ => user}/gui/desktopEnvironments/modules/neovim/config/servers.nix (100%) rename src/modules/{ => user}/gui/desktopEnvironments/modules/neovim/default.nix (100%) rename src/modules/{ => user}/gui/desktopEnvironments/modules/utils/default.nix (100%) rename src/modules/{ => user}/gui/desktopEnvironments/modules/writing/default.nix (100%) rename src/modules/{ => user}/gui/desktopEnvironments/sway/config/rofi.nix (100%) rename src/modules/{ => user}/gui/desktopEnvironments/sway/config/shellHook.nix (100%) rename src/modules/{ => user}/gui/desktopEnvironments/sway/config/sway.nix (100%) rename src/modules/{ => user}/gui/desktopEnvironments/sway/default.nix (100%) rename src/modules/{ => user}/gui/wallpapers/mountains.jpg (100%) rename src/modules/{ => user}/utils/default.nix (100%) rename src/modules/{ => user}/utils/modules/default.nix (100%) rename src/modules/{ => user}/utils/modules/dev/default.nix (100%) rename src/modules/{ => user}/utils/modules/email/config/aerc.conf (100%) rename src/modules/{ => user}/utils/modules/email/config/binds.conf (100%) rename src/modules/{ => user}/utils/modules/email/default.nix (100%) rename src/modules/{ => user}/utils/modules/irc/default.nix (100%) rename src/modules/{ => user}/utils/modules/vim/config/vimrc (100%) rename src/modules/{ => user}/utils/modules/vim/default.nix (100%) create mode 100644 src/systems/server/system.nix diff --git a/src/modules/system/corn/default.nix b/src/modules/system/corn/default.nix new file mode 100644 index 0000000..eff2c15 --- /dev/null +++ b/src/modules/system/corn/default.nix @@ -0,0 +1,38 @@ +{ pkgs, lib, config, ... }: + +with lib; +let + cfg = config.modules.corn; + +in +{ options.modules.corn = { enable = mkEnableOption "corn"; }; + + imports = [ + ./core-lightning + ./sparrow-cli + ]; + + config = mkIf cfg.enable { + users = { + users = { + "bitcoind" = { + description = "bitcoind system user"; + isSystemUser = true; + group = "bitcoin"; + }; + }; + groups = { + "bitcoin" = { + members = [ "core-lightning" "electrs" ]; + }; + }; + }; + services.bitcoind = { + "main-net" = { + enable = true; + user = "bitcoind"; + group = "bitcoin"; + }; + }; + }; +} diff --git a/src/modules/system/corn/modules/core-lightning/default.nix b/src/modules/system/corn/modules/core-lightning/default.nix new file mode 100644 index 0000000..30c65c6 --- /dev/null +++ b/src/modules/system/corn/modules/core-lightning/default.nix @@ -0,0 +1,25 @@ +{ lib, pkgs, config, ... }: + +with lib; + let cfg = config.modules.corn.core-lightning; + +in +{ options.modules.corn.core-lightning = { enable = mkEnableOption "corn.core-lightning"; }; + config = mkIf cfg.enable { + home.packages = with pkgs; [ + clightning + ]; + + systemd.services.clightning = { + after = [ "network.target" ]; + wantedBy = [ "multi-user.target" ]; + script = '' + ${pkgs.clightning}/bin/lightningd --conf=... + ''; + serviceConfig = { + User = "core-lighting"; + Group = "bitcoin"; + }; + }; + }; +} diff --git a/src/modules/system/corn/modules/default.nix b/src/modules/system/corn/modules/default.nix new file mode 100644 index 0000000..7d57eba --- /dev/null +++ b/src/modules/system/corn/modules/default.nix @@ -0,0 +1,6 @@ +{ + imports = [ + ./core-lightning + ./sparrow-cli + ]; +} diff --git a/src/modules/system/corn/modules/electrs/default.nix b/src/modules/system/corn/modules/electrs/default.nix new file mode 100644 index 0000000..e69de29 diff --git a/src/modules/system/corn/modules/sparrow-cli/default.nix b/src/modules/system/corn/modules/sparrow-cli/default.nix new file mode 100644 index 0000000..589df5c --- /dev/null +++ b/src/modules/system/corn/modules/sparrow-cli/default.nix @@ -0,0 +1,14 @@ +{ lib, pkgs, config, ... }: + +with lib; + let + cfg = config.modules.corn.sparrow-server; + sparrow-server = import ./derivation.nix { inherit pkgs; }; +in +{ options.modules.corn.sparrow-server = { enable = mkEnableOption "corn.sparrow-server"; }; + config = mkIf cfg.enable { + home.packages = with pkgs; [ + sparrow-server + ]; + }; +} diff --git a/src/modules/system/corn/modules/sparrow-cli/derivation.nix b/src/modules/system/corn/modules/sparrow-cli/derivation.nix new file mode 100644 index 0000000..8e5e698 --- /dev/null +++ b/src/modules/system/corn/modules/sparrow-cli/derivation.nix @@ -0,0 +1,24 @@ +{ pkgs, ... }: + +with pkgs; +stdenv.mkDerivation rec { + pname = "sparrow-server"; + version = "1.8.2"; + + src = fetchurl { + url = "https://github.com/sparrowwallet/sparrow/releases/download/${version}/sparrow-server-${version}-x86_64.tar.gz"; + sha256 = "16hyrf8j7mv3m1ry7r2k3w70yxbf6smgcm5d35xy2hjqfmahv65m"; + }; + + installPhase = '' + mkdir -p $out/bin + cp -r * $out/bin + ''; + + meta = { + description = "Sparrow Server"; + homepage = "https://sparrowwallet.com/"; + license = stdenv.lib.licenses.mit; + platforms = stdenv.lib.platforms.linux; + }; +} diff --git a/src/modules/system/default.nix b/src/modules/system/default.nix new file mode 100644 index 0000000..1b5d773 --- /dev/null +++ b/src/modules/system/default.nix @@ -0,0 +1,5 @@ +{ + imports = [ + ./corn + ]; +} diff --git a/src/modules/bash/config/alias.nix b/src/modules/user/bash/config/alias.nix similarity index 100% rename from src/modules/bash/config/alias.nix rename to src/modules/user/bash/config/alias.nix diff --git a/src/modules/bash/config/bashprofile.nix b/src/modules/user/bash/config/bashprofile.nix similarity index 100% rename from src/modules/bash/config/bashprofile.nix rename to src/modules/user/bash/config/bashprofile.nix diff --git a/src/modules/bash/config/bashrc.nix b/src/modules/user/bash/config/bashrc.nix similarity index 100% rename from src/modules/bash/config/bashrc.nix rename to src/modules/user/bash/config/bashrc.nix diff --git a/src/modules/bash/config/prompt.nix b/src/modules/user/bash/config/prompt.nix similarity index 100% rename from src/modules/bash/config/prompt.nix rename to src/modules/user/bash/config/prompt.nix diff --git a/src/modules/bash/default.nix b/src/modules/user/bash/default.nix similarity index 100% rename from src/modules/bash/default.nix rename to src/modules/user/bash/default.nix diff --git a/src/modules/default.nix b/src/modules/user/default.nix similarity index 100% rename from src/modules/default.nix rename to src/modules/user/default.nix diff --git a/src/modules/git/default.nix b/src/modules/user/git/default.nix similarity index 100% rename from src/modules/git/default.nix rename to src/modules/user/git/default.nix diff --git a/src/modules/gpg/default.nix b/src/modules/user/gpg/default.nix similarity index 100% rename from src/modules/gpg/default.nix rename to src/modules/user/gpg/default.nix diff --git a/src/modules/gui/default.nix b/src/modules/user/gui/default.nix similarity index 100% rename from src/modules/gui/default.nix rename to src/modules/user/gui/default.nix diff --git a/src/modules/gui/desktopEnvironments/default.nix b/src/modules/user/gui/desktopEnvironments/default.nix similarity index 100% rename from src/modules/gui/desktopEnvironments/default.nix rename to src/modules/user/gui/desktopEnvironments/default.nix diff --git a/src/modules/gui/desktopEnvironments/modules/alacritty/config/alacritty.nix b/src/modules/user/gui/desktopEnvironments/modules/alacritty/config/alacritty.nix similarity index 100% rename from src/modules/gui/desktopEnvironments/modules/alacritty/config/alacritty.nix rename to src/modules/user/gui/desktopEnvironments/modules/alacritty/config/alacritty.nix diff --git a/src/modules/gui/desktopEnvironments/modules/alacritty/default.nix b/src/modules/user/gui/desktopEnvironments/modules/alacritty/default.nix similarity index 100% rename from src/modules/gui/desktopEnvironments/modules/alacritty/default.nix rename to src/modules/user/gui/desktopEnvironments/modules/alacritty/default.nix diff --git a/src/modules/gui/desktopEnvironments/modules/browsers/default.nix b/src/modules/user/gui/desktopEnvironments/modules/browsers/default.nix similarity index 100% rename from src/modules/gui/desktopEnvironments/modules/browsers/default.nix rename to src/modules/user/gui/desktopEnvironments/modules/browsers/default.nix diff --git a/src/modules/gui/desktopEnvironments/modules/corn/default.nix b/src/modules/user/gui/desktopEnvironments/modules/corn/default.nix similarity index 100% rename from src/modules/gui/desktopEnvironments/modules/corn/default.nix rename to src/modules/user/gui/desktopEnvironments/modules/corn/default.nix diff --git a/src/modules/gui/desktopEnvironments/modules/default.nix b/src/modules/user/gui/desktopEnvironments/modules/default.nix similarity index 100% rename from src/modules/gui/desktopEnvironments/modules/default.nix rename to src/modules/user/gui/desktopEnvironments/modules/default.nix diff --git a/src/modules/gui/desktopEnvironments/modules/fun/default.nix b/src/modules/user/gui/desktopEnvironments/modules/fun/default.nix similarity index 100% rename from src/modules/gui/desktopEnvironments/modules/fun/default.nix rename to src/modules/user/gui/desktopEnvironments/modules/fun/default.nix diff --git a/src/modules/gui/desktopEnvironments/modules/neovim/config/lazyvim/init.lua b/src/modules/user/gui/desktopEnvironments/modules/neovim/config/lazyvim/init.lua similarity index 100% rename from src/modules/gui/desktopEnvironments/modules/neovim/config/lazyvim/init.lua rename to src/modules/user/gui/desktopEnvironments/modules/neovim/config/lazyvim/init.lua diff --git a/src/modules/gui/desktopEnvironments/modules/neovim/config/lazyvim/lua/config/autocmds.lua b/src/modules/user/gui/desktopEnvironments/modules/neovim/config/lazyvim/lua/config/autocmds.lua similarity index 100% rename from src/modules/gui/desktopEnvironments/modules/neovim/config/lazyvim/lua/config/autocmds.lua rename to src/modules/user/gui/desktopEnvironments/modules/neovim/config/lazyvim/lua/config/autocmds.lua diff --git a/src/modules/gui/desktopEnvironments/modules/neovim/config/lazyvim/lua/config/keymaps.lua b/src/modules/user/gui/desktopEnvironments/modules/neovim/config/lazyvim/lua/config/keymaps.lua similarity index 100% rename from src/modules/gui/desktopEnvironments/modules/neovim/config/lazyvim/lua/config/keymaps.lua rename to src/modules/user/gui/desktopEnvironments/modules/neovim/config/lazyvim/lua/config/keymaps.lua diff --git a/src/modules/gui/desktopEnvironments/modules/neovim/config/lazyvim/lua/config/lazy.lua b/src/modules/user/gui/desktopEnvironments/modules/neovim/config/lazyvim/lua/config/lazy.lua similarity index 100% rename from src/modules/gui/desktopEnvironments/modules/neovim/config/lazyvim/lua/config/lazy.lua rename to src/modules/user/gui/desktopEnvironments/modules/neovim/config/lazyvim/lua/config/lazy.lua diff --git a/src/modules/gui/desktopEnvironments/modules/neovim/config/lazyvim/lua/config/options.lua b/src/modules/user/gui/desktopEnvironments/modules/neovim/config/lazyvim/lua/config/options.lua similarity index 100% rename from src/modules/gui/desktopEnvironments/modules/neovim/config/lazyvim/lua/config/options.lua rename to src/modules/user/gui/desktopEnvironments/modules/neovim/config/lazyvim/lua/config/options.lua diff --git a/src/modules/gui/desktopEnvironments/modules/neovim/config/lazyvim/lua/plugins/core.lua b/src/modules/user/gui/desktopEnvironments/modules/neovim/config/lazyvim/lua/plugins/core.lua similarity index 100% rename from src/modules/gui/desktopEnvironments/modules/neovim/config/lazyvim/lua/plugins/core.lua rename to src/modules/user/gui/desktopEnvironments/modules/neovim/config/lazyvim/lua/plugins/core.lua diff --git a/src/modules/gui/desktopEnvironments/modules/neovim/config/servers.nix b/src/modules/user/gui/desktopEnvironments/modules/neovim/config/servers.nix similarity index 100% rename from src/modules/gui/desktopEnvironments/modules/neovim/config/servers.nix rename to src/modules/user/gui/desktopEnvironments/modules/neovim/config/servers.nix diff --git a/src/modules/gui/desktopEnvironments/modules/neovim/default.nix b/src/modules/user/gui/desktopEnvironments/modules/neovim/default.nix similarity index 100% rename from src/modules/gui/desktopEnvironments/modules/neovim/default.nix rename to src/modules/user/gui/desktopEnvironments/modules/neovim/default.nix diff --git a/src/modules/gui/desktopEnvironments/modules/utils/default.nix b/src/modules/user/gui/desktopEnvironments/modules/utils/default.nix similarity index 100% rename from src/modules/gui/desktopEnvironments/modules/utils/default.nix rename to src/modules/user/gui/desktopEnvironments/modules/utils/default.nix diff --git a/src/modules/gui/desktopEnvironments/modules/writing/default.nix b/src/modules/user/gui/desktopEnvironments/modules/writing/default.nix similarity index 100% rename from src/modules/gui/desktopEnvironments/modules/writing/default.nix rename to src/modules/user/gui/desktopEnvironments/modules/writing/default.nix diff --git a/src/modules/gui/desktopEnvironments/sway/config/rofi.nix b/src/modules/user/gui/desktopEnvironments/sway/config/rofi.nix similarity index 100% rename from src/modules/gui/desktopEnvironments/sway/config/rofi.nix rename to src/modules/user/gui/desktopEnvironments/sway/config/rofi.nix diff --git a/src/modules/gui/desktopEnvironments/sway/config/shellHook.nix b/src/modules/user/gui/desktopEnvironments/sway/config/shellHook.nix similarity index 100% rename from src/modules/gui/desktopEnvironments/sway/config/shellHook.nix rename to src/modules/user/gui/desktopEnvironments/sway/config/shellHook.nix diff --git a/src/modules/gui/desktopEnvironments/sway/config/sway.nix b/src/modules/user/gui/desktopEnvironments/sway/config/sway.nix similarity index 100% rename from src/modules/gui/desktopEnvironments/sway/config/sway.nix rename to src/modules/user/gui/desktopEnvironments/sway/config/sway.nix diff --git a/src/modules/gui/desktopEnvironments/sway/default.nix b/src/modules/user/gui/desktopEnvironments/sway/default.nix similarity index 100% rename from src/modules/gui/desktopEnvironments/sway/default.nix rename to src/modules/user/gui/desktopEnvironments/sway/default.nix diff --git a/src/modules/gui/wallpapers/mountains.jpg b/src/modules/user/gui/wallpapers/mountains.jpg similarity index 100% rename from src/modules/gui/wallpapers/mountains.jpg rename to src/modules/user/gui/wallpapers/mountains.jpg diff --git a/src/modules/utils/default.nix b/src/modules/user/utils/default.nix similarity index 100% rename from src/modules/utils/default.nix rename to src/modules/user/utils/default.nix diff --git a/src/modules/utils/modules/default.nix b/src/modules/user/utils/modules/default.nix similarity index 100% rename from src/modules/utils/modules/default.nix rename to src/modules/user/utils/modules/default.nix diff --git a/src/modules/utils/modules/dev/default.nix b/src/modules/user/utils/modules/dev/default.nix similarity index 100% rename from src/modules/utils/modules/dev/default.nix rename to src/modules/user/utils/modules/dev/default.nix diff --git a/src/modules/utils/modules/email/config/aerc.conf b/src/modules/user/utils/modules/email/config/aerc.conf similarity index 100% rename from src/modules/utils/modules/email/config/aerc.conf rename to src/modules/user/utils/modules/email/config/aerc.conf diff --git a/src/modules/utils/modules/email/config/binds.conf b/src/modules/user/utils/modules/email/config/binds.conf similarity index 100% rename from src/modules/utils/modules/email/config/binds.conf rename to src/modules/user/utils/modules/email/config/binds.conf diff --git a/src/modules/utils/modules/email/default.nix b/src/modules/user/utils/modules/email/default.nix similarity index 100% rename from src/modules/utils/modules/email/default.nix rename to src/modules/user/utils/modules/email/default.nix diff --git a/src/modules/utils/modules/irc/default.nix b/src/modules/user/utils/modules/irc/default.nix similarity index 100% rename from src/modules/utils/modules/irc/default.nix rename to src/modules/user/utils/modules/irc/default.nix diff --git a/src/modules/utils/modules/vim/config/vimrc b/src/modules/user/utils/modules/vim/config/vimrc similarity index 100% rename from src/modules/utils/modules/vim/config/vimrc rename to src/modules/user/utils/modules/vim/config/vimrc diff --git a/src/modules/utils/modules/vim/default.nix b/src/modules/user/utils/modules/vim/default.nix similarity index 100% rename from src/modules/utils/modules/vim/default.nix rename to src/modules/user/utils/modules/vim/default.nix diff --git a/src/systems/desktop/home.nix b/src/systems/desktop/home.nix index 1a01c9d..757781f 100644 --- a/src/systems/desktop/home.nix +++ b/src/systems/desktop/home.nix @@ -6,7 +6,7 @@ home-manager.users.${config.user.name} = { imports = [ ../../user - ../../modules + ../../modules/user ]; programs.home-manager.enable = true; diff --git a/src/systems/desktop/system.nix b/src/systems/desktop/system.nix index 85fb8da..2b886e8 100644 --- a/src/systems/desktop/system.nix +++ b/src/systems/desktop/system.nix @@ -78,14 +78,6 @@ execWheelOnly = true; }; -# System Services - services = { - cron = { - enable = true; - systemCronJobs = []; - }; - }; - # Locale time = { timeZone = "America/New_York"; diff --git a/src/systems/server/default.nix b/src/systems/server/default.nix index 3744368..5d6cab9 100644 --- a/src/systems/server/default.nix +++ b/src/systems/server/default.nix @@ -1 +1,9 @@ -# TODO: nixify the server +{ ... }: + +{ + imports = [ + ../../user + ./hardware.nix + ./system.nix + ]; +} diff --git a/src/systems/server/system.nix b/src/systems/server/system.nix new file mode 100644 index 0000000..f73eabc --- /dev/null +++ b/src/systems/server/system.nix @@ -0,0 +1,104 @@ +{ pkgs, lib, config, ... }: + +{ system.stateVersion = "23.11"; + + imports = [ + ../../modules/system + ]; + +# Users + users.users = { + ${config.user.name} = { + isNormalUser = true; + extraGroups = config.user.groups; + openssh.authorizedKeys.keys = config.user.sshKeys; + }; + }; + +# Nix + nix = { + channel.enable = false; + package = pkgs.nixFlakes; + extraOptions = "experimental-features = nix-command flakes"; + settings = { + auto-optimise-store = true; + trusted-users = [ "${config.user.name}" ]; + }; + gc = { + automatic = true; + dates = "weekly"; + options = "--delete-older-than 30d"; + }; + }; + +# Bootloader + boot.loader = { + timeout = null; + grub = { + enable = true; + useOSProber = true; + devices = [ "nodev" ]; + efiSupport = true; + configurationLimit = 5; + }; + + efi = { + canTouchEfiVariables = true; + }; + }; + +# Fonts + fonts.packages = with pkgs; [ + terminus_font + terminus-nerdfont + ]; + +# Sudo Options + security.sudo = { + wheelNeedsPassword = false; + execWheelOnly = true; + }; + +# Locale + time = { + timeZone = "America/New_York"; + hardwareClockInLocalTime = true; + }; + + services.timesyncd = { + enable = true; + servers = [ + "0.pool.ntp.org" + "1.pool.ntp.org" + "2.pool.ntp.org" + "3.pool.ntp.org" + ]; + }; + + i18n.defaultLocale = "en_US.UTF-8"; + + console = { + font = "Lat2-Terminus16"; + useXkbConfig = true; + }; + +# Networking + networking = { + hostName = "archimedes"; + useDHCP = lib.mkDefault true; + networkmanager.enable = true; + firewall = { + enable = true; + allowedTCPPorts = [ 22 80 443 ]; + }; + }; + + services.openssh = { + enable = true; + startWhenNeeded = true; + settings = { + X11Forwarding = false; + PasswordAuthentication = false; + }; + }; +} diff --git a/src/systems/wsl/home.nix b/src/systems/wsl/home.nix index 2bb8d39..679c4a6 100644 --- a/src/systems/wsl/home.nix +++ b/src/systems/wsl/home.nix @@ -6,7 +6,7 @@ home-manager.users.${config.user.name} = { imports = [ ../../user - ../../modules + ../../modules/user ]; programs.home-manager.enable = true; diff --git a/src/systems/wsl/system.nix b/src/systems/wsl/system.nix index 756aff7..332885e 100644 --- a/src/systems/wsl/system.nix +++ b/src/systems/wsl/system.nix @@ -27,6 +27,7 @@ options = "--delete-older-than 30d"; }; }; + # Sudo Options security.sudo = { wheelNeedsPassword = false; From 203170a88fdb854b9a32e36e0e95c76fd209b4fc Mon Sep 17 00:00:00 2001 From: Bryan Ramos Date: Wed, 28 Feb 2024 15:45:10 -0500 Subject: [PATCH 02/26] v2 --- flake.nix | 46 +++++++++++------- .../corn/modules/core-lightning/default.nix | 25 ---------- .../system/corn/modules/electrs/default.nix | 0 .../machines}/desktop/default.nix | 0 .../machines}/desktop/disks.nix | 0 .../machines}/desktop/hardware.nix | 0 .../machines}/desktop/home.nix | 4 +- .../machines}/desktop/system.nix | 0 .../machines}/laptop/default.nix | 0 .../machines}/server/default.nix | 2 +- src/system/machines/server/home.nix | 35 +++++++++++++ .../machines}/server/system.nix | 11 ++++- .../machines}/wsl/default.nix | 0 src/{systems => system/machines}/wsl/home.nix | 4 +- .../machines}/wsl/system.nix | 0 src/{systems => system/machines}/wsl/wsl.nix | 0 .../modules/bitcoin}/default.nix | 15 ++++-- .../modules/core-lightning/default.nix | 40 +++++++++++++++ .../modules/bitcoin}/modules/default.nix | 1 + .../bitcoin/modules/electrs/default.nix | 35 +++++++++++++ .../modules/sparrow-server}/default.nix | 4 +- .../modules/sparrow-server}/derivation.nix | 0 .../system => system/modules}/default.nix | 1 + src/user/{ => configs}/default.nix | 0 src/user/{ => configs}/pgpKey.nix | 0 .../modules}/bash/config/alias.nix | 0 .../modules}/bash/config/bashprofile.nix | 0 .../modules}/bash/config/bashrc.nix | 0 .../modules}/bash/config/prompt.nix | 0 .../user => user/modules}/bash/default.nix | 0 .../user => user/modules}/default.nix | 0 .../user => user/modules}/git/default.nix | 0 .../user => user/modules}/gpg/default.nix | 0 .../user => user/modules}/gui/default.nix | 0 .../gui/desktopEnvironments/default.nix | 0 .../modules/alacritty/config/alacritty.nix | 0 .../modules/alacritty/default.nix | 0 .../modules/browsers/default.nix | 0 .../modules/corn/default.nix | 0 .../desktopEnvironments/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 .../desktopEnvironments/sway/config/rofi.nix | 0 .../sway/config/shellHook.nix | 0 .../desktopEnvironments/sway/config/sway.nix | 0 .../gui/desktopEnvironments/sway/default.nix | 0 .../modules}/gui/wallpapers/mountains.jpg | Bin src/{ => user}/modules/security/default.nix | 0 .../user => user/modules}/utils/default.nix | 0 .../modules}/utils/modules/default.nix | 0 .../modules}/utils/modules/dev/default.nix | 0 .../utils/modules/email/config/aerc.conf | 0 .../utils/modules/email/config/binds.conf | 0 .../modules}/utils/modules/email/default.nix | 0 .../modules}/utils/modules/irc/default.nix | 0 .../modules}/utils/modules/vim/config/vimrc | 0 .../modules}/utils/modules/vim/default.nix | 0 66 files changed, 169 insertions(+), 54 deletions(-) delete mode 100644 src/modules/system/corn/modules/core-lightning/default.nix delete mode 100644 src/modules/system/corn/modules/electrs/default.nix rename src/{systems => system/machines}/desktop/default.nix (100%) rename src/{systems => system/machines}/desktop/disks.nix (100%) rename src/{systems => system/machines}/desktop/hardware.nix (100%) rename src/{systems => system/machines}/desktop/home.nix (95%) rename src/{systems => system/machines}/desktop/system.nix (100%) rename src/{systems => system/machines}/laptop/default.nix (100%) rename src/{systems => system/machines}/server/default.nix (79%) create mode 100644 src/system/machines/server/home.nix rename src/{systems => system/machines}/server/system.nix (92%) rename src/{systems => system/machines}/wsl/default.nix (100%) rename src/{systems => system/machines}/wsl/home.nix (94%) rename src/{systems => system/machines}/wsl/system.nix (100%) rename src/{systems => system/machines}/wsl/wsl.nix (100%) rename src/{modules/system/corn => system/modules/bitcoin}/default.nix (63%) create mode 100644 src/system/modules/bitcoin/modules/core-lightning/default.nix rename src/{modules/system/corn => system/modules/bitcoin}/modules/default.nix (81%) create mode 100644 src/system/modules/bitcoin/modules/electrs/default.nix rename src/{modules/system/corn/modules/sparrow-cli => system/modules/bitcoin/modules/sparrow-server}/default.nix (58%) rename src/{modules/system/corn/modules/sparrow-cli => system/modules/bitcoin/modules/sparrow-server}/derivation.nix (100%) rename src/{modules/system => system/modules}/default.nix (69%) rename src/user/{ => configs}/default.nix (100%) rename src/user/{ => configs}/pgpKey.nix (100%) rename src/{modules/user => user/modules}/bash/config/alias.nix (100%) rename src/{modules/user => user/modules}/bash/config/bashprofile.nix (100%) rename src/{modules/user => user/modules}/bash/config/bashrc.nix (100%) rename src/{modules/user => user/modules}/bash/config/prompt.nix (100%) rename src/{modules/user => user/modules}/bash/default.nix (100%) rename src/{modules/user => user/modules}/default.nix (100%) rename src/{modules/user => user/modules}/git/default.nix (100%) rename src/{modules/user => user/modules}/gpg/default.nix (100%) rename src/{modules/user => user/modules}/gui/default.nix (100%) rename src/{modules/user => user/modules}/gui/desktopEnvironments/default.nix (100%) rename src/{modules/user => user/modules}/gui/desktopEnvironments/modules/alacritty/config/alacritty.nix (100%) rename src/{modules/user => user/modules}/gui/desktopEnvironments/modules/alacritty/default.nix (100%) rename src/{modules/user => user/modules}/gui/desktopEnvironments/modules/browsers/default.nix (100%) rename src/{modules/user => user/modules}/gui/desktopEnvironments/modules/corn/default.nix (100%) rename src/{modules/user => user/modules}/gui/desktopEnvironments/modules/default.nix (100%) rename src/{modules/user => user/modules}/gui/desktopEnvironments/modules/fun/default.nix (100%) rename src/{modules/user => user/modules}/gui/desktopEnvironments/modules/neovim/config/lazyvim/init.lua (100%) rename src/{modules/user => user/modules}/gui/desktopEnvironments/modules/neovim/config/lazyvim/lua/config/autocmds.lua (100%) rename src/{modules/user => user/modules}/gui/desktopEnvironments/modules/neovim/config/lazyvim/lua/config/keymaps.lua (100%) rename src/{modules/user => user/modules}/gui/desktopEnvironments/modules/neovim/config/lazyvim/lua/config/lazy.lua (100%) rename src/{modules/user => user/modules}/gui/desktopEnvironments/modules/neovim/config/lazyvim/lua/config/options.lua (100%) rename src/{modules/user => user/modules}/gui/desktopEnvironments/modules/neovim/config/lazyvim/lua/plugins/core.lua (100%) rename src/{modules/user => user/modules}/gui/desktopEnvironments/modules/neovim/config/servers.nix (100%) rename src/{modules/user => user/modules}/gui/desktopEnvironments/modules/neovim/default.nix (100%) rename src/{modules/user => user/modules}/gui/desktopEnvironments/modules/utils/default.nix (100%) rename src/{modules/user => user/modules}/gui/desktopEnvironments/modules/writing/default.nix (100%) rename src/{modules/user => user/modules}/gui/desktopEnvironments/sway/config/rofi.nix (100%) rename src/{modules/user => user/modules}/gui/desktopEnvironments/sway/config/shellHook.nix (100%) rename src/{modules/user => user/modules}/gui/desktopEnvironments/sway/config/sway.nix (100%) rename src/{modules/user => user/modules}/gui/desktopEnvironments/sway/default.nix (100%) rename src/{modules/user => user/modules}/gui/wallpapers/mountains.jpg (100%) rename src/{ => user}/modules/security/default.nix (100%) rename src/{modules/user => user/modules}/utils/default.nix (100%) rename src/{modules/user => user/modules}/utils/modules/default.nix (100%) rename src/{modules/user => user/modules}/utils/modules/dev/default.nix (100%) rename src/{modules/user => user/modules}/utils/modules/email/config/aerc.conf (100%) rename src/{modules/user => user/modules}/utils/modules/email/config/binds.conf (100%) rename src/{modules/user => user/modules}/utils/modules/email/default.nix (100%) rename src/{modules/user => user/modules}/utils/modules/irc/default.nix (100%) rename src/{modules/user => user/modules}/utils/modules/vim/config/vimrc (100%) rename src/{modules/user => user/modules}/utils/modules/vim/default.nix (100%) diff --git a/flake.nix b/flake.nix index fb62b86..44ab66e 100644 --- a/flake.nix +++ b/flake.nix @@ -25,23 +25,35 @@ in { - nixosConfigurations.desktop = nixpkgs.lib.nixosSystem { - inherit system pkgs; - modules = [ - ./src/systems/desktop - home-manager.nixosModules.home-manager - (import ./src/systems/desktop/home.nix) - ]; - }; - nixosConfigurations.windows = nixpkgs.lib.nixosSystem { - inherit system pkgs; - modules = [ - ./src/systems/wsl - nixos-wsl.nixosModules.wsl - (import ./src/systems/wsl/wsl.nix) - home-manager.nixosModules.home-manager - (import ./src/systems/wsl/home.nix) - ]; + nixosConfigurations = { + desktop = nixpkgs.lib.nixosSystem { + inherit system pkgs; + modules = [ + ./src/system/machines/desktop + home-manager.nixosModules.home-manager + (import ./src/system/machines/desktop/home.nix) + ]; + }; + + windows = nixpkgs.lib.nixosSystem { + inherit system pkgs; + modules = [ + ./src/system/machines/wsl + nixos-wsl.nixosModules.wsl + (import ./src/system/machines/wsl/wsl.nix) + home-manager.nixosModules.home-manager + (import ./src/system/machines/wsl/home.nix) + ]; + }; + + server = nixpkgs.lib.nixosSystem { + inherit system pkgs; + modules = [ + ./src/system/machines/server + home-manager.nixosModules.home-manager + (import ./src/system/machines/server/home.nix) + ]; + }; }; }; } diff --git a/src/modules/system/corn/modules/core-lightning/default.nix b/src/modules/system/corn/modules/core-lightning/default.nix deleted file mode 100644 index 30c65c6..0000000 --- a/src/modules/system/corn/modules/core-lightning/default.nix +++ /dev/null @@ -1,25 +0,0 @@ -{ lib, pkgs, config, ... }: - -with lib; - let cfg = config.modules.corn.core-lightning; - -in -{ options.modules.corn.core-lightning = { enable = mkEnableOption "corn.core-lightning"; }; - config = mkIf cfg.enable { - home.packages = with pkgs; [ - clightning - ]; - - systemd.services.clightning = { - after = [ "network.target" ]; - wantedBy = [ "multi-user.target" ]; - script = '' - ${pkgs.clightning}/bin/lightningd --conf=... - ''; - serviceConfig = { - User = "core-lighting"; - Group = "bitcoin"; - }; - }; - }; -} diff --git a/src/modules/system/corn/modules/electrs/default.nix b/src/modules/system/corn/modules/electrs/default.nix deleted file mode 100644 index e69de29..0000000 diff --git a/src/systems/desktop/default.nix b/src/system/machines/desktop/default.nix similarity index 100% rename from src/systems/desktop/default.nix rename to src/system/machines/desktop/default.nix diff --git a/src/systems/desktop/disks.nix b/src/system/machines/desktop/disks.nix similarity index 100% rename from src/systems/desktop/disks.nix rename to src/system/machines/desktop/disks.nix diff --git a/src/systems/desktop/hardware.nix b/src/system/machines/desktop/hardware.nix similarity index 100% rename from src/systems/desktop/hardware.nix rename to src/system/machines/desktop/hardware.nix diff --git a/src/systems/desktop/home.nix b/src/system/machines/desktop/home.nix similarity index 95% rename from src/systems/desktop/home.nix rename to src/system/machines/desktop/home.nix index 757781f..b85e05e 100644 --- a/src/systems/desktop/home.nix +++ b/src/system/machines/desktop/home.nix @@ -5,8 +5,8 @@ home-manager.useUserPackages = true; home-manager.users.${config.user.name} = { imports = [ - ../../user - ../../modules/user + ../../../user + ../../../user/modules ]; programs.home-manager.enable = true; diff --git a/src/systems/desktop/system.nix b/src/system/machines/desktop/system.nix similarity index 100% rename from src/systems/desktop/system.nix rename to src/system/machines/desktop/system.nix diff --git a/src/systems/laptop/default.nix b/src/system/machines/laptop/default.nix similarity index 100% rename from src/systems/laptop/default.nix rename to src/system/machines/laptop/default.nix diff --git a/src/systems/server/default.nix b/src/system/machines/server/default.nix similarity index 79% rename from src/systems/server/default.nix rename to src/system/machines/server/default.nix index 5d6cab9..58605a4 100644 --- a/src/systems/server/default.nix +++ b/src/system/machines/server/default.nix @@ -2,7 +2,7 @@ { imports = [ - ../../user + ../../../user ./hardware.nix ./system.nix ]; diff --git a/src/system/machines/server/home.nix b/src/system/machines/server/home.nix new file mode 100644 index 0000000..3fa0be1 --- /dev/null +++ b/src/system/machines/server/home.nix @@ -0,0 +1,35 @@ +{ config, ... }: + +{ + home-manager.useGlobalPkgs = true; + home-manager.useUserPackages = true; + home-manager.users.${config.user.name} = { + imports = [ + ../../../user + ../../../user/modules + ]; + + programs.home-manager.enable = true; + programs.bash.shellAliases = { + nixup = "sudo nixos-rebuild switch --flake /etc/nixos/.#server"; + }; + + home.stateVersion = "23.11"; + + home.username = "${config.user.name}"; + home.homeDirectory = "/home/${config.user.name}"; + + modules = { + bash.enable = true; + git.enable = true; + gpg.enable = true; + + utils = { + enable = true; + vim.enable = true; + }; + + gui.enable = false; + }; + }; +} diff --git a/src/systems/server/system.nix b/src/system/machines/server/system.nix similarity index 92% rename from src/systems/server/system.nix rename to src/system/machines/server/system.nix index f73eabc..0c9a916 100644 --- a/src/systems/server/system.nix +++ b/src/system/machines/server/system.nix @@ -3,9 +3,18 @@ { system.stateVersion = "23.11"; imports = [ - ../../modules/system + ../modules ]; + modules = { + bitcoin = { + enable = true; + clightning = true; + electrs = true; + sparrow-server = true; + }; + }; + # Users users.users = { ${config.user.name} = { diff --git a/src/systems/wsl/default.nix b/src/system/machines/wsl/default.nix similarity index 100% rename from src/systems/wsl/default.nix rename to src/system/machines/wsl/default.nix diff --git a/src/systems/wsl/home.nix b/src/system/machines/wsl/home.nix similarity index 94% rename from src/systems/wsl/home.nix rename to src/system/machines/wsl/home.nix index 679c4a6..b7a657e 100644 --- a/src/systems/wsl/home.nix +++ b/src/system/machines/wsl/home.nix @@ -5,8 +5,8 @@ home-manager.useUserPackages = true; home-manager.users.${config.user.name} = { imports = [ - ../../user - ../../modules/user + ../../../user + ../../../user/modules ]; programs.home-manager.enable = true; diff --git a/src/systems/wsl/system.nix b/src/system/machines/wsl/system.nix similarity index 100% rename from src/systems/wsl/system.nix rename to src/system/machines/wsl/system.nix diff --git a/src/systems/wsl/wsl.nix b/src/system/machines/wsl/wsl.nix similarity index 100% rename from src/systems/wsl/wsl.nix rename to src/system/machines/wsl/wsl.nix diff --git a/src/modules/system/corn/default.nix b/src/system/modules/bitcoin/default.nix similarity index 63% rename from src/modules/system/corn/default.nix rename to src/system/modules/bitcoin/default.nix index eff2c15..fda6a50 100644 --- a/src/modules/system/corn/default.nix +++ b/src/system/modules/bitcoin/default.nix @@ -2,10 +2,10 @@ with lib; let - cfg = config.modules.corn; + cfg = config.modules.bitcoin; in -{ options.modules.corn = { enable = mkEnableOption "corn"; }; +{ options.modules.bitcoin = { enable = mkEnableOption "bitcoin"; }; imports = [ ./core-lightning @@ -13,6 +13,10 @@ in ]; config = mkIf cfg.enable { + programs.bash.shellAliases = { + btc = "bitcoin-cli"; + }; + users = { users = { "bitcoind" = { @@ -23,15 +27,18 @@ in }; groups = { "bitcoin" = { - members = [ "core-lightning" "electrs" ]; + members = [ "clightning" "electrs" ]; }; }; }; + services.bitcoind = { - "main-net" = { + "bitcoind" = { enable = true; + testnet = false; user = "bitcoind"; group = "bitcoin"; + #extraConfig = TODO; }; }; }; diff --git a/src/system/modules/bitcoin/modules/core-lightning/default.nix b/src/system/modules/bitcoin/modules/core-lightning/default.nix new file mode 100644 index 0000000..2629928 --- /dev/null +++ b/src/system/modules/bitcoin/modules/core-lightning/default.nix @@ -0,0 +1,40 @@ +{ lib, pkgs, config, ... }: + +with lib; + let cfg = config.modules.bitcoin.core-lightning; + +in +{ options.modules.bitcoin.core-lightning = { enable = mkEnableOption "bitcoin.core-lightning"; }; + config = mkIf cfg.enable { + programs.bash.shellAliases = { + cln = "lightningd"; + }; + + home.packages = with pkgs; [ + clightning + ]; + + users = { + users = { + "clightning" = { + description = "clightning system user"; + isSystemUser = true; + group = "bitcoin"; + }; + }; + }; + + systemd.services.clightning = { + Unit = { + after = [ "network.target" "bitcoind.service" ]; + wantedBy = [ "multi-user.target" ]; + }; + Service = { + ExecStart = "${pkgs.clightning}/bin/lightningd --conf=..."; + Restart = "always"; + User = "clightning"; + Group = "bitcoin"; + }; + }; + }; +} diff --git a/src/modules/system/corn/modules/default.nix b/src/system/modules/bitcoin/modules/default.nix similarity index 81% rename from src/modules/system/corn/modules/default.nix rename to src/system/modules/bitcoin/modules/default.nix index 7d57eba..e7f0860 100644 --- a/src/modules/system/corn/modules/default.nix +++ b/src/system/modules/bitcoin/modules/default.nix @@ -1,6 +1,7 @@ { imports = [ ./core-lightning + ./electrs ./sparrow-cli ]; } diff --git a/src/system/modules/bitcoin/modules/electrs/default.nix b/src/system/modules/bitcoin/modules/electrs/default.nix new file mode 100644 index 0000000..a082b48 --- /dev/null +++ b/src/system/modules/bitcoin/modules/electrs/default.nix @@ -0,0 +1,35 @@ +{ lib, pkgs, config, ... }: + +with lib; + let cfg = config.modules.bitcoin.electrs; +in +{ options.modules.bitcoin.electrs = { enable = mkEnableOption "bitcoin.electrs"; }; + config = mkIf cfg.enable { + environment.systemPackages = with pkgs; [ + electrs + ]; + + users = { + users = { + "electrs" = { + description = "electrs system user"; + isSystemUser = true; + group = "bitcoin"; + }; + }; + }; + + systemd.services.electrs = { + Unit = { + after = [ "network.target" "bitcoind.service" ]; + wantedBy = [ "multi-user.target" ]; + }; + Service = { + ExecStart = "${pkgs.electrs}/bin/electrs --conf=..."; + Restart = "always"; + User = "electrs"; + Group = "bitcoin"; + }; + }; + }; +} diff --git a/src/modules/system/corn/modules/sparrow-cli/default.nix b/src/system/modules/bitcoin/modules/sparrow-server/default.nix similarity index 58% rename from src/modules/system/corn/modules/sparrow-cli/default.nix rename to src/system/modules/bitcoin/modules/sparrow-server/default.nix index 589df5c..4a7450f 100644 --- a/src/modules/system/corn/modules/sparrow-cli/default.nix +++ b/src/system/modules/bitcoin/modules/sparrow-server/default.nix @@ -2,10 +2,10 @@ with lib; let - cfg = config.modules.corn.sparrow-server; + cfg = config.modules.bitcoin.sparrow-server; sparrow-server = import ./derivation.nix { inherit pkgs; }; in -{ options.modules.corn.sparrow-server = { enable = mkEnableOption "corn.sparrow-server"; }; +{ options.modules.bitcoin.sparrow-server = { enable = mkEnableOption "bitcoin.sparrow-server"; }; config = mkIf cfg.enable { home.packages = with pkgs; [ sparrow-server diff --git a/src/modules/system/corn/modules/sparrow-cli/derivation.nix b/src/system/modules/bitcoin/modules/sparrow-server/derivation.nix similarity index 100% rename from src/modules/system/corn/modules/sparrow-cli/derivation.nix rename to src/system/modules/bitcoin/modules/sparrow-server/derivation.nix diff --git a/src/modules/system/default.nix b/src/system/modules/default.nix similarity index 69% rename from src/modules/system/default.nix rename to src/system/modules/default.nix index 1b5d773..79cd10e 100644 --- a/src/modules/system/default.nix +++ b/src/system/modules/default.nix @@ -1,5 +1,6 @@ { imports = [ ./corn + ./security ]; } diff --git a/src/user/default.nix b/src/user/configs/default.nix similarity index 100% rename from src/user/default.nix rename to src/user/configs/default.nix diff --git a/src/user/pgpKey.nix b/src/user/configs/pgpKey.nix similarity index 100% rename from src/user/pgpKey.nix rename to src/user/configs/pgpKey.nix diff --git a/src/modules/user/bash/config/alias.nix b/src/user/modules/bash/config/alias.nix similarity index 100% rename from src/modules/user/bash/config/alias.nix rename to src/user/modules/bash/config/alias.nix diff --git a/src/modules/user/bash/config/bashprofile.nix b/src/user/modules/bash/config/bashprofile.nix similarity index 100% rename from src/modules/user/bash/config/bashprofile.nix rename to src/user/modules/bash/config/bashprofile.nix diff --git a/src/modules/user/bash/config/bashrc.nix b/src/user/modules/bash/config/bashrc.nix similarity index 100% rename from src/modules/user/bash/config/bashrc.nix rename to src/user/modules/bash/config/bashrc.nix diff --git a/src/modules/user/bash/config/prompt.nix b/src/user/modules/bash/config/prompt.nix similarity index 100% rename from src/modules/user/bash/config/prompt.nix rename to src/user/modules/bash/config/prompt.nix diff --git a/src/modules/user/bash/default.nix b/src/user/modules/bash/default.nix similarity index 100% rename from src/modules/user/bash/default.nix rename to src/user/modules/bash/default.nix diff --git a/src/modules/user/default.nix b/src/user/modules/default.nix similarity index 100% rename from src/modules/user/default.nix rename to src/user/modules/default.nix diff --git a/src/modules/user/git/default.nix b/src/user/modules/git/default.nix similarity index 100% rename from src/modules/user/git/default.nix rename to src/user/modules/git/default.nix diff --git a/src/modules/user/gpg/default.nix b/src/user/modules/gpg/default.nix similarity index 100% rename from src/modules/user/gpg/default.nix rename to src/user/modules/gpg/default.nix diff --git a/src/modules/user/gui/default.nix b/src/user/modules/gui/default.nix similarity index 100% rename from src/modules/user/gui/default.nix rename to src/user/modules/gui/default.nix diff --git a/src/modules/user/gui/desktopEnvironments/default.nix b/src/user/modules/gui/desktopEnvironments/default.nix similarity index 100% rename from src/modules/user/gui/desktopEnvironments/default.nix rename to src/user/modules/gui/desktopEnvironments/default.nix diff --git a/src/modules/user/gui/desktopEnvironments/modules/alacritty/config/alacritty.nix b/src/user/modules/gui/desktopEnvironments/modules/alacritty/config/alacritty.nix similarity index 100% rename from src/modules/user/gui/desktopEnvironments/modules/alacritty/config/alacritty.nix rename to src/user/modules/gui/desktopEnvironments/modules/alacritty/config/alacritty.nix diff --git a/src/modules/user/gui/desktopEnvironments/modules/alacritty/default.nix b/src/user/modules/gui/desktopEnvironments/modules/alacritty/default.nix similarity index 100% rename from src/modules/user/gui/desktopEnvironments/modules/alacritty/default.nix rename to src/user/modules/gui/desktopEnvironments/modules/alacritty/default.nix diff --git a/src/modules/user/gui/desktopEnvironments/modules/browsers/default.nix b/src/user/modules/gui/desktopEnvironments/modules/browsers/default.nix similarity index 100% rename from src/modules/user/gui/desktopEnvironments/modules/browsers/default.nix rename to src/user/modules/gui/desktopEnvironments/modules/browsers/default.nix diff --git a/src/modules/user/gui/desktopEnvironments/modules/corn/default.nix b/src/user/modules/gui/desktopEnvironments/modules/corn/default.nix similarity index 100% rename from src/modules/user/gui/desktopEnvironments/modules/corn/default.nix rename to src/user/modules/gui/desktopEnvironments/modules/corn/default.nix diff --git a/src/modules/user/gui/desktopEnvironments/modules/default.nix b/src/user/modules/gui/desktopEnvironments/modules/default.nix similarity index 100% rename from src/modules/user/gui/desktopEnvironments/modules/default.nix rename to src/user/modules/gui/desktopEnvironments/modules/default.nix diff --git a/src/modules/user/gui/desktopEnvironments/modules/fun/default.nix b/src/user/modules/gui/desktopEnvironments/modules/fun/default.nix similarity index 100% rename from src/modules/user/gui/desktopEnvironments/modules/fun/default.nix rename to src/user/modules/gui/desktopEnvironments/modules/fun/default.nix diff --git a/src/modules/user/gui/desktopEnvironments/modules/neovim/config/lazyvim/init.lua b/src/user/modules/gui/desktopEnvironments/modules/neovim/config/lazyvim/init.lua similarity index 100% rename from src/modules/user/gui/desktopEnvironments/modules/neovim/config/lazyvim/init.lua rename to src/user/modules/gui/desktopEnvironments/modules/neovim/config/lazyvim/init.lua diff --git a/src/modules/user/gui/desktopEnvironments/modules/neovim/config/lazyvim/lua/config/autocmds.lua b/src/user/modules/gui/desktopEnvironments/modules/neovim/config/lazyvim/lua/config/autocmds.lua similarity index 100% rename from src/modules/user/gui/desktopEnvironments/modules/neovim/config/lazyvim/lua/config/autocmds.lua rename to src/user/modules/gui/desktopEnvironments/modules/neovim/config/lazyvim/lua/config/autocmds.lua diff --git a/src/modules/user/gui/desktopEnvironments/modules/neovim/config/lazyvim/lua/config/keymaps.lua b/src/user/modules/gui/desktopEnvironments/modules/neovim/config/lazyvim/lua/config/keymaps.lua similarity index 100% rename from src/modules/user/gui/desktopEnvironments/modules/neovim/config/lazyvim/lua/config/keymaps.lua rename to src/user/modules/gui/desktopEnvironments/modules/neovim/config/lazyvim/lua/config/keymaps.lua diff --git a/src/modules/user/gui/desktopEnvironments/modules/neovim/config/lazyvim/lua/config/lazy.lua b/src/user/modules/gui/desktopEnvironments/modules/neovim/config/lazyvim/lua/config/lazy.lua similarity index 100% rename from src/modules/user/gui/desktopEnvironments/modules/neovim/config/lazyvim/lua/config/lazy.lua rename to src/user/modules/gui/desktopEnvironments/modules/neovim/config/lazyvim/lua/config/lazy.lua diff --git a/src/modules/user/gui/desktopEnvironments/modules/neovim/config/lazyvim/lua/config/options.lua b/src/user/modules/gui/desktopEnvironments/modules/neovim/config/lazyvim/lua/config/options.lua similarity index 100% rename from src/modules/user/gui/desktopEnvironments/modules/neovim/config/lazyvim/lua/config/options.lua rename to src/user/modules/gui/desktopEnvironments/modules/neovim/config/lazyvim/lua/config/options.lua diff --git a/src/modules/user/gui/desktopEnvironments/modules/neovim/config/lazyvim/lua/plugins/core.lua b/src/user/modules/gui/desktopEnvironments/modules/neovim/config/lazyvim/lua/plugins/core.lua similarity index 100% rename from src/modules/user/gui/desktopEnvironments/modules/neovim/config/lazyvim/lua/plugins/core.lua rename to src/user/modules/gui/desktopEnvironments/modules/neovim/config/lazyvim/lua/plugins/core.lua diff --git a/src/modules/user/gui/desktopEnvironments/modules/neovim/config/servers.nix b/src/user/modules/gui/desktopEnvironments/modules/neovim/config/servers.nix similarity index 100% rename from src/modules/user/gui/desktopEnvironments/modules/neovim/config/servers.nix rename to src/user/modules/gui/desktopEnvironments/modules/neovim/config/servers.nix diff --git a/src/modules/user/gui/desktopEnvironments/modules/neovim/default.nix b/src/user/modules/gui/desktopEnvironments/modules/neovim/default.nix similarity index 100% rename from src/modules/user/gui/desktopEnvironments/modules/neovim/default.nix rename to src/user/modules/gui/desktopEnvironments/modules/neovim/default.nix diff --git a/src/modules/user/gui/desktopEnvironments/modules/utils/default.nix b/src/user/modules/gui/desktopEnvironments/modules/utils/default.nix similarity index 100% rename from src/modules/user/gui/desktopEnvironments/modules/utils/default.nix rename to src/user/modules/gui/desktopEnvironments/modules/utils/default.nix diff --git a/src/modules/user/gui/desktopEnvironments/modules/writing/default.nix b/src/user/modules/gui/desktopEnvironments/modules/writing/default.nix similarity index 100% rename from src/modules/user/gui/desktopEnvironments/modules/writing/default.nix rename to src/user/modules/gui/desktopEnvironments/modules/writing/default.nix diff --git a/src/modules/user/gui/desktopEnvironments/sway/config/rofi.nix b/src/user/modules/gui/desktopEnvironments/sway/config/rofi.nix similarity index 100% rename from src/modules/user/gui/desktopEnvironments/sway/config/rofi.nix rename to src/user/modules/gui/desktopEnvironments/sway/config/rofi.nix diff --git a/src/modules/user/gui/desktopEnvironments/sway/config/shellHook.nix b/src/user/modules/gui/desktopEnvironments/sway/config/shellHook.nix similarity index 100% rename from src/modules/user/gui/desktopEnvironments/sway/config/shellHook.nix rename to src/user/modules/gui/desktopEnvironments/sway/config/shellHook.nix diff --git a/src/modules/user/gui/desktopEnvironments/sway/config/sway.nix b/src/user/modules/gui/desktopEnvironments/sway/config/sway.nix similarity index 100% rename from src/modules/user/gui/desktopEnvironments/sway/config/sway.nix rename to src/user/modules/gui/desktopEnvironments/sway/config/sway.nix diff --git a/src/modules/user/gui/desktopEnvironments/sway/default.nix b/src/user/modules/gui/desktopEnvironments/sway/default.nix similarity index 100% rename from src/modules/user/gui/desktopEnvironments/sway/default.nix rename to src/user/modules/gui/desktopEnvironments/sway/default.nix diff --git a/src/modules/user/gui/wallpapers/mountains.jpg b/src/user/modules/gui/wallpapers/mountains.jpg similarity index 100% rename from src/modules/user/gui/wallpapers/mountains.jpg rename to src/user/modules/gui/wallpapers/mountains.jpg diff --git a/src/modules/security/default.nix b/src/user/modules/security/default.nix similarity index 100% rename from src/modules/security/default.nix rename to src/user/modules/security/default.nix diff --git a/src/modules/user/utils/default.nix b/src/user/modules/utils/default.nix similarity index 100% rename from src/modules/user/utils/default.nix rename to src/user/modules/utils/default.nix diff --git a/src/modules/user/utils/modules/default.nix b/src/user/modules/utils/modules/default.nix similarity index 100% rename from src/modules/user/utils/modules/default.nix rename to src/user/modules/utils/modules/default.nix diff --git a/src/modules/user/utils/modules/dev/default.nix b/src/user/modules/utils/modules/dev/default.nix similarity index 100% rename from src/modules/user/utils/modules/dev/default.nix rename to src/user/modules/utils/modules/dev/default.nix diff --git a/src/modules/user/utils/modules/email/config/aerc.conf b/src/user/modules/utils/modules/email/config/aerc.conf similarity index 100% rename from src/modules/user/utils/modules/email/config/aerc.conf rename to src/user/modules/utils/modules/email/config/aerc.conf diff --git a/src/modules/user/utils/modules/email/config/binds.conf b/src/user/modules/utils/modules/email/config/binds.conf similarity index 100% rename from src/modules/user/utils/modules/email/config/binds.conf rename to src/user/modules/utils/modules/email/config/binds.conf diff --git a/src/modules/user/utils/modules/email/default.nix b/src/user/modules/utils/modules/email/default.nix similarity index 100% rename from src/modules/user/utils/modules/email/default.nix rename to src/user/modules/utils/modules/email/default.nix diff --git a/src/modules/user/utils/modules/irc/default.nix b/src/user/modules/utils/modules/irc/default.nix similarity index 100% rename from src/modules/user/utils/modules/irc/default.nix rename to src/user/modules/utils/modules/irc/default.nix diff --git a/src/modules/user/utils/modules/vim/config/vimrc b/src/user/modules/utils/modules/vim/config/vimrc similarity index 100% rename from src/modules/user/utils/modules/vim/config/vimrc rename to src/user/modules/utils/modules/vim/config/vimrc diff --git a/src/modules/user/utils/modules/vim/default.nix b/src/user/modules/utils/modules/vim/default.nix similarity index 100% rename from src/modules/user/utils/modules/vim/default.nix rename to src/user/modules/utils/modules/vim/default.nix From 8258e828913cbe704acc2d1f11d887a88e648610 Mon Sep 17 00:00:00 2001 From: Bryan Ramos Date: Wed, 28 Feb 2024 21:27:03 -0500 Subject: [PATCH 03/26] 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 From 31fb8f6a87e85f30937b11bd53ac49bae2e1b49f Mon Sep 17 00:00:00 2001 From: Bryan Ramos Date: Wed, 28 Feb 2024 21:32:24 -0500 Subject: [PATCH 04/26] cont2 --- src/user/modules/gui/default.nix | 5 ++++- .../gui/desktopEnvironments/sway/config/sway.nix | 4 ++-- .../gui/desktopEnvironments/sway/default.nix | 1 - .../wallpapers/mountains.jpg | Bin 4 files changed, 6 insertions(+), 4 deletions(-) rename src/user/modules/gui/{ => desktopEnvironments}/wallpapers/mountains.jpg (100%) diff --git a/src/user/modules/gui/default.nix b/src/user/modules/gui/default.nix index 936f908..1ed120c 100644 --- a/src/user/modules/gui/default.nix +++ b/src/user/modules/gui/default.nix @@ -1,3 +1,6 @@ { - imports = [ ./desktopEnvironments ]; + imports = [ + ./desktopEnvironments + ./modules + ]; } diff --git a/src/user/modules/gui/desktopEnvironments/sway/config/sway.nix b/src/user/modules/gui/desktopEnvironments/sway/config/sway.nix index 5eec3b2..4a16e6d 100644 --- a/src/user/modules/gui/desktopEnvironments/sway/config/sway.nix +++ b/src/user/modules/gui/desktopEnvironments/sway/config/sway.nix @@ -17,13 +17,13 @@ in HDMI-A-1 = { resolution = "1920x1080"; position = "0,0"; - bg = "/etc/nixos/src/modules/gui/wallpapers/mountains.jpg fill"; + bg = "/etc/nixos/src/user/modules/gui/desktopEnvironments/wallpapers fill"; }; DP-1 = { resolution = "1080x1920"; position = "1920,0"; transform = "90"; - bg = "/etc/nixos/src/modules/gui/wallpapers/mountains.jpg fill"; + bg = "/etc/nixos/src/user/modules/gui/desktopEnvironments/wallpapers fill"; }; }; modifier = "Mod1"; diff --git a/src/user/modules/gui/desktopEnvironments/sway/default.nix b/src/user/modules/gui/desktopEnvironments/sway/default.nix index 100d7e3..ecf7c4e 100644 --- a/src/user/modules/gui/desktopEnvironments/sway/default.nix +++ b/src/user/modules/gui/desktopEnvironments/sway/default.nix @@ -6,7 +6,6 @@ let in { options.modules.user.gui.sway = { enable = mkEnableOption "user.gui.sway"; }; - imports = [ ../../modules ]; config = mkIf cfg.enable { wayland.windowManager.sway = import ./config/sway.nix { inherit pkgs config lib; }; programs.rofi = import ./config/rofi.nix { inherit pkgs config lib; }; diff --git a/src/user/modules/gui/wallpapers/mountains.jpg b/src/user/modules/gui/desktopEnvironments/wallpapers/mountains.jpg similarity index 100% rename from src/user/modules/gui/wallpapers/mountains.jpg rename to src/user/modules/gui/desktopEnvironments/wallpapers/mountains.jpg From 7d54484c89e71963533ee50ee06b24f18424bb6c Mon Sep 17 00:00:00 2001 From: Bryan Ramos Date: Wed, 28 Feb 2024 21:53:36 -0500 Subject: [PATCH 05/26] cont --- src/system/modules/bitcoin/default.nix | 24 ++++++++++++++++++- .../modules/core-lightning/default.nix | 2 +- .../modules/c-lightning-REST/default.nix | 0 .../core-lightning/modules/default.nix | 5 ++++ .../bitcoin/modules/electrs/default.nix | 19 +++++++++++---- src/system/modules/default.nix | 1 - 6 files changed, 44 insertions(+), 7 deletions(-) create mode 100644 src/system/modules/bitcoin/modules/core-lightning/modules/c-lightning-REST/default.nix diff --git a/src/system/modules/bitcoin/default.nix b/src/system/modules/bitcoin/default.nix index 59852fe..b62372a 100644 --- a/src/system/modules/bitcoin/default.nix +++ b/src/system/modules/bitcoin/default.nix @@ -38,7 +38,29 @@ in testnet = false; user = "bitcoind"; group = "bitcoin"; - #extraConfig = TODO; + configFile = /var/lib/bitcoind/bitcoin.conf; + + rpc = { + "btcd" = { + #passwordHMAC = #CHECK IF THIS IS SAFE TO EXPOSE!!; + }; + port = 8332; + }; + + extraConfig = '' + server=1 + mempoolfullrbf=1 + v2transport=1 + + rpcbind=127.0.0.1 + rpcallowip=127.0.0.1 + + proxy=127.0.0.1:9050 + listen=1 + listenonion=1 + torcontrol=127.0.0.1:9051 + torenablecircuit=1 + ''; }; }; }; diff --git a/src/system/modules/bitcoin/modules/core-lightning/default.nix b/src/system/modules/bitcoin/modules/core-lightning/default.nix index 912e8cb..c851f6f 100644 --- a/src/system/modules/bitcoin/modules/core-lightning/default.nix +++ b/src/system/modules/bitcoin/modules/core-lightning/default.nix @@ -47,7 +47,7 @@ in PrivateTmp = true; ProtectSystem = "full"; - NoNetPrivileges = true; + NoNewPrivileges = true; PrivateDevies = true; }; Install = { diff --git a/src/system/modules/bitcoin/modules/core-lightning/modules/c-lightning-REST/default.nix b/src/system/modules/bitcoin/modules/core-lightning/modules/c-lightning-REST/default.nix new file mode 100644 index 0000000..e69de29 diff --git a/src/system/modules/bitcoin/modules/core-lightning/modules/default.nix b/src/system/modules/bitcoin/modules/core-lightning/modules/default.nix index e69de29..2b2fd49 100644 --- a/src/system/modules/bitcoin/modules/core-lightning/modules/default.nix +++ b/src/system/modules/bitcoin/modules/core-lightning/modules/default.nix @@ -0,0 +1,5 @@ +{ + imports = [ + ./c-lightning-REST + ]; +} diff --git a/src/system/modules/bitcoin/modules/electrs/default.nix b/src/system/modules/bitcoin/modules/electrs/default.nix index a082b48..9c988e4 100644 --- a/src/system/modules/bitcoin/modules/electrs/default.nix +++ b/src/system/modules/bitcoin/modules/electrs/default.nix @@ -21,14 +21,25 @@ in systemd.services.electrs = { Unit = { - after = [ "network.target" "bitcoind.service" ]; - wantedBy = [ "multi-user.target" ]; + Description = "Electrs Bitcoin Indexer"; + After = [ "network.target" "bitcoind.service" ]; + Requires = [ "bitcoind.service" ]; }; Service = { - ExecStart = "${pkgs.electrs}/bin/electrs --conf=..."; - Restart = "always"; + ExecStartPre = "/usr/bin/sleep 10"; + ExecStart = "${pkgs.electrs}/bin/electrs"; + User = "electrs"; Group = "bitcoin"; + Type = "simple"; + + KillMode = "process"; + TimeoutSec = "60"; + Restart = "always"; + RestartSec = "60"; + }; + Install = { + WantedBy = [ "multi-user.target" ]; }; }; }; diff --git a/src/system/modules/default.nix b/src/system/modules/default.nix index 7af4fab..7e1d613 100644 --- a/src/system/modules/default.nix +++ b/src/system/modules/default.nix @@ -1,6 +1,5 @@ { imports = [ ./bitcoin - ./security ]; } From de3de307116ef0536921828f648569eab9fbf735 Mon Sep 17 00:00:00 2001 From: Bryan Ramos Date: Wed, 28 Feb 2024 22:10:14 -0500 Subject: [PATCH 06/26] cat --- src/system/machines/desktop/default.nix | 2 +- src/system/machines/wsl/default.nix | 2 +- 2 files changed, 2 insertions(+), 2 deletions(-) diff --git a/src/system/machines/desktop/default.nix b/src/system/machines/desktop/default.nix index 5d6cab9..6357cb0 100644 --- a/src/system/machines/desktop/default.nix +++ b/src/system/machines/desktop/default.nix @@ -2,7 +2,7 @@ { imports = [ - ../../user + ../../user/configs ./hardware.nix ./system.nix ]; diff --git a/src/system/machines/wsl/default.nix b/src/system/machines/wsl/default.nix index d97c4da..be38ce0 100644 --- a/src/system/machines/wsl/default.nix +++ b/src/system/machines/wsl/default.nix @@ -2,7 +2,7 @@ { imports = [ - ../../user + ../../user/configs ./system.nix ]; } From 0fd73dc8d221437c02b3be930d34e812f8b30e44 Mon Sep 17 00:00:00 2001 From: Bryan Ramos Date: Thu, 29 Feb 2024 15:16:22 -0500 Subject: [PATCH 07/26] added user symlink to root of repo --- src/user/configs/default.nix | 2 +- user.symlink.nix | 1 + 2 files changed, 2 insertions(+), 1 deletion(-) create mode 120000 user.symlink.nix diff --git a/src/user/configs/default.nix b/src/user/configs/default.nix index fcdd4e6..ca58f78 100644 --- a/src/user/configs/default.nix +++ b/src/user/configs/default.nix @@ -1,6 +1,6 @@ { lib, pkgs, ... }: -# Replace with your user configurations +# Replace symlink at root of repo with user configs { options = { user = lib.mkOption { diff --git a/user.symlink.nix b/user.symlink.nix new file mode 120000 index 0000000..b671e3c --- /dev/null +++ b/user.symlink.nix @@ -0,0 +1 @@ +src/user/configs/default.nix \ No newline at end of file From 4d6a6b9bc3c3740e5f9885384138a52fd1a65236 Mon Sep 17 00:00:00 2001 From: Bryan Ramos Date: Fri, 1 Mar 2024 11:38:55 -0500 Subject: [PATCH 08/26] bigly --- src/system/modules/bitcoin/default.nix | 5 ++-- .../modules/core-lightning/default.nix | 29 ++++++++++++++----- .../modules/c-lightning-REST/default.nix | 18 ++++++++++++ .../modules/c-lightning-REST/derivation.nix | 28 ++++++++++++++++++ .../bitcoin/modules/electrs/default.nix | 7 +++-- .../modules/sparrow-server/default.nix | 6 ++-- 6 files changed, 78 insertions(+), 15 deletions(-) create mode 100644 src/system/modules/bitcoin/modules/core-lightning/modules/c-lightning-REST/derivation.nix diff --git a/src/system/modules/bitcoin/default.nix b/src/system/modules/bitcoin/default.nix index b62372a..f2412bb 100644 --- a/src/system/modules/bitcoin/default.nix +++ b/src/system/modules/bitcoin/default.nix @@ -23,6 +23,8 @@ in description = "bitcoind system user"; isSystemUser = true; group = "bitcoin"; + home = /var/lib/bitcoind; + createHome = true; }; }; groups = { @@ -41,9 +43,6 @@ in configFile = /var/lib/bitcoind/bitcoin.conf; rpc = { - "btcd" = { - #passwordHMAC = #CHECK IF THIS IS SAFE TO EXPOSE!!; - }; port = 8332; }; diff --git a/src/system/modules/bitcoin/modules/core-lightning/default.nix b/src/system/modules/bitcoin/modules/core-lightning/default.nix index c851f6f..19e59fd 100644 --- a/src/system/modules/bitcoin/modules/core-lightning/default.nix +++ b/src/system/modules/bitcoin/modules/core-lightning/default.nix @@ -1,4 +1,5 @@ { lib, pkgs, config, ... }: +#TODO: c-lightning config file with lib; let cfg = config.modules.system.bitcoin.core-lightning; @@ -6,21 +7,23 @@ with lib; in { options.modules.system.bitcoin.core-lightning = { enable = mkEnableOption "system.bitcoin.core-lightning"; }; config = mkIf cfg.enable { - imports = [ ./modules ]; + imports = [ ./modules ]; programs.bash.shellAliases = { cln = "lightningd"; }; - home.packages = with pkgs; [ + environment.systemPackages = with pkgs; [ clightning ]; users = { users = { - "clightning" = { - description = "clightning system user"; + "c-lightning" = { + description = "core-lightning system user"; isSystemUser = true; group = "bitcoin"; + home = /var/lib/c-lightning; + createHome = true; }; }; }; @@ -33,12 +36,23 @@ in Wants = [ "network-online.target" ]; }; Service = { - ExecStartPre = "/usr/bin/sleep 10"; - ExecStart = "${pkgs.clightning}/bin/lightningd --conf=/var/lib/clightning/.lightning/config"; + ExecStartPre = + let + lightningConf = '' + ''; #put lightning conf here + in + "${pkgs.writeShellScript "prepare-clightning-config" '' + mkdir -p /var/lib/c-lightning/.lightning + chown -R c-lightning:bitcoin /var/lib/c-lightning + echo "${lightningConf}" > /var/lib/c-lightning/.lightning/config + chmod 600 /var/lib/c-lightning/.lightning/config + ''}"; + + ExecStart = "${pkgs.clightning}/bin/lightningd --conf=/var/lib/c-lightning/.lightning/config"; RuntimeDirectory = "lightningd"; - User = "clightning"; + User = "c-lightning"; Group = "bitcoin"; Type = "forking"; @@ -49,6 +63,7 @@ in ProtectSystem = "full"; NoNewPrivileges = true; PrivateDevies = true; + MemoryDenyWriteAccess = false; }; Install = { WantedBy = [ "multi-user.target" ]; diff --git a/src/system/modules/bitcoin/modules/core-lightning/modules/c-lightning-REST/default.nix b/src/system/modules/bitcoin/modules/core-lightning/modules/c-lightning-REST/default.nix index e69de29..c04a9e8 100644 --- a/src/system/modules/bitcoin/modules/core-lightning/modules/c-lightning-REST/default.nix +++ b/src/system/modules/bitcoin/modules/core-lightning/modules/c-lightning-REST/default.nix @@ -0,0 +1,18 @@ +{ lib, pkgs, config, ... }: + +with lib; + let + cfg = config.modules.system.bitcoin.core-lightning.REST; + cln = config.modules.system.bitcoin.core-lightning; + c-lightning-REST = import ./derivation.nix { inherit pkgs; }; + +in +{ options.modules.system.bitcoin.core-lightning.REST = { + enable = mkEnableOption "system.bitcoin.core-lightning.REST"; + }; + config = mkIf (cfg.enable && cln.enable) { + environment.systemPackages = with pkgs; [ + c-lightning-REST + ]; + }; +} diff --git a/src/system/modules/bitcoin/modules/core-lightning/modules/c-lightning-REST/derivation.nix b/src/system/modules/bitcoin/modules/core-lightning/modules/c-lightning-REST/derivation.nix new file mode 100644 index 0000000..4c7dd7e --- /dev/null +++ b/src/system/modules/bitcoin/modules/core-lightning/modules/c-lightning-REST/derivation.nix @@ -0,0 +1,28 @@ +{ pkgs, ... }: + +with pkgs; +stdenv.mkDerivation rec { + pname = "c-lightning-REST"; + version = "0.10.7"; + + src = fetchurl { + url = "https://github.com/Ride-The-Lightning/c-lightning-REST/archive/refs/tags/v${version}.tar.gz"; + sha256 = "1swg53vbacsrsgy79lni07dy2h44b0yf2kad7j4fv17az4gwnxk7"; + }; + + buildInputs = with pkgs; [ + nodejs + ]; + + installPhase = '' + mkdir -p $out + cp -r * $out/ + ''; + + meta = { + description = "c-lighting REST API"; + homepage = "https://github.com/Ride-The-Lightning/c-lightning-REST"; + license = stdenv.lib.licenses.mit; + platforms = stdenv.lib.platforms.linux; + }; +} diff --git a/src/system/modules/bitcoin/modules/electrs/default.nix b/src/system/modules/bitcoin/modules/electrs/default.nix index 9c988e4..677bafd 100644 --- a/src/system/modules/bitcoin/modules/electrs/default.nix +++ b/src/system/modules/bitcoin/modules/electrs/default.nix @@ -1,4 +1,5 @@ { lib, pkgs, config, ... }: +#TODO: electrs configuration file with lib; let cfg = config.modules.bitcoin.electrs; @@ -15,6 +16,8 @@ in description = "electrs system user"; isSystemUser = true; group = "bitcoin"; + home = /var/lib/electrs; + createHome = true; }; }; }; @@ -34,9 +37,9 @@ in Type = "simple"; KillMode = "process"; - TimeoutSec = "60"; + TimeoutSec = 60; Restart = "always"; - RestartSec = "60"; + RestartSec = 60; }; Install = { WantedBy = [ "multi-user.target" ]; diff --git a/src/system/modules/bitcoin/modules/sparrow-server/default.nix b/src/system/modules/bitcoin/modules/sparrow-server/default.nix index ca6ff75..6629f8c 100644 --- a/src/system/modules/bitcoin/modules/sparrow-server/default.nix +++ b/src/system/modules/bitcoin/modules/sparrow-server/default.nix @@ -2,12 +2,12 @@ with lib; let - cfg = config.modules.gui.bitcoin.sparrow-server; + cfg = config.modules.system.bitcoin.sparrow-server; sparrow-server = import ./derivation.nix { inherit pkgs; }; in -{ options.modules.gui.bitcoin.sparrow-server = { enable = mkEnableOption "gui.bitcoin.sparrow-server"; }; +{ options.modules.system.bitcoin.sparrow-server = { enable = mkEnableOption "system.bitcoin.sparrow-server"; }; config = mkIf cfg.enable { - home.packages = with pkgs; [ + environment.systemPackages = with pkgs; [ sparrow-server ]; }; From 1d52958cdecff65f98c354291d62b9d5067c97ce Mon Sep 17 00:00:00 2001 From: Bryan Ramos Date: Fri, 1 Mar 2024 14:07:34 -0500 Subject: [PATCH 09/26] update --- src/system/machines/desktop/hardware.nix | 1 - src/system/machines/desktop/system.nix | 3 ++- src/system/machines/server/default.nix | 2 +- src/user/configs/default.nix | 6 ++---- 4 files changed, 5 insertions(+), 7 deletions(-) diff --git a/src/system/machines/desktop/hardware.nix b/src/system/machines/desktop/hardware.nix index 1f2732d..6625e01 100644 --- a/src/system/machines/desktop/hardware.nix +++ b/src/system/machines/desktop/hardware.nix @@ -53,4 +53,3 @@ powerManagement.cpuFreqGovernor = lib.mkDefault "performance"; hardware.cpu.intel.updateMicrocode = lib.mkDefault config.hardware.enableRedistributableFirmware; } - diff --git a/src/system/machines/desktop/system.nix b/src/system/machines/desktop/system.nix index 2b886e8..a2d6709 100644 --- a/src/system/machines/desktop/system.nix +++ b/src/system/machines/desktop/system.nix @@ -6,7 +6,8 @@ users.users = { ${config.user.name} = { isNormalUser = true; - extraGroups = config.user.groups; + extraGroups = config.user.groups + ++ [ "video" "audio" "kvm" "libvirtd" "docker" ]; openssh.authorizedKeys.keys = config.user.sshKeys; }; }; diff --git a/src/system/machines/server/default.nix b/src/system/machines/server/default.nix index 58605a4..5237d0c 100644 --- a/src/system/machines/server/default.nix +++ b/src/system/machines/server/default.nix @@ -2,7 +2,7 @@ { imports = [ - ../../../user + ../../../user/configs ./hardware.nix ./system.nix ]; diff --git a/src/user/configs/default.nix b/src/user/configs/default.nix index ca58f78..5de4451 100644 --- a/src/user/configs/default.nix +++ b/src/user/configs/default.nix @@ -10,9 +10,7 @@ shell = pkgs.bash; groups = [ - "wheel" "networkmanager" "home-manager" - "input" "video" "audio" - "kvm" "libvirtd" "docker" + "wheel" "networkmanager" "home-manager" "input" ]; sshKeys = [ @@ -20,7 +18,7 @@ "ecdsa-sha2-nistp256 AAAAE2VjZHNhLXNoYTItbmlzdHAyNTYAAAAIbmlzdHAyNTYAAABBBK2ROz7EVvE+nzF5k9EYZ2v3JhBzk058uh3QJTzcG4t70fkZgh9y56AOx26eXlKQWuuV05e8EkWRuVI8gfA2ROI=" ]; - gitConfig= { + gitConfig = { userName = "Bryan Ramos"; userEmail = "bryan@ramos.codes"; signing = { From 974f185b001ef02f1d94345f398e3a9980dafc03 Mon Sep 17 00:00:00 2001 From: Bryan Ramos Date: Fri, 1 Mar 2024 15:49:38 -0500 Subject: [PATCH 10/26] progress --- src/system/modules/bitcoin/default.nix | 5 +-- .../modules/bitcoin/modules/default.nix | 2 +- src/system/modules/default.nix | 2 ++ src/system/modules/nginx/default.nix | 21 +++++++++++++ src/system/modules/nginx/sites/default.nix | 5 +++ .../modules/nginx/sites/mySite/default.nix | 30 ++++++++++++++++++ .../sites/mySite/modules/btc/default.nix | 31 +++++++++++++++++++ .../sites/mySite/modules/git/default.nix | 30 ++++++++++++++++++ src/system/modules/tor/default.nix | 23 ++++++++++++++ src/system/modules/tor/modules/default.nix | 5 +++ src/system/modules/tor/modules/relay.nix | 16 ++++++++++ src/user/configs/default.nix | 5 +-- 12 files changed, 168 insertions(+), 7 deletions(-) create mode 100644 src/system/modules/nginx/default.nix create mode 100644 src/system/modules/nginx/sites/default.nix create mode 100644 src/system/modules/nginx/sites/mySite/default.nix create mode 100644 src/system/modules/nginx/sites/mySite/modules/btc/default.nix create mode 100644 src/system/modules/nginx/sites/mySite/modules/git/default.nix create mode 100644 src/system/modules/tor/default.nix create mode 100644 src/system/modules/tor/modules/default.nix create mode 100644 src/system/modules/tor/modules/relay.nix diff --git a/src/system/modules/bitcoin/default.nix b/src/system/modules/bitcoin/default.nix index f2412bb..a18f739 100644 --- a/src/system/modules/bitcoin/default.nix +++ b/src/system/modules/bitcoin/default.nix @@ -7,10 +7,7 @@ let in { options.modules.system.bitcoin = { enable = mkEnableOption "system.bitcoin"; }; - imports = [ - ./core-lightning - ./sparrow-cli - ]; + imports = [ ./modules ]; config = mkIf cfg.enable { programs.bash.shellAliases = { diff --git a/src/system/modules/bitcoin/modules/default.nix b/src/system/modules/bitcoin/modules/default.nix index e7f0860..bbb0cbc 100644 --- a/src/system/modules/bitcoin/modules/default.nix +++ b/src/system/modules/bitcoin/modules/default.nix @@ -2,6 +2,6 @@ imports = [ ./core-lightning ./electrs - ./sparrow-cli + ./sparrow-server ]; } diff --git a/src/system/modules/default.nix b/src/system/modules/default.nix index 7e1d613..77c150a 100644 --- a/src/system/modules/default.nix +++ b/src/system/modules/default.nix @@ -1,5 +1,7 @@ { imports = [ ./bitcoin + ./nginx + ./tor ]; } diff --git a/src/system/modules/nginx/default.nix b/src/system/modules/nginx/default.nix new file mode 100644 index 0000000..6079a17 --- /dev/null +++ b/src/system/modules/nginx/default.nix @@ -0,0 +1,21 @@ +{ lib, config, pkgs, ... }: + +with lib; +let + cfg = config.modules.system.nginx; + +in +{ options.modules.system.nginx = { enable = mkEnableOption "system.nginx"; }; + config = mkIf cfg.enable { + imports = [ ./sites ]; + security.acme = { + defaults = { + email = config.user.email; + }; + }; + services.nginx = { + enable = true; + package = pkgs.nginxMainLine; + }; + }; +} diff --git a/src/system/modules/nginx/sites/default.nix b/src/system/modules/nginx/sites/default.nix new file mode 100644 index 0000000..94b7201 --- /dev/null +++ b/src/system/modules/nginx/sites/default.nix @@ -0,0 +1,5 @@ +{ + imports = [ + ./mySite + ]; +} diff --git a/src/system/modules/nginx/sites/mySite/default.nix b/src/system/modules/nginx/sites/mySite/default.nix new file mode 100644 index 0000000..56932e2 --- /dev/null +++ b/src/system/modules/nginx/sites/mySite/default.nix @@ -0,0 +1,30 @@ +{ lib, config, ... }: + +with lib; +let + cfg = config.modules.system.nginx.mySite; + nginxCfg = config.modules.system.nginx; + +in +{ options.modules.system.nginx.mySite = { enable = mkEnableOption "system.nginx.mySite"; }; + config = mkIf (cfg.enable && nginxCfg) { + security.acme = { + certs = { + "*.ramos.codes" = { + #TODO: configure ACME certs + }; + }; + }; + services.nginx = { + #TODO: check if configure as vhost or stream + virtualHosts = { + "*.ramos.codes" = { + addSSL = true; + onlySSL = true; + forceSSL = true; + acmeRoot = null; + }; + }; + }; + }; +} diff --git a/src/system/modules/nginx/sites/mySite/modules/btc/default.nix b/src/system/modules/nginx/sites/mySite/modules/btc/default.nix new file mode 100644 index 0000000..fa7f50c --- /dev/null +++ b/src/system/modules/nginx/sites/mySite/modules/btc/default.nix @@ -0,0 +1,31 @@ +{ lib, config, ... }: + +with lib; +let + cfg = config.modules.system.nginx.mySite.btc; + mySiteCfg = config.modules.system.nginx.mySite; + btcCfg = config.modules.system.bitcoin; + +in +{ options.modules.system.nginx.mySite.btc = { enable = mkEnableOption "system.nginx.mySite.btc"; }; + config = mkIf (cfg.enable && mySiteCfg && btcCfg) { + #security.acme = { + # certs = { + # "btc.ramos.codes" = { + # #TODO: configure ACME certs + # }; + # }; + #}; + #services.nginx = { + # #TODO: check if configure as vhost or stream + # virtualHosts = { + # "btc.ramos.codes" = { + # addSSL = true; + # onlySSL = true; + # forceSSL = true; + # acmeRoot = null; + # }; + # }; + #}; + }; +} diff --git a/src/system/modules/nginx/sites/mySite/modules/git/default.nix b/src/system/modules/nginx/sites/mySite/modules/git/default.nix new file mode 100644 index 0000000..62b8f66 --- /dev/null +++ b/src/system/modules/nginx/sites/mySite/modules/git/default.nix @@ -0,0 +1,30 @@ +{ lib, config, ... }: + +with lib; +let + cfg = config.modules.system.nginx.mySite.git; + mySiteCfg = config.modules.system.nginx.mySite; + +in +{ options.modules.system.nginx.mySite.git = { enable = mkEnableOption "system.nginx.mySite.git"; }; + config = mkIf (cfg.enable && mySiteCfg) { + #security.acme = { + # certs = { + # "ramos.codes" = { + # #TODO: configure ACME certs + # }; + # }; + #}; + #services.nginx = { + # #TODO: check if configure as vhost or stream + # streamConfig = services.nginx.streamConfig ++ { + # "*.ramos.codes" = { + # addSSL = true; + # onlySSL = true; + # forceSSL = true; + # acmeRoot = null; + # }; + # }; + #}; + }; +} diff --git a/src/system/modules/tor/default.nix b/src/system/modules/tor/default.nix new file mode 100644 index 0000000..efdf41c --- /dev/null +++ b/src/system/modules/tor/default.nix @@ -0,0 +1,23 @@ +{ lib, config, ... }: + +with lib; +let + cfg = config.modules.system.tor; + +in +{ options.modules.system.tor = { enable = mkEnableOption "system.tor"; }; + config = mkIf cfg.enable { + imports = [ ./modules ]; + services.tor = { + enable = true; + client = { + enable = lib.mkDefault true; + dns.enable = mkIf services.tor.client.enable true; + }; + relay.enable = lib.mkDefault false; + enableGeoIP = false; + DoSConnectionEnabled = true; + DoSCircuitCreationEnabled = true; + }; + }; +} diff --git a/src/system/modules/tor/modules/default.nix b/src/system/modules/tor/modules/default.nix new file mode 100644 index 0000000..893538e --- /dev/null +++ b/src/system/modules/tor/modules/default.nix @@ -0,0 +1,5 @@ +{ + imports = [ + ./relay + ]; +} diff --git a/src/system/modules/tor/modules/relay.nix b/src/system/modules/tor/modules/relay.nix new file mode 100644 index 0000000..17044a6 --- /dev/null +++ b/src/system/modules/tor/modules/relay.nix @@ -0,0 +1,16 @@ +{ lib, config, ... }: + +with lib; +let + cfg = config.modules.system.tor.relay; + torCfg = config.modules.system.tor; + +in +{ options.modules.system.tor.relay = { enable = mkEnableOption "system.tor.relay"; }; + config = mkIf (cfg.enable && torCfg.enable) { + services.tor = { + client.enable = false; + relay.enable = true; + }; + }; +} diff --git a/src/user/configs/default.nix b/src/user/configs/default.nix index 5de4451..ec65534 100644 --- a/src/user/configs/default.nix +++ b/src/user/configs/default.nix @@ -3,10 +3,11 @@ # Replace symlink at root of repo with user configs { options = { - user = lib.mkOption { + user = lib.mkOption rec { type = lib.types.attrs; default = { name = "bryan"; + email = "bryan@ramos.codes"; shell = pkgs.bash; groups = [ @@ -20,7 +21,7 @@ gitConfig = { userName = "Bryan Ramos"; - userEmail = "bryan@ramos.codes"; + userEmail = "${default.user.email}"; signing = { key = "F1F3466458452B2DF351F1E864D12BA95ACE1F2D"; signByDefault = true; From 00a997d0146b923e26f736e0989827d90f3da2ce Mon Sep 17 00:00:00 2001 From: Bryan Ramos Date: Fri, 1 Mar 2024 16:01:51 -0500 Subject: [PATCH 11/26] rec --- src/user/configs/default.nix | 105 +++++++++++++++++------------------ 1 file changed, 51 insertions(+), 54 deletions(-) diff --git a/src/user/configs/default.nix b/src/user/configs/default.nix index ec65534..8f2736e 100644 --- a/src/user/configs/default.nix +++ b/src/user/configs/default.nix @@ -1,63 +1,60 @@ { lib, pkgs, ... }: # Replace symlink at root of repo with user configs +let + userConfigs = rec { + name = "bryan"; + email = "bryan@ramos.codes"; + shell = pkgs.bash; + groups = [ "wheel" "networkmanager" "home-manager" "input" ]; + + sshKeys = [ + "ssh-rsa AAAAB3NzaC1yc2EAAAADAQABAAACAQDl4895aB9P5p/lp8Hq5rHun4clvhyTSHFi3U2d6OOBoW5Fm+VcQnW/xbjmCBsXk5BdiowsBxQhwnzdfz/KJL7J5RobomUEaVRwb9UwT88eJveLp14BG8j2J3SjfyhrCX+4jkPx0bPQk1HGcuYY+tPEXf1q/ps88Dhu0CARBIzYQOTYY6b1qWzxpDoFZGHjKG8g5iY6FIu65yKKvvVy1f8IgZ3l3IpwBWVamxgkTcYY0QYSrmzo1n7TXxwrWbvenAqBsQ0cBPs+gVa3uIr+1TJl0Az5SElBVGu3LvUdlk58trtPUj6TQR3YUkg7Vjll7WHOdqhux5ZQNhjkOsHerf0Tw86e6cEzgeTuIbQHIb0LcsUunwKcuh2+au7RO599cvHn0+xZE5MZBxloDDaJ3JsiliM8kyPP/U3ERj03cWLW7BqbT+sfjAOl21RCzk0iQxk1wt/8VmtCr9Adv7IyrtaYvf/bwRP+g+9ldmzKGt8Mdb605uVzZ70H/LLm17f40Te+QHaex5by/6p6cuwEEZtgIg53Wpglu0rA6UxrBfQEHKl/Jt3FLeE0mnEyYkkR2MnHNtyWRIXtuqYZMAm2Ub1pFHH7jQV1gGiDVTw6a2eIwK21a/hXtRjFUpFd1nB1n+KNfJBE4zT3wm3Ud7mKw/6rWnoRyhYZvGXkFdp+iEs49Q==" + "ecdsa-sha2-nistp256 AAAAE2VjZHNhLXNoYTItbmlzdHAyNTYAAAAIbmlzdHAyNTYAAABBBK2ROz7EVvE+nzF5k9EYZ2v3JhBzk058uh3QJTzcG4t70fkZgh9y56AOx26eXlKQWuuV05e8EkWRuVI8gfA2ROI=" + ]; + + gitConfig = { + userName = "Bryan Ramos"; + userEmail = email; + signing = { + key = "F1F3466458452B2DF351F1E864D12BA95ACE1F2D"; + signByDefault = true; + }; + + extraConfig = { + init = { defaultBranch = "master"; }; + mergetool = { + lazygit = { + cmd = "lazygit"; + trustExitCode = true; + }; + }; + merge = { tool = "lazygit"; }; + safe = { directory = "/etc/nixos"; }; + }; + + ignores = [ + "node_modules" + ".direnv" + "dist-newstyle" + ".nuxt/" + ".output/" + "dist" + ]; + }; + + pgpKey = { + text = import ./pgpKey.nix; + trust = 5; + }; + }; +in { options = { - user = lib.mkOption rec { + user = lib.mkOption { type = lib.types.attrs; - default = { - name = "bryan"; - email = "bryan@ramos.codes"; - shell = pkgs.bash; - - groups = [ - "wheel" "networkmanager" "home-manager" "input" - ]; - - sshKeys = [ - "ssh-rsa AAAAB3NzaC1yc2EAAAADAQABAAACAQDl4895aB9P5p/lp8Hq5rHun4clvhyTSHFi3U2d6OOBoW5Fm+VcQnW/xbjmCBsXk5BdiowsBxQhwnzdfz/KJL7J5RobomUEaVRwb9UwT88eJveLp14BG8j2J3SjfyhrCX+4jkPx0bPQk1HGcuYY+tPEXf1q/ps88Dhu0CARBIzYQOTYY6b1qWzxpDoFZGHjKG8g5iY6FIu65yKKvvVy1f8IgZ3l3IpwBWVamxgkTcYY0QYSrmzo1n7TXxwrWbvenAqBsQ0cBPs+gVa3uIr+1TJl0Az5SElBVGu3LvUdlk58trtPUj6TQR3YUkg7Vjll7WHOdqhux5ZQNhjkOsHerf0Tw86e6cEzgeTuIbQHIb0LcsUunwKcuh2+au7RO599cvHn0+xZE5MZBxloDDaJ3JsiliM8kyPP/U3ERj03cWLW7BqbT+sfjAOl21RCzk0iQxk1wt/8VmtCr9Adv7IyrtaYvf/bwRP+g+9ldmzKGt8Mdb605uVzZ70H/LLm17f40Te+QHaex5by/6p6cuwEEZtgIg53Wpglu0rA6UxrBfQEHKl/Jt3FLeE0mnEyYkkR2MnHNtyWRIXtuqYZMAm2Ub1pFHH7jQV1gGiDVTw6a2eIwK21a/hXtRjFUpFd1nB1n+KNfJBE4zT3wm3Ud7mKw/6rWnoRyhYZvGXkFdp+iEs49Q==" - "ecdsa-sha2-nistp256 AAAAE2VjZHNhLXNoYTItbmlzdHAyNTYAAAAIbmlzdHAyNTYAAABBBK2ROz7EVvE+nzF5k9EYZ2v3JhBzk058uh3QJTzcG4t70fkZgh9y56AOx26eXlKQWuuV05e8EkWRuVI8gfA2ROI=" - ]; - - gitConfig = { - userName = "Bryan Ramos"; - userEmail = "${default.user.email}"; - signing = { - key = "F1F3466458452B2DF351F1E864D12BA95ACE1F2D"; - signByDefault = true; - }; - - extraConfig = { - init = { defaultBranch = "master"; }; - mergetool = { - lazygit = { - cmd = "lazygit"; - trustExitCode = true; - }; - }; - merge = { - tool = "lazygit"; - }; - safe = { - directory = "/etc/nixos"; - }; - }; - - ignores = [ - "node_modules" - ".direnv" - "dist-newstyle" - ".nuxt/" - ".output/" - "dist" - ]; - }; - - pgpKey = { - text = import ./pgpKey.nix; - trust = 5; - }; - }; + default = userConfigs; + description = "User Configurations"; }; }; } From 339b3f54b3fec390b6b7eedcb165b3b984e3bb84 Mon Sep 17 00:00:00 2001 From: Bryan Ramos Date: Fri, 26 Apr 2024 22:53:28 -0400 Subject: [PATCH 12/26] changed symlink name --- src/user/configs/default.nix | 1 - user.symlink.nix => user.nix | 0 2 files changed, 1 deletion(-) rename user.symlink.nix => user.nix (100%) diff --git a/src/user/configs/default.nix b/src/user/configs/default.nix index 8f2736e..b76bc85 100644 --- a/src/user/configs/default.nix +++ b/src/user/configs/default.nix @@ -1,6 +1,5 @@ { lib, pkgs, ... }: -# Replace symlink at root of repo with user configs let userConfigs = rec { name = "bryan"; diff --git a/user.symlink.nix b/user.nix similarity index 100% rename from user.symlink.nix rename to user.nix From 19396dac8a86b05821e531266fd451e4c2c003c9 Mon Sep 17 00:00:00 2001 From: Bryan Ramos Date: Fri, 26 Apr 2024 23:02:16 -0400 Subject: [PATCH 13/26] removed unneeded comments --- src/system/machines/desktop/system.nix | 9 --------- 1 file changed, 9 deletions(-) diff --git a/src/system/machines/desktop/system.nix b/src/system/machines/desktop/system.nix index a2d6709..71022e7 100644 --- a/src/system/machines/desktop/system.nix +++ b/src/system/machines/desktop/system.nix @@ -2,7 +2,6 @@ { system.stateVersion = "22.11"; -# Users users.users = { ${config.user.name} = { isNormalUser = true; @@ -12,7 +11,6 @@ }; }; -# Nix nix = { channel.enable = false; package = pkgs.nixFlakes; @@ -28,7 +26,6 @@ }; }; -# Bootloader boot.loader = { timeout = null; grub = { @@ -48,19 +45,16 @@ pavucontrol ]; -# DE programs.sway = { enable = true; package = null; }; -# Fonts fonts.packages = with pkgs; [ terminus_font terminus-nerdfont ]; -# Audio services.pipewire = { enable = true; audio.enable = true; @@ -73,13 +67,11 @@ alsa.support32Bit = true; }; -# Sudo Options security.sudo = { wheelNeedsPassword = false; execWheelOnly = true; }; -# Locale time = { timeZone = "America/New_York"; hardwareClockInLocalTime = true; @@ -102,7 +94,6 @@ useXkbConfig = true; }; -# Networking networking = { hostName = "socrates"; useDHCP = lib.mkDefault true; From 850bcbf66b2cabddbd63c559b79c8e29c1e60a35 Mon Sep 17 00:00:00 2001 From: Bryan Ramos Date: Wed, 8 May 2024 21:20:40 -0400 Subject: [PATCH 14/26] fixed wallpapers --- .../modules/gui/desktopEnvironments/sway/config/sway.nix | 4 ++-- src/user/modules/gui/desktopEnvironments/sway/default.nix | 5 +++++ 2 files changed, 7 insertions(+), 2 deletions(-) diff --git a/src/user/modules/gui/desktopEnvironments/sway/config/sway.nix b/src/user/modules/gui/desktopEnvironments/sway/config/sway.nix index 4a16e6d..388d34a 100644 --- a/src/user/modules/gui/desktopEnvironments/sway/config/sway.nix +++ b/src/user/modules/gui/desktopEnvironments/sway/config/sway.nix @@ -17,13 +17,13 @@ in HDMI-A-1 = { resolution = "1920x1080"; position = "0,0"; - bg = "/etc/nixos/src/user/modules/gui/desktopEnvironments/wallpapers fill"; + bg = "~/Pictures/wallpapers fill"; }; DP-1 = { resolution = "1080x1920"; position = "1920,0"; transform = "90"; - bg = "/etc/nixos/src/user/modules/gui/desktopEnvironments/wallpapers fill"; + bg = "~/Pictures/wallpapers fill"; }; }; modifier = "Mod1"; diff --git a/src/user/modules/gui/desktopEnvironments/sway/default.nix b/src/user/modules/gui/desktopEnvironments/sway/default.nix index ecf7c4e..cacd5d9 100644 --- a/src/user/modules/gui/desktopEnvironments/sway/default.nix +++ b/src/user/modules/gui/desktopEnvironments/sway/default.nix @@ -54,5 +54,10 @@ in }; fonts.fontconfig.enable = true; + + home.file."~/Pictures/wallpapers" = { + source = ../../wallpapers; + recursive = true; + }; }; } From f4787dc4127f2302962921a5fafc6faec87ea857 Mon Sep 17 00:00:00 2001 From: Bryan Ramos Date: Wed, 8 May 2024 21:25:38 -0400 Subject: [PATCH 15/26] fixed user path --- src/system/machines/desktop/default.nix | 2 +- src/system/machines/wsl/default.nix | 2 +- src/system/machines/wsl/wsl.nix | 2 +- 3 files changed, 3 insertions(+), 3 deletions(-) diff --git a/src/system/machines/desktop/default.nix b/src/system/machines/desktop/default.nix index 6357cb0..5237d0c 100644 --- a/src/system/machines/desktop/default.nix +++ b/src/system/machines/desktop/default.nix @@ -2,7 +2,7 @@ { imports = [ - ../../user/configs + ../../../user/configs ./hardware.nix ./system.nix ]; diff --git a/src/system/machines/wsl/default.nix b/src/system/machines/wsl/default.nix index be38ce0..4f15952 100644 --- a/src/system/machines/wsl/default.nix +++ b/src/system/machines/wsl/default.nix @@ -2,7 +2,7 @@ { imports = [ - ../../user/configs + ../../../user/configs ./system.nix ]; } diff --git a/src/system/machines/wsl/wsl.nix b/src/system/machines/wsl/wsl.nix index cd9cbcf..bcde209 100644 --- a/src/system/machines/wsl/wsl.nix +++ b/src/system/machines/wsl/wsl.nix @@ -2,7 +2,7 @@ { imports = [ - ../../user + ../../../user ]; wsl = { From ace324425d09896daae515d922ef6b0155c94b3b Mon Sep 17 00:00:00 2001 From: Bryan Ramos Date: Wed, 8 May 2024 21:33:45 -0400 Subject: [PATCH 16/26] fixed wallpapers path --- src/user/configs/default.nix | 3 +++ .../gui/desktopEnvironments/sway/config/sway.nix | 4 ++-- .../gui/desktopEnvironments/sway/default.nix | 2 +- .../wallpapers/mountains.jpg | Bin user.nix => user.configs.nix | 0 wallpapers | 1 + 6 files changed, 7 insertions(+), 3 deletions(-) rename src/user/modules/gui/{desktopEnvironments => }/wallpapers/mountains.jpg (100%) rename user.nix => user.configs.nix (100%) create mode 120000 wallpapers diff --git a/src/user/configs/default.nix b/src/user/configs/default.nix index b76bc85..5851ff1 100644 --- a/src/user/configs/default.nix +++ b/src/user/configs/default.nix @@ -5,6 +5,9 @@ let name = "bryan"; email = "bryan@ramos.codes"; shell = pkgs.bash; + + wallpaper = "mountains.jpg"; + groups = [ "wheel" "networkmanager" "home-manager" "input" ]; sshKeys = [ diff --git a/src/user/modules/gui/desktopEnvironments/sway/config/sway.nix b/src/user/modules/gui/desktopEnvironments/sway/config/sway.nix index 388d34a..2ba0682 100644 --- a/src/user/modules/gui/desktopEnvironments/sway/config/sway.nix +++ b/src/user/modules/gui/desktopEnvironments/sway/config/sway.nix @@ -17,13 +17,13 @@ in HDMI-A-1 = { resolution = "1920x1080"; position = "0,0"; - bg = "~/Pictures/wallpapers fill"; + bg = "~/Pictures/wallpapers/${config.user.wallpaper} fill"; }; DP-1 = { resolution = "1080x1920"; position = "1920,0"; transform = "90"; - bg = "~/Pictures/wallpapers fill"; + bg = "~/Pictures/wallpapers/${config.user.wallpaper} fill"; }; }; modifier = "Mod1"; diff --git a/src/user/modules/gui/desktopEnvironments/sway/default.nix b/src/user/modules/gui/desktopEnvironments/sway/default.nix index cacd5d9..82caa5e 100644 --- a/src/user/modules/gui/desktopEnvironments/sway/default.nix +++ b/src/user/modules/gui/desktopEnvironments/sway/default.nix @@ -55,7 +55,7 @@ in fonts.fontconfig.enable = true; - home.file."~/Pictures/wallpapers" = { + home.file."Pictures/wallpapers" = { source = ../../wallpapers; recursive = true; }; diff --git a/src/user/modules/gui/desktopEnvironments/wallpapers/mountains.jpg b/src/user/modules/gui/wallpapers/mountains.jpg similarity index 100% rename from src/user/modules/gui/desktopEnvironments/wallpapers/mountains.jpg rename to src/user/modules/gui/wallpapers/mountains.jpg diff --git a/user.nix b/user.configs.nix similarity index 100% rename from user.nix rename to user.configs.nix diff --git a/wallpapers b/wallpapers new file mode 120000 index 0000000..2580d92 --- /dev/null +++ b/wallpapers @@ -0,0 +1 @@ +src/user/modules/gui/wallpapers/ \ No newline at end of file From b186a0ca26cbea5d1173e172acfab4ffba443ba1 Mon Sep 17 00:00:00 2001 From: Bryan Ramos Date: Wed, 8 May 2024 22:11:44 -0400 Subject: [PATCH 17/26] removed grub wallpaper --- src/system/machines/desktop/system.nix | 1 + 1 file changed, 1 insertion(+) diff --git a/src/system/machines/desktop/system.nix b/src/system/machines/desktop/system.nix index 71022e7..f0219ea 100644 --- a/src/system/machines/desktop/system.nix +++ b/src/system/machines/desktop/system.nix @@ -34,6 +34,7 @@ devices = [ "nodev" ]; efiSupport = true; configurationLimit = 5; + splashImage = null; }; efi = { From c98d27b4068f0f6b56d5f603d5c281169ce02bf6 Mon Sep 17 00:00:00 2001 From: Bryan Ramos Date: Wed, 8 May 2024 22:22:23 -0400 Subject: [PATCH 18/26] removed unnecessary comments --- src/system/machines/server/home.nix | 14 ++++++-------- src/system/machines/server/system.nix | 7 ------- 2 files changed, 6 insertions(+), 15 deletions(-) diff --git a/src/system/machines/server/home.nix b/src/system/machines/server/home.nix index 815d1b8..fb18dc2 100644 --- a/src/system/machines/server/home.nix +++ b/src/system/machines/server/home.nix @@ -19,16 +19,14 @@ home.homeDirectory = "/home/${config.user.name}"; modules = { - bash.enable = true; - git.enable = true; - gpg.enable = true; - - utils = { - enable = true; + user = { + bash.enable = true; + git.enable = true; + gui.enable = false; + gpg.enable = true; + utils.enable = true; vim.enable = true; }; - - gui.enable = false; }; }; } diff --git a/src/system/machines/server/system.nix b/src/system/machines/server/system.nix index 0c9a916..ee785d0 100644 --- a/src/system/machines/server/system.nix +++ b/src/system/machines/server/system.nix @@ -15,7 +15,6 @@ }; }; -# Users users.users = { ${config.user.name} = { isNormalUser = true; @@ -24,7 +23,6 @@ }; }; -# Nix nix = { channel.enable = false; package = pkgs.nixFlakes; @@ -40,7 +38,6 @@ }; }; -# Bootloader boot.loader = { timeout = null; grub = { @@ -56,19 +53,16 @@ }; }; -# Fonts fonts.packages = with pkgs; [ terminus_font terminus-nerdfont ]; -# Sudo Options security.sudo = { wheelNeedsPassword = false; execWheelOnly = true; }; -# Locale time = { timeZone = "America/New_York"; hardwareClockInLocalTime = true; @@ -91,7 +85,6 @@ useXkbConfig = true; }; -# Networking networking = { hostName = "archimedes"; useDHCP = lib.mkDefault true; From f28ec054cdc9222b4093afa29d56c1856b3698f8 Mon Sep 17 00:00:00 2001 From: Bryan Ramos Date: Thu, 9 May 2024 10:49:44 -0400 Subject: [PATCH 19/26] added nix-less home-manager config --- flake.nix | 12 +++- src/system/machines/nix-less/default.nix | 8 +++ src/system/machines/nix-less/home.nix | 38 +++++++++++ src/system/machines/nix-less/system.nix | 84 ++++++++++++++++++++++++ src/system/machines/nix-less/wsl.nix | 21 ++++++ 5 files changed, 162 insertions(+), 1 deletion(-) create mode 100644 src/system/machines/nix-less/default.nix create mode 100644 src/system/machines/nix-less/home.nix create mode 100644 src/system/machines/nix-less/system.nix create mode 100644 src/system/machines/nix-less/wsl.nix diff --git a/flake.nix b/flake.nix index 44ab66e..b2d76f1 100644 --- a/flake.nix +++ b/flake.nix @@ -3,7 +3,7 @@ inputs = { nixpkgs.url = "github:NixOS/nixpkgs/nixos-23.11"; - home-manager= { + home-manager = { url = "github:nix-community/home-manager/release-23.11"; inputs.nixpkgs.follows = "nixpkgs"; }; @@ -22,6 +22,7 @@ allowUnfree = true; }; }; + config = import ./user.config.nix; in { @@ -55,5 +56,14 @@ ]; }; }; + + homeConfigurations = { + ${config.user.name} = home-manager.lib.homeManagerConfiguration { + inherit pkgs; + modules = [ + ./src/system/machines/nix-less + ]; + }; + }; }; } diff --git a/src/system/machines/nix-less/default.nix b/src/system/machines/nix-less/default.nix new file mode 100644 index 0000000..4f15952 --- /dev/null +++ b/src/system/machines/nix-less/default.nix @@ -0,0 +1,8 @@ +{ ... }: + +{ + imports = [ + ../../../user/configs + ./system.nix + ]; +} diff --git a/src/system/machines/nix-less/home.nix b/src/system/machines/nix-less/home.nix new file mode 100644 index 0000000..80f34b1 --- /dev/null +++ b/src/system/machines/nix-less/home.nix @@ -0,0 +1,38 @@ +{ config, ... }: + +{ + home-manager.useGlobalPkgs = true; + home-manager.useUserPackages = true; + home-manager.users.${config.user.name} = { + imports = [ + ../../../user + ]; + + programs.home-manager.enable = true; + programs.bash.shellAliases = { + nixup = "sudo nixos-rebuild switch --flake /etc/nixos/.#windows"; + }; + + home.stateVersion = "23.11"; + + home.username = "${config.user.name}"; + home.homeDirectory = "/home/${config.user.name}"; + + modules = { + user = { + bash.enable = true; + git.enable = true; + gpg.enable = true; + gui.enable = false; + security.enable = true; + utils = { + enable = true; + dev.enable = true; + email.enable = true; + irc.enable = true; + vim.enable = true; + }; + }; + }; + }; +} diff --git a/src/system/machines/nix-less/system.nix b/src/system/machines/nix-less/system.nix new file mode 100644 index 0000000..332885e --- /dev/null +++ b/src/system/machines/nix-less/system.nix @@ -0,0 +1,84 @@ +{ pkgs, lib, config, ... }: + +{ system.stateVersion = "23.11"; + +# Users + users.users = { + ${config.user.name} = { + isNormalUser = true; + extraGroups = config.user.groups; + openssh.authorizedKeys.keys = config.user.sshKeys; + }; + }; + boot.isContainer = true; + +# Nix + nix = { + channel.enable = false; + package = pkgs.nixFlakes; + extraOptions = "experimental-features = nix-command flakes"; + settings = { + auto-optimise-store = true; + trusted-users = [ "${config.user.name}" ]; + }; + gc = { + automatic = true; + dates = "weekly"; + options = "--delete-older-than 30d"; + }; + }; + +# Sudo Options + security.sudo = { + wheelNeedsPassword = false; + execWheelOnly = true; + }; + +# System Services + services = { + cron = { + enable = true; + systemCronJobs = []; + }; + }; + +# Locale + time = { + timeZone = "America/New_York"; + }; + + services.timesyncd = { + enable = true; + servers = [ + "0.pool.ntp.org" + "1.pool.ntp.org" + "2.pool.ntp.org" + "3.pool.ntp.org" + ]; + }; + + i18n.defaultLocale = "en_US.UTF-8"; + + console = { + font = "Lat2-Terminus16"; + useXkbConfig = true; + }; + +# Networking + networking = { + useDHCP = lib.mkDefault true; + firewall = { + enable = true; + allowedTCPPorts = [ 22 80 443 ]; + }; + }; + + services.openssh = { + enable = true; + startWhenNeeded = true; + settings = { + X11Forwarding = false; + PasswordAuthentication = false; + }; + }; +} diff --git a/src/system/machines/nix-less/wsl.nix b/src/system/machines/nix-less/wsl.nix new file mode 100644 index 0000000..bcde209 --- /dev/null +++ b/src/system/machines/nix-less/wsl.nix @@ -0,0 +1,21 @@ +{ pkgs, config, ... }: + +{ + imports = [ + ../../../user + ]; + + wsl = { + enable = true; + defaultUser = pkgs.lib.mkDefault "${config.user.name}"; + nativeSystemd = true; + + wslConf = { + boot.command = "cd"; + network = { + hostname = "plato"; + generateHosts = true; + }; + }; + }; +} From 1d170da221bd6fd6560be9ec8e8ac273848fefdf Mon Sep 17 00:00:00 2001 From: Bryan Ramos Date: Thu, 9 May 2024 11:53:23 -0400 Subject: [PATCH 20/26] nix-less hm config ready --- flake.nix | 10 +-- src/system/machines/nix-less/default.nix | 11 +-- src/system/machines/nix-less/home.nix | 73 ++++++++++------ src/system/machines/nix-less/system.nix | 84 ------------------- src/system/machines/nix-less/wsl.nix | 21 ----- src/user/modules/bash/config/bashrc.nix | 2 - src/user/modules/bash/config/prompt.nix | 2 +- .../modules/gui/modules/browsers/default.nix | 1 + .../modules/utils/modules/dev/default.nix | 5 -- .../modules/utils/modules/vim/config/vimrc | 5 +- .../modules/utils/modules/vim/default.nix | 9 +- 11 files changed, 63 insertions(+), 160 deletions(-) delete mode 100644 src/system/machines/nix-less/system.nix delete mode 100644 src/system/machines/nix-less/wsl.nix diff --git a/flake.nix b/flake.nix index b2d76f1..8226306 100644 --- a/flake.nix +++ b/flake.nix @@ -56,14 +56,6 @@ ]; }; }; - - homeConfigurations = { - ${config.user.name} = home-manager.lib.homeManagerConfiguration { - inherit pkgs; - modules = [ - ./src/system/machines/nix-less - ]; - }; - }; + homeConfigurations = import ./src/system/machines/nix-less; }; } diff --git a/src/system/machines/nix-less/default.nix b/src/system/machines/nix-less/default.nix index 4f15952..cb653ad 100644 --- a/src/system/machines/nix-less/default.nix +++ b/src/system/machines/nix-less/default.nix @@ -1,8 +1,9 @@ -{ ... }: +{ config, pkgs, home-manager, ... }: { - imports = [ - ../../../user/configs - ./system.nix - ]; + imports = [ ../../../user ]; + "${config.user.name}" = home-manager.lib.homeManagerConfiguration { + inherit pkgs; + modules = [ ./home.nix ]; + }; } diff --git a/src/system/machines/nix-less/home.nix b/src/system/machines/nix-less/home.nix index 80f34b1..726099f 100644 --- a/src/system/machines/nix-less/home.nix +++ b/src/system/machines/nix-less/home.nix @@ -1,37 +1,56 @@ -{ config, ... }: +{ config, pkgs, ... }: { - home-manager.useGlobalPkgs = true; - home-manager.useUserPackages = true; - home-manager.users.${config.user.name} = { - imports = [ - ../../../user - ]; + imports = [ ../../../user ]; - programs.home-manager.enable = true; - programs.bash.shellAliases = { - nixup = "sudo nixos-rebuild switch --flake /etc/nixos/.#windows"; + home = { + stateVersion = "23.11"; + username = "${config.user.name}"; + homeDirectory = "/home/${config.user.name}"; + + file.".config/home-manager" = { + source = ../../../../../nixos; + recursive = true; }; + }; - home.stateVersion = "23.11"; + programs.home-manager.enable = true; + programs.bash.shellAliases = { + nixup = "home-manager switch"; + }; - home.username = "${config.user.name}"; - home.homeDirectory = "/home/${config.user.name}"; + nix = { + package = pkgs.nixFlakes; + extraOptions = "experimental-features = nix-command flakes"; + settings = { + auto-optimise-store = true; + trusted-users = [ "${config.user.name}" ]; + }; + gc = { + automatic = true; + dates = "weekly"; + options = "--delete-older-than 30d"; + }; + }; + modules = { + user = { + bash.enable = true; + git.enable = true; + gpg.enable = true; + security.enable = false; + gui = { + alacritty.enable = true; + browsers.enable = true; + neovim.enable = true; - modules = { - user = { - bash.enable = true; - git.enable = true; - gpg.enable = true; - gui.enable = false; - security.enable = true; - utils = { - enable = true; - dev.enable = true; - email.enable = true; - irc.enable = true; - vim.enable = true; - }; + + }; + utils = { + enable = true; + dev.enable = true; + email.enable = true; + irc.enable = true; + vim.enable = true; }; }; }; diff --git a/src/system/machines/nix-less/system.nix b/src/system/machines/nix-less/system.nix deleted file mode 100644 index 332885e..0000000 --- a/src/system/machines/nix-less/system.nix +++ /dev/null @@ -1,84 +0,0 @@ -{ pkgs, lib, config, ... }: - -{ system.stateVersion = "23.11"; - -# Users - users.users = { - ${config.user.name} = { - isNormalUser = true; - extraGroups = config.user.groups; - openssh.authorizedKeys.keys = config.user.sshKeys; - }; - }; - boot.isContainer = true; - -# Nix - nix = { - channel.enable = false; - package = pkgs.nixFlakes; - extraOptions = "experimental-features = nix-command flakes"; - settings = { - auto-optimise-store = true; - trusted-users = [ "${config.user.name}" ]; - }; - gc = { - automatic = true; - dates = "weekly"; - options = "--delete-older-than 30d"; - }; - }; - -# Sudo Options - security.sudo = { - wheelNeedsPassword = false; - execWheelOnly = true; - }; - -# System Services - services = { - cron = { - enable = true; - systemCronJobs = []; - }; - }; - -# Locale - time = { - timeZone = "America/New_York"; - }; - - services.timesyncd = { - enable = true; - servers = [ - "0.pool.ntp.org" - "1.pool.ntp.org" - "2.pool.ntp.org" - "3.pool.ntp.org" - ]; - }; - - i18n.defaultLocale = "en_US.UTF-8"; - - console = { - font = "Lat2-Terminus16"; - useXkbConfig = true; - }; - -# Networking - networking = { - useDHCP = lib.mkDefault true; - firewall = { - enable = true; - allowedTCPPorts = [ 22 80 443 ]; - }; - }; - - services.openssh = { - enable = true; - startWhenNeeded = true; - settings = { - X11Forwarding = false; - PasswordAuthentication = false; - }; - }; -} diff --git a/src/system/machines/nix-less/wsl.nix b/src/system/machines/nix-less/wsl.nix deleted file mode 100644 index bcde209..0000000 --- a/src/system/machines/nix-less/wsl.nix +++ /dev/null @@ -1,21 +0,0 @@ -{ pkgs, config, ... }: - -{ - imports = [ - ../../../user - ]; - - wsl = { - enable = true; - defaultUser = pkgs.lib.mkDefault "${config.user.name}"; - nativeSystemd = true; - - wslConf = { - boot.command = "cd"; - network = { - hostname = "plato"; - generateHosts = true; - }; - }; - }; -} diff --git a/src/user/modules/bash/config/bashrc.nix b/src/user/modules/bash/config/bashrc.nix index f437a83..2ebcc48 100644 --- a/src/user/modules/bash/config/bashrc.nix +++ b/src/user/modules/bash/config/bashrc.nix @@ -54,8 +54,6 @@ function penpot() { esac } -source ~/Documents/projects/ldv/ldv.sh - set -o vi bind 'set completion-ignore-case on' diff --git a/src/user/modules/bash/config/prompt.nix b/src/user/modules/bash/config/prompt.nix index b6db41e..07b844c 100644 --- a/src/user/modules/bash/config/prompt.nix +++ b/src/user/modules/bash/config/prompt.nix @@ -9,7 +9,7 @@ check_ssh() { add_icon() { local icon=$1 if [[ ! $venv_icons =~ $icon ]]; then - venv_icons+="$icon" + venv_icons+="$icon " fi } diff --git a/src/user/modules/gui/modules/browsers/default.nix b/src/user/modules/gui/modules/browsers/default.nix index 2a79193..fe150bb 100644 --- a/src/user/modules/gui/modules/browsers/default.nix +++ b/src/user/modules/gui/modules/browsers/default.nix @@ -11,6 +11,7 @@ in home.packages = with pkgs; [ tor-browser + brave ]; }; } diff --git a/src/user/modules/utils/modules/dev/default.nix b/src/user/modules/utils/modules/dev/default.nix index 11f807f..2058f1e 100644 --- a/src/user/modules/utils/modules/dev/default.nix +++ b/src/user/modules/utils/modules/dev/default.nix @@ -10,11 +10,6 @@ in home.packages = with pkgs; [ nix-init nix-prefetch-git - - glibc - gcc - - docker ]; }; } diff --git a/src/user/modules/utils/modules/vim/config/vimrc b/src/user/modules/utils/modules/vim/config/vimrc index 4dd4ca7..e8d3055 100644 --- a/src/user/modules/utils/modules/vim/config/vimrc +++ b/src/user/modules/utils/modules/vim/config/vimrc @@ -13,7 +13,7 @@ autocmd VimEnter * if len(filter(values(g:plugs), '!isdirectory(v:val.dir)')) \| endif call plug#begin('~/.vim/plugged') - Plug 'joshdick/onedark.vim' + Plug 'petobens/colorish' Plug 'tpope/vim-surround' Plug 'jiangmiao/auto-pairs' Plug 'junegunn/fzf', { 'do': { -> fzf#install() } } @@ -26,7 +26,8 @@ call plug#begin('~/.vim/plugged') call plug#end() let mapleader = "\" -colorscheme onedark +set background=dark +colorscheme onedarkish highlight CursorLine ctermbg=NONE guibg=NONE highlight CursorLineNr ctermfg=magenta guifg=magenta diff --git a/src/user/modules/utils/modules/vim/default.nix b/src/user/modules/utils/modules/vim/default.nix index 5a2133e..8805e0f 100644 --- a/src/user/modules/utils/modules/vim/default.nix +++ b/src/user/modules/utils/modules/vim/default.nix @@ -7,8 +7,12 @@ let in { options.modules.user.utils.vim = { enable = mkEnableOption "user.utils.vim"; }; config = mkIf cfg.enable { + programs.bash.shellAliases = { + vi = "${pkgs.vim}/bin/vim"; + }; + home = { - packages = with pkgs; [ + packages = with pkgs; [ vim ]; file.".vim" = { @@ -16,8 +20,5 @@ in recursive = true; }; }; - programs.bash.shellAliases = { - vi = "${pkgs.vim}/bin/vim"; - }; }; } From 6a06793716f42983eb5778e430aac70da9246781 Mon Sep 17 00:00:00 2001 From: Bryan Ramos Date: Thu, 9 May 2024 11:56:25 -0400 Subject: [PATCH 21/26] changed up --- flake.nix | 7 +++++-- src/system/machines/nix-less/default.nix | 10 ++++------ src/system/machines/nix-less/home.nix | 11 ++--------- 3 files changed, 11 insertions(+), 17 deletions(-) diff --git a/flake.nix b/flake.nix index 8226306..56cf209 100644 --- a/flake.nix +++ b/flake.nix @@ -22,10 +22,10 @@ allowUnfree = true; }; }; - config = import ./user.config.nix; in { + import = ./user.configs.nix; nixosConfigurations = { desktop = nixpkgs.lib.nixosSystem { inherit system pkgs; @@ -56,6 +56,9 @@ ]; }; }; - homeConfigurations = import ./src/system/machines/nix-less; + homeConfigurations."bryan" = home-manager.lib.homeManagerConfiguration { + inherit pkgs; + modules = [ ./src/system/machines/nix-less ]; + }; }; } diff --git a/src/system/machines/nix-less/default.nix b/src/system/machines/nix-less/default.nix index cb653ad..baf8fb6 100644 --- a/src/system/machines/nix-less/default.nix +++ b/src/system/machines/nix-less/default.nix @@ -1,9 +1,7 @@ -{ config, pkgs, home-manager, ... }: +{ ... }: { - imports = [ ../../../user ]; - "${config.user.name}" = home-manager.lib.homeManagerConfiguration { - inherit pkgs; - modules = [ ./home.nix ]; - }; + imports = [ + ./home.nix + ]; } diff --git a/src/system/machines/nix-less/home.nix b/src/system/machines/nix-less/home.nix index 726099f..e0dede3 100644 --- a/src/system/machines/nix-less/home.nix +++ b/src/system/machines/nix-less/home.nix @@ -9,14 +9,14 @@ homeDirectory = "/home/${config.user.name}"; file.".config/home-manager" = { - source = ../../../../../nixos; + source = ../../../..; recursive = true; }; }; programs.home-manager.enable = true; programs.bash.shellAliases = { - nixup = "home-manager switch"; + nixup = "home-manager switch --flake"; }; nix = { @@ -26,11 +26,6 @@ auto-optimise-store = true; trusted-users = [ "${config.user.name}" ]; }; - gc = { - automatic = true; - dates = "weekly"; - options = "--delete-older-than 30d"; - }; }; modules = { user = { @@ -42,8 +37,6 @@ alacritty.enable = true; browsers.enable = true; neovim.enable = true; - - }; utils = { enable = true; From 3dd31d28f7a5d63b57723217fb85e95f992acfa6 Mon Sep 17 00:00:00 2001 From: Bryan Ramos Date: Thu, 9 May 2024 16:04:02 -0400 Subject: [PATCH 22/26] r --- README.md | 32 +++++++------------ flake.nix | 4 +-- .../{nix-less => workstation}/default.nix | 0 .../{nix-less => workstation}/home.nix | 2 +- 4 files changed, 14 insertions(+), 24 deletions(-) rename src/system/machines/{nix-less => workstation}/default.nix (100%) rename src/system/machines/{nix-less => workstation}/home.nix (95%) diff --git a/README.md b/README.md index 14f00b3..3ebf3a6 100644 --- a/README.md +++ b/README.md @@ -8,35 +8,25 @@ If you need a list of available packages and options: - [nixpkgs Options](https://search.nixos.org/options?) 🔍️ - [home-manager Options](https://mipmip.github.io/home-manager-option-search/) ☕️ -## Get Inspired 🌟 - -Ready to go down the Nix 🐇🕳️❓️ - Fork this repo and create your own NixOS config✨ Take inspiration💡, borrow ideas💭 and customize it to your 💖 content ⚠️ Be sure to tailor any settings related to my hardware and system to your own hardware⚠️ -👉️Run `nixos-generate-config` if you need a new `hardware-configuration.nix` - ## Requirements ⚙️ -- Nix package manager ❄️ -- Nix 2.0 `flakes` enabled⚡️ +- [Nix package manager](https://www.nixos.org/)❄️ +- [Nix 2.0 `flakes` enabled](https://nixos.wiki/wiki/Flakes#Enable_flakes_permanently_in_NixOS)⚡️ +- *optional*[home-manager installed](https://nix-community.github.io/home-manager/index.xhtml#sec-flakes-standalone) -Install by visiting [nixos.org](https://www.nixos.org/) or through your package manager🚀 +# End-Points Exposed ❄️🔧💻️❄️ -### Enabling Flakes ❄️ +NixOS Configurations: + - desktop + - server + - laptop (wip) + - wsl -Unleash Nix💥 - -Add to your `nix.conf` or `configuration.nix`👇️ -```nix -nix = { - package = pkgs.nixFlakes; - extraOptions = "experimental-features = nix-command flakes"; -}; -``` - -# Happy Nix Hacking! ❄️🔧💻️❄️ +Home-Manager Configurations: + - workstation diff --git a/flake.nix b/flake.nix index 56cf209..6f67574 100644 --- a/flake.nix +++ b/flake.nix @@ -56,9 +56,9 @@ ]; }; }; - homeConfigurations."bryan" = home-manager.lib.homeManagerConfiguration { + homeConfigurations."work" = home-manager.lib.homeManagerConfiguration { inherit pkgs; - modules = [ ./src/system/machines/nix-less ]; + modules = [ ./src/system/machines/workstation ]; }; }; } diff --git a/src/system/machines/nix-less/default.nix b/src/system/machines/workstation/default.nix similarity index 100% rename from src/system/machines/nix-less/default.nix rename to src/system/machines/workstation/default.nix diff --git a/src/system/machines/nix-less/home.nix b/src/system/machines/workstation/home.nix similarity index 95% rename from src/system/machines/nix-less/home.nix rename to src/system/machines/workstation/home.nix index e0dede3..b4d6156 100644 --- a/src/system/machines/nix-less/home.nix +++ b/src/system/machines/workstation/home.nix @@ -16,7 +16,7 @@ programs.home-manager.enable = true; programs.bash.shellAliases = { - nixup = "home-manager switch --flake"; + #nixup = "home-manager switch --flake"; }; nix = { From 67840c243de6f6cfe2e22497aaeafd6cda3cd32d Mon Sep 17 00:00:00 2001 From: Bryan Ramos Date: Thu, 9 May 2024 16:24:41 -0400 Subject: [PATCH 23/26] updated README --- README.md | 13 ++++++------- flake.nix | 2 +- src/system/machines/wsl/home.nix | 2 +- 3 files changed, 8 insertions(+), 9 deletions(-) diff --git a/README.md b/README.md index 3ebf3a6..9fcdfbc 100644 --- a/README.md +++ b/README.md @@ -1,6 +1,6 @@ -# My NixOS Configurations ❄️👨‍💻 +# My Nix Configurations ❄️‍💻 -My modular NixOS🔥 +My modular Nix configs🔥 If you need a list of available packages and options: @@ -16,17 +16,16 @@ Take inspiration💡, borrow ideas💭 and customize it to your 💖 content ## Requirements ⚙️ -- [Nix package manager](https://www.nixos.org/)❄️ -- [Nix 2.0 `flakes` enabled](https://nixos.wiki/wiki/Flakes#Enable_flakes_permanently_in_NixOS)⚡️ -- *optional*[home-manager installed](https://nix-community.github.io/home-manager/index.xhtml#sec-flakes-standalone) +- [Nix package manager](https://www.nixos.org/) +- [Nix 2.0 `flakes` enabled](https://nixos.wiki/wiki/Flakes#Enable_flakes_permanently_in_NixOS) +- [home-manager installed](https://nix-community.github.io/home-manager/index.xhtml#sec-flakes-standalone)*optional* # End-Points Exposed ❄️🔧💻️❄️ NixOS Configurations: - desktop - - server - - laptop (wip) - wsl + - server (wip) Home-Manager Configurations: - workstation diff --git a/flake.nix b/flake.nix index 6f67574..582e8e2 100644 --- a/flake.nix +++ b/flake.nix @@ -36,7 +36,7 @@ ]; }; - windows = nixpkgs.lib.nixosSystem { + wsl = nixpkgs.lib.nixosSystem { inherit system pkgs; modules = [ ./src/system/machines/wsl diff --git a/src/system/machines/wsl/home.nix b/src/system/machines/wsl/home.nix index 80f34b1..7b207e4 100644 --- a/src/system/machines/wsl/home.nix +++ b/src/system/machines/wsl/home.nix @@ -10,7 +10,7 @@ programs.home-manager.enable = true; programs.bash.shellAliases = { - nixup = "sudo nixos-rebuild switch --flake /etc/nixos/.#windows"; + nixup = "sudo nixos-rebuild switch --flake /etc/nixos/.#wsl"; }; home.stateVersion = "23.11"; From 481d4354285e71090f8c252b8fdf00542614eb1f Mon Sep 17 00:00:00 2001 From: Bryan Ramos Date: Thu, 9 May 2024 16:28:56 -0400 Subject: [PATCH 24/26] removed redundant --- .gitignore | 1 - flake.nix | 1 - 2 files changed, 2 deletions(-) delete mode 100644 .gitignore diff --git a/.gitignore b/.gitignore deleted file mode 100644 index b2be92b..0000000 --- a/.gitignore +++ /dev/null @@ -1 +0,0 @@ -result diff --git a/flake.nix b/flake.nix index 582e8e2..c120394 100644 --- a/flake.nix +++ b/flake.nix @@ -25,7 +25,6 @@ in { - import = ./user.configs.nix; nixosConfigurations = { desktop = nixpkgs.lib.nixosSystem { inherit system pkgs; From 201e2160a47a0ddf6943186aaf90e8e2058b78f1 Mon Sep 17 00:00:00 2001 From: Bryan Ramos Date: Thu, 9 May 2024 16:45:12 -0400 Subject: [PATCH 25/26] removed redundant --- src/user/configs/default.nix | 1 + wallpapers | 1 - 2 files changed, 1 insertion(+), 1 deletion(-) delete mode 120000 wallpapers diff --git a/src/user/configs/default.nix b/src/user/configs/default.nix index 5851ff1..d0acf2d 100644 --- a/src/user/configs/default.nix +++ b/src/user/configs/default.nix @@ -6,6 +6,7 @@ let email = "bryan@ramos.codes"; shell = pkgs.bash; + # This will pull an image from your ~Pictures/wallpapers directory wallpaper = "mountains.jpg"; groups = [ "wheel" "networkmanager" "home-manager" "input" ]; diff --git a/wallpapers b/wallpapers deleted file mode 120000 index 2580d92..0000000 --- a/wallpapers +++ /dev/null @@ -1 +0,0 @@ -src/user/modules/gui/wallpapers/ \ No newline at end of file From 25df3c37ef8fc3fae509f66501b2705dc9597120 Mon Sep 17 00:00:00 2001 From: Bryan Ramos Date: Fri, 10 May 2024 00:15:24 -0400 Subject: [PATCH 26/26] fix --- src/system/machines/desktop/hardware.nix | 4 ++-- src/system/machines/desktop/system.nix | 2 +- src/user/modules/utils/modules/dev/default.nix | 2 ++ 3 files changed, 5 insertions(+), 3 deletions(-) diff --git a/src/system/machines/desktop/hardware.nix b/src/system/machines/desktop/hardware.nix index 6625e01..f99b551 100644 --- a/src/system/machines/desktop/hardware.nix +++ b/src/system/machines/desktop/hardware.nix @@ -14,12 +14,12 @@ # FStab fileSystems = { "/" = { - device = "/dev/disk/by-uuid/af24c5b3-8a6e-4333-a61d-922a97928cae"; + device = "/dev/disk/by-uuid/d4e0a913-9ba8-451e-9086-b6d5d483dd9f"; fsType = "ext4"; }; "/home" = { - device = "/dev/disk/by-uuid/1639ee20-28d6-4649-814d-ba981c138b35"; + device = "/dev/disk/by-uuid/e1780967-0b87-46ff-8200-430d79d59e47"; fsType = "ext4"; }; diff --git a/src/system/machines/desktop/system.nix b/src/system/machines/desktop/system.nix index f0219ea..94e7eff 100644 --- a/src/system/machines/desktop/system.nix +++ b/src/system/machines/desktop/system.nix @@ -1,6 +1,6 @@ { pkgs, lib, config, ... }: -{ system.stateVersion = "22.11"; +{ system.stateVersion = "23.11"; users.users = { ${config.user.name} = { diff --git a/src/user/modules/utils/modules/dev/default.nix b/src/user/modules/utils/modules/dev/default.nix index 2058f1e..58c7306 100644 --- a/src/user/modules/utils/modules/dev/default.nix +++ b/src/user/modules/utils/modules/dev/default.nix @@ -10,6 +10,8 @@ in home.packages = with pkgs; [ nix-init nix-prefetch-git + + gcc ]; }; }