From baeb144e571c3235739a4882081e0e38e2405c6a Mon Sep 17 00:00:00 2001
From: Pacman99 <pachum99@gmail.com>
Date: Thu, 13 May 2021 11:04:15 -0700
Subject: [PATCH 01/15] profiles/core: enable ssh by default for keys

---
 profiles/core/default.nix | 6 ++++++
 1 file changed, 6 insertions(+)

diff --git a/profiles/core/default.nix b/profiles/core/default.nix
index 41b5136e..9e98ba6b 100644
--- a/profiles/core/default.nix
+++ b/profiles/core/default.nix
@@ -143,6 +143,12 @@ in
     '';
   };
 
+  # For rage encryption, all hosts need a ssh key pair
+  services.openssh = {
+    enable = true;
+    openFirewall = lib.mkDefault false;
+  };
+
   services.earlyoom.enable = true;
 
 }

From 64b7892f6e362b21182e665a49d3634a26370341 Mon Sep 17 00:00:00 2001
From: Pacman99 <pachum99@gmail.com>
Date: Thu, 13 May 2021 10:35:23 -0700
Subject: [PATCH 02/15] Add agenix integration to secrets and flake

---
 flake.lock             | 21 +++++++++++++++++++++
 flake.nix              | 17 ++++++++++++++++-
 overlays/overrides.nix |  1 +
 secrets/.gitattributes |  1 +
 secrets/secrets.nix    |  9 +++++++++
 5 files changed, 48 insertions(+), 1 deletion(-)
 create mode 100644 secrets/secrets.nix

