From 092c8a75f90d4a2076c635f90df332dcbb9aec07 Mon Sep 17 00:00:00 2001
From: randomuser <randomuser@tilde.club>
Date: Wed, 24 Jan 2024 23:27:38 -0600
Subject: [PATCH] rid myself of the utilpkg flake and put a firewall on mlg

---
 boxes/mlg/default.nix |  6 ++++--
 builds/flake.lock     | 27 ---------------------------
 builds/flake.nix      | 28 ----------------------------
 flake.lock            | 20 +-------------------
 flake.nix             |  6 +-----
 modules/common.nix    |  7 +++----
 6 files changed, 9 insertions(+), 85 deletions(-)
 delete mode 100644 builds/flake.lock
 delete mode 100644 builds/flake.nix

diff --git a/boxes/mlg/default.nix b/boxes/mlg/default.nix
index b057c63..024c6cf 100644
--- a/boxes/mlg/default.nix
+++ b/boxes/mlg/default.nix
@@ -61,6 +61,8 @@
   services.avahi.openFirewall = true; # opens the firewall for UDP port 5353
 
   nixpkgs.config.allowUnfree = true;
-  networking.hostName = "mlg";
-
+  networking = {
+    hostName = "mlg";
+    firewall.enable = true;
+  };
 }
diff --git a/builds/flake.lock b/builds/flake.lock
deleted file mode 100644
index c5ee110..0000000
--- a/builds/flake.lock
+++ /dev/null
@@ -1,27 +0,0 @@
-{
-  "nodes": {
-    "nixpkgs": {
-      "locked": {
-        "lastModified": 1703467016,
-        "narHash": "sha256-/5A/dNPhbQx/Oa2d+Get174eNI3LERQ7u6WTWOlR1eQ=",
-        "owner": "NixOS",
-        "repo": "nixpkgs",
-        "rev": "d02d818f22c777aa4e854efc3242ec451e5d462a",
-        "type": "github"
-      },
-      "original": {
-        "owner": "NixOS",
-        "ref": "nixos-23.11",
-        "repo": "nixpkgs",
-        "type": "github"
-      }
-    },
-    "root": {
-      "inputs": {
-        "nixpkgs": "nixpkgs"
-      }
-    }
-  },
-  "root": "root",
-  "version": 7
-}
diff --git a/builds/flake.nix b/builds/flake.nix
deleted file mode 100644
index 350b96a..0000000
--- a/builds/flake.nix
+++ /dev/null
@@ -1,28 +0,0 @@
-{
-  inputs.nixpkgs.url = "github:NixOS/nixpkgs/nixos-23.11";
-
-  outputs =
-    { nixpkgs, ... }:
-    let
-      inherit (nixpkgs) lib;
-      withSystem =
-        f:
-        lib.fold lib.recursiveUpdate { } (
-          map f [
-            "x86_64-linux"
-          ]
-        );
-      mkPackages = pkgs: {
-        st = pkgs.callPackage ./st.nix { };
-        rebuild = pkgs.callPackage ./rebuild.nix { };
-        utils = pkgs.callPackage ./utils.nix { };
-      };
-    in
-    withSystem (
-      system: {
-        overlays.default = final: _: mkPackages final;
-
-        packages.${system} = mkPackages nixpkgs.legacyPackages.${system};
-      }
-    );
-}
diff --git a/flake.lock b/flake.lock
index ef6132e..99bd06f 100644
--- a/flake.lock
+++ b/flake.lock
@@ -172,8 +172,7 @@
         "firefox-addons": "firefox-addons",
         "home-manager": "home-manager",
         "nixpkgs": "nixpkgs",
-        "simple-nixos-mailserver": "simple-nixos-mailserver",
-        "utilpkg": "utilpkg"
+        "simple-nixos-mailserver": "simple-nixos-mailserver"
       }
     },
     "simple-nixos-mailserver": {
@@ -201,23 +200,6 @@
         "type": "gitlab"
       }
     },
-    "utilpkg": {
-      "inputs": {
-        "nixpkgs": [
-          "nixpkgs"
-        ]
-      },
-      "locked": {
-        "lastModified": 1,
-        "narHash": "sha256-3icKqIEjS068WDJ+05sEvFDL6DsPB0GpKTc8Bm4F9Po=",
-        "path": "/nix/store/9797g0387xqz764w22ascnvn3bvm90kd-source/builds",
-        "type": "path"
-      },
-      "original": {
-        "path": "/nix/store/9797g0387xqz764w22ascnvn3bvm90kd-source/builds",
-        "type": "path"
-      }
-    },
     "utils": {
       "locked": {
         "lastModified": 1605370193,
diff --git a/flake.nix b/flake.nix
index 220cdcd..ebcd34a 100644
--- a/flake.nix
+++ b/flake.nix
@@ -11,16 +11,12 @@
       url = "gitlab:rycee/nur-expressions?dir=pkgs/firefox-addons";
       inputs.nixpkgs.follows = "nixpkgs";
     };
-    utilpkg = {
-      url = "./builds";
-      inputs.nixpkgs.follows = "nixpkgs";
-    };
     simple-nixos-mailserver = {
       url = "gitlab:simple-nixos-mailserver/nixos-mailserver/nixos-23.11";
     };
   };
 
-  outputs = { self, nixpkgs, home-manager, firefox-addons, simple-nixos-mailserver, utilpkg, ... }@inputs: {
+  outputs = { self, nixpkgs, home-manager, firefox-addons, simple-nixos-mailserver, ... }@inputs: {
     nixosConfigurations = {
       netbox = nixpkgs.lib.nixosSystem {
         system = "x86_64-linux";
diff --git a/modules/common.nix b/modules/common.nix
index 8d9f344..6336be3 100644
--- a/modules/common.nix
+++ b/modules/common.nix
@@ -6,10 +6,9 @@
   ];
 
   environment.systemPackages = [
-# is it this? this throws a similar error; no attr st, etc.
-    inputs.utilpkg.packages.x86_64-linux.st
-    inputs.utilpkg.packages.x86_64-linux.rebuild
-    inputs.utilpkg.packages.x86_64-linux.utils
+    (pkgs.callPackage ../builds/rebuild.nix {})
+    (pkgs.callPackage ../builds/st.nix {})
+    (pkgs.callPackage ../builds/utils.nix {})
     pkgs.man-pages
   ];