summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
-rw-r--r--installer/default.nix13
-rw-r--r--system-profiles/networkmanager.nix6
2 files changed, 11 insertions, 8 deletions
diff --git a/installer/default.nix b/installer/default.nix
index 9043d59b..912a0ce9 100644
--- a/installer/default.nix
+++ b/installer/default.nix
@@ -1,4 +1,8 @@
1{ flake, config, pkgs, ... }: { 1{ flake, config, pkgs, lib, ... }:
2
3with lib;
4
5{
2 imports = with flake.nixosModules.systemProfiles; [ 6 imports = with flake.nixosModules.systemProfiles; [
3 default-locale zfs networkmanager openssh 7 default-locale zfs networkmanager openssh
4 ]; 8 ];
@@ -13,6 +17,7 @@
13 rulesetFile = ./ruleset.nft; 17 rulesetFile = ./ruleset.nft;
14 }; 18 };
15 }; 19 };
20 users.groups."networkmanager".members = [ "nixos" ];
16 21
17 services.openssh = { 22 services.openssh = {
18 enable = true; 23 enable = true;
@@ -21,10 +26,6 @@
21 26
22 services.qemuGuest.enable = true; 27 services.qemuGuest.enable = true;
23 28
24 services.resolved = {
25 llmnr = "false";
26 };
27
28 environment.systemPackages = with pkgs; [ 29 environment.systemPackages = with pkgs; [
29 nvme-cli iotop pciutils bottom 30 nvme-cli iotop pciutils bottom
30 31
@@ -48,6 +49,8 @@
48 }; 49 };
49 nixpkgs.config.allowUnfree = true; 50 nixpkgs.config.allowUnfree = true;
50 51
52 nix.settings.auto-allocate-uids = mkForce false;
53
51 system.stateVersion = config.system.nixos.release; # No state in installer 54 system.stateVersion = config.system.nixos.release; # No state in installer
52 }; 55 };
53} 56}
diff --git a/system-profiles/networkmanager.nix b/system-profiles/networkmanager.nix
index 437ee74c..d5c85999 100644
--- a/system-profiles/networkmanager.nix
+++ b/system-profiles/networkmanager.nix
@@ -1,4 +1,4 @@
1{ lib, ... }: 1{ config, lib, ... }:
2 2
3with lib; 3with lib;
4 4
@@ -9,13 +9,13 @@ with lib;
9 enable = true; 9 enable = true;
10 dhcp = "internal"; 10 dhcp = "internal";
11 dns = mkForce "dnsmasq"; 11 dns = mkForce "dnsmasq";
12 firewallBackend = mkIf config.networking.nftables.enable "nftables";
13 logLevel = "INFO";
12 extraConfig = '' 14 extraConfig = ''
13 [connectivity] 15 [connectivity]
14 uri=https://online.yggdrasil.li 16 uri=https://online.yggdrasil.li
15 ''; 17 '';
16 }; 18 };
17
18 dhcpcd.enable = false;
19 }; 19 };
20 20
21 systemd.services."NetworkManager-wait-online".enable = false; 21 systemd.services."NetworkManager-wait-online".enable = false;