okay let's see if darwin-configurations works
This commit is contained in:
parent
c7b1179fb7
commit
f4dce4a0b4
1
.gitignore
vendored
1
.gitignore
vendored
|
@ -1 +1,2 @@
|
||||||
result
|
result
|
||||||
|
result-*
|
||||||
|
|
15
darwin/maud/default.nix
Normal file
15
darwin/maud/default.nix
Normal file
|
@ -0,0 +1,15 @@
|
||||||
|
{ pkgs, ... }:
|
||||||
|
{
|
||||||
|
environment.systemPackages = with pkgs; [ ripgrep ];
|
||||||
|
|
||||||
|
services.nix-daemon.enable = true;
|
||||||
|
programs = {
|
||||||
|
fish.enable = true;
|
||||||
|
zsh.enable = true;
|
||||||
|
};
|
||||||
|
|
||||||
|
nix.settings.experimental-features = "nix-command flakes";
|
||||||
|
|
||||||
|
system.stateVersion = 4;
|
||||||
|
nixpkgs.hostPlatform = "x86_64-darwin";
|
||||||
|
}
|
41
flake.lock
41
flake.lock
|
@ -56,6 +56,26 @@
|
||||||
"type": "github"
|
"type": "github"
|
||||||
}
|
}
|
||||||
},
|
},
|
||||||
|
"darwin": {
|
||||||
|
"inputs": {
|
||||||
|
"nixpkgs": [
|
||||||
|
"nixpkgs"
|
||||||
|
]
|
||||||
|
},
|
||||||
|
"locked": {
|
||||||
|
"lastModified": 1711591334,
|
||||||
|
"narHash": "sha256-9d5ilxxq4CXw44eFw8VFrRneAKex7D8xjn95mwZjgf4=",
|
||||||
|
"owner": "lnl7",
|
||||||
|
"repo": "nix-darwin",
|
||||||
|
"rev": "f0dd0838c3558b59dc3b726d8ab89f5b5e35c297",
|
||||||
|
"type": "github"
|
||||||
|
},
|
||||||
|
"original": {
|
||||||
|
"owner": "lnl7",
|
||||||
|
"repo": "nix-darwin",
|
||||||
|
"type": "github"
|
||||||
|
}
|
||||||
|
},
|
||||||
"devshell": {
|
"devshell": {
|
||||||
"inputs": {
|
"inputs": {
|
||||||
"flake-utils": "flake-utils",
|
"flake-utils": "flake-utils",
|
||||||
|
@ -375,11 +395,11 @@
|
||||||
"lix": {
|
"lix": {
|
||||||
"flake": false,
|
"flake": false,
|
||||||
"locked": {
|
"locked": {
|
||||||
"lastModified": 1711639271,
|
"lastModified": 1711732153,
|
||||||
"narHash": "sha256-SIdsZPOTKIkcTCm5e5bdIffC9UJygwQBEa4C55XUxJM=",
|
"narHash": "sha256-edBKGW9NIEGwjLQjWxdig9eVms7NG/oBilI+7JixrpU=",
|
||||||
"ref": "refs/heads/main",
|
"ref": "refs/heads/main",
|
||||||
"rev": "47b0967cd1a28b780558e9db403c8e28bae11a13",
|
"rev": "3754a2202b61aa59712baa3177a9bc18c2bb9e04",
|
||||||
"revCount": 15250,
|
"revCount": 15267,
|
||||||
"type": "git",
|
"type": "git",
|
||||||
"url": "ssh://git@lix.systems/lix-project/lix"
|
"url": "ssh://git@lix.systems/lix-project/lix"
|
||||||
},
|
},
|
||||||
|
@ -403,11 +423,11 @@
|
||||||
]
|
]
|
||||||
},
|
},
|
||||||
"locked": {
|
"locked": {
|
||||||
"lastModified": 1711647160,
|
"lastModified": 1711696613,
|
||||||
"narHash": "sha256-I9WCwuRUU+LRBtcwLqCmfI2v1vbtXnfb6hxwT5mbEGc=",
|
"narHash": "sha256-s7E5WBtEs91AkyzLpTCgFD3B5oAlfvCcqIhfAwUipVM=",
|
||||||
"ref": "refs/heads/main",
|
"ref": "refs/heads/main",
|
||||||
"rev": "280c404856a313c83d4e8cc6d2d17d93e9b5363b",
|
"rev": "9c691a41855d11d63ca9c1be12d8440577cb8782",
|
||||||
"revCount": 32,
|
"revCount": 34,
|
||||||
"type": "git",
|
"type": "git",
|
||||||
"url": "ssh://git@lix.systems/lix-project/nixos-module"
|
"url": "ssh://git@lix.systems/lix-project/nixos-module"
|
||||||
},
|
},
|
||||||
|
@ -491,7 +511,9 @@
|
||||||
"home-manager": [
|
"home-manager": [
|
||||||
"home-manager"
|
"home-manager"
|
||||||
],
|
],
|
||||||
"nix-darwin": [],
|
"nix-darwin": [
|
||||||
|
"darwin"
|
||||||
|
],
|
||||||
"nixpkgs": [
|
"nixpkgs": [
|
||||||
"nixpkgs"
|
"nixpkgs"
|
||||||
],
|
],
|
||||||
|
@ -589,6 +611,7 @@
|
||||||
"root": {
|
"root": {
|
||||||
"inputs": {
|
"inputs": {
|
||||||
"artemist": "artemist",
|
"artemist": "artemist",
|
||||||
|
"darwin": "darwin",
|
||||||
"fonts": "fonts",
|
"fonts": "fonts",
|
||||||
"home-manager": "home-manager",
|
"home-manager": "home-manager",
|
||||||
"jovian": "jovian",
|
"jovian": "jovian",
|
||||||
|
|
32
flake.nix
32
flake.nix
|
@ -8,6 +8,10 @@
|
||||||
inputs.nixpkgs.follows = "nixpkgs";
|
inputs.nixpkgs.follows = "nixpkgs";
|
||||||
inputs.utils.follows = "utils";
|
inputs.utils.follows = "utils";
|
||||||
};
|
};
|
||||||
|
darwin = {
|
||||||
|
url = "github:lnl7/nix-darwin";
|
||||||
|
inputs.nixpkgs.follows = "nixpkgs";
|
||||||
|
};
|
||||||
fonts = {
|
fonts = {
|
||||||
url = "git+https://git.mildlyfunctional.gay/artemist/fonts.git";
|
url = "git+https://git.mildlyfunctional.gay/artemist/fonts.git";
|
||||||
inputs.artemist.follows = "artemist";
|
inputs.artemist.follows = "artemist";
|
||||||
|
@ -42,7 +46,7 @@
|
||||||
url = "github:nix-community/nixvim";
|
url = "github:nix-community/nixvim";
|
||||||
inputs.nixpkgs.follows = "nixpkgs";
|
inputs.nixpkgs.follows = "nixpkgs";
|
||||||
inputs.home-manager.follows = "home-manager";
|
inputs.home-manager.follows = "home-manager";
|
||||||
inputs.nix-darwin.follows = "";
|
inputs.nix-darwin.follows = "darwin";
|
||||||
};
|
};
|
||||||
nix-index-database = {
|
nix-index-database = {
|
||||||
url = "github:nix-community/nix-index-database";
|
url = "github:nix-community/nix-index-database";
|
||||||
|
@ -59,16 +63,16 @@
|
||||||
outputs =
|
outputs =
|
||||||
{
|
{
|
||||||
self,
|
self,
|
||||||
nixpkgs,
|
darwin,
|
||||||
home-manager,
|
home-manager,
|
||||||
utils,
|
nixpkgs,
|
||||||
nixvim,
|
nixvim,
|
||||||
|
utils,
|
||||||
...
|
...
|
||||||
}@inputs:
|
}@inputs:
|
||||||
let
|
let
|
||||||
baseDir = ./system;
|
|
||||||
lib = nixpkgs.lib;
|
lib = nixpkgs.lib;
|
||||||
makeSystem =
|
makeNixosSystem =
|
||||||
module:
|
module:
|
||||||
lib.nixosSystem (rec {
|
lib.nixosSystem (rec {
|
||||||
specialArgs = {
|
specialArgs = {
|
||||||
|
@ -79,11 +83,23 @@
|
||||||
{ home-manager.extraSpecialArgs = specialArgs; }
|
{ home-manager.extraSpecialArgs = specialArgs; }
|
||||||
] ++ [ module ];
|
] ++ [ module ];
|
||||||
});
|
});
|
||||||
|
makeDarwinSystem =
|
||||||
|
module:
|
||||||
|
darwin.lib.darwinSystem rec {
|
||||||
|
specialArgs = {
|
||||||
|
inherit inputs;
|
||||||
|
};
|
||||||
|
modules = [
|
||||||
|
home-manager.darwinModules.home-manager
|
||||||
|
{ home-manager.extraSpecialArgs = specialArgs; }
|
||||||
|
] ++ [ module ];
|
||||||
|
};
|
||||||
|
makeConfigurations =
|
||||||
|
baseDir: make: lib.mapAttrs (name: _: make (baseDir + "/${name}")) (builtins.readDir baseDir);
|
||||||
in
|
in
|
||||||
{
|
{
|
||||||
nixosConfigurations = lib.mapAttrs (name: _: makeSystem (baseDir + "/${name}")) (
|
nixosConfigurations = makeConfigurations ./system makeNixosSystem;
|
||||||
builtins.readDir baseDir
|
darwinConfigurations = makeConfigurations ./darwin makeDarwinSystem;
|
||||||
);
|
|
||||||
}
|
}
|
||||||
// utils.lib.eachDefaultSystem (
|
// utils.lib.eachDefaultSystem (
|
||||||
system:
|
system:
|
||||||
|
|
Loading…
Reference in a new issue