Reorganized

unorganized/modules/base/default.nix

@@ -0,0 +1,60 @@
+{
+  lib,
+  config,
+  pkgs,
+  ...
+}:
+
+with lib;
+let
+  cfg = config.modules.base;
+in
+{
+  options.modules.base = {
+    enable = mkEnableOption "base";
+  };
+
+  config = mkIf cfg.enable {
+    environment.systemPackages = with pkgs; [
+      # Add base linux utilities
+      git
+      wget
+      curl
+      dig
+      procps
+      wireguard-tools
+      usbutils
+      pciutils
+      zip
+      unzip
+    ];
+
+    modules = {
+      # Enable base modules
+      clean-tmp.enable = true;
+      neovim.enable = true;
+      systemd-boot.enable = true;
+    };
+
+    # TODO: Remove everything below, it is here out of convenience and should be elsewhere
+    # networking.nameservers = [
+    #   "9.9.9.9"
+    #   "149.112.112.112"
+    # ];
+    # programs.captive-browser.enable = true;
+    services.resolved = {
+      enable = true;
+    };
+    networking.firewall.enable = true;
+    modules.unfree.enable = true;
+    nix.settings.experimental-features = "nix-command flakes";
+    nixpkgs.hostPlatform = "x86_64-linux";
+
+    console.packages = [
+      pkgs.dina-psfu
+    ];
+    console.font = "dina";
+    console.earlySetup = true;
+    boot.loader.timeout = 0;
+  };
+}

unorganized/modules/base/desktop.nix

@@ -0,0 +1,93 @@
+{
+  lib,
+  config,
+  pkgs,
+  ...
+}:
+
+with lib;
+let
+  cfg = config.modules.base.desktop;
+in
+{
+  options.modules.base.desktop = {
+    enable = mkEnableOption "desktop";
+  };
+
+  config = mkIf cfg.enable {
+    environment.systemPackages = with pkgs; [
+      # TODO: MOVE
+      quickemu # TODO: Reenable once building this is fixed
+      pdftk
+
+      # TODO: Move to USB module
+      # usbutils
+      # udiskie
+      # udisks
+      brightnessctl
+
+      wireshark
+    ];
+
+    # Move to Realm module
+    security.krb5 = {
+      enable = true;
+      settings = {
+        libdefaults = {
+          rdns = false;
+        };
+        realms = {
+          "GEWISWG.GEWIS.NL" = {
+            kdc = [
+              "https://gewisvdesktop.gewis.nl/KdcProxy"
+            ];
+          };
+        };
+      };
+    };
+
+    modules = {
+      # Enable base modules
+      base.enable = true;
+      fontconfig.enable = true;
+      nixgreety.enable = true;
+      pipewire.enable = true;
+      graphics.enable = true;
+    };
+
+    programs.dconf.enable = true;
+    services.libinput.enable = true;
+    networking.firewall = {
+      enable = true;
+      logRefusedConnections = true;
+      logRefusedPackets = true;
+      logReversePathDrops = true;
+      logRefusedUnicastsOnly = false;
+    };
+    programs.wireshark.enable = true;
+    machine.sudo-groups = [ "wireshark" ];
+    services.upower.enable = true; # For battery percentage in gnome
+    modules.unfree.allowedPackages = [
+      "nvidia-x11"
+      "nvidia-settings"
+    ];
+    networking.firewall.allowedTCPPortRanges = [
+      {
+        from = 10000;
+        to = 11000;
+      }
+    ];
+    networking.firewall.allowedUDPPortRanges = [
+      {
+        from = 10000;
+        to = 11000;
+      }
+    ];
+    security.rtkit.enable = true;
+    security.polkit.enable = true;
+
+    # TODO: Move to USB module
+    # services.gvfs.enable = true;
+    services.udisks2.enable = true;
+  };
+}