mirror of
https://github.com/srid/nixos-config.git
synced 2025-12-26 15:04:59 +08:00
Use nixos-unified
This commit is contained in:
parent
d4f5109a88
commit
2de06ee965
4 changed files with 23 additions and 24 deletions
|
|
@ -2,7 +2,7 @@
|
|||
[](https://nixos.zulipchat.com/#narrow/stream/413948-nixos)
|
||||
[](https://srid.ca/coc "This project follows the 'Harmlessness Code of Conduct'")
|
||||
|
||||
This repository contains the Nix / NixOS configuration for all of my systems. See [nixos-flake](https://community.flake.parts/nixos-flake) if you wish to create your own configuration from scratch.
|
||||
This repository contains the Nix / NixOS configuration for all of my systems. See [nixos-unified](https://nixos-unified.org) if you wish to create your own configuration from scratch.
|
||||
|
||||
## Setup
|
||||
|
||||
|
|
@ -54,7 +54,7 @@ Start from `flake.nix` (see [Flakes](https://nixos.wiki/wiki/Flakes)). [`flake-p
|
|||
| `./mdules/{nixos,darwin,home,flake-parts}/foo.nix` | `{nixos,darwin,home,flake}Modules.foo` |
|
||||
| `./overlays/foo.nix` | `overlays.foo` |
|
||||
| `./packages` | N/A (Nix packages) |
|
||||
| `./secrets` | N/A (agenix data) |
|
||||
| `./secrets` | N/A (agenix data) |
|
||||
|
||||
## Tips
|
||||
|
||||
|
|
|
|||
33
flake.lock
generated
33
flake.lock
generated
|
|
@ -689,22 +689,6 @@
|
|||
"type": "github"
|
||||
}
|
||||
},
|
||||
"nixos-flake": {
|
||||
"locked": {
|
||||
"lastModified": 1727741402,
|
||||
"narHash": "sha256-dUtUaG8norNNdqX9UM/31/fbpkiyBf4iKLr02agjEcI=",
|
||||
"owner": "srid",
|
||||
"repo": "nixos-flake",
|
||||
"rev": "82752b478b4ae17248983a4cbc6a7dbd0acb71a1",
|
||||
"type": "github"
|
||||
},
|
||||
"original": {
|
||||
"owner": "srid",
|
||||
"ref": "autoWire",
|
||||
"repo": "nixos-flake",
|
||||
"type": "github"
|
||||
}
|
||||
},
|
||||
"nixos-hardware": {
|
||||
"locked": {
|
||||
"lastModified": 1678397099,
|
||||
|
|
@ -720,6 +704,21 @@
|
|||
"type": "github"
|
||||
}
|
||||
},
|
||||
"nixos-unified": {
|
||||
"locked": {
|
||||
"lastModified": 1727917530,
|
||||
"narHash": "sha256-yXjRRdwmeUeuUwANwY2630Utr3crjq43KNpXZpl5Xo8=",
|
||||
"owner": "srid",
|
||||
"repo": "nixos-unified",
|
||||
"rev": "469a19843f13ed5196ef73154c4c96a1e48cf626",
|
||||
"type": "github"
|
||||
},
|
||||
"original": {
|
||||
"owner": "srid",
|
||||
"repo": "nixos-unified",
|
||||
"type": "github"
|
||||
}
|
||||
},
|
||||
"nixos-vscode-server": {
|
||||
"inputs": {
|
||||
"flake-utils": "flake-utils_2",
|
||||
|
|
@ -1048,8 +1047,8 @@
|
|||
"home-manager": "home-manager",
|
||||
"nix-darwin": "nix-darwin",
|
||||
"nix-index-database": "nix-index-database",
|
||||
"nixos-flake": "nixos-flake",
|
||||
"nixos-hardware": "nixos-hardware",
|
||||
"nixos-unified": "nixos-unified",
|
||||
"nixos-vscode-server": "nixos-vscode-server",
|
||||
"nixpkgs": "nixpkgs_4",
|
||||
"nixvim": "nixvim",
|
||||
|
|
|
|||
|
|
@ -10,7 +10,7 @@
|
|||
home-manager.url = "github:nix-community/home-manager";
|
||||
home-manager.inputs.nixpkgs.follows = "nixpkgs";
|
||||
nixos-hardware.url = "github:NixOS/nixos-hardware";
|
||||
nixos-flake.url = "github:srid/nixos-flake/autoWire"; # https://github.com/srid/nixos-flake/pull/74
|
||||
nixos-unified.url = "github:srid/nixos-unified";
|
||||
disko.url = "github:nix-community/disko";
|
||||
disko.inputs.nixpkgs.follows = "nixpkgs";
|
||||
ragenix.url = "github:yaxitech/ragenix";
|
||||
|
|
|
|||
|
|
@ -1,20 +1,20 @@
|
|||
{ inputs, ... }:
|
||||
{
|
||||
imports = [
|
||||
inputs.nixos-flake.flakeModules.default
|
||||
inputs.nixos-flake.flakeModules.autoWire
|
||||
inputs.nixos-unified.flakeModules.default
|
||||
inputs.nixos-unified.flakeModules.autoWire
|
||||
];
|
||||
perSystem = { self', ... }: {
|
||||
packages.default = self'.packages.activate;
|
||||
|
||||
# Flake inputs we want to update periodically
|
||||
# Run: `nix run .#update`.
|
||||
nixos-flake = {
|
||||
nixos-unified = {
|
||||
primary-inputs = [
|
||||
"nixpkgs"
|
||||
"home-manager"
|
||||
"nix-darwin"
|
||||
"nixos-flake"
|
||||
"nixos-unified"
|
||||
"nix-index-database"
|
||||
"nixvim"
|
||||
"omnix"
|
||||
|
|
|
|||
Loading…
Add table
Add a link
Reference in a new issue