From d6465b7ed0dc877967e4b4c21a4254cae7e0512e Mon Sep 17 00:00:00 2001 From: TheArcaneBrony Date: Fri, 24 Feb 2023 20:03:16 +0000 Subject: Cleanup --- host/Rory-devenv/configuration.nix | 12 ------------ host/Rory-discordbots/configuration.nix | 9 --------- host/Rory-fosscord/configuration.nix | 9 --------- host/Rory-nginx/configuration.nix | 9 --------- host/Rory-postgres/configuration.nix | 5 +---- modules/base-server.nix | 3 +++ 6 files changed, 4 insertions(+), 43 deletions(-) diff --git a/host/Rory-devenv/configuration.nix b/host/Rory-devenv/configuration.nix index 8edaf6f..5087bc9 100755 --- a/host/Rory-devenv/configuration.nix +++ b/host/Rory-devenv/configuration.nix @@ -14,9 +14,6 @@ } ]; }; - # environment.systemPackages = with pkgs; [ - # postgresql - # ]; systemd.tmpfiles.rules = [ "d /data/pg 0750 postgres postgres" ]; services = { @@ -65,14 +62,6 @@ spice-vdagentd.enable = true; }; - users.users = { - Rory = { - packages = with pkgs; [ - - ]; - }; - }; - environment.systemPackages = with pkgs; [ zsh gnome-console @@ -87,7 +76,6 @@ glxinfo vscode-with-extensions nodejs - ]; fonts.fonts = with pkgs; [ (nerdfonts.override { fonts = [ "JetBrainsMono" ]; }) diff --git a/host/Rory-discordbots/configuration.nix b/host/Rory-discordbots/configuration.nix index ed9b248..3eff333 100755 --- a/host/Rory-discordbots/configuration.nix +++ b/host/Rory-discordbots/configuration.nix @@ -13,21 +13,12 @@ networking = { hostName = "Rory-discordbots"; - networkmanager.enable = false; - wireless.enable = false; - - firewall = { - enable = false; - }; interfaces.ens18.ipv4.addresses = [ { address = "192.168.1.50"; prefixLength = 24; } ]; }; - sound.enable = false; - hardware.pulseaudio.enable = false; - system.stateVersion = "22.11"; # DO NOT EDIT! } diff --git a/host/Rory-fosscord/configuration.nix b/host/Rory-fosscord/configuration.nix index 78756f4..d0654b2 100755 --- a/host/Rory-fosscord/configuration.nix +++ b/host/Rory-fosscord/configuration.nix @@ -11,21 +11,12 @@ networking = { hostName = "Rory-fosscord"; - networkmanager.enable = false; - wireless.enable = false; - - firewall = { - enable = false; - }; interfaces.ens18.ipv4.addresses = [ { address = "192.168.1.100"; prefixLength = 24; } ]; }; - sound.enable = false; - hardware.pulseaudio.enable = false; - system.stateVersion = "22.11"; # DO NOT EDIT! } diff --git a/host/Rory-nginx/configuration.nix b/host/Rory-nginx/configuration.nix index 29d2eeb..5d3347c 100755 --- a/host/Rory-nginx/configuration.nix +++ b/host/Rory-nginx/configuration.nix @@ -8,12 +8,6 @@ networking = { hostName = "Rory-nginx"; - networkmanager.enable = false; - wireless.enable = false; - - firewall = { - enable = false; - }; interfaces.ens18.ipv4.addresses = [ { address = "192.168.1.2"; prefixLength = 24; @@ -73,8 +67,5 @@ security.acme.acceptTerms = true; security.acme.defaults.email = "root@thearcanebrony.net"; - sound.enable = false; - hardware.pulseaudio.enable = false; - system.stateVersion = "22.11"; # DO NOT EDIT! } diff --git a/host/Rory-postgres/configuration.nix b/host/Rory-postgres/configuration.nix index 4f191b2..73647d6 100755 --- a/host/Rory-postgres/configuration.nix +++ b/host/Rory-postgres/configuration.nix @@ -13,10 +13,7 @@ prefixLength = 24; } ]; }; - - # environment.systemPackages = with pkgs; [ - # postgresql - # ]; + systemd.tmpfiles.rules = [ "d /data/pg 0750 postgres postgres" ]; services.postgresql = { diff --git a/modules/base-server.nix b/modules/base-server.nix index f985b41..b035b08 100755 --- a/modules/base-server.nix +++ b/modules/base-server.nix @@ -39,6 +39,9 @@ defaultGateway = "192.168.1.1"; }; + sound.enable = false; + hardware.pulseaudio.enable = false; + i18n.defaultLocale = "en_US.UTF-8"; services = { prometheus = { -- cgit 1.4.1