The Blue Update #1

Merged
Jimbo merged 101 commits from Refactor into main 2024-10-25 21:26:22 -04:00
2 changed files with 10 additions and 10 deletions
Showing only changes of commit 9c71495c73 - Show all commits

View file

@ -6,7 +6,7 @@
unstable.url = "github:nixos/nixpkgs/nixos-unstable"; unstable.url = "github:nixos/nixpkgs/nixos-unstable";
nur.url = "github:nix-community/NUR"; nur.url = "github:nix-community/NUR";
mailserver.url = "gitlab:simple-nixos-mailserver/nixos-mailserver/nixos-24.05"; mailserver.url = "gitlab:simple-nixos-mailserver/nixos-mailserver/nixos-24.05";
blender-bin.url = "https://flakehub.com/f/edolstra/blender-bin/1.0.8.tar.gz"; blender-bin.url = "https://flakehub.com/f/edolstra/blender-bin/1.0.9.tar.gz";
minecraft.url = "github:Infinidoge/nix-minecraft"; minecraft.url = "github:Infinidoge/nix-minecraft";
hardware.url = "github:nixos/nixos-hardware/master"; hardware.url = "github:nixos/nixos-hardware/master";
@ -16,7 +16,6 @@
inputs.nixpkgs.follows = "nixpkgs"; inputs.nixpkgs.follows = "nixpkgs";
}; };
# Home manager
home-manager = { home-manager = {
url = "github:nix-community/home-manager/release-24.05"; url = "github:nix-community/home-manager/release-24.05";
inputs.nixpkgs.follows = "nixpkgs"; inputs.nixpkgs.follows = "nixpkgs";
@ -34,7 +33,8 @@
lanzaboote, lanzaboote,
home-manager, home-manager,
... ...
}@inputs: let }@inputs:
let
mkNixos = modules: nixpkgs.lib.nixosSystem { mkNixos = modules: nixpkgs.lib.nixosSystem {
inherit modules; inherit modules;
specialArgs = { inherit (self) inputs outputs; }; specialArgs = { inherit (self) inputs outputs; };
@ -59,11 +59,11 @@
lanzaboote.nixosModules.lanzaboote lanzaboote.nixosModules.lanzaboote
]; ];
cyberspark = mkNixos [ cyberspark = mkNixos [
./system/hosts/JimServer/configuration.nix ./hosts/cyberspark/system
mailserver.nixosModule mailserver.nixosModule
]; ];
shuttleworth = mkNixos [ shuttleworth = mkNixos [
./system/hosts/JimPine/configuration.nix ./hosts/shuttleworth/system
hardware.nixosModules.pine64-pinebook-pro hardware.nixosModules.pine64-pinebook-pro
]; ];
}; };
@ -76,17 +76,17 @@
] nixpkgs.legacyPackages.x86_64-linux; ] nixpkgs.legacyPackages.x86_64-linux;
"jimbo@cyberspark" = mkHome [ "jimbo@cyberspark" = mkHome [
./home/hosts/JimServer/home.nix ./hosts/cyberspark/home
] nixpkgs.legacyPackages.x86_64-linux; ] nixpkgs.legacyPackages.x86_64-linux;
"jimbo@shuttleworth" = mkHome [ "jimbo@shuttleworth" = mkHome [
./home/hosts/JimPine/home.nix ./hosts/shuttleworth/home
nur.nixosModules.nur nur.nixosModules.nur
] nixpkgs.legacyPackages.aarch64-linux; ] nixpkgs.legacyPackages.aarch64-linux;
# Profile for ssh envrionments on different non-root systems # Profile for ssh envrionments on different non-root systems
"jimbo@terminal" = mkHome [ "jimbo@terminal" = mkHome [
./home/hosts/JimTerminal/home.nix ./hosts/terminal/home
] nixpkgs.legacyPackages.x86_64-linux; ] nixpkgs.legacyPackages.x86_64-linux;
}; };
}; };

View file

@ -3,7 +3,7 @@
nixpkgs.overlays = [ nixpkgs.overlays = [
inputs.blender-bin.overlays.default inputs.blender-bin.overlays.default
(final: _prev: import ./packages { pkgs = final; }) (final: _prev: import ./packages { pkgs = final; })
#(import ./mpv) (import ./mpv)
#(import ./unstable { inherit inputs; }) (import ./unstable { inherit inputs; })
]; ];
} }