diff --git a/flake.lock b/flake.lock
index 2195b9a2..e9976a6f 100644
--- a/flake.lock
+++ b/flake.lock
@@ -1,5 +1,25 @@
 {
   "nodes": {
+    "agenix": {
+      "inputs": {
+        "nixpkgs": [
+          "latest"
+        ]
+      },
+      "locked": {
+        "lastModified": 1620877075,
+        "narHash": "sha256-XvgTqtmQZHegu9UMDSR50gK5cHEM2gbnRH0qecmdN54=",
+        "owner": "ryantm",
+        "repo": "agenix",
+        "rev": "e543aa7d68f222e1e771165da9e9a64b5bf7b3e3",
+        "type": "github"
+      },
+      "original": {
+        "owner": "ryantm",
+        "repo": "agenix",
+        "type": "github"
+      }
+    },
     "ci-agent": {
       "inputs": {
         "flake-compat": "flake-compat",
@@ -352,6 +372,7 @@
     },
     "root": {
       "inputs": {
+        "agenix": "agenix",
         "ci-agent": "ci-agent",
         "darwin": "darwin",
         "digga": "digga",
diff --git a/flake.nix b/flake.nix
index 6b6860f5..f641f592 100644
--- a/flake.nix
+++ b/flake.nix
@@ -17,13 +17,26 @@
       home.inputs.nixpkgs.follows = "nixos";
       naersk.url = "github:nmattia/naersk";
       naersk.inputs.nixpkgs.follows = "latest";
+      agenix.url = "github:ryantm/agenix";
+      agenix.inputs.nixpkgs.follows = "latest";
       nixos-hardware.url = "github:nixos/nixos-hardware";
 
       pkgs.url = "path:./pkgs";
       pkgs.inputs.nixpkgs.follows = "nixos";
     };
 
-  outputs = inputs@{ self, pkgs, digga, nixos, ci-agent, home, nixos-hardware, nur, ... }:
+  outputs =
+    { self
+    , pkgs
+    , digga
+    , nixos
+    , ci-agent
+    , home
+    , nixos-hardware
+    , nur
+    , agenix
+    , ...
+    } @ inputs:
     digga.lib.mkFlake {
       inherit self inputs;
 
@@ -36,6 +49,7 @@
             ./pkgs/default.nix
             pkgs.overlay # for `srcs`
             nur.overlay
+            agenix.overlay
           ];
         };
         latest = { };
@@ -60,6 +74,7 @@
             { _module.args.ourLib = self.lib; }
             ci-agent.nixosModules.agent-profile
             home.nixosModules.home-manager
+            agenix.nixosModules.age
             ./modules/customBuilds.nix
           ];
         };
diff --git a/overlays/overrides.nix b/overlays/overrides.nix
index 59516b3d..629f44b1 100644
--- a/overlays/overrides.nix
+++ b/overlays/overrides.nix
@@ -8,6 +8,7 @@ channels: final: prev: {
     discord
     element-desktop
     manix
+    rage
     nixpkgs-fmt
     qutebrowser
     signal-desktop
diff --git a/secrets/.gitattributes b/secrets/.gitattributes
index ff69eb2a..901863e3 100644
--- a/secrets/.gitattributes
+++ b/secrets/.gitattributes
@@ -1,3 +1,4 @@
 * filter=git-crypt diff=git-crypt
 .gitattributes !filter !diff
+secrets.nix !filter !diff
 README.md !filter !diff
diff --git a/secrets/secrets.nix b/secrets/secrets.nix
new file mode 100644
index 00000000..bac30e03
--- /dev/null
+++ b/secrets/secrets.nix
@@ -0,0 +1,9 @@
+let
+  # set ssh public keys here for your system and user
+  system = "";
+  user = "";
+  allKeys = [ system user ];
+in
+{
+  "secret.age".publicKeys = allKeys;
+}

From c57925d35aed6f89727e938069914b767b9af92d Mon Sep 17 00:00:00 2001
From: Pacman99 <pachum99@gmail.com>
Date: Thu, 13 May 2021 10:35:41 -0700
Subject: [PATCH 03/15] document agenix integration

Co-authored-by: David Arnold <dar@xoe.solutions>
---
 doc/secrets.md | 110 +++++++++++++++++++++++++++++++++++++++++++++----
 1 file changed, 101 insertions(+), 9 deletions(-)

diff --git a/doc/secrets.md b/doc/secrets.md
index de77c5b8..6afe2f6a 100644
--- a/doc/secrets.md
+++ b/doc/secrets.md
@@ -1,18 +1,110 @@
 # Secrets
-Secrets are managed using [git-crypt][git-crypt] so you can keep your flake in
-a public repository like GitHub without exposing your password or other
-sensitive data.
+Secrets are managed using [git-crypt][git-crypt] and [agenix][agenix]
+so you can keep your flake in a public repository like GitHub without
+exposing your password or other sensitive data.
 
 By default, everything in the secrets folder is automatically encrypted. Just
 be sure to run `git-crypt init` before putting anything in here.
 
+## Agenix
+Currently, there is [no mechanism][secrets-issue] in nix itself to deploy secrets
+within the nix store because it is world-readable.
+
+Most NixOS modules have the ability to set options to files in the system, outside
+the nix store, that contain sensitive information. You can use [agenix][agenix]
+to easily setup those secret files declaratively.
+
+[agenix][agenix] encrypts secrets and stores them as .age files in your repository.
+Age files are encrypted with multiple ssh public keys, so any host or user with a
+matching ssh private key can read the data. The [age module][age module] will add those
+encrypted files to the nix store and decrypt them on activation to `/run/secrets`.
+
+### Setup
+All hosts must have openssh enabled, this is done by default in the core profile.
+
+You need to populate your `secrets/secrets.nix` with the proper ssh public keys.
+Be extra careful to make sure you only add public keys, you should never share a
+private key!!
+
+secrets/secrets.nix:
+```nix
+let
+  system = "<system ssh key>";
+  user = "<user ssh key>";
+  allKeys = [ system user ];
+in
+```
+
+On most systems, you can get your systems ssh public key from `/etc/ssh/ssh_host_ed25519_key.pub`. If
+this file doesn't exist you likely need to enable openssh and rebuild your system.
+
+Your users ssh public key is probably stored in `~/.ssh/id_ed25519.pub` or
+`~/.ssh/id_rsa.pub`. If you haven't generated a ssh key yet, be sure do so:
+```sh
+ssh-keygen -t ed25519
+```
+
 > ##### _Note:_
-> Currently, there is [no mechanism][secrets-issue] in nix to deploy secrets
-> within the nix/store so, if they end up in the nix/store after deployment, they
-> will be world readable on that machine.
->
-> The author of devos intends to implement a workaround for this situation in
-> the near future, but for the time being, simple be aware of this.
+> The underlying tool used by agenix, rage, doesn't work well with password protected
+> ssh keys. So if you have lots of secrets you might have to type in your password many
+> times.
+
+
+### Secrets
+You will need the `agenix` command to create secrets. DevOS conveniently provides that
+in the devShell, so just run `nix develop` whenever you want to edit secrets. Make sure
+to always run `agenix` while in the `secrets/` folder, so it can pick up your `secrets.nix`.
+
+To create secrets, simply add lines to your `secrets/secrets.nix`:
+```
+let
+  ...
+  allKeys = [ system user ];
+in
+{
+  "secret.age".publicKeys = allKeys;
+}
+```
+That would tell agenix to create a `secret.age` file that is encrypted with the `system`
+and `user` ssh public key.
+
+Then go into the `secrets` folder and run:
+```sh
+agenix -e secret.age
+```
+This will create the `secret.age`, if it doesn't already exist, and allow you to edit it.
+
+If you ever change the `publicKeys` entry of any secret make sure to rekey the secrets:
+```sh
+agenix --rekey
+```
+
+### Usage
+Once you have your secret file encrypted and ready to use, you can utilize the [age module][age module]
+to ensure that your secrets end up in `/run/secrets`.
+
+In any profile that uses a NixOS module that requires a secret you can enable a particular secret like so:
+
+```nix
+{ self, ... }:
+{
+  age.secrets.mysecret.file = "${self}/secrets/mysecret.age";
+}
+```
+
+
+Then you can just pass the path `/run/secrets/mysecret` to the module.
+
+You can make use of the many options provided by the age module to customize where and how
+secrets get decrypted. You can learn about them by looking at the
+[age module][age module].
+
+
+> ##### _Note:_
+> You can take a look at the [agenix repository][agenix] for more information
+> about the tool.
 
 [git-crypt]: https://github.com/AGWA/git-crypt
+[agenix]: https://github.com/ryantm/agenix
+[age module]: https://github.com/ryantm/agenix/blob/master/modules/age.nix
 [secrets-issue]: https://github.com/NixOS/nix/issues/8

From d9082066f7bc5bd6a58ab55418db3d6abf4da3d6 Mon Sep 17 00:00:00 2001
From: Pacman99 <pachum99@myrdd.info>
Date: Thu, 27 May 2021 10:41:55 -0700
Subject: [PATCH 04/15] flake: update to new digga api

---
 flake.lock               | 19 ++++++++++---------
 flake.nix                | 20 +++++++++++++-------
 modules/customBuilds.nix |  1 -
 3 files changed, 23 insertions(+), 17 deletions(-)

diff --git a/flake.lock b/flake.lock
index 783e74f4..7df2f1a6 100644
--- a/flake.lock
+++ b/flake.lock
@@ -91,11 +91,11 @@
     },
     "devshell": {
       "locked": {
-        "lastModified": 1618523768,
-        "narHash": "sha256-Gev9da35pHUey3kGz/zrJFc/9ICs++vPCho7qB1mqd8=",
+        "lastModified": 1622013274,
+        "narHash": "sha256-mK/Lv0lCbl07dI5s7tR/7nb79HunKnJik3KyR6yeI2k=",
         "owner": "numtide",
         "repo": "devshell",
-        "rev": "709fe4d04a9101c9d224ad83f73416dce71baf21",
+        "rev": "e7faf69e6bf8546517cc936c7f6d31c7eb3abcb2",
         "type": "github"
       },
       "original": {
@@ -113,15 +113,16 @@
         "utils": "utils_2"
       },
       "locked": {
-        "lastModified": 1621354376,
-        "narHash": "sha256-b597Jj8B1Nq4NX/Gl/+bYGKqJxpSfUtr1Nmp9m1DND8=",
+        "lastModified": 1622572028,
+        "narHash": "sha256-NqF1Nuc5JwH4U/O1Srz8HeqwKcEEDcj4gPJX5FrFWAQ=",
         "owner": "divnix",
         "repo": "digga",
-        "rev": "5ef9b8cabbc10c9b4fe5534107224c7241c63b3d",
+        "rev": "cd94f8c1d13a24d66c7c77b60c7a4d7a42217708",
         "type": "github"
       },
       "original": {
         "owner": "divnix",
+        "ref": "develop",
         "repo": "digga",
         "type": "github"
       }
@@ -405,11 +406,11 @@
         "flake-utils": "flake-utils"
       },
       "locked": {
-        "lastModified": 1620801141,
-        "narHash": "sha256-XPJ+/nP/s218E11R+4LJyvkrQXvdT3D6TzNjfWVYZnI=",
+        "lastModified": 1622553785,
+        "narHash": "sha256-zccUcgFmAI2YGq5AmNOKjYGHLVKnOvzD5vfHymu5nYU=",
         "owner": "gytis-ivaskevicius",
         "repo": "flake-utils-plus",
-        "rev": "1a742047f3f7c97b22768ba7738ac5a01052099e",
+        "rev": "10096872a0691c3a213073aa8bfe739d37d84a49",
         "type": "github"
       },
       "original": {
diff --git a/flake.nix b/flake.nix
index b95b0eeb..2f64a1fd 100644
--- a/flake.nix
+++ b/flake.nix
@@ -5,7 +5,7 @@
     {
       nixos.url = "nixpkgs/nixos-unstable";
       latest.url = "nixpkgs";
-      digga.url = "github:divnix/digga";
+      digga.url = "github:divnix/digga/develop";
 
       ci-agent = {
         url = "github:hercules-ci/hercules-ci-agent";
@@ -84,18 +84,24 @@
           /* set host specific properties here */
           NixOS = { };
         };
-        profiles = [ ./profiles ./users ];
-        suites = { profiles, users, ... }: with profiles; rec {
-          base = [ core users.nixos users.root ];
+        importables = rec {
+          profiles = digga.lib.importers.rakeLeaves ./profiles // {
+            users = digga.lib.importers.rakeLeaves ./users;
+          };
+          suites = with profiles; rec {
+            base = [ core users.nixos users.root ];
+          };
         };
       };
 
       home = {
         modules = ./users/modules/module-list.nix;
         externalModules = [ ];
-        profiles = [ ./users/profiles ];
-        suites = { profiles, ... }: with profiles; rec {
-          base = [ direnv git ];
+        importables = rec {
+          profiles = digga.lib.importers.rakeLeaves ./users/profiles;
+          suites = with profiles; rec {
+            base = [ direnv git ];
+          };
         };
       };
 
diff --git a/modules/customBuilds.nix b/modules/customBuilds.nix
index 875d23a0..e343c80e 100644
--- a/modules/customBuilds.nix
+++ b/modules/customBuilds.nix
@@ -10,7 +10,6 @@ in
   system.build = {
     iso = (mkBuild (diggaLib.modules.isoConfig {
       inherit self;
-      inherit (self) inputs;
       fullHostConfig = config;
     })).config.system.build.isoImage;
 

From 8e250d5084eb62c16a930f4b02a7e42b6952b852 Mon Sep 17 00:00:00 2001
From: Pacman99 <pachum99@myrdd.info>
Date: Sat, 29 May 2021 12:53:33 -0700
Subject: [PATCH 05/15] flake: add agenix to devShell

---
 flake.nix | 4 ++++
 1 file changed, 4 insertions(+)

diff --git a/flake.nix b/flake.nix
index 2f64a1fd..ee288909 100644
--- a/flake.nix
+++ b/flake.nix
@@ -105,6 +105,10 @@
         };
       };
 
+      devshell.externalModules = { pkgs, ... }: {
+        packages = [ pkgs.agenix ];
+      };
+
       homeConfigurations = digga.lib.mkHomeConfigurations self.nixosConfigurations;
 
       deploy.nodes = digga.lib.mkDeployNodes self.nixosConfigurations { };

From 454b27937f2d3c07457dfdaf37474f4e037c1cb6 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Jaros=C5=82aw=20Wygoda?= <jaroslaw@wygoda.me>
Date: Thu, 3 Jun 2021 08:48:25 +0200
Subject: [PATCH 06/15] customBuilds: add digitalOcean

---
 doc/SUMMARY.md           |  1 +
 doc/flk/doi.md           | 10 ++++++++++
 modules/customBuilds.nix |  4 ++++
 3 files changed, 15 insertions(+)
 create mode 100644 doc/flk/doi.md

diff --git a/doc/SUMMARY.md b/doc/SUMMARY.md
index f35bf379..e2b6e9a4 100644
--- a/doc/SUMMARY.md
+++ b/doc/SUMMARY.md
@@ -24,6 +24,7 @@
   - [up](./flk/up.md)
   - [update](./flk/update.md)
   - [get](./flk/get.md)
+  - [doi](./flk/doi.md)
   - [iso](./flk/iso.md)
   - [install](./flk/install.md)
   - [home](./flk/home.md)
diff --git a/doc/flk/doi.md b/doc/flk/doi.md
new file mode 100644
index 00000000..fc522cdd
--- /dev/null
+++ b/doc/flk/doi.md
@@ -0,0 +1,10 @@
+# DigitalOcean
+
+Now you can [create a droplet](https://cloud.digitalocean.com/droplets/new) using your custom image.
+
+Making a DigitalOcean compatible image for `hosts/NixOS.nix` is as simple as:
+```sh
+flk doi NixOS
+```
+
+This works for any file matching `hosts/*.nix` excluding `default.nix`.
diff --git a/modules/customBuilds.nix b/modules/customBuilds.nix
index e343c80e..7181f65e 100644
--- a/modules/customBuilds.nix
+++ b/modules/customBuilds.nix
@@ -25,5 +25,9 @@ in
         }
       ];
     })).config.home-manager.users;
