From e4008a0bebbfe7efe7dd6d8277012021ea908bf6 Mon Sep 17 00:00:00 2001 From: Greg Hellings Date: Sat, 25 Jul 2026 15:45:21 -0500 Subject: [PATCH] chore: remove icdm-root as well --- home/hosts/icdm-root/default.nix | 4 -- hosts/unstable/icdm-root/boot.nix | 11 ---- hosts/unstable/icdm-root/default.nix | 28 --------- hosts/unstable/icdm-root/filesystem.nix | 13 ---- .../icdm-root/hardware-configuration.nix | 53 ---------------- hosts/unstable/icdm-root/location.nix | 15 ----- hosts/unstable/icdm-root/networking.nix | 63 ------------------- hosts/unstable/icdm-root/wiki.nix | 17 ----- 8 files changed, 204 deletions(-) delete mode 100644 home/hosts/icdm-root/default.nix delete mode 100644 hosts/unstable/icdm-root/boot.nix delete mode 100644 hosts/unstable/icdm-root/default.nix delete mode 100644 hosts/unstable/icdm-root/filesystem.nix delete mode 100644 hosts/unstable/icdm-root/hardware-configuration.nix delete mode 100644 hosts/unstable/icdm-root/location.nix delete mode 100644 hosts/unstable/icdm-root/networking.nix delete mode 100644 hosts/unstable/icdm-root/wiki.nix diff --git a/home/hosts/icdm-root/default.nix b/home/hosts/icdm-root/default.nix deleted file mode 100644 index 04618ac..0000000 --- a/home/hosts/icdm-root/default.nix +++ /dev/null @@ -1,4 +0,0 @@ -{ ... }: - -{ -} diff --git a/hosts/unstable/icdm-root/boot.nix b/hosts/unstable/icdm-root/boot.nix deleted file mode 100644 index 47810f3..0000000 --- a/hosts/unstable/icdm-root/boot.nix +++ /dev/null @@ -1,11 +0,0 @@ -{ ... }: - -{ - # Bootloader. - boot = { - loader.grub = { - enable = true; - device = "/dev/sda"; - }; - }; -} diff --git a/hosts/unstable/icdm-root/default.nix b/hosts/unstable/icdm-root/default.nix deleted file mode 100644 index c4ea82e..0000000 --- a/hosts/unstable/icdm-root/default.nix +++ /dev/null @@ -1,28 +0,0 @@ -# Edit this configuration file to define what should be installed on -# your system. Help is available in the configuration.nix(5) man page -# and in the NixOS manual (accessible by running ‘nixos-help’). - -{ pkgs, ... }: - -{ - imports = [ - # Include the results of the hardware scan. - ./hardware-configuration.nix - ./boot.nix - ./filesystem.nix - ./location.nix - ./networking.nix - ./wiki.nix - ]; - - # Define a user account. Don't forget to set a password with ‘passwd’. - users.users.greg = { - isNormalUser = true; - description = "Gregory Hellings"; - extraGroups = [ - "networkmanager" - "wheel" - ]; - packages = with pkgs; [ ]; - }; -} diff --git a/hosts/unstable/icdm-root/filesystem.nix b/hosts/unstable/icdm-root/filesystem.nix deleted file mode 100644 index f6b543f..0000000 --- a/hosts/unstable/icdm-root/filesystem.nix +++ /dev/null @@ -1,13 +0,0 @@ -{ ... }: - -let -in -{ - fileSystems."serve" = { - #device = "10.42.1.4:/volume1/icdm-mysql/"; - #fsType = "nfs"; - device = "/dev/sdb1"; - fsType = "auto"; - mountPoint = "/srv"; - }; -} diff --git a/hosts/unstable/icdm-root/hardware-configuration.nix b/hosts/unstable/icdm-root/hardware-configuration.nix deleted file mode 100644 index 3c850c2..0000000 --- a/hosts/unstable/icdm-root/hardware-configuration.nix +++ /dev/null @@ -1,53 +0,0 @@ -# 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, - modulesPath, - ... -}: - -{ - imports = [ (modulesPath + "/installer/scan/not-detected.nix") ]; - - boot.initrd.availableKernelModules = [ - "xhci_pci" - "ehci_pci" - "ahci" - "usbhid" - "usb_storage" - "sd_mod" - ]; - boot.initrd.kernelModules = [ ]; - boot.kernelModules = [ "kvm-intel" ]; - boot.extraModulePackages = [ ]; - - fileSystems."/" = { - device = "/dev/disk/by-uuid/dab0d455-e25e-4445-8fa4-5320047d7e7b"; - fsType = "btrfs"; - options = [ "subvol=@" ]; - }; - - fileSystems."/boot" = { - device = "/dev/disk/by-uuid/5aedbb07-5761-423b-909d-2560405eae32"; - fsType = "ext4"; - }; - - fileSystems."/var" = { - device = "/dev/disk/by-uuid/57968536-c29d-417d-997e-85223d1d1f65"; - fsType = "btrfs"; - }; - - swapDevices = [ { device = "/dev/disk/by-uuid/09691dce-375a-43c6-8d40-4498d20a6d9a"; } ]; - - # 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..useDHCP`. - networking.useDHCP = lib.mkDefault true; - # networking.interfaces.eno1.useDHCP = lib.mkDefault true; - # networking.interfaces.wlp2s0.useDHCP = lib.mkDefault true; - - hardware.cpu.intel.updateMicrocode = lib.mkDefault config.hardware.enableRedistributableFirmware; -} diff --git a/hosts/unstable/icdm-root/location.nix b/hosts/unstable/icdm-root/location.nix deleted file mode 100644 index 079dfda..0000000 --- a/hosts/unstable/icdm-root/location.nix +++ /dev/null @@ -1,15 +0,0 @@ -{ ... }: - -{ - # Set your time zone. - time.timeZone = "America/Chicago"; - - # Select internationalisation properties. - i18n.defaultLocale = "en_US.UTF-8"; - - # Configure keymap in X11 - services.xserver.xkb = { - layout = "us"; - variant = ""; - }; -} diff --git a/hosts/unstable/icdm-root/networking.nix b/hosts/unstable/icdm-root/networking.nix deleted file mode 100644 index 66951e6..0000000 --- a/hosts/unstable/icdm-root/networking.nix +++ /dev/null @@ -1,63 +0,0 @@ -{ ... }: -let - dnsHosts = builtins.concatStringsSep "\n" [ "wiki.icdm.lan 10.42.101.1" ]; -in -{ - # If we have to do proxying in Bayonnais, we can start to work on that here - # networking.proxy.noProxy = "127.0.0.1,localhost,internal.domain"; - networking = { - hostName = "icdm-root"; - useDHCP = false; - defaultGateway = "10.42.1.1"; - nameservers = [ - "100.100.100.100" - "10.42.1.2" - ]; - enableIPv6 = false; - - interfaces = { - eno1.ipv4.addresses = [ - { - address = "10.42.101.1"; - prefixLength = 16; - } - { - address = "10.77.1.2"; - prefixLength = 16; - } - ]; - }; - # Allow traffic through - firewall = { - enable = true; - allowedTCPPorts = [ 53 ]; - allowedUDPPorts = [ - 53 - 67 - ]; - }; - - extraHosts = "${dnsHosts}"; - }; - - services.dnsmasq = { - enable = true; - settings = { - domain = "icdm.lan"; - dhcp-range = [ "eno1,10.77.1.10,10.77.1.255,255.255.0.0,12h" ]; - dhcp-option = [ - "eno1,option:router,10.77.1.1" - "eno1,option:dns-server,10.77.1.2,1.1.1.1" - "eno1,option:domain-search,icdm.lan" - ]; - expand-hosts = true; - log-dhcp = true; - log-queries = true; - # Upstream servers - server = [ - "1.1.1.1" - "8.8.4.4" - ]; - }; - }; -} diff --git a/hosts/unstable/icdm-root/wiki.nix b/hosts/unstable/icdm-root/wiki.nix deleted file mode 100644 index fe658e4..0000000 --- a/hosts/unstable/icdm-root/wiki.nix +++ /dev/null @@ -1,17 +0,0 @@ -{ pkgs, ... }: -let - wikiHost = "wiki.icdm.lan"; - kiwixport = 8080; -in -{ - services.kiwix-serve = { - enable = true; - port = kiwixport; - library = { - inherit (pkgs) zim; - }; - }; - - greg.proxies."${wikiHost}".target = "http://localhost:${toString kiwixport}"; - networking.firewall.allowedTCPPorts = [ 80 ]; -}