sorceress
/
nix-infra
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

WIP

This commit is contained in:
Agatha Lovelace 2024-09-05 18:32:01 +02:00
parent 1457e0e883
commit 3c29f101ab
Signed by: sorceress
GPG Key ID: 01D0B3AB10CED4F8
4 changed files with 19 additions and 6 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

3
common/default.nix
View File

@ -3,9 +3,6 @@
## Optimizations ## Optimizations
# Clean /tmp
boot.tmp.cleanOnBoot = true;
# Link identical files # Link identical files
nix.settings.auto-optimise-store = true; nix.settings.auto-optimise-store = true;

4
common/linux-specific.nix Normal file
View File

@ -0,0 +1,4 @@
{
# Clean /tmp
boot.tmp.cleanOnBoot = true;
}

17
flake.nix
View File

@ -2,6 +2,7 @@
inputs = { inputs = {
nixpkgs.url = "nixpkgs/nixos-24.05"; nixpkgs.url = "nixpkgs/nixos-24.05";
nixpkgs-unstable.url = "nixpkgs/nixpkgs-unstable"; nixpkgs-unstable.url = "nixpkgs/nixpkgs-unstable";
nixpkgs-darwin.url = "github:NixOS/nixpkgs/nixpkgs-24.05-darwin";
vampysite.url = "git+https://git.lain.faith/sorceress/vampysite"; vampysite.url = "git+https://git.lain.faith/sorceress/vampysite";
@ -10,6 +11,11 @@
inputs.nixpkgs.follows = "nixpkgs"; inputs.nixpkgs.follows = "nixpkgs";
}; };
nix-darwin = {
url = "github:LnL7/nix-darwin";
inputs.nixpkgs.follows = "nixpkgs-darwin";
};
mms = { mms = {
url = "github:mkaito/nixos-modded-minecraft-servers"; url = "github:mkaito/nixos-modded-minecraft-servers";
inputs.nixpkgs.follows = "nixpkgs"; inputs.nixpkgs.follows = "nixpkgs";
@ -51,13 +57,14 @@
inputs.nixpkgs.follows = "nixpkgs-unstable"; inputs.nixpkgs.follows = "nixpkgs-unstable";
}; };
}; };
outputs = { nixpkgs, nixpkgs-unstable, home-manager, mms, helix, url-eater outputs = { nixpkgs, nixpkgs-unstable, home-manager, nix-darwin, mms, helix
, colorpickle, matrix-ril100, frq-friend, colmena, vampysite, ccase, ... , url-eater, colorpickle, matrix-ril100, frq-friend, colmena, vampysite
}: { , ccase, ... }: {
colmena = let colmena = let
mkDesktop = hostname: { mkDesktop = hostname: {
imports = [ imports = [
./common ./common
./common/linux-specific.nix
./hosts/${hostname}/configuration.nix ./hosts/${hostname}/configuration.nix
./common/options.nix ./common/options.nix
(import "${home-manager}/nixos") (import "${home-manager}/nixos")
@ -120,6 +127,7 @@
bloodletting = { bloodletting = {
imports = [ imports = [
./common ./common
./common/linux-specific.nix
./hosts/bloodletting/configuration.nix ./hosts/bloodletting/configuration.nix
(import "${home-manager}/nixos") (import "${home-manager}/nixos")
mms.module mms.module
@ -176,6 +184,9 @@
ritual = mkDesktop "ritual"; ritual = mkDesktop "ritual";
tears = mkDesktop "tears"; tears = mkDesktop "tears";
}; };
darwinConfigurations."Agathas-Mac-mini" = nix-darwin.lib.darwinSystem {
modules = [ ./common ./hosts/Agathas-Mac-mini/configuration.nix ];
};
devShells."x86_64-linux".default = devShells."x86_64-linux".default =
let pkgs = import nixpkgs { system = "x86_64-linux"; }; let pkgs = import nixpkgs { system = "x86_64-linux"; };
in pkgs.mkShell { in pkgs.mkShell {

1
hosts/Agathas-Mac-mini/configuration.nix Normal file
View File

@ -0,0 +1 @@
{ nixpkgs.hostPlatform = "aarch64-darwin"; }