+
+    digitalOcean = (mkBuild ({ modulesPath, ... }: {
+      imports = [ "${modulesPath}/virtualisation/digital-ocean-image.nix" ];
+    })).config.system.build.digitalOceanImage;
   };
 }

From 30892d83eb9461b1249a7b392eedb21cd2c38e3e Mon Sep 17 00:00:00 2001
From: Pacman99 <pachum99@myrdd.info>
Date: Thu, 3 Jun 2021 22:42:45 -0700
Subject: [PATCH 07/15] gitignore: add flk command results

---
 .gitignore | 5 +++++
 1 file changed, 5 insertions(+)

diff --git a/.gitignore b/.gitignore
index 72a01664..e2486b12 100644
--- a/.gitignore
+++ b/.gitignore
@@ -3,3 +3,8 @@ up
 hosts/up-*
 .direnv
 doc/index.html
+
+# Result of flk commands
+vm
+iso
+doi

From fe3a624930d35a7278001a5d05629959c5a42d4d Mon Sep 17 00:00:00 2001
From: Pacman99 <pachum99@myrdd.info>
Date: Thu, 3 Jun 2021 12:25:06 -0700
Subject: [PATCH 08/15] docs: general updates

---
 doc/CONTRIBUTING.md      |   5 +-
 doc/concepts/hosts.md    |  11 ++-
 doc/concepts/profiles.md |  43 +++++----
 doc/concepts/suites.md   |  14 +--
 doc/concepts/users.md    |  23 +++--
 doc/lib.md               |  87 -----------------
 doc/mkFlakeOptions.md    | 200 ++++++++++++++++++++++++++++++++-------
 doc/outputs/pkgs.md      |   3 +-
 doc/tests.md             |  11 +--
 9 files changed, 227 insertions(+), 170 deletions(-)
 delete mode 100644 doc/lib.md

diff --git a/doc/CONTRIBUTING.md b/doc/CONTRIBUTING.md
index bb480aee..f7210697 100644
--- a/doc/CONTRIBUTING.md
+++ b/doc/CONTRIBUTING.md
@@ -1,5 +1,8 @@
 # Pull Requests
