3 files changed, 14 insertions, 55 deletions
diff --git a/modules/base-server.nix b/modules/base-server.nix
index 0b05a9d..ccf4a77 100755
--- a/modules/base-server.nix
+++ b/modules/base-server.nix
@@ -51,18 +51,14 @@
networking = {
hostName = lib.mkDefault "Rory-nix-base-server";
networkmanager.enable = false;
- useNetworkd = true;
wireless.enable = false;
enableIPv6 = false;
firewall = {
enable = false;
- # allowedTCPPorts = [ ... ];
- # allowedUDPPorts = [ ... ];
allowedTCPPorts = [ 22 ];
};
useDHCP = false;
- # nameservers = [ "1.1.1.1" "1.0.0.1" "8.8.8.8" "8.4.4.8" ];
nameservers = [
"10.10.0.4"
"10.10.0.5"
@@ -71,7 +67,7 @@
"8.8.8.8"
"8.4.4.8"
];
- defaultGateway = "192.168.1.1";
+ defaultGateway = lib.mkDefault "192.168.1.1";
};
hardware.pulseaudio.enable = false;
@@ -81,51 +77,6 @@
hardware.enableRedistributableFirmware = false;
services = {
- # prometheus = {
- # exporters = {
- # node = {
- # enable = true;
- # port = 9100;
- # enabledCollectors = [
- # #"logind" #too slow
- # "systemd"
- # "processes"
- # "interrupts"
- # # Testing:
- # "buddyinfo"
- # "cgroups"
- # "ksmd"
- # "lnstat"
- # "mountstats"
- # "network_route"
- # #"perf" # requires sysctl change
- # "qdisc"
- # "sysctl"
- # "softirqs"
- # "tcpstat"
- # ];
- # disabledCollectors = [
- # "textfile"
- # "xfs"
- # "zfs"
- # "selinux"
- # "cpufreq"
- # "btrfs"
- # "powersupplyclass"
- # "mdadm"
- # "tapestats"
- # "fibrechannel"
- # "cpu_vulnerabilities"
- # "watchdog"
- # "thermal_zone"
- # "logind"
- # "nfs"
- # "nfsd"
- # "infiniband"
- # ];
- # };
- # };
- # };
promtail = {
enable = true;
configuration = {
diff --git a/modules/base.nix b/modules/base.nix
index 6119cdf..09f638a 100755
--- a/modules/base.nix
+++ b/modules/base.nix
@@ -65,8 +65,6 @@
hostName = lib.mkDefault "Rory-nix-base";
firewall = {
enable = false;
- # allowedTCPPorts = [ ... ];
- # allowedUDPPorts = [ ... ];
};
nameservers = lib.mkDefault [
"1.1.1.1"
@@ -175,13 +173,24 @@
virtualisation.vmVariant = {
services.getty.autologinUser = "root";
virtualisation = {
- memorySize = 4096;
- cores = 2;
+ memorySize = 8192;
+ cores = 6;
msize = 1*1024*1024;
bios = pkgs.qboot;
};
monitoring.monitorAll = lib.mkForce false;
services.promtail.enable = lib.mkForce false;
+ networking.useDHCP = lib.mkOverride 51 true;
+
+ environment.systemPackages = with pkgs; [
+ qutebrowser
+ gomuks
+ kdePackages.konqueror
+ weston
+ kitty
+ waybar
+ sway
+ ];
};
}
diff --git a/modules/users/Rory.nix b/modules/users/Rory.nix
index 545d2fa..56a30c3 100755
--- a/modules/users/Rory.nix
+++ b/modules/users/Rory.nix
@@ -48,7 +48,6 @@
mutableUsers = false;
users.Rory.password = "password";
};
- networking.interfaces.enp34s0 = lib.mkForce { };
};
home-manager.users.Rory = {
|
