Commit graph

829 commits

Author SHA1 Message Date
Pacman99
2ab4df3f60 suites: re-add rec to simplify suite definitions 2021-05-15 10:31:54 -07:00
Pacman99
00f8b477a6 bors.toml: don't delete merged branches
This caused develop to be deleted. And if most people send PR's from
forks of devos, this line doesn't really help much.
2021-05-14 22:49:39 -07:00
Pacman99
634cfcb301 flake: update digga
includes fix for flk config generation
2021-05-14 21:27:49 -07:00
bors[bot]
4df3d8c2e8
Merge #276
276: Update core r=blaggacao a=Pacman99

Core is starting to get pretty stale. All the changes in `develop` are pretty stable and I think we should encourage updating to them. As most future updates can be done through [devlib](https://github.com/divnix/devlib), so once you switch to this version of the template. Updating to new changes will be much simpler (ie #91).

Co-authored-by: Pacman99 <pachum99@gmail.com>
Co-authored-by: Pacman99 <pachum99@myrdd.info>
Co-authored-by: David Arnold <dar@xoe.solutions>
2021-05-15 04:17:49 +00:00
Pacman99
2f474e37f7 flake: update to latest digga api
allows overlays to also be used with `imports` and renames importHosts
2021-05-14 16:49:12 -07:00
Pacman99
25388a0b55
Merge pull request #280 from Pacman99/digga
tree: rename devlib -> digga
2021-05-14 11:05:08 -07:00
Pacman99
dd6c481791 flake: format ourlib for consistency with digga 2021-05-14 11:01:44 -07:00
Pacman99
923ce7feff tree: rename devlib -> digga 2021-05-14 10:20:02 -07:00
Pacman99
ccc0fc97fe flake.nix: use imports for auto-import of hosts
This makes the auto-importing of hosts obvious and explicitly indicates
how the options would end up getting merged.
2021-05-13 17:03:51 -07:00
Pacman99
7793ab42da flake: update devlib input
includes nixos option improvements and importHosts change
2021-05-13 16:59:52 -07:00
Pacman99
c89dfed81c don't import cachix in suites
its already imported in the core profile
2021-05-12 19:18:11 -07:00
Pacman99
67f545123c flake: format and update to devlib api changes 2021-05-12 12:31:43 -07:00
Pacman99
3ee831f852
flake.nix: explicitly append overlays from path
Co-authored-by: David Arnold <dar@xoe.solutions>
2021-05-12 12:29:00 -07:00
Pacman99
2b73d3bf53 customBuilds: add TODO to drop builderArgs 2021-05-12 11:43:27 -07:00
Pacman99
858e8546fe flake: update devlib input
includes ability to customize shell from template
2021-05-12 08:17:40 -07:00
Pacman99
a081a922a5 flake: update devlib input
drop ca experimental features and filterPackages improvements
2021-05-11 23:41:34 -07:00
Pacman99
0d7eb1c488 doc/lib: explain ourlib usage 2021-05-11 11:44:05 -07:00
Pacman99
8a590c9fef core: use self for nixos-option compat path 2021-05-11 11:40:37 -07:00
Pacman99
725e459655
doc/start: fix grammar
Co-authored-by: David Arnold <dar@xoe.solutions>
2021-05-10 12:22:16 -07:00
Pacman99
8f20bb069a
doc/extern: elaborate external modules filtering
Co-authored-by: David Arnold <dar@xoe.solutions>
2021-05-10 12:19:31 -07:00
Pacman99
6e906e87bc
doc/extern: improve overlay filtering explanation
Co-authored-by: David Arnold <dar@xoe.solutions>
2021-05-10 12:17:41 -07:00
Pacman99
4b4f9dc45c Merge branch 'core' into develop 2021-05-06 13:55:02 -07:00
Pacman99
226dd9be1a
Merge pull request #273 from Pacman99/devlib
Switch to out of tree devlib
2021-05-05 15:19:33 -07:00
Pacman99
f4cd79194a add in-tree local lib, ourlib 2021-05-05 13:44:39 -07:00
Pacman99
8dabd0f569 switch to devlib repo and remove in-tree lib 2021-05-05 13:24:08 -07:00
Pacman99
b8f7cdbe63 improve home-manager and deploy-rs integration
move both to be setup in template
only set home-manager options if they exist
2021-05-03 19:20:41 -05:00
Pacman99
7bf605d08c lib/modules: pull devlib module arg from pkgs
So any overlays affecting devlib also affect the module argument
2021-05-02 21:05:21 -07:00
Pacman99
deb47dbfae move otherArguments to right side of merge
for overlay list ordering, otherArguments should have priority
2021-05-02 11:15:44 -07:00
Pacman99
30412b16b9
Merge pull request #271 from Pacman99/lib-rearrange
Rearrange and cleanup lib
2021-05-02 10:15:40 -07:00
Pacman99
197d792946 update to new lib format 2021-05-02 10:13:48 -07:00
Pacman99
496348b8af lib: update namespaces and cleanup exports 2021-05-02 10:13:48 -07:00
Pacman99
e837aaa875 lib: remove devos section 2021-05-02 10:13:48 -07:00
Pacman99
c93e9fda0f lib: init importers section 2021-05-02 10:13:48 -07:00
Pacman99
e97e916521 lib: init generators section 2021-05-02 10:13:48 -07:00
Pacman99
378107fd03
Merge pull request #266 from Pacman99/extract-builds
pass builderArgs to config and extract builds
2021-05-01 17:44:44 -07:00
Pacman99
e98e595704 pass builderArgs to config and extract builds
have mkHomeConfiguration create its own custom build within the function
create a externalModule for customBuilds so its easy to add more
2021-04-30 10:52:35 -07:00
Pacman99
e1f18728e2
Merge pull request #268 from Pacman99/dontexport
use __dontExport property for lib and overrides
2021-04-29 15:24:55 -07:00
Pacman99
23ee58d2d0 use __dontExport property for lib and overrides 2021-04-29 11:55:42 -07:00
Pacman99
a5dcb5fae9 fix flake by removing flake-compat follows 2021-04-27 18:41:51 -07:00
Pacman99
62c9b126d3
Merge pull request #264 from divnix/api-next
Implement new api and rebase on flake-utils-plus
2021-04-27 16:55:13 -07:00
Pacman99
5bc88ad2c2 don't use lockfile to get flake-compat
lock file format isn't very reliable with naming inputs
2021-04-27 16:36:07 -07:00
Pacman99
bb9bc02478 fix channels.*.input defaultText formatting 2021-04-27 12:52:16 -07:00
Pacman99
aa825b87a6 auto import hosts in flake.nix
this allows host-specific settings to be overriden with mkMerge
2021-04-27 10:26:45 -07:00
Pacman99
df39cb692e rebuild and update mkFlakeOptions.md 2021-04-27 09:52:56 -07:00
Pacman99
a7cd35e433 update lib subflake lock 2021-04-27 09:47:31 -07:00
Pacman99
d5276195f7 move overrides.nix to overlays
also update overrides docs
it is a pure devos overlay now, it makes sense to go in overlays
2021-04-27 09:47:04 -07:00
Pacman99
e67b49c280 auto-flatten coercedListOf and type fixes 2021-04-27 09:35:44 -07:00
Pacman99
f57840d723 mkFlake/default.nix: formatting 2021-04-27 09:32:12 -07:00
Pacman99
7f3116c1cc safeReadDir: conver path to string for reliability 2021-04-27 09:30:28 -07:00
Pacman99
466304c8cd improve passing host and channel arguments to fup
we need to filter out arguments that are added in the devos api
also anything thats null in either hostDefaults and hosts has to be
removed
2021-04-27 08:01:46 -07:00