Jimbo/NixOS-Config
1
0
Fork 0
Code Issues Pull requests Actions Packages Projects Releases Wiki Activity

The Blue Update #1

Merged
Jimbo merged 101 commits from Refactor into main 2024-10-25 21:26:22 -04:00
Conversation 0 Commits 101 Files changed 306 +9 -78
5 changed files with 9 additions and 78 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files
Showing only changes of commit 7f5e5f2cc0 - Show all commits

69
flake.lock
View file

@ -1,30 +1,5 @@
{
"nodes": {
"agenix": {
"inputs": {
"darwin": "darwin",
"home-manager": [
"home-manager"
],
"nixpkgs": [
"nixpkgs"
],
"systems": "systems"
},
"locked": {
"lastModified": 1723293904,
"narHash": "sha256-b+uqzj+Wa6xgMS9aNbX4I+sXeb5biPDi39VgvSFqFvU=",
"owner": "ryantm",
"repo": "agenix",
"rev": "f6291c5935fdc4e0bef208cfc0dcab7e3f7a1c41",
"type": "github"
},
"original": {
"owner": "ryantm",
"repo": "agenix",
"type": "github"
}
},
"blender-bin": {
"inputs": {
"nixpkgs": "nixpkgs"
@ -79,28 +54,6 @@
"type": "github"
}
},
"darwin": {
"inputs": {
"nixpkgs": [
"agenix",
"nixpkgs"
]
},
"locked": {
"lastModified": 1700795494,
"narHash": "sha256-gzGLZSiOhf155FW7262kdHo2YDeugp3VuIFb4/GGng0=",
"owner": "lnl7",
"repo": "nix-darwin",
"rev": "4b9b83d5a92e8c1fbfd8eb27eda375908c11ec4d",
"type": "github"
},
"original": {
"owner": "lnl7",
"ref": "master",
"repo": "nix-darwin",
"type": "github"
}
},
"flake-compat": {
"flake": false,
"locked": {
@ -172,7 +125,7 @@
},
"flake-utils": {
"inputs": {
"systems": "systems_2"
"systems": "systems"
},
"locked": {
"lastModified": 1710146030,
@ -190,7 +143,7 @@
},
"flake-utils_2": {
"inputs": {
"systems": "systems_4"
"systems": "systems_3"
},
"locked": {
"lastModified": 1681202837,
@ -470,7 +423,6 @@
},
"root": {
"inputs": {
"agenix": "agenix",
"blender-bin": "blender-bin",
"hardware": "hardware",
"home-manager": "home-manager",
@ -552,21 +504,6 @@
"type": "github"
}
},
"systems_4": {
"locked": {
"lastModified": 1681028828,
"narHash": "sha256-Vy1rq5AaRuLzOxct8nz4T6wlgyUR7zLU309k9mBC768=",
"owner": "nix-systems",
"repo": "default",
"rev": "da67096a3b9bf56a91d16901293e51ba5b49a27e",
"type": "github"
},
"original": {
"owner": "nix-systems",
"repo": "default",
"type": "github"
}
},
"unstable": {
"locked": {
"lastModified": 1728492678,
@ -584,7 +521,7 @@
},
"utils": {
"inputs": {
"systems": "systems_3"
"systems": "systems_2"
},
"locked": {
"lastModified": 1709126324,

10
flake.nix
View file

@ -17,21 +17,15 @@
inputs.nixpkgs.follows = "nixpkgs";
};
agenix = {
url = "github:ryantm/agenix";
inputs.nixpkgs.follows = "nixpkgs";
inputs.home-manager.follows = "home-manager";
};
mailserver.url = "gitlab:simple-nixos-mailserver/nixos-mailserver/nixos-24.05";
minecraft.url = "github:Infinidoge/nix-minecraft";
};
outputs = { self, nixpkgs, unstable, home-manager, nur, blender-bin, hardware, lanzaboote, agenix, mailserver, minecraft, ... }:
outputs = { self, nixpkgs, unstable, home-manager, nur, blender-bin, hardware, lanzaboote, mailserver, minecraft, ... }:
let
mkNixos = modules: nixpkgs.lib.nixosSystem {
inherit modules;
specialArgs = { inherit nixpkgs unstable hardware lanzaboote agenix mailserver minecraft; };
specialArgs = { inherit nixpkgs unstable hardware lanzaboote mailserver minecraft; };
};
mkHome = modules: pkgs: home-manager.lib.homeManagerConfiguration {

3
hosts/firefly/system/default.nix
View file

@ -1,4 +1,4 @@
{ agenix, lanzaboote, ... }:
{ lanzaboote, ... }:
{
imports = [
./hardware
@ -19,7 +19,6 @@
../../../modules/system/devices/networking/firewall/pc
# Imports
agenix.nixosModules.default
lanzaboote.nixosModules.lanzaboote
];

2
modules/system/services/server/minecraft/default.nix
View file

@ -10,6 +10,8 @@
./servers/uberbeta
];
nixpkgs.overlays = [ minecraft.overlay ];
services.minecraft-servers = {
enable = true;
eula = true;

3
overlays/default.nix
View file

@ -1,9 +1,8 @@
{ unstable, minecraft, ... }:
{ unstable, ... }:
{
nixpkgs.overlays = [
(import ./unstable { inherit unstable; })
(final: _prev: import ./packages { pkgs = final; })
(import ./mpv)
minecraft.overlay
];
}