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.

Sign up for GitHub

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

Jump to bottom

Remove ´profiles/suites.nix` and fix hardware module in hosts documentation #291

Merged
merged 2 commits into from
May 18, 2021
Merged

Remove ´profiles/suites.nix` and fix hardware module in hosts documentation #291

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
2 commits
Select commit Hold shift + click to select a range
629a509
hosts doc: fix hardware module in example
ymarkus May 18, 2021
564888d
remove profiles/suites.nix
ymarkus May 18, 2021
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
2 changes: 1 addition & 1 deletion doc/concepts/hosts.md
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -38,7 +38,7 @@ flake.nix:
{
librem = {
channelName = "latest";
modules = [ hardware.purism-librem-13v3 ];
modules = [ nixos-hardware.nixosModules.purism-librem-13v3 ];
Copy link
Member

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

Based on your other comment from the thread, could you also apply this patch:

diff --git a/doc/concepts/hosts.md b/doc/concepts/hosts.md
index 1fa9028..d9902eb 100644
--- a/doc/concepts/hosts.md
+++ b/doc/concepts/hosts.md
@@ -33,15 +33,15 @@ that you intend to use on your machine.
 flake.nix:
 ```nix
 {
-  nixos.hosts = mkMerge [
-    (devos.lib.importHosts ./hosts)
-    {
+  nixos = {
+    imports = [ (devos.lib.importHosts ./hosts) ];
+    hosts = {
       librem = {
         channelName = "latest";
         modules = [ hardware.purism-librem-13v3 ];
       };
-    }
-  ];
+    };
+  };
 }

Copy link
Member

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

Just to update the doc to match flake.nix

};
}
];
Expand Down
10 changes: 0 additions & 10 deletions profiles/suites.nix
View file
Open in desktop

This file was deleted.