nix: Modularize

configuration.nix

@@ -17,15 +17,18 @@
     ./modules/networking
     ./modules/virtualization
     ./modules/xserver
+    ./modules/systemd
+    ./modules/vnstat
+    ./modules/locale
+    ./modules/firejail
+    ./modules/timezone
+    ./modules/nix
+    ./modules/npm
   ];
 
   boot.loader.systemd-boot.enable = true;
   boot.loader.efi.canTouchEfiVariables = true;
 
-  systemd.extraConfig = ''
-    DefaultTimeoutStopSec=10s
-  '';
-
   environment.sessionVariables = {
     EDITOR = "nvim";
     VISUAL = "nvim";
@@ -35,17 +38,6 @@
   };
 
 
-
-  time.timeZone = "America/New_York";
-
-  i18n.defaultLocale = "en_US.UTF-8";
-  i18n.supportedLocales =
-    [ "en_US.UTF-8/UTF-8" "ja_JP.UTF-8/UTF-8" "fr_FR.UTF-8/UTF-8" ];
-
-
-  programs.firejail.enable = true;
-  nix.package = pkgs.nixFlakes;
-  nix.settings.experimental-features = [ "nix-command" "flakes" ];
   environment.systemPackages = with pkgs; [
     pinentry-curses
     wget
@@ -69,7 +61,6 @@
     ponysay
     lolcat
     figlet
-    calcurse
     httpie
     cmatrix
     sox
@@ -108,10 +99,6 @@
     genact
   ];
 
-  networking.networkmanager.wifi.macAddress = "random";
-  networking.networkmanager.ethernet.macAddress = "random";
-  services.resolved.llmnr = "false";
-
   environment.defaultPackages = [ ];
 
   system.stateVersion = "22.11";

modules/firejail/default.nix

@@ -0,0 +1,3 @@
+{
+  programs.firejail.enable = true;
+}

modules/locale/default.nix

@@ -0,0 +1,5 @@
+{
+  i18n.defaultLocale = "en_US.UTF-8";
+  i18n.supportedLocales =
+    [ "en_US.UTF-8/UTF-8" "ja_JP.UTF-8/UTF-8" "fr_FR.UTF-8/UTF-8" ];
+}

modules/networking/default.nix

@@ -5,8 +5,12 @@
     networkmanager = {
       enable = true;
       dns = "none";
+      wifi.macAddress = "random";
+      ethernet.macAddress = "random";
     };
 
     useHostResolvConf = true;
   };
+
+  services.resolved.llmnr = "false";
 }

modules/nix/default.nix

@@ -0,0 +1,10 @@
+{ pkgs, ... }:
+
+{
+  nix = {
+    package = pkgs.nixFlakes;
+    settings = {
+      experimental-features = [ "nix-command" "flakes" ];
+    };
+  };
+}

modules/npm/default.nix

@@ -0,0 +1,3 @@
+{
+  programs.npm.enable = true;
+}

modules/systemd/default.nix

@@ -0,0 +1,5 @@
+{
+  systemd.extraConfig = ''
+    DefaultTimeoutStopSec=10s
+  '';
+}

modules/timezone/default.nix

@@ -0,0 +1,3 @@
+{
+  time.timeZone = "America/New_York";
+}

modules/vnstat/default.nix

@@ -0,0 +1,3 @@
+{
+  services.vnstat.enable = true;
+}