From 2026c5b6e8f58b48b806fa90f0b0eb7d332cc173 Mon Sep 17 00:00:00 2001 From: TheWanderingCrow Date: Fri, 4 Oct 2024 13:37:26 -0400 Subject: [PATCH] Rename some stuff --- flake.nix | 2 +- hosts/WCE-Home/default.nix | 31 ---------------------- hosts/WCE-Overseer/default.nix | 19 +++++++++++++ hosts/WCE-Vault/default.nix | 11 -------- modules/core.nix | 6 ++--- modules/users/default.nix | 3 +-- modules/users/{ha => overseer}/default.nix | 0 modules/users/{ha => overseer}/user.nix | 2 +- modules/users/vault/default.nix | 5 ---- modules/users/vault/user.nix | 7 ----- modules/vault/default.nix | 10 ------- 11 files changed, 25 insertions(+), 71 deletions(-) delete mode 100644 hosts/WCE-Home/default.nix create mode 100644 hosts/WCE-Overseer/default.nix delete mode 100644 hosts/WCE-Vault/default.nix rename modules/users/{ha => overseer}/default.nix (100%) rename modules/users/{ha => overseer}/user.nix (66%) delete mode 100644 modules/users/vault/default.nix delete mode 100644 modules/users/vault/user.nix delete mode 100644 modules/vault/default.nix diff --git a/flake.nix b/flake.nix index 4c9827b..12c025d 100644 --- a/flake.nix +++ b/flake.nix @@ -28,5 +28,5 @@ inputs.home-manager.nixosModules.home-manager ]; }); - in {nixosConfigurations = lib.attrsets.genAttrs [ "Parzival" "Parzival-Mobile" "WCE-Vault" "WCE-Home" ] ns;}; + in {nixosConfigurations = lib.attrsets.genAttrs [ "Parzival" "Parzival-Mobile" "WCE-Overseer" ] ns;}; } diff --git a/hosts/WCE-Home/default.nix b/hosts/WCE-Home/default.nix deleted file mode 100644 index b7bf32e..0000000 --- a/hosts/WCE-Home/default.nix +++ /dev/null @@ -1,31 +0,0 @@ -{lib, config, pkgs, ...}:{ - imports = [ - ../../modules - ]; - - networking.hostName = "WCE-Home"; - networking.firewall.allowedTCPPorts = [ 8123 ]; - proxmoxLXC.manageNetwork = true; - - virtualisation.oci-containers = { - backend = "podman"; - containers.homeassistant = { - volumes = [ "home-assistant:/home/ha/ha-config" ]; - environment.TZ = "America/New_York"; - image = "ghcr.io/home-assistant/home-assistant:stable"; - extraOptions = [ - "--network=host" - "--device=/dev/ttyACM0:/dev/ttyACM0" - ]; - }; - }; - - nixpkgs.hostPlatform = lib.mkDefault "x86_64-linux"; - - packages.gui.enable = false; - packages.wayland.enable = false; - packages.programming.enable = false; - - users.crow.enable = false; - users.ha.enable = true; -} diff --git a/hosts/WCE-Overseer/default.nix b/hosts/WCE-Overseer/default.nix new file mode 100644 index 0000000..9b483b0 --- /dev/null +++ b/hosts/WCE-Overseer/default.nix @@ -0,0 +1,19 @@ +{lib, config, pkgs, ...}:{ + imports = [ + ../../modules + ]; + + networking.hostName = "WCE-Overseer"; + networking.firewall.allowedTCPPorts = [ 8123 ]; + proxmoxLXC.manageNetwork = true; + + + nixpkgs.hostPlatform = lib.mkDefault "x86_64-linux"; + + packages.gui.enable = false; + packages.wayland.enable = false; + packages.programming.enable = false; + + users.crow.enable = false; + users.overseer.enable = true; +} diff --git a/hosts/WCE-Vault/default.nix b/hosts/WCE-Vault/default.nix deleted file mode 100644 index b6515ef..0000000 --- a/hosts/WCE-Vault/default.nix +++ /dev/null @@ -1,11 +0,0 @@ -{config, pkgs, ...}:{ - imports = [ - ./hardware-configuration.nix - ../../modules - ]; - - networking.hostName = "WCE-Vault"; - gui.enable = false; - programming.enable = false; - users.vault.enable = true; -} diff --git a/modules/core.nix b/modules/core.nix index f8ba7e3..54fa4e2 100644 --- a/modules/core.nix +++ b/modules/core.nix @@ -26,8 +26,8 @@ vault = { enable = lib.mkEnableOption "enable vault"; }; - ha = { - enable = lib.mkEnableOption "enable home assistant user"; + overseer = { + enable = lib.mkEnableOption "enable container overseer user"; }; }; }; @@ -51,7 +51,7 @@ vault = { enable = lib.mkDefault false; }; - ha = { + overseer = { enable = lib.mkDefault false; }; }; diff --git a/modules/users/default.nix b/modules/users/default.nix index 7ef348e..cc7e1d1 100644 --- a/modules/users/default.nix +++ b/modules/users/default.nix @@ -1,8 +1,7 @@ {config, ...}: { imports = [ ./crow - ./vault - ./ha + ./overseer ]; config.home-manager = { diff --git a/modules/users/ha/default.nix b/modules/users/overseer/default.nix similarity index 100% rename from modules/users/ha/default.nix rename to modules/users/overseer/default.nix diff --git a/modules/users/ha/user.nix b/modules/users/overseer/user.nix similarity index 66% rename from modules/users/ha/user.nix rename to modules/users/overseer/user.nix index 96f25d7..b6bee91 100644 --- a/modules/users/ha/user.nix +++ b/modules/users/overseer/user.nix @@ -1,5 +1,5 @@ { lib, config, ...}: { - config.users.users.ha = lib.mkIf config.users.ha.enable { + config.users.users.overseer = lib.mkIf config.users.overseer.enable { isNormalUser = true; initialPassword = "changeme"; extraGroups = [ "wheel" "libvirtd" ]; diff --git a/modules/users/vault/default.nix b/modules/users/vault/default.nix deleted file mode 100644 index 9712fa4..0000000 --- a/modules/users/vault/default.nix +++ /dev/null @@ -1,5 +0,0 @@ -{lib, config, ...}: { - imports = [ - ./user.nix - ]; -} diff --git a/modules/users/vault/user.nix b/modules/users/vault/user.nix deleted file mode 100644 index 214cb90..0000000 --- a/modules/users/vault/user.nix +++ /dev/null @@ -1,7 +0,0 @@ -{ lib, config, ...}: { - config.users.users.vault = lib.mkIf config.users.vault.enable { - isNormalUser = true; - initialPassword = "changeme"; - extraGroups = []; - }; -} diff --git a/modules/vault/default.nix b/modules/vault/default.nix deleted file mode 100644 index 4c51ef0..0000000 --- a/modules/vault/default.nix +++ /dev/null @@ -1,10 +0,0 @@ -{ inputs, pkgs, lib, config, ...}: { - options.vault.enable = lib.mkEnableOption "enables hashicorp vault services"; - - config = { - services.vault = lib.mkIf config.users.vault.enable { - enable = true; - address = "localhost:8200"; - }; - }; -}