rid myself of the utilpkg flake and put a firewall on mlg

This commit is contained in:
randomuser 2024-01-24 23:27:38 -06:00
parent 21778be01c
commit 092c8a75f9
6 changed files with 9 additions and 85 deletions

View File

@ -61,6 +61,8 @@
services.avahi.openFirewall = true; # opens the firewall for UDP port 5353 services.avahi.openFirewall = true; # opens the firewall for UDP port 5353
nixpkgs.config.allowUnfree = true; nixpkgs.config.allowUnfree = true;
networking.hostName = "mlg"; networking = {
hostName = "mlg";
firewall.enable = true;
};
} }

View File

@ -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
}

View File

@ -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};
}
);
}

View File

@ -172,8 +172,7 @@
"firefox-addons": "firefox-addons", "firefox-addons": "firefox-addons",
"home-manager": "home-manager", "home-manager": "home-manager",
"nixpkgs": "nixpkgs", "nixpkgs": "nixpkgs",
"simple-nixos-mailserver": "simple-nixos-mailserver", "simple-nixos-mailserver": "simple-nixos-mailserver"
"utilpkg": "utilpkg"
} }
}, },
"simple-nixos-mailserver": { "simple-nixos-mailserver": {
@ -201,23 +200,6 @@
"type": "gitlab" "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": { "utils": {
"locked": { "locked": {
"lastModified": 1605370193, "lastModified": 1605370193,

View File

@ -11,16 +11,12 @@
url = "gitlab:rycee/nur-expressions?dir=pkgs/firefox-addons"; url = "gitlab:rycee/nur-expressions?dir=pkgs/firefox-addons";
inputs.nixpkgs.follows = "nixpkgs"; inputs.nixpkgs.follows = "nixpkgs";
}; };
utilpkg = {
url = "./builds";
inputs.nixpkgs.follows = "nixpkgs";
};
simple-nixos-mailserver = { simple-nixos-mailserver = {
url = "gitlab:simple-nixos-mailserver/nixos-mailserver/nixos-23.11"; 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 = { nixosConfigurations = {
netbox = nixpkgs.lib.nixosSystem { netbox = nixpkgs.lib.nixosSystem {
system = "x86_64-linux"; system = "x86_64-linux";

View File

@ -6,10 +6,9 @@
]; ];
environment.systemPackages = [ environment.systemPackages = [
# is it this? this throws a similar error; no attr st, etc. (pkgs.callPackage ../builds/rebuild.nix {})
inputs.utilpkg.packages.x86_64-linux.st (pkgs.callPackage ../builds/st.nix {})
inputs.utilpkg.packages.x86_64-linux.rebuild (pkgs.callPackage ../builds/utils.nix {})
inputs.utilpkg.packages.x86_64-linux.utils
pkgs.man-pages pkgs.man-pages
]; ];