Merge branch 'master' into teutat3s

README.md

@@ -22,20 +22,6 @@ Also, have a look at [_flake.nix_][toc]. If anything is not immediately
 discoverable via "[`digga`][digga]'s [`mkFlake`][mk-flake],
 please file a bug report.
 
-<<<<<<< HEAD
-## Motivation
-NixOS provides an amazing abstraction to manage our environment, but that new
-power can sometimes bring feelings of overwhelm and confusion. Having a turing
-complete system can easily lead to unlimited complexity if we do it wrong.
-Instead, we should have a community consensus on how to manage a NixOS system
-and its satellite projects, from which best practices can evolve.
-
-___The future is declarative! 🎉___
-
-## Examples in the Wild
-The author maintains his own branch, so you can take inspiration, direction, or
-make critical comments about the [code][please]. 😜
-=======
 ### Status: Beta
 Although this project has already matured quite a bit, especially through
 recent outfactoring of [`digga`][digga], a fair amount of api polishing is still
@@ -44,7 +30,6 @@ of changes and progress, and a [`develop`](https://github.com/divnix/devos/tree/
 
 ## In the Wild
 * The original [authors][please]
->>>>>>> devos/develop
 
 ## Shoulders
 This work does not reinvent the wheel. It stands on the [shoulders of the

flake.lock

@@ -505,7 +505,7 @@
         "owner": "berberman",
         "repo": "nvfetcher",
         "rev": "e9600782adbf6fb8217087bd2f05335cad96e542",
-        "type": "github"
+       "type": "github"
       },
       "original": {
         "owner": "berberman",