-If making a change to core, or adding a feature, please be sure to update the
+All development is done in the `develop` branch. Only minor bug-fixes and release
+PRs should target `master`.
+
+If making a change to the template, or adding a feature, please be sure to update the
 relevant docs. Each directory contains its own README.md, which will
 automatically be pulled into the [mdbook](https://devos.divnix.com). The book is
 rendered on every change, so the docs should always be up to date.
diff --git a/doc/concepts/hosts.md b/doc/concepts/hosts.md
index 37130f39..1c3c3fa0 100644
--- a/doc/concepts/hosts.md
+++ b/doc/concepts/hosts.md
@@ -6,13 +6,14 @@ of these hosts, devos automatically imports every _.nix_ file inside this
 directory to the mentioned attribute set, applying the projects defaults to
 each. The only hard requirement is that the file contain a valid NixOS module.
 
-As an example, a file `hosts/system.nix` will be available via the flake
-output `nixosConfigurations.system`. You can have as many hosts as you want
-and all of them will be automatically imported based on their name.
+As an example, a file `hosts/system.nix` or `hosts/system/default.nix` will
+be available via the flake output `nixosConfigurations.system`. You can have
+as many hosts as you want and all of them will be automatically imported based
+on their name.
 
 For each host, the configuration automatically sets the `networking.hostName`
-attribute to the name of the file minus the _.nix_ extension. This is for
-convenience, since `nixos-rebuild` automatically searches for a configuration
+attribute to the folder name or name of the file minus the _.nix_ extension. This
+is for convenience, since `nixos-rebuild` automatically searches for a configuration
 matching the current systems hostname if one is not specified explicitly.
 
 You can set channels, systems, and add extra modules to each host by editing the
diff --git a/doc/concepts/profiles.md b/doc/concepts/profiles.md
index 1c8f416e..b4ff0a19 100644
--- a/doc/concepts/profiles.md
+++ b/doc/concepts/profiles.md
@@ -8,34 +8,29 @@ separation of concerns.
 If you need guidance, a community [branch](https://github.com/divnix/devos/tree/community/profiles)
 is maintained to help get up to speed on their usage.
 
-## Constraints
-For the sake of consistency, a profile should always be defined in a
-___default.nix___ containing a [nixos module config][config].
-A profile's directory is used for quick modularization of
-[interelated bits](./profiles.md#subprofiles).
+## Creation
+Profiles are created with the `rakeLeaves` function which recursively collects
+`.nix` files from within a folder. The recursion stops at folders with a `default.nix` 
+in them. You end up with an attribute set with leaves(paths to profiles) or
+nodes(attrsets leading to more nodes or leaves).
+
+A profile is used for quick modularization of [interelated bits](./profiles.md#subprofiles).
 
 > ##### _Notes:_
 > * For _declaring_ module options, there's the [modules](../outputs/modules.md) directory.
 > * This directory takes inspiration from
 >   [upstream](https://github.com/NixOS/nixpkgs/tree/master/nixos/modules/profiles)
 >   .
-> * Sticking to a simple [spec][spec] has refreshing advantages.
->   [hercules-ci](../integrations/hercules.md) expects all profiles to be
->   defined in a ___default.nix___, allowing them to be built automatically when
->   added. Congruently, [suites](suites.md) expect ___default.nix___ to avoid
->   having to manage their paths manually.
 
-## Subprofiles
-Profiles can also define subprofiles. They follow the same constraints outlined
-above. A good top level profile should be a high level concern, such as your
-personal development environment while the subprofiles should be more focused
-program configurations such as your text editor, and shell configs. This way,
-you can either pull in the whole development profile, or pick and choose
-individual programs.
+### Nested profiles
+Profiles can be nested in attribute sets due to the recursive nature of `rakeLeaves`.
+This can be useful to have a set of profiles created for a specific purpose. It is
+sometimes useful to have a `common` profile that has high level concerns related
+to all its sister profiles.
 
 ### Example
 
-profiles/develop/default.nix:
+profiles/develop/common.nix:
 ```nix
 {
   imports = [ ./zsh ];
@@ -43,7 +38,7 @@ profiles/develop/default.nix:
 }
 ```
 
-profiles/develop/zsh/default.nix:
+profiles/develop/zsh.nix:
 ```nix
 {  ... }:
 {
@@ -52,6 +47,16 @@ profiles/develop/zsh/default.nix:
 }
 ```
 
+The examples above will end up with a profiles set like this:
+```nix
+{
+  develop = {
+    common = ./profiles/develop/common.nix;
+    zsh = ./profiles/develop/zsh.nix;
+  };
+}
+```
+
 ## Conclusion
 Profiles are the most important concept in DevOS. They allow us to keep our
 Nix expressions self contained and modular. This way we can maximize reuse
diff --git a/doc/concepts/suites.md b/doc/concepts/suites.md
index 5c0d5909..0182d9be 100644
--- a/doc/concepts/suites.md
+++ b/doc/concepts/suites.md
@@ -1,19 +1,13 @@
 # Suites
 Suites provide a mechanism for users to easily combine and name collecitons of
-profiles. For good examples, check out the suites defined in the community
-[branch](https://github.com/divnix/devos/blob/community/suites/default.nix).
+profiles. For good examples, check out the suites defined in the community branch.
 
-In the future, we will use suites as a mechanism for deploying various machine
-types which don't depend on hardware, such as vm's and containers.
+`suites` are a special case of an `importable` which get passed as a special
+argument (one that can be use in an `imports` line) to your hosts.
 
-They are defined with the `suites` argument in either `home` or `nixos` namespace.
+They are defined with the `suites` argument in either the `home` or `nixos` namespace.
 Suites should be passed as a function that take profiles as an argument.
 
-The profiles are passed based on the folder names and list passed to the relevant
-`profiles` argument. In the template's flake.nix `profiles` is set as
-`[ ./profiles ./users ]` and that corresponds to the `{ profiles, users }` argument
-pattern.
-
 ## Definition
 ```nix
 rec {
diff --git a/doc/concepts/users.md b/doc/concepts/users.md
index 235884a2..20f371de 100644
--- a/doc/concepts/users.md
+++ b/doc/concepts/users.md
@@ -23,11 +23,23 @@ your users. For a fully fleshed out example, check out the developers personal
 ```
 
 ## Home Manager
-Home Manager support follows the same principles as regular nixos configurations.
+Home Manager support follows the same principles as regular nixos configurations,
+it even gets its own namespace in your `flake.nix` as `home`.
+
 All modules defined in [user modules][modules-list] will be imported to
-Home Manager. All profiles are availabe in [suites][suites] as userProfiles.
-The `userSuites` output will be available in your Home Manager Configuration as
-the special argument, `suites`.
+Home Manager.
+User profiles can be collected in a similar fashion as system ones into a `suites`
+argument that gets passed to your home-manager users.
+
+### Example
+```nix
+{
+  home-manager.users.nixos = { suites, ... }: {
+    imports = suites.base;
+  };
+}
+```
+
 
 ## External Usage
 You can easily use the defined home-manager configurations outside of NixOS
@@ -56,5 +68,4 @@ nix build "github:divnix/devos#homeConfigurations.nixos@NixOS.home.activationPac
 ```
 
 [home-manager]: https://nix-community.github.io/home-manager
-[suites]: https://github.com/divnix/devos/tree/core/suites/default.nix
-[modules-list]: https://github.com/divnix/devos/tree/core/modules/module-list.nix
+[modules-list]: https://github.com/divnix/devos/tree/core/users/modules/module-list.nix
diff --git a/doc/lib.md b/doc/lib.md
deleted file mode 100644
index ee402ebc..00000000
--- a/doc/lib.md
+++ /dev/null
@@ -1,87 +0,0 @@
-# Lib
-The lib directory mirrors the upstream concepts of [`nixpkgs:./lib`][nixpkgs-lib], 
-[`nixpkgs:./nixos/lib`][nixpkgs-nixos-lib] and [`nixpkgs:./pkgs/pkgs-lib`][nixpkgs-pkgs-lib],
-but also occasionally [`nixpkgs:./pkgs/build-support`][nixpkgs-pkgs-build-support].
-
-All functions defined in lib can be accessed in modules and packages as `ourlib`.
-
-For example:
-
-- you want to add a library function that depends on some packages
-and use it throughout your devos environment: place it into `./lib`
-as if you would place it into [`nixpkgs:./pkgs/pkgs-lib`][nixpkgs-pkgs-lib].
-
-- you want to add library functions that don't depend on `pkgs`: place
-them into `./lib` as if you would place them into [`nixpkgs:./lib`][nixpkgs-lib].
-
-- need to try out a newish custom build support: place it here before
-upstreaming into [`nixpkgs:./pkgs/build-support`][nixpkgs-pkgs-build-support].
-
-- you want to reutilize certain module configuration functions or helpers:
-place them into `./lib` as if you would place them into [`nixpkgs:./nixos/lib`][nixpkgs-nixos-lib].
-
-Once your library grows, we recoomend you start organizing them into subfolders
-analogous `nixpkgs`:
-
-| `nixpkgs`              | `devos`            |
-| ---------------------- | ------------------ |
-| `./lib`                | `./lib`            |
-| `./pkgs/pkgs-lib`      | `./lib/pkgs-lib`   |
-| `./nixos/lib`          | `./lib/nixos-lib`  |
-| `./pkgs/build-support` | `./lib/pkgs-build` |
-
-
-## Example
-lib/nixos-lib/mkCustomI3BindSym/default.nix:
-```nix
-{ pkgs, writers, ... }:
-{ name, cmd, workspace, baseKey }:
-let
-  isWorkspaceEmpty = writers.writePython3 "is-workspace-empty" {
-    libraries = [ pkgs.python3Packages.i3ipc ];
-  } (builtins.readFile ./is-workspace-empty.py);
-
-  ws = builtins.toString workspace;
-in
-''
-
-  # ${name}
-  #bindsym ${baseKey}+${ws} workspace ${ws}; exec ${cmd}
-  bindsym ${baseKey}+${ws} workspace ${ws}; exec bash -c "${isWorkspaceEmpty} && ${cmd}"
-''
-```
-
-lib/nixos-lib/mkCustomI3BindSym/is-workspace-empty.py:
-```python
-# returns 0/1 if current workspace is empty/non-empty
-
-import i3ipc
-
-i3 = i3ipc.Connection()
-tree = i3.get_tree()
-
-
-def current_workspace():
-    return tree.find_focused().workspace()
-
-
-if current_workspace().leaves():
-    print("Error current workspace is not empty")
-    exit(1)
-exit(0)
-```
-
-lib/default.nix:
-```nix
-{ nixos, pkgs, ... }:
-# ...
-{
-  # ...
-  mkCustomI3BindSym = pkgs.callPackage ./nixos-lib/mkCustomI3BindSym { };
-}
-```
-
-[nixpkgs-lib]: https://github.com/NixOS/nixpkgs/tree/master/lib
-[nixpkgs-pkgs-lib]: https://github.com/NixOS/nixpkgs/tree/master/pkgs/pkgs-lib
-[nixpkgs-pkgs-build-support]: https://github.com/NixOS/nixpkgs/tree/master/pkgs/build-support
-[nixpkgs-nixos-lib]: https://github.com/NixOS/nixpkgs/tree/master/nixos/lib
diff --git a/doc/mkFlakeOptions.md b/doc/mkFlakeOptions.md
index 90719ba1..dbc7abc1 100644
--- a/doc/mkFlakeOptions.md
+++ b/doc/mkFlakeOptions.md
@@ -40,7 +40,7 @@ nix flake
 
 *_Default_*
 ```
-"inputs.<name>"
+"self.inputs.<name>"
 ```
 
 
@@ -81,6 +81,56 @@ attribute set or path convertible to it
 
 
 
+## devshell
+Modules to include in your devos shell. the `modules` argument
+will be exported under the `devshellModules` output
+
+
+*_Type_*:
+submodule
+
+
+*_Default_*
+```
+{}
+```
+
+
+
+
+## devshell.externalModules
+modules to include that won't be exported
+meant importing modules from external flakes
+
+
+*_Type_*:
+list of valid module or path convertible to its or anything convertible to it
+
+
+*_Default_*
+```
+[]
+```
+
+
+
+
+## devshell.modules
+modules to include in all hosts and export to devshellModules output
+
+
+*_Type_*:
+list of path to a modules or anything convertible to it or path convertible to it
+
+
+*_Default_*
+```
+[]
+```
+
+
+
+
 ## home
 hosts, modules, suites, and profiles for home-manager
 
@@ -103,7 +153,7 @@ meant importing modules from external flakes
 
 
 *_Type_*:
-list of valid module or path convertible to its
+list of valid module or path convertible to its or anything convertible to it
 
 
 *_Default_*
@@ -114,6 +164,34 @@ list of valid module or path convertible to its
 
 
 
+## home.importables
+Packages of paths to be passed to modules as `specialArgs`.
+
+
+*_Type_*:
+attribute set
+
+
+*_Default_*
+```
+{}
+```
+
+
+
+
+## home.importables.suites
+collections of profiles
+
+
+*_Type_*:
+attribute set of list of paths or anything convertible to its
+
+
+
+
+
+
 ## home.modules
 modules to include in all hosts and export to homeModules output
 
@@ -131,10 +209,17 @@ list of path to a modules or anything convertible to it or path convertible to i
 
 
 ## home.profiles
-profile folders that can be collected into suites
-the name of the argument passed to suites is based
-on the folder name.
-[ ./profiles ] => { profiles }:
+WARNING: The 'suites' and `profiles` options have been deprecated, you can now create
+both with the importables option. `rakeLeaves` can be used to create profiles and
+by passing a module or `rec` set to `importables`, suites can access profiles.
+Example:
+```
+importables = rec {
+  profiles = digga.lib.importers.rakeLeaves ./profiles;
+  suites = with profiles; { };
+}
+```
+See https://github.com/divnix/digga/pull/30 for more details
 
 
 *_Type_*:
@@ -150,31 +235,23 @@ list of paths
 
 
 ## home.suites
-Function that takes profiles and returns suites for this config system
-These can be accessed through the 'suites' special argument.
+WARNING: The 'suites' and `profiles` options have been deprecated, you can now create
+both with the importables option. `rakeLeaves` can be used to create profiles and
+by passing a module or `rec` set to `importables`, suites can access profiles.
+Example:
+```
+importables = rec {
+  profiles = digga.lib.importers.rakeLeaves ./profiles;
+  suites = with profiles; { };
+}
+```
+See https://github.com/divnix/digga/pull/30 for more details
 
 
 *_Type_*:
 function that evaluates to a(n) attrs or path convertible to it
 
 
-*_Default_*
-```
-"<function>"
-```
-
-
-
-
-## inputs
-inputs for this flake
-used to set channel defaults and create registry
-
-
-*_Type_*:
-attribute set of nix flakes
-
-
 
 
 
@@ -236,7 +313,7 @@ meant importing modules from external flakes
 
 
 *_Type_*:
-list of valid module or path convertible to its
+list of valid module or path convertible to its or anything convertible to it
 
 
 *_Default_*
@@ -343,11 +420,46 @@ null
 
 
 
+## nixos.importables
+Packages of paths to be passed to modules as `specialArgs`.
+
+
+*_Type_*:
+attribute set
+
+
+*_Default_*
+```
+{}
+```
+
+
+
+
+## nixos.importables.suites
+collections of profiles
+
+
+*_Type_*:
+attribute set of list of paths or anything convertible to its
+
+
+
+
+
+
 ## nixos.profiles
-profile folders that can be collected into suites
-the name of the argument passed to suites is based
-on the folder name.
-[ ./profiles ] => { profiles }:
+WARNING: The 'suites' and `profiles` options have been deprecated, you can now create
+both with the importables option. `rakeLeaves` can be used to create profiles and
+by passing a module or `rec` set to `importables`, suites can access profiles.
+Example:
+```
+importables = rec {
+  profiles = digga.lib.importers.rakeLeaves ./profiles;
+  suites = with profiles; { };
+}
+```
+See https://github.com/divnix/digga/pull/30 for more details
 
 
 *_Type_*:
@@ -363,17 +475,39 @@ list of paths
 
 
 ## nixos.suites
-Function that takes profiles and returns suites for this config system
-These can be accessed through the 'suites' special argument.
+WARNING: The 'suites' and `profiles` options have been deprecated, you can now create
+both with the importables option. `rakeLeaves` can be used to create profiles and
+by passing a module or `rec` set to `importables`, suites can access profiles.
+Example:
+```
+importables = rec {
+  profiles = digga.lib.importers.rakeLeaves ./profiles;
+  suites = with profiles; { };
+}
+```
+See https://github.com/divnix/digga/pull/30 for more details
 
 
 *_Type_*:
 function that evaluates to a(n) attrs or path convertible to it
 
 
+
+
+
+
+## outputsBuilder
+builder for flake system-spaced outputs
+The builder gets passed an attrset of all channels
+
+
+*_Type_*:
+function that evaluates to a(n) attrs
+
+
 *_Default_*
 ```
-"<function>"
+"channels: { }"
 ```
 
 
diff --git a/doc/outputs/pkgs.md b/doc/outputs/pkgs.md
index 99684b5d..58ce52bd 100644
--- a/doc/outputs/pkgs.md
+++ b/doc/outputs/pkgs.md
@@ -7,8 +7,7 @@ The only minor difference is that, instead of adding the `callPackage` call to
 `all-packages.nix`, you just add it the the _default.nix_ in this directory,
 which is defined as a simple overlay.
 
-This overlay is set as the default `overlay` output attribute for the flake.
-And all the packages are exported via `packages.<system>.<pkg-name>`, for all
+All the packages are exported via `packages.<system>.<pkg-name>`, for all
 the supported systems listed in the package's `meta.platforms` attribute.
 
 And, as usual, every package in the overlay is also available to any NixOS
diff --git a/doc/tests.md b/doc/tests.md
index f6fd7fe9..1d7b65e2 100644
--- a/doc/tests.md
+++ b/doc/tests.md
@@ -5,22 +5,19 @@ NixOS offers some incredibly powerful tools to write tests for your
 configuration, and, optionally, run them in
 [CI](./integrations/hercules.md).
 
-## Lib Tests
-You can easily write tests for your own library functions in the
-lib/___tests/lib.nix___ file and they will be run on every `nix flake check` or
-during a CI run.
-
 ## Unit Tests
-Unit tests are can be created from regular derivations, and they can do
+Unit tests can be created from regular derivations, and they can do
 almost anything you can imagine. By convention, it is best to test your
 packages during their [check phase][check]. All packages and their tests will
 be built during CI.
 
 ## Integration Tests
+All your profiles defined in suites will be tested in a NixOS VM.
+
 You can write integration tests for one or more NixOS VMs that can,
 optionally, be networked together, and yes, it's as awesome as it sounds!
 
-Be sure to use the `mkTest` function, in the [___tests/default.nix___][default]
+Be sure to use the `mkTest` function from digga, `digga.lib.pkgs-lib.mkTest`
 which wraps the official [testing-python][testing-python] function to ensure
 that the system is setup exactly as it is for a bare DevOS system. There are
 already great resources for learning how to use these tests effectively,

From c30e8c5ca2c1aa3772b0bb1ac70eabb491fbea9c Mon Sep 17 00:00:00 2001
From: almostnobody <1583339+almostnobody@users.noreply.github.com>
Date: Tue, 8 Jun 2021 22:10:17 +0300
Subject: [PATCH 09/15] override module doc: fix #310

---
 doc/concepts/overrides.md | 7 ++++---
 1 file changed, 4 insertions(+), 3 deletions(-)

diff --git a/doc/concepts/overrides.md b/doc/concepts/overrides.md
index 303108c0..801703bf 100644
--- a/doc/concepts/overrides.md
+++ b/doc/concepts/overrides.md
@@ -27,10 +27,11 @@ You can also pull modules from other channels. All modules have access to the
 `modulesPath` for each channel as `<channelName>ModulesPath`. And you can use
 `disabledModules` to remove modules from the current channel.
 
-Pulling the zsh module from the `latest` channel:
+To pull zsh module from the `latest` channel this code can be placed in any module, whether its your host file, a profile, or a module in ./modules etc:
 ```nix
-{ latestModulesPath }: {
-  modules = [ "${latestModulesPath}/programs/zsh/zsh.nix" ];
+{ latestModulesPath }:
+{
+  import = [ "${latestModulesPath}/programs/zsh/zsh.nix" ];
   disabledModules = [ "programs/zsh/zsh.nix" ];
 }
 ```

From d852305c4c05d7769a72ce7d6207a3d072c4d388 Mon Sep 17 00:00:00 2001
From: almostnobody <1583339+almostnobody@users.noreply.github.com>
Date: Tue, 8 Jun 2021 22:24:24 +0300
Subject: [PATCH 10/15] Update doc/concepts/overrides.md

Co-authored-by: Pacman99 <pachum99@myrdd.info>
---
 doc/concepts/overrides.md | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/doc/concepts/overrides.md b/doc/concepts/overrides.md
index 801703bf..610fde04 100644
--- a/doc/concepts/overrides.md
+++ b/doc/concepts/overrides.md
@@ -31,7 +31,7 @@ To pull zsh module from the `latest` channel this code can be placed in any modu
 ```nix
 { latestModulesPath }:
 {
-  import = [ "${latestModulesPath}/programs/zsh/zsh.nix" ];
+  imports = [ "${latestModulesPath}/programs/zsh/zsh.nix" ];
   disabledModules = [ "programs/zsh/zsh.nix" ];
 }
 ```

From 4d1b3a5e132b924ea6f945831ab0ee25407c996b Mon Sep 17 00:00:00 2001
From: Pacman99 <pachum99@myrdd.info>
Date: Tue, 8 Jun 2021 14:07:19 -0700
Subject: [PATCH 11/15] Merge pull request #311 from almostnobody/patch-1

override module doc: fix #310
---
 doc/concepts/overrides.md | 7 ++++---
 1 file changed, 4 insertions(+), 3 deletions(-)

diff --git a/doc/concepts/overrides.md b/doc/concepts/overrides.md
index 303108c0..610fde04 100644
--- a/doc/concepts/overrides.md
+++ b/doc/concepts/overrides.md
@@ -27,10 +27,11 @@ You can also pull modules from other channels. All modules have access to the
 `modulesPath` for each channel as `<channelName>ModulesPath`. And you can use
 `disabledModules` to remove modules from the current channel.
 
-Pulling the zsh module from the `latest` channel:
+To pull zsh module from the `latest` channel this code can be placed in any module, whether its your host file, a profile, or a module in ./modules etc:
 ```nix
-{ latestModulesPath }: {
-  modules = [ "${latestModulesPath}/programs/zsh/zsh.nix" ];
+{ latestModulesPath }:
+{
+  imports = [ "${latestModulesPath}/programs/zsh/zsh.nix" ];
   disabledModules = [ "programs/zsh/zsh.nix" ];
 }
 ```

From 5831adb06109adac4fd7d4f76564235917b876f9 Mon Sep 17 00:00:00 2001
From: Pacman99 <pachum99@myrdd.info>
Date: Tue, 8 Jun 2021 18:14:32 -0700
Subject: [PATCH 12/15] flake: switch to digga master To use the now released
 v0.2.0

---
 flake.lock | 14 +++++++-------
 flake.nix  |  2 +-
 2 files changed, 8 insertions(+), 8 deletions(-)

diff --git a/flake.lock b/flake.lock
index 7df2f1a6..e0411771 100644
--- a/flake.lock
+++ b/flake.lock
@@ -113,16 +113,16 @@
         "utils": "utils_2"
       },
       "locked": {
-        "lastModified": 1622572028,
-        "narHash": "sha256-NqF1Nuc5JwH4U/O1Srz8HeqwKcEEDcj4gPJX5FrFWAQ=",
+        "lastModified": 1623197477,
+        "narHash": "sha256-2Qk/uIHb1nXre2rRlGonAJmpuamBs7RRfgXhMmS5JkU=",
         "owner": "divnix",
         "repo": "digga",
-        "rev": "cd94f8c1d13a24d66c7c77b60c7a4d7a42217708",
+        "rev": "f69703abc33f221b676966a8435c4f09ef70ff49",
         "type": "github"
       },
       "original": {
         "owner": "divnix",
-        "ref": "develop",
+        "ref": "master",
         "repo": "digga",
         "type": "github"
       }
@@ -406,11 +406,11 @@
         "flake-utils": "flake-utils"
       },
       "locked": {
-        "lastModified": 1622553785,
-        "narHash": "sha256-zccUcgFmAI2YGq5AmNOKjYGHLVKnOvzD5vfHymu5nYU=",
+        "lastModified": 1622583383,
+        "narHash": "sha256-2DFx619SNfjzYwqx1ryae8zHnTh+N7VsZkbtAbrYIIA=",
         "owner": "gytis-ivaskevicius",
         "repo": "flake-utils-plus",
-        "rev": "10096872a0691c3a213073aa8bfe739d37d84a49",
+        "rev": "6b2ea4b02cad77fac581c6a9ec4f822ba87dce5c",
         "type": "github"
       },
       "original": {
diff --git a/flake.nix b/flake.nix
index ee288909..359aa31a 100644
--- a/flake.nix
+++ b/flake.nix
@@ -5,7 +5,7 @@
     {
       nixos.url = "nixpkgs/nixos-unstable";
       latest.url = "nixpkgs";
-      digga.url = "github:divnix/digga/develop";
+      digga.url = "github:divnix/digga/master";
 
       ci-agent = {
         url = "github:hercules-ci/hercules-ci-agent";

From a7c20465ecd79b13d4cfe151c3096b2c309f2bf6 Mon Sep 17 00:00:00 2001
From: Pacman99 <pachum99@myrdd.info>
Date: Tue, 8 Jun 2021 18:27:54 -0700
Subject: [PATCH 13/15] doc/suites: updating explanation of suites

---
 doc/concepts/suites.md | 9 ++++-----
 1 file changed, 4 insertions(+), 5 deletions(-)

diff --git a/doc/concepts/suites.md b/doc/concepts/suites.md
index 0182d9be..e120ad67 100644
--- a/doc/concepts/suites.md
+++ b/doc/concepts/suites.md
@@ -2,11 +2,10 @@
 Suites provide a mechanism for users to easily combine and name collecitons of
 profiles. For good examples, check out the suites defined in the community branch.
 
-`suites` are a special case of an `importable` which get passed as a special
-argument (one that can be use in an `imports` line) to your hosts.
-
-They are defined with the `suites` argument in either the `home` or `nixos` namespace.
-Suites should be passed as a function that take profiles as an argument.
+`suites` are defined in the `importables` argument in either the `home` or `nixos`
+namespace. They are a special case of an `importable` which get passed as a special
+argument (one that can be use in an `imports` line) to your hosts. All lists defined
+in `suites` are flattened and type-checked as paths.
 
 ## Definition
 ```nix

From be1b5cc2ffe04d1067c586044c69292abe7b2cf5 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Benjamin=20B=C3=A4dorf?= <hello@benjaminbaedorf.eu>
Date: Wed, 9 Jun 2021 18:23:37 +0200
Subject: [PATCH 14/15] Remove fonts, cleanup pub solar overlay

---
 overlays/fonts.nix                   |  1 -
 overlays/fonts/default.nix           |  4 ----
 overlays/fonts/futura.nix            | 19 -------------------
 overlays/pub-solar.nix               |  1 -
 overlays/pub-solar/default.nix       |  4 ++--
 overlays/pub-solar/image-gpu-rom.nix |  7 -------
 overlays/pub-solar/iommu-test.nix    |  9 ---------
 overlays/pub-solar/overlay.nix       |  5 -----
 8 files changed, 2 insertions(+), 48 deletions(-)
 delete mode 100644 overlays/fonts.nix
 delete mode 100644 overlays/fonts/default.nix
 delete mode 100644 overlays/fonts/futura.nix
 delete mode 100644 overlays/pub-solar.nix
 delete mode 100644 overlays/pub-solar/image-gpu-rom.nix
 delete mode 100644 overlays/pub-solar/iommu-test.nix
 delete mode 100644 overlays/pub-solar/overlay.nix

diff --git a/overlays/fonts.nix b/overlays/fonts.nix
deleted file mode 100644
index 4f837020..00000000
--- a/overlays/fonts.nix
+++ /dev/null
@@ -1 +0,0 @@
-import ./fonts
diff --git a/overlays/fonts/default.nix b/overlays/fonts/default.nix
deleted file mode 100644
index c5be3050..00000000
--- a/overlays/fonts/default.nix
+++ /dev/null
@@ -1,4 +0,0 @@
-final: prev:
-with final; {
-  futura-otf = import ./futura.nix;
-}
diff --git a/overlays/fonts/futura.nix b/overlays/fonts/futura.nix
deleted file mode 100644
index 3c2c3cc4..00000000
--- a/overlays/fonts/futura.nix
+++ /dev/null
@@ -1,19 +0,0 @@
-{ stdenv, fetchFromGitHub }:
-
-stdenv.mkDerivation rec {
-  pname = "futura";
-  version = "1.0.0";
-
-  src = ../secrets/fonts/Futura Std;
-
-  installPhase = ''
-    install -D -m 444 /* -t $out/share/fonts/otf
-  '';
-
-  meta = with stdenv.lib; {
-    description = "";
-    longDescription = ''
-    '';
-    homepage = "";
-  };
-}
diff --git a/overlays/pub-solar.nix b/overlays/pub-solar.nix
deleted file mode 100644
index e1215796..00000000
--- a/overlays/pub-solar.nix
+++ /dev/null
@@ -1 +0,0 @@
-import ./pub-solar
diff --git a/overlays/pub-solar/default.nix b/overlays/pub-solar/default.nix
index 88257773..935206d9 100644
--- a/overlays/pub-solar/default.nix
+++ b/overlays/pub-solar/default.nix
@@ -2,13 +2,13 @@ final: prev:
 with final; {
   import-gtk-settings = writeShellScriptBin "import-gtk-settings" (import ./import-gtk-settings.nix final);
   mailto-mutt = writeShellScriptBin "mailto-mutt" (import ./mailto-mutt.nix final);
-  mu = writeShellScriptBin "mu" (import ./mu.nix final);
   mopidy-jellyfin = import ./mopidy-jellyfin.nix final;
+  mu = writeShellScriptBin "mu" (import ./mu.nix final);
   psos = writeShellScriptBin "psos" (import ./psos.nix final);
   s = writeShellScriptBin "s" (import ./s.nix final);
-  swaylock-bg = writeScriptBin "swaylock-bg" (import ./swaylock-bg.nix final);
   sway-launcher = writeScriptBin "sway-launcher" (import ./sway-launcher.nix final);
   sway-service = writeShellScriptBin "sway-service" (import ./sway-service.nix final);
+  swaylock-bg = writeScriptBin "swaylock-bg" (import ./swaylock-bg.nix final);
   toggle-kbd-layout = writeShellScriptBin "toggle-kbd-layout" (import ./toggle-kbd-layout.nix final);
   uhk-agent = import ./uhk-agent.nix final;
   wcwd = writeShellScriptBin "wcwd" (import ./wcwd.nix final);
diff --git a/overlays/pub-solar/image-gpu-rom.nix b/overlays/pub-solar/image-gpu-rom.nix
deleted file mode 100644
index a472ee52..00000000
--- a/overlays/pub-solar/image-gpu-rom.nix
+++ /dev/null
@@ -1,7 +0,0 @@
-GPU_VGA_PORT="0000:01:00.0"
-
-echo 1 > "/sys/bus/pci/devices/$GPU_VGA_PORT/rom"
-cat "/sys/bus/pci/devices/$GPU_VGA_PORT/rom" > \
-"/usr/share/qemu/gpu-1060.rom"
-echo 0 > "/sys/bus/pci/devices/$GPU_VGA_PORT/rom"
-
diff --git a/overlays/pub-solar/iommu-test.nix b/overlays/pub-solar/iommu-test.nix
deleted file mode 100644
index e2439bfa..00000000
--- a/overlays/pub-solar/iommu-test.nix
+++ /dev/null
@@ -1,9 +0,0 @@
-shopt - s nullglob
-  for
-  g in /sys/kernel/iommu_groups/*; do
-echo "IOMMU Group ${g##*/}:"
-for d in $g/devices/*; do
-echo -e "\t$(lspci -nns ${d##*/})"
-done;
-done;
-
diff --git a/overlays/pub-solar/overlay.nix b/overlays/pub-solar/overlay.nix
deleted file mode 100644
index 5378b910..00000000
--- a/overlays/pub-solar/overlay.nix
+++ /dev/null
@@ -1,5 +0,0 @@
-# You can use this file as a nixpkgs overlay. This is useful in the
-# case where you don't want to add the whole NUR namespace to your
-# configuration.
-
-self: super: import ./default.nix { pkgs = super; }

From 54adc61a488ce9334161c931cb1f7736153773d5 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Benjamin=20B=C3=A4dorf?= <hello@benjaminbaedorf.eu>
Date: Wed, 9 Jun 2021 18:42:56 +0200
Subject: [PATCH 15/15] Move overlay to pkgs

---
 overlays/pub-solar/default.nix                   | 15 ---------------
 pkgs/default.nix                                 | 16 +++++++++++++++-
 .../pub-solar => pkgs}/import-gtk-settings.nix   |  0
 {overlays/pub-solar => pkgs}/mailto-mutt.nix     |  0
 {overlays/pub-solar => pkgs}/mopidy-jellyfin.nix |  0
 {overlays/pub-solar => pkgs}/mu.nix              |  0
 {overlays/pub-solar => pkgs}/psos.nix            |  0
 {overlays/pub-solar => pkgs}/s.nix               |  0
 {overlays/pub-solar => pkgs}/sway-launcher.nix   |  0
 {overlays/pub-solar => pkgs}/sway-service.nix    |  0
 {overlays/pub-solar => pkgs}/swaylock-bg.nix     |  0
 .../pub-solar => pkgs}/toggle-kbd-layout.nix     |  0
 {overlays/pub-solar => pkgs}/uhk-agent.nix       |  0
 {overlays/pub-solar => pkgs}/wcwd.nix            |  0
 profiles/core/default.nix                        | 16 ++++++----------
 15 files changed, 21 insertions(+), 26 deletions(-)
 delete mode 100644 overlays/pub-solar/default.nix
 rename {overlays/pub-solar => pkgs}/import-gtk-settings.nix (100%)
 rename {overlays/pub-solar => pkgs}/mailto-mutt.nix (100%)
 rename {overlays/pub-solar => pkgs}/mopidy-jellyfin.nix (100%)
 rename {overlays/pub-solar => pkgs}/mu.nix (100%)
 rename {overlays/pub-solar => pkgs}/psos.nix (100%)
 rename {overlays/pub-solar => pkgs}/s.nix (100%)
 rename {overlays/pub-solar => pkgs}/sway-launcher.nix (100%)
 rename {overlays/pub-solar => pkgs}/sway-service.nix (100%)
 rename {overlays/pub-solar => pkgs}/swaylock-bg.nix (100%)
 rename {overlays/pub-solar => pkgs}/toggle-kbd-layout.nix (100%)
 rename {overlays/pub-solar => pkgs}/uhk-agent.nix (100%)
 rename {overlays/pub-solar => pkgs}/wcwd.nix (100%)

diff --git a/overlays/pub-solar/default.nix b/overlays/pub-solar/default.nix
deleted file mode 100644
index 935206d9..00000000
--- a/overlays/pub-solar/default.nix
+++ /dev/null
@@ -1,15 +0,0 @@
-final: prev:
-with final; {
-  import-gtk-settings = writeShellScriptBin "import-gtk-settings" (import ./import-gtk-settings.nix final);
-  mailto-mutt = writeShellScriptBin "mailto-mutt" (import ./mailto-mutt.nix final);
-  mopidy-jellyfin = import ./mopidy-jellyfin.nix final;
-  mu = writeShellScriptBin "mu" (import ./mu.nix final);
-  psos = writeShellScriptBin "psos" (import ./psos.nix final);
-  s = writeShellScriptBin "s" (import ./s.nix final);
-  sway-launcher = writeScriptBin "sway-launcher" (import ./sway-launcher.nix final);
-  sway-service = writeShellScriptBin "sway-service" (import ./sway-service.nix final);
-  swaylock-bg = writeScriptBin "swaylock-bg" (import ./swaylock-bg.nix final);
-  toggle-kbd-layout = writeShellScriptBin "toggle-kbd-layout" (import ./toggle-kbd-layout.nix final);
-  uhk-agent = import ./uhk-agent.nix final;
-  wcwd = writeShellScriptBin "wcwd" (import ./wcwd.nix final);
-}
diff --git a/pkgs/default.nix b/pkgs/default.nix
index ce168707..935206d9 100644
--- a/pkgs/default.nix
+++ b/pkgs/default.nix
@@ -1 +1,15 @@
-final: prev: { }
+final: prev:
+with final; {
+  import-gtk-settings = writeShellScriptBin "import-gtk-settings" (import ./import-gtk-settings.nix final);
+  mailto-mutt = writeShellScriptBin "mailto-mutt" (import ./mailto-mutt.nix final);
+  mopidy-jellyfin = import ./mopidy-jellyfin.nix final;
+  mu = writeShellScriptBin "mu" (import ./mu.nix final);
+  psos = writeShellScriptBin "psos" (import ./psos.nix final);
+  s = writeShellScriptBin "s" (import ./s.nix final);
+  sway-launcher = writeScriptBin "sway-launcher" (import ./sway-launcher.nix final);
+  sway-service = writeShellScriptBin "sway-service" (import ./sway-service.nix final);
+  swaylock-bg = writeScriptBin "swaylock-bg" (import ./swaylock-bg.nix final);
+  toggle-kbd-layout = writeShellScriptBin "toggle-kbd-layout" (import ./toggle-kbd-layout.nix final);
+  uhk-agent = import ./uhk-agent.nix final;
+  wcwd = writeShellScriptBin "wcwd" (import ./wcwd.nix final);
+}
diff --git a/overlays/pub-solar/import-gtk-settings.nix b/pkgs/import-gtk-settings.nix
similarity index 100%
rename from overlays/pub-solar/import-gtk-settings.nix
rename to pkgs/import-gtk-settings.nix
diff --git a/overlays/pub-solar/mailto-mutt.nix b/pkgs/mailto-mutt.nix
similarity index 100%
rename from overlays/pub-solar/mailto-mutt.nix
rename to pkgs/mailto-mutt.nix
diff --git a/overlays/pub-solar/mopidy-jellyfin.nix b/pkgs/mopidy-jellyfin.nix
similarity index 100%
rename from overlays/pub-solar/mopidy-jellyfin.nix
rename to pkgs/mopidy-jellyfin.nix
diff --git a/overlays/pub-solar/mu.nix b/pkgs/mu.nix
similarity index 100%
rename from overlays/pub-solar/mu.nix
rename to pkgs/mu.nix
diff --git a/overlays/pub-solar/psos.nix b/pkgs/psos.nix
similarity index 100%
rename from overlays/pub-solar/psos.nix
rename to pkgs/psos.nix
diff --git a/overlays/pub-solar/s.nix b/pkgs/s.nix
similarity index 100%
rename from overlays/pub-solar/s.nix
rename to pkgs/s.nix
diff --git a/overlays/pub-solar/sway-launcher.nix b/pkgs/sway-launcher.nix
similarity index 100%
rename from overlays/pub-solar/sway-launcher.nix
rename to pkgs/sway-launcher.nix
diff --git a/overlays/pub-solar/sway-service.nix b/pkgs/sway-service.nix
similarity index 100%
rename from overlays/pub-solar/sway-service.nix
rename to pkgs/sway-service.nix
diff --git a/overlays/pub-solar/swaylock-bg.nix b/pkgs/swaylock-bg.nix
similarity index 100%
rename from overlays/pub-solar/swaylock-bg.nix
rename to pkgs/swaylock-bg.nix
diff --git a/overlays/pub-solar/toggle-kbd-layout.nix b/pkgs/toggle-kbd-layout.nix
similarity index 100%
rename from overlays/pub-solar/toggle-kbd-layout.nix
rename to pkgs/toggle-kbd-layout.nix
diff --git a/overlays/pub-solar/uhk-agent.nix b/pkgs/uhk-agent.nix
similarity index 100%
rename from overlays/pub-solar/uhk-agent.nix
rename to pkgs/uhk-agent.nix
diff --git a/overlays/pub-solar/wcwd.nix b/pkgs/wcwd.nix
similarity index 100%
rename from overlays/pub-solar/wcwd.nix
rename to pkgs/wcwd.nix
diff --git a/profiles/core/default.nix b/profiles/core/default.nix
index f523fc1c..b20a6d79 100644
--- a/profiles/core/default.nix
+++ b/profiles/core/default.nix
@@ -127,17 +127,13 @@ in
 
     system.autoUpgrade.enable = true;
 
-<<<<<<< HEAD
-    services.earlyoom.enable = true;
-=======
-  # For rage encryption, all hosts need a ssh key pair
-  services.openssh = {
-    enable = true;
-    openFirewall = lib.mkDefault false;
-  };
+    # For rage encryption, all hosts need a ssh key pair
+    services.openssh = {
+      enable = true;
+      openFirewall = lib.mkDefault false;
+    };
 
-  services.earlyoom.enable = true;
->>>>>>> devos/core
+    services.earlyoom.enable = true;
 
     boot.kernelPackages = pkgs.linuxPackages_latest;
     boot.supportedFilesystems = [ "ntfs" ];