Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Remove 'both' template #69

Merged
merged 1 commit into from
Sep 26, 2024
Merged
Show file tree
Hide file tree
Changes from all commits
Commits
File filter

Filter by extension

Filter by extension

Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
3 changes: 0 additions & 3 deletions README.md
Original file line number Diff line number Diff line change
Expand Up @@ -4,11 +4,8 @@

A [flake-parts](https://flake.parts/) module to unify [NixOS](https://nixos.org/manual/nixos/stable/) + [nix-darwin](https://github.com/LnL7/nix-darwin) + [home-manager] configuration in a single flake, while providing a consistent interface (and enabling common modules) for both Linux and macOS. For motivation, see https://community.flake.parts/nixos-flake


[home-manager]: https://github.com/nix-community/home-manager



## Getting Started

https://community.flake.parts/nixos-flake/start
Expand Down
4 changes: 2 additions & 2 deletions doc/examples.md
Original file line number Diff line number Diff line change
Expand Up @@ -2,8 +2,8 @@
order: 10
---

# Examples
# Examples

- https://github.com/srid/nixos-config (using `#both` [[templates|template]])
- https://github.com/srid/nixos-config (using both `#macos` & `#linux` [[templates|template]])
- https://github.com/juspay/nix-dev-home (using `#home` [[templates|template]])
- https://github.com/hkmangla/nixos (using `#linux` [[templates|template]])
4 changes: 1 addition & 3 deletions doc/start.md
Original file line number Diff line number Diff line change
Expand Up @@ -23,6 +23,4 @@ For a more automated way to install NixOS, see [nixos-anywhere](https://github.c
## macOS

1. [Install Nix](https://nixos.asia/en/install)
1. Use the [[templates|macOS only template]][^both]

[^both]: Alternatively, use the "Both platforms" [[templates|template]] if you are sharing your configuration with the other platform as well.
1. Use the [[templates|macOS only template]]
9 changes: 0 additions & 9 deletions doc/templates.md
Original file line number Diff line number Diff line change
Expand Up @@ -8,15 +8,6 @@ You can easily initialize one of our templates using [Omnix](https://omnix.page/

[^no-omnix]: If you do not use Omnix, you must use `nix flake init`, and manually change the template values such as username and hostname.

{#both}
### Both platforms

NixOS, nix-darwin, [home-manager] configuration combined, with common modules.

```bash
nix --accept-flake-config run github:juspay/omnix -- \
init -o ~/nix-config github:srid/nixos-flake#both
```

{#nixos}
### NixOS only
Expand Down
130 changes: 0 additions & 130 deletions examples/both/flake.nix

This file was deleted.

14 changes: 0 additions & 14 deletions flake.nix
Original file line number Diff line number Diff line change
Expand Up @@ -7,11 +7,6 @@
tmplPath = path: builtins.path { inherit path; filter = path: _: baseNameOf path != "test.sh"; };
in
rec {
default = both;
both = {
description = "nixos-flake template for both Linux and macOS in same flake";
path = tmplPath ./examples/both;
};
linux = {
description = "nixos-flake template for NixOS configuration.nix";
path = tmplPath ./examples/linux;
Expand Down Expand Up @@ -39,11 +34,6 @@
];
};

both = {
template = templates.both;
inherit (home) params;
};

macos = {
template = templates.macos;
params = home.params ++ [
Expand Down Expand Up @@ -77,10 +67,6 @@
dir = "examples/linux";
systems = [ "x86_64-linux" "aarch64-linux" ];
};
both = {
inherit overrideInputs;
dir = "examples/both";
};
};
};
};
Expand Down