Compare commits
No commits in common. "d80210517149e9e5d4f60dfa1026f6c9f63d04eb" and "227dddf2f77b231ed3861087632ad0d552043b67" have entirely different histories.
d802105171
...
227dddf2f7
5 changed files with 15 additions and 90 deletions
32
builders.nix
32
builders.nix
|
@ -1,4 +1,4 @@
|
|||
{ nixpkgs, nix-darwin, self, ... }@inputs:
|
||||
{ nixpkgs, self, ... }@inputs:
|
||||
|
||||
let
|
||||
makePkgs = system: (import nixpkgs {
|
||||
|
@ -73,34 +73,4 @@ rec {
|
|||
builtins.listToAttrs
|
||||
(map toPartialHomeManagerConfig)
|
||||
systems;
|
||||
|
||||
|
||||
toPartialDarwinConfig =
|
||||
{ hostname, system ? "aarch64-darwin", }:
|
||||
nameValuePair
|
||||
hostname
|
||||
(nix-darwin.lib.darwinSystem rec {
|
||||
pkgs = makePkgs system;
|
||||
specialArgs = { inherit inputs self; };
|
||||
|
||||
modules = [
|
||||
inputs.home-manager.darwinModules.home-manager
|
||||
./hosts/${hostname}/configuration.nix
|
||||
|
||||
|
||||
{
|
||||
home-manager.extraSpecialArgs = {
|
||||
inherit inputs self pkgs;
|
||||
lib = pkgs.lib.extend (_: _: inputs.home-manager.lib);
|
||||
};
|
||||
}
|
||||
];
|
||||
});
|
||||
|
||||
compileDarwinSystems =
|
||||
systems:
|
||||
lib.right
|
||||
builtins.listToAttrs
|
||||
(map toPartialDarwinConfig)
|
||||
systems;
|
||||
}
|
||||
|
|
21
flake.lock
21
flake.lock
|
@ -482,26 +482,6 @@
|
|||
"type": "github"
|
||||
}
|
||||
},
|
||||
"nix-darwin": {
|
||||
"inputs": {
|
||||
"nixpkgs": [
|
||||
"nixpkgs"
|
||||
]
|
||||
},
|
||||
"locked": {
|
||||
"lastModified": 1730765507,
|
||||
"narHash": "sha256-u2KaQonCkHQbQvYrfZz7OJuyOrFelbfh5gS9L43c1WY=",
|
||||
"owner": "LnL7",
|
||||
"repo": "nix-darwin",
|
||||
"rev": "5d891207854e792a33b5984e9bee56c8b57ef010",
|
||||
"type": "github"
|
||||
},
|
||||
"original": {
|
||||
"owner": "LnL7",
|
||||
"repo": "nix-darwin",
|
||||
"type": "github"
|
||||
}
|
||||
},
|
||||
"nix-github-actions": {
|
||||
"inputs": {
|
||||
"nixpkgs": [
|
||||
|
@ -626,7 +606,6 @@
|
|||
"lix-module": "lix-module",
|
||||
"neovim-overlay": "neovim-overlay",
|
||||
"niri": "niri",
|
||||
"nix-darwin": "nix-darwin",
|
||||
"nixpkgs": "nixpkgs_2",
|
||||
"repo-clone": "repo-clone",
|
||||
"sops-nix": "sops-nix",
|
||||
|
|
11
flake.nix
11
flake.nix
|
@ -11,8 +11,6 @@
|
|||
dunst-theme = { url = "github:d2718nis/rose-pine-dunst"; flake = false; };
|
||||
niri = { url = "github:sodiboo/niri-flake"; inputs.nixpkgs.follows = "nixpkgs"; };
|
||||
|
||||
nix-darwin = { url = "github:LnL7/nix-darwin"; inputs.nixpkgs.follows = "nixpkgs"; };
|
||||
|
||||
repo-clone.url = "git+https://git.zynh.me/Zynh0722/repo-clone";
|
||||
fish_theme = { url = "git+https://git.zynh.me/Zynh0722/omf-theme"; flake = false; };
|
||||
backgrounds = { url = "git+https://git.zynh.me/Zynh0722/backgrounds"; inputs.nixpkgs.follows = "nixpkgs"; };
|
||||
|
@ -32,10 +30,11 @@
|
|||
homeConfigurations = builders.compileHomes [
|
||||
{ user = "zynh"; hostname = "msiserver"; }
|
||||
{ user = "val"; hostname = "caveserver"; }
|
||||
];
|
||||
|
||||
darwinConfigurations = builders.compileDarwinSystems [
|
||||
{ hostname = "little-lightning"; }
|
||||
{
|
||||
user = "zynh";
|
||||
hostname = "little-lightning";
|
||||
system = "aarch64-darwin";
|
||||
}
|
||||
];
|
||||
|
||||
overlays.default = import ./pkgs;
|
||||
|
|
|
@ -1,31 +0,0 @@
|
|||
{ pkgs, self, ... }: {
|
||||
# List packages installed in system profile. To search by name, run:
|
||||
# $ nix-env -qaP | grep wget
|
||||
environment.systemPackages = [ ];
|
||||
|
||||
nix.settings = {
|
||||
experimental-features = [ "nix-command" "flakes" ];
|
||||
auto-optimise-store = true;
|
||||
};
|
||||
|
||||
# Auto upgrade nix package and the daemon service.
|
||||
services.nix-daemon.enable = true;
|
||||
|
||||
# Enable alternative shell support in nix-darwin.
|
||||
# programs.fish.enable = true;
|
||||
|
||||
users.users.zynh = {
|
||||
name = "zynh";
|
||||
home = "/Users/zynh";
|
||||
};
|
||||
|
||||
home-manager = {
|
||||
users = { "zynh" = import ./home.nix; };
|
||||
backupFileExtension = "backup";
|
||||
};
|
||||
|
||||
# Set Git commit hash for darwin-version.
|
||||
system.configurationRevision = self.rev or self.dirtyRev or null;
|
||||
# $ darwin-rebuild changelog
|
||||
system.stateVersion = 5;
|
||||
}
|
|
@ -5,6 +5,14 @@
|
|||
../../home/modules
|
||||
];
|
||||
|
||||
nix = {
|
||||
package = pkgs.nix;
|
||||
settings = {
|
||||
auto-optimise-store = true;
|
||||
experimental-features = [ "nix-command" "flakes" ];
|
||||
};
|
||||
};
|
||||
|
||||
snowhawk = {
|
||||
alacritty.enable = true;
|
||||
macos.enable = true;
|
||||
|
@ -30,7 +38,7 @@
|
|||
home.packages = with pkgs; [
|
||||
nix-output-monitor
|
||||
(writeShellScriptBin "rebuild" ''
|
||||
darwin-rebuild switch --flake ~/nixos#little-lightning |& nom
|
||||
home-manager switch --flake ~/nixos#zynh@little-lightning |& nom
|
||||
'')
|
||||
|
||||
wakeonlan
|
||||
|
|
Loading…
Reference in a new issue