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

Changes to the flake, thanks Jules

Browse source
This commit is contained in:
Jimbo 2024-10-09 23:52:50 -04:00
parent 35dabb4249
commit 87fbcda3d3
2 changed files with 32 additions and 27 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

57
flake.nix
View file

@ -33,13 +33,8 @@
lanzaboote,
home-manager,
...
} @inputs: let
inherit (self) outputs;
forAllSystems = nixpkgs.lib.genAttrs [
"aarch64-linux"
"x86_64-linux"
];
in rec {
} @inputs:
let
channels = {
master = import nixpkgs {
inherit (flake) system overlays;
@ -49,41 +44,53 @@
nur = import nur { nurpkgs = import nixpkgs { inherit (flake) system; }; };
};
packages = import ./packages/default.nix { inherit (nix) pkgs; };
# Variables defined so they can be accessed globally
secrets = import ./extras/secrets.nix;
cmd = import ./extras/cmd.nix;
displays = import ./extras/displays.nix;
ips = import ./extras/ips.nix;
look = import ./extras/look.nix;
ws = import ./extras/workspaces.nix;
flake = {
overlays = [
nur.overlay
minecraft.overlay
(import ./overlays/mpv { inherit (self) inputs channels; })
];
packages = import ./packages/default.nix { inherit (nix) pkgs; };
secrets = import ./extras/secrets.nix;
cmd = import ./extras/cmd.nix;
displays = import ./extras/displays.nix;
ips = import ./extras/ips.nix;
look = import ./extras/look.nix;
ws = import ./extras/workspaces.nix;
};
nix = rec {
pkgs = channels.master // flake.packages;
inherit (pkgs) lib;
inherit (flake) channels-config;
};
in {
# NixOS config entrypoint, use 'nixos-rebuild --flake .#your-hostname'
nixosConfigurations = {
JimDesktop = nixpkgs.lib.nixosSystem {
specialArgs = {inherit inputs outputs;};
inherit (nix) pkgs;
specialArgs = { inherit inputs outputs; };
modules = [
./system/hosts/JimDesktop/configuration.nix
lanzaboote.nixosModules.lanzaboote
];
};
JimServer = nixpkgs.lib.nixosSystem {
specialArgs = {inherit inputs outputs;};
specialArgs = { inherit inputs outputs; };
modules = [
./system/hosts/JimServer/configuration.nix
mailserver.nixosModule
];
};
JimPine = nixpkgs.lib.nixosSystem {
specialArgs = {inherit inputs outputs;};
specialArgs = { inherit inputs outputs; };
modules = [
./system/hosts/JimPine/configuration.nix
hardware.nixosModules.pine64-pinebook-pro
];
};
JimLenovo = nixpkgs.lib.nixosSystem {
specialArgs = {inherit inputs outputs;};
specialArgs = { inherit inputs outputs; };
modules = [
./system/hosts/JimLenovo/configuration.nix
];
@ -94,7 +101,7 @@
homeConfigurations = {
"jimbo@JimDesktop" = home-manager.lib.homeManagerConfiguration {
pkgs = nixpkgs.legacyPackages.x86_64-linux;
extraSpecialArgs = {inherit inputs outputs;};
extraSpecialArgs = { inherit inputs outputs; };
modules = [
./home/hosts/JimDesktop/home.nix
nur.nixosModules.nur
@ -102,14 +109,14 @@
};
"jimbo@JimServer" = home-manager.lib.homeManagerConfiguration {
pkgs = nixpkgs.legacyPackages.x86_64-linux;
extraSpecialArgs = {inherit inputs outputs;};
extraSpecialArgs = { inherit inputs outputs; };
modules = [
./home/hosts/JimServer/home.nix
];
};
"jimbo@JimPine" = home-manager.lib.homeManagerConfiguration {
pkgs = nixpkgs.legacyPackages.aarch64-linux;
extraSpecialArgs = {inherit inputs outputs;};
extraSpecialArgs = { inherit inputs outputs; };
modules = [
./home/hosts/JimPine/home.nix
nur.nixosModules.nur
@ -117,7 +124,7 @@
};
"jimbo@JimLenovo" = home-manager.lib.homeManagerConfiguration {
pkgs = nixpkgs.legacyPackages.x86_64-linux;
extraSpecialArgs = {inherit inputs outputs;};
extraSpecialArgs = { inherit inputs outputs; };
modules = [
./home/hosts/JimLenovo/home.nix
nur.nixosModules.nur
@ -126,7 +133,7 @@
# Derivation for ssh envrionments on other people's servers
"jimbo@JimTerminal" = home-manager.lib.homeManagerConfiguration {
pkgs = nixpkgs.legacyPackages.x86_64-linux;
extraSpecialArgs = {inherit inputs outputs;};
extraSpecialArgs = { inherit inputs outputs; };
modules = [
./home/hosts/JimTerminal/home.nix
];

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

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