Skip to content

Commit

Permalink
Use nixos-unified
Browse files Browse the repository at this point in the history
  • Loading branch information
srid committed Oct 4, 2024
1 parent d4f5109 commit 2de06ee
Show file tree
Hide file tree
Showing 4 changed files with 23 additions and 24 deletions.
4 changes: 2 additions & 2 deletions README.md
Original file line number Diff line number Diff line change
Expand Up @@ -2,7 +2,7 @@
[![project chat](https://img.shields.io/badge/zulip-join_chat-brightgreen.svg)](https://nixos.zulipchat.com/#narrow/stream/413948-nixos)
[![Harmeless Code of Conduct](https://img.shields.io/badge/harmless-8A2BE2)](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

Expand Down Expand Up @@ -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

Expand Down
33 changes: 16 additions & 17 deletions flake.lock

Some generated files are not rendered by default. Learn more about how customized files appear on GitHub.

2 changes: 1 addition & 1 deletion flake.nix
Original file line number Diff line number Diff line change
Expand Up @@ -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";
Expand Down
8 changes: 4 additions & 4 deletions modules/flake-parts/nixos-flake.nix
Original file line number Diff line number Diff line change
@@ -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"
Expand Down

0 comments on commit 2de06ee

Please sign in to comment.