lib/modules/programs.nix

@@ -57,7 +57,6 @@ let
     [ "logo-ls" "logo-ls" ]
     [ "lutris" "Lutris" ]
     [ "minegrub-theme" "Minegrub Theme" ]
-    [ "networkmanager" "NetworkManager" ]
     [ "nginx" "nginx" ]
     [ "nodejs-n" "n" ]
     [ "nuke-usb" "nuke-usb" ]
@@ -98,7 +97,6 @@ in
     ./programs/nextcloud.nix
     ./programs/oh-my-posh.nix
     ./programs/rclone.nix
-    ./programs/systemd-networkd.nix
   ];
 
   options = {

lib/modules/programs/systemd-networkd.nix

@@ -1,26 +0,0 @@
-{ lib, config, ... }:
-let
-  inherit (lib) mkEnableOption mkOption types;
-in
-{
-  options = {
-    valhalla = {
-      linux.programs.systemd-networkd = {
-        enable = mkEnableOption "systemd-networkd";
-
-        networks = mkOption {
-          type = types.attrsOf types.attrs;
-          description = "The networks to configure.";
-        };
-
-        networkFiles = mkOption {
-          type = types.attrsOf types.str;
-          description = "The files for configuring the networks.";
-          default = builtins.mapAttrs
-            (name: network: lib.generators.toINI { listsAsDuplicateKeys = true; } network)
-            config.valhalla.linux.programs.systemd-networkd.networks;
-        };
-      };
-    };
-  };
-}

lib/modules/software.nix

@@ -114,7 +114,6 @@ in {
               "vim"
             ])) // (optionalAttrs desktopExperience (mkPrograms [
               "icedtea"
-              "networkmanager"
               "plasma"
               "sddm"
               "waydroid"

profiles/machines/manuel/server.nix

@@ -70,33 +70,6 @@ in {
       linux.programs = {
         grub.enable = true;
 
-        systemd-networkd = {
-          enable = true;
-
-          networks =
-            let device = "enp0s31f6";
-            in {
-              ${device} = {
-                Match = {
-                  Name = device;
-                };
-
-                Network = {
-                  Address = "2a01:4f8:10b:2644::2/64";
-                  Gateway = [
-                    "94.130.48.193"
-                    "fe80::1"
-                  ];
-                };
-
-                Address = {
-                  Address = "94.130.48.251";
-                  Peer = "94.130.48.193/32";
-                };
-              };
-            };
-        };
-
         docker = {
           services = {
             anki-sync.enable = true;

scripts/Arch/OS/setup.fish

@@ -36,6 +36,7 @@ begin
             base \
             linux \
             linux-firmware \
+            networkmanager \
             man-db \
             man-pages \
             texinfo
@@ -62,11 +63,7 @@ begin
             end
 
             and genfstab -U "$mountDir" >>"$mountDir/etc/fstab"
-
+            and arch-chroot "$mountDir" systemctl enable NetworkManager
-            and if isProgramEnabled "networkmanager"
-                and pacstrap -K "$mountDir" networkmanager
-                arch-chroot "$mountDir" systemctl enable NetworkManager
-            end
 
             and if set -q timezone
                 arch-chroot "$mountDir" ln -sf "/usr/share/zoneinfo/$timezone" /etc/localtime

scripts/Arch/Software/systemd-networkd/main.fish

@@ -1,13 +0,0 @@
-#!/bin/env fish
-begin
-    set -l dir (status dirname)
-    source "$dir/../../../lib/software.fish"
-    inherit "$dir/../../../Common/Software/systemd-networkd/main.fish"
-
-    function configureSW -V dir
-        systemctl enable systemd-networkd
-        configureSWBase $argv
-    end
-
-    runInstaller $argv
-end

scripts/Arch/lib/deploy.fish

@@ -71,7 +71,6 @@ function deploySoftware -d "Deploys a the specified software action" -a action
     end
 
     and source "$dir/../../Common/Software/bash/main.fish" $argv
-    and source "$dir/../Software/systemd-networkd/main.fish" $argv
     and source "$dir/../Software/btrfs/main.fish" $argv
     and source "$dir/../../Common/Software/nuke-usb/main.fish" $argv
     and source "$dir/../Software/sudo/main.fish" $argv

scripts/Common/Software/systemd-networkd/main.fish

@@ -1,16 +0,0 @@
-#!/bin/env fish
-begin
-    set -l dir (status dirname)
-    source "$dir/../../../lib/software.fish"
-
-    function configureSW -V dir
-        source "$dir/../../../lib/settings.fish"
-        set config (getProgramConfig $argv --json)
-
-        for name in (echo "$config" | jq '.networkFiles | keys[]' --raw-output0 | string split0 || true)
-            echo "$config" | NAME=$name jq '.networkFiles[env.NAME]' | sudo tee "/etc/systemd/network/10-$name.network" >/dev/null
-        end
-    end
-
-    runInstaller $argv
-end