modules

Author: randomizedcoder

Makefile

@@ -6,7 +6,14 @@
 all: hp0 hp3
 
 hp0:
-	scp ./hp0/configuration.nix hp0:
+	scp -C ./hp0/* hp0:
+	scp -C ./modules/* hp0:
+	scp -C ./nix_switch.bash hp0:
 
 hp3:
-	scp ./hp3/configuration.nix hp3:
+	scp -C ./hp3/* hp3:
+	scp -C ./modules/* hp3:
+	scp -C ./nix_switch.bash hp3:
+
+#
+# end

hp0/configuration.nix

@@ -14,12 +14,21 @@
 # https://discourse.nixos.org/t/differences-between-nix-channels/13998
 
 {
+  # https://nixos.wiki/wiki/NixOS_modules
   imports =
     [ # Include the results of the hardware scan.
       ./hardware-configuration.nix
       # sudo nix-channel --add https://github.com/nix-community/home-manager/archive/release-23.11.tar.gz home-manager
       # sudo nix-channel --update
       <home-manager/nixos>
+      #
+      ./sysctl.nix
+      ./wireless.nix
+      ./hosts.nix
+      ./firewall.nix
+      ./il8n.nix
+      ./systemPackages.nix
+      ./home-manager.nix
     ];
 
   # Bootloader.
@@ -30,89 +39,19 @@
   boot.kernelPackages = pkgs.linuxPackages_latest;
   #boot.kernelPackages = pkgs.linuxPackages_rpi4
 
-  # https://www.kernel.org/doc/html/latest/networking/ip-sysctl.html
-  boot.kernel.sysctl = {
-    # detect dead connections more quickly
-    "net.ipv4.tcp_keepalive_intvl" = 30;
-    #net.ipv4.tcp_keepalive_intvl = 75
-    "net.ipv4.tcp_keepalive_probes" = 4;
-    #net.ipv4.tcp_keepalive_probes = 9
-    "net.ipv4.tcp_keepalive_time" = 120;
-    #net.ipv4.tcp_keepalive_time = 7200
-    # 30 * 4 = 120 seconds. / 60 = 2 minutes
-    # default: 75 seconds * 9 = 675 seconds. /60 = 11.25 minutes
-    "net.ipv4.tcp_rmem" = "4096	1000000	16000000";
-    "net.ipv4.tcp_wmem" = "4096	1000000	16000000";
-    #net.ipv4.tcp_rmem = 4096       131072  6291456
-    #net.ipv4.tcp_wmem = 4096       16384   4194304
-    # enable Enable reuse of TIME-WAIT sockets globally
-    "net.ipv4.tcp_tw_reuse" = 1;
-    #net.ipv4.tcp_tw_reuse=2
-    "net.ipv4.tcp_timestamps" = 1;
-    "net.ipv4.tcp_ecn" = 1;
-    "net.core.rmem_default" = 26214400;
-    "net.core.rmem_max" = 26214400;
-    "net.core.wmem_default" = 26214400;
-    "net.core.wmem_max" = 26214400;
-    #net.core.optmem_max = 20480
-    #net.core.rmem_default = 212992
-    #net.core.rmem_max = 212992
-    #net.core.wmem_default = 212992
-    #net.core.wmem_max = 212992
-    "net.ipv4.ip_local_port_range" = "1025 65535";
-    #net.ipv4.ip_local_port_range ="32768 60999"
-  };
-
   # https://nixos.wiki/wiki/Networking
   # https://nlewo.github.io/nixos-manual-sphinx/configuration/ipv4-config.xml.html
   networking.hostName = "hp0";
-  # networking.wireless.enable = true;  # Enables wireless support via wpa_supplicant.
-  networking.wireless = {
-    enable = true;  # Enables wireless support via wpa_supplicant.
-    environmentFile = "/home/das/wireless.env";
-    networks."devices".psk = "performance";
-    #networks."devices".psk = "@PSK_DEVICES@";
-    extraConfig = "ctrl_interface=DIR=/var/run/wpa_supplicant GROUP=wheel";
-    # output ends up in /run/wpa_supplicant/wpa_supplicant.conf
-  };
-  # https://linux.die.net/man/5/wpa_supplicant.conf
-  # https://nixos.wiki/wiki/Wpa_supplicant
-  # https://nixos.org/manual/nixos/stable/options#opt-networking.wireless.environmentFile
-  # https://blog.stigok.com/2021/05/04/getting-wpa-cli-to-work-in-nixos.html
 
   # Configure network proxy if necessary
   # networking.proxy.default = "http://user:password@proxy:port/";
   # networking.proxy.noProxy = "127.0.0.1,localhost,internal.domain";
 
-  # Enable networking
   networking.networkmanager.enable = false;
-  #networking.networkmanager.enable = true;
-
-  networking.hosts = {
-    "172.16.40.198" = ["hp0eth"];
-    "172.16.40.152" = ["hp0wifi"];
-    "172.16.40.146" = ["hp3eth"];
-    "172.16.40.130" = ["hp3wifi"];
-  };
 
   # Set your time zone.
   time.timeZone = "America/Los_Angeles";
 
-  # Select internationalisation properties.
-  i18n.defaultLocale = "en_US.UTF-8";
-
-  i18n.extraLocaleSettings = {
-    LC_ADDRESS = "en_US.UTF-8";
-    LC_IDENTIFICATION = "en_US.UTF-8";
-    LC_MEASUREMENT = "en_US.UTF-8";
-    LC_MONETARY = "en_US.UTF-8";
-    LC_NAME = "en_US.UTF-8";
-    LC_NUMERIC = "en_US.UTF-8";
-    LC_PAPER = "en_US.UTF-8";
-    LC_TELEPHONE = "en_US.UTF-8";
-    LC_TIME = "en_US.UTF-8";
-  };
-
   # Enable touchpad support (enabled default in most desktopManager).
   # services.xserver.libinput.enable = true;
 
@@ -129,107 +68,6 @@
     ];
   };
 
-  # https://nix-community.github.io/home-manager/index.xhtml#ch-installation
-  users.users.eve.isNormalUser = true;
-  home-manager.users.das = { pkgs, ... }: {
-    home.packages = with pkgs; [
-      #
-      tmux
-      screen
-      #
-      libgcc
-      # https://nixos.wiki/wiki/C
-      # https://search.nixos.org/packages?channel=24.05&show=gcc&from=0&size=50&sort=relevance&type=packages&query=gcc
-      gcc
-      automake
-      gnumake
-      pkg-config
-      #
-      perl
-      python3
-      #
-      gawk
-      jq
-      git
-      htop
-      minicom
-      #
-      ethtool
-      iproute2
-      vlan
-      tcpdump
-      wireshark
-      iperf2
-      netperf
-      flent
-      bpftools
-      iw
-      wirelesstools
-      wpa_supplicant_ro_ssids
-      #
-      hwloc
-      # go
-      # https://nixos.wiki/wiki/Go
-      # https://nixos.org/manual/nixpkgs/stable/#sec-language-go
-      # https://nixos.wiki/wiki/FAQ#How_can_I_install_a_package_from_unstable_while_remaining_on_the_stable_channel.3F
-      libcap
-      gcc
-      #  thunderbird
-      go
-      # rust
-      # https://nixos.wiki/wiki/Rust
-      pkgs.cargo
-      pkgs.rustc
-    ];
-
-    programs.bash.enable = true;
-    home.stateVersion = "23.11";
-
-    programs.vim = {
-      enable = true;
-      plugins = with pkgs.vimPlugins; [ vim-airline ];
-      settings = { ignorecase = true; };
-      extraConfig = ''
-        set mouse=a
-      '';
-    };
-    #ldflags = [
-    #  "-X main.Version=${version}"
-    #  "-X main.Commit=${version}"
-    #];
-
-    programs.git = {
-      enable = true;
-      userEmail = "dave.seddon.ca@gmail.com";
-      userName = "randomizedcoder ";
-      #signing.key = "GPG-KEY-ID";
-      #signing.signByDefault = true;
-    };
-    nixpkgs.config.allowUnfree = true;
-  };
-
-  # Allow unfree packages
-  nixpkgs.config.allowUnfree = true;
-
-  # List packages installed in system profile. To search, run:
-  # $ nix search wget
-  environment.systemPackages = with pkgs; [
-  #  vim # Do not forget to add an editor to edit configuration.nix! The Nano editor is also installed by default.
-  #  wget
-    vim
-    curl
-    wget
-    tcpdump
-    iproute2
-    nftables
-    iptables
-    pciutils
-    usbutils
-    iw
-    wirelesstools
-    wpa_supplicant_ro_ssids
-  ];
-
   # Some programs need SUID wrappers, can be configured further or are
   # started in user sessions.
   # programs.mtr.enable = true;
@@ -244,35 +82,6 @@
 
   services.openssh.enable = true;
 
-  # Open ports in the firewall.
-  # networking.firewall.allowedTCPPorts = [ ... ];
-  # networking.firewall.allowedUDPPorts = [ ... ];
-  # Or disable the firewall altogether.
-  # networking.firewall.enable = false;
-
-  # https://nixos.wiki/wiki/Firewall
-  # https://scvalex.net/posts/54/
-  # sudo nft --stateless list table filter
-  # sudo sudo iptables-save
-  networking.firewall = {
-    enable = false;
-    allowedTCPPorts = [
-      22     # ssh
-      5001   # iperf2
-    ];
-    #   allowedTCPPorts = [ 22 5001 ];
-    #   #allowedUDPPortRanges = [
-    #   #  { from = 4000; to = 4007; }
-    #   #  { from = 8000; to = 8010; }
-    #   #];
-    # NixOS automagically creates stateful connection tracking, which we don't want
-    # for performance reasons
-    # extraCommands = ''
-    # iptables --delete nixos-fw -m conntrack --ctstate RELATED,ESTABLISHED -j nixos-fw-accept || true
-    # '';
-  };
-  # networking.firewall.interfaces."eth0".allowedTCPPorts = [ 80 443 ];
-
   # This value determines the NixOS release from which the default
   # settings for stateful data, like file locations and database versions
   # on your system were taken. It‘s perfectly fine and recommended to leave
@@ -286,5 +95,4 @@
   # services.qemuGuest.enable = true;
 
   # https://wiki.nixos.org/wiki/Laptop
-
 }