cosmetics

.luarc.json

@@ -0,0 +1,4 @@
+{
+    "$schema": "https://raw.githubusercontent.com/sumneko/vscode-lua/master/setting/schema.json",
+    "Lua.workspace.checkThirdParty": false
+}

ssh/config

@@ -26,13 +26,7 @@ Host nioma
     IdentityFile ~/.ssh/free-aws.pem
     Port 22
 
-# Ubuntu 22.04 LTS Pegasust@Linode
+# NixOS Pegasust-gh@Linode
-Host ocolo-lab
-    HostName ocolo.pegasust.com
-    User root
-    Port 22
-
-# NixOS Pegasust@Linode
 Host nyx
     HostName nyx.pegasust.com
     User hungtr
@@ -43,14 +37,9 @@ Host lizzi
     User hungtr
     Port 22
 
+# Ubuntu 4G Pegasust-gh@Linode
 Host ash
     HostName 192.155.95.41
     User hungtr
     Port 22
 
-Host lester
-    HostName 139.144.185.207
-    User hungtr
-    Port 22
-
-

system-nix/configuration.nix

@@ -2,9 +2,9 @@
 let
   hostname = specialArgs.hostname;
   enableSSH = specialArgs.enableSSH or true;
-  networking = { hostName = hostname; } // (specialArgs.networking or { });
+  _networking = { hostName = hostname; } // (specialArgs._networking or { });
-  boot = specialArgs.boot or { };
+  _boot = specialArgs._boot or { };
-  services = specialArgs.services or { };
+  _services = specialArgs._services or { };
   includeHardware = specialArgs.includeHardware or true;
 in
 with lib;
@@ -14,7 +14,7 @@ with lib;
   ] else [ ]) ++ [
     "${modulesPath}/profiles/minimal.nix"
   ];
-  inherit boot;
+  boot = _boot;
 
   system.stateVersion = "22.05";
   # users.users.<defaultUser>.uid = 1000;
@@ -56,7 +56,7 @@ with lib;
   ];
   # tailscale is mandatory : ^)
   # inherit services;
-  services = services // {
+  services = _services // {
     tailscale.enable = true;
   };
   # create a oneshot job to authenticate to Tailscale
@@ -89,23 +89,25 @@ with lib;
   };
   # Don't touch networking.firewall.enable, just configure everything else.
   # inherit networking;
-  networking = networking // {
+  # inherit _networking;
-    firewall = (networking.firewall.enable and {
+  networking = _networking // {
-      trustedInterfaces = networking.firewall.trustedInterfaces or [ ] ++ [
+    firewall =
-        "tailscale0"
+      if _networking.firewall.enable ? false then {
-      ];
+        trustedInterfaces = _networking.firewall.trustedInterfaces or [ ] ++ [
-      allowedUDPPorts = networking.firewall.allowedUDPPorts or [ ] ++ [
+          "tailscale0"
-        config.services.tailscale.port
+        ];
-      ];
+        allowedUDPPorts = _networking.firewall.allowedUDPPorts or [ ] ++ [
-      allowedTCPPorts = networking.firewall.allowedTCPPorts or [ ] ++ [
+          config.services.tailscale.port
-        22
+        ];
-      ];
+        allowedTCPPorts = _networking.firewall.allowedTCPPorts or [ ] ++ [
-      allowedUDPPortRanges = networking.firewall.allowedUDPPortRanges or [ ] ++ [
+          22
-        { from = 60000; to = 61000; } # mosh
+        ];
+        allowedUDPPortRanges = _networking.firewall.allowedUDPPortRanges or [ ] ++ [
+          { from = 60000; to = 61000; } # mosh
 
-      ];
+        ];
-      checkReversePath = "loose";
+        checkReversePath = "loose";
-    }) or {};
+      } else { enable = false; };
   };
 
 }

system-nix/flake.nix

@@ -17,7 +17,7 @@
         specialArgs = {
           # includeHardware = false;
           hostname = "Felia";
-          services.openssh = {
+          _services.openssh = {
             permitRootLogin = "no";
             enable = true;
           };
@@ -31,36 +31,25 @@
         ];
         specialArgs = {
           hostname = "lizzi";
-          networking = {
+          _networking = {
             interfaces.eth1.ipv4.addresses = [{
               address = "71.0.0.1";
               prefixLength = 24;
             }];
             firewall = {
               enable = false;
-              # Also wishing for nix-lsp to be a bit better here
+              allowedTCPPorts = [ 80 443 ];
-              # A man can only pray and cry
-              # How would we add such functionality to nix-lsp if nix is 
-              # inherently lazy?
-              #
-              # Can use the schema, maybe?
-              #
-              # Also wishing on the ability for services to declare their
-              # own ports now
-              #
-              # Maybe write a mkService?
-              allowedTCPPorts = [80 443];
             };
             useDHCP = false;
             interfaces.eth0.useDHCP = true;
           };
-          boot.loader.grub.enable = true;
+          _boot.loader.grub.enable = true;
-          boot.loader.grub.version = 2;
+          _boot.loader.grub.version = 2;
-          services.openssh = {
+          _services.openssh = {
             permitRootLogin = "no";
             enable = true;
           };
-          services.gitea = {
+          _services.gitea = {
             enable = true;
             stateDir = "/gitea";
             rootUrl = "https://git.pegasust.com";
@@ -71,7 +60,7 @@
               };
             };
           };
-          services.nginx = {
+          _services.nginx = {
             enable = true;
             clientMaxBodySize = "100m"; # Allow big file transfers over git :^)
             recommendedGzipSettings = true;
@@ -95,14 +84,14 @@
         ];
         specialArgs = {
           hostname = "lester";
-          networking = {
+          _networking = {
             firewall.enable = true;
             useDHCP = false;
             interfaces.eth0.useDHCP = true;
           };
-          boot.loader.grub.enable = true;
+          _boot.loader.grub.enable = true;
-          boot.loader.grub.version = 2;
+          _boot.loader.grub.version = 2;
-          services.openssh = {
+          _services.openssh = {
             permitRootLogin = "no";
             enable = true;
           };
@@ -115,7 +104,7 @@
         ];
         specialArgs = {
           hostname = "nyx";
-          networking = {
+          _networking = {
             interfaces.eth1.ipv4.addresses = [{
               address = "71.0.0.2";
               prefixLength = 24;
@@ -124,9 +113,9 @@
             useDHCP = false;
             interfaces.eth0.useDHCP = true;
           };
-          boot.loader.grub.enable = true;
+          _boot.loader.grub.enable = true;
-          boot.loader.grub.version = 2;
+          _boot.loader.grub.version = 2;
-          services.openssh = {
+          _services.openssh = {
             permitRootLogin = "no";
             enable = true;
           };

system-nix/profiles/lizzi/hardware-configuration.nix

@@ -0,0 +1,47 @@
+# Do not modify this file!  It was generated by ‘nixos-generate-config’
+# and may be overwritten by future invocations.  Please make changes
+# to /etc/nixos/configuration.nix instead.
+{ config, lib, pkgs, modulesPath, ... }:
+
+{
+  imports =
+    [ (modulesPath + "/profiles/qemu-guest.nix")
+    ];
+
+  boot.initrd.availableKernelModules = [ "virtio_pci" "virtio_scsi" "ahci" "sd_mod" ];
+  boot.initrd.kernelModules = [ ];
+  boot.kernelParams = [ "console=ttyS0,19200n8" ];
+  boot.loader.grub.extraConfig = ''
+    serial --speed=19200 --unit=0 --word=8 --parity=no --stop=1
+    terminal_input serial;
+    terminal_output serial
+  '';
+  boot.loader.grub.forceInstall = true;
+  boot.loader.grub.device = "nodev";
+  boot.loader.timeout = 10;
+  boot.kernelModules = [ ];
+  boot.extraModulePackages = [ ];
+
+  fileSystems = {
+    "/" =  { device = "/dev/sda";
+      fsType = "ext4";
+    };
+    "/gitea" = {
+      device = "/dev/disk/by-id/scsi-0Linode_Volume_gitea";
+      fsType = "ext4";
+    };
+  };
+
+  swapDevices =
+    [ { device = "/dev/sdb"; }
+    ];
+
+  # Enables DHCP on each ethernet and wireless interface. In case of scripted networking
+  # (the default) this is the recommended approach. When using systemd-networkd it's
+  # still possible to use this option, but it's recommended to use it in conjunction
+  # with explicit per-interface declarations with `networking.interfaces.<interface>.useDHCP`.
+  networking.useDHCP = lib.mkDefault true;
+  # networking.interfaces.enp0s5.useDHCP = lib.mkDefault true;
+
+  hardware.cpu.amd.updateMicrocode = lib.mkDefault config.hardware.enableRedistributableFirmware;
+}