Commit graph

877 commits

Author SHA1 Message Date
Benjamin Bädorf bf28a630c9
Merge branch 'core' into b12f 2021-06-14 19:50:35 +02:00
Benjamin Bädorf 83333fa0d6
Merge branch 'b12f' of git.b12f.io:pub-solar/os into b12f 2021-06-14 19:49:32 +02:00
Benjamin Bädorf e437f7fca6
Merge branch 'core' into b12f 2021-06-14 19:45:03 +02:00
Benjamin Bädorf fc23fbc05b
Merge upstream 2021-06-09 18:46:29 +02:00
teutat3s 41b72dfe1c Merge pull request 'Remove fonts, cleanup pub solar overlay' (#3) from fix/cleanup-core into core
Reviewed-on: https://git.b12f.io/pub-solar/os/pulls/3
2021-06-09 16:43:36 +00:00
Benjamin Bädorf 54adc61a48
Move overlay to pkgs 2021-06-09 18:42:56 +02:00
Benjamin Bädorf be1b5cc2ff
Remove fonts, cleanup pub solar overlay 2021-06-09 18:38:09 +02:00
Benjamin Bädorf 52b6a54d28
Merge upstream 2021-06-09 18:37:21 +02:00
bors[bot] b3118a6ea2
Merge #301
301: Update core r=blaggacao a=Pacman99

Most of the changes were in digga

Co-authored-by: Pacman99 <pachum99@gmail.com>
Co-authored-by: bors[bot] <26634292+bors[bot]@users.noreply.github.com>
Co-authored-by: Pacman99 <pachum99@myrdd.info>
Co-authored-by: Jarosław Wygoda <jaroslaw@wygoda.me>
Co-authored-by: almostnobody <1583339+almostnobody@users.noreply.github.com>
2021-06-09 01:41:45 +00:00
Pacman99 a7c20465ec doc/suites: updating explanation of suites 2021-06-08 18:27:54 -07:00
Pacman99 5831adb061 flake: switch to digga master
To use the now released v0.2.0
2021-06-08 18:14:32 -07:00
Pacman99 4d1b3a5e13 Merge pull request #311 from almostnobody/patch-1
override module doc: fix #310
2021-06-08 14:11:56 -07:00
Pacman99 9dcc4adeef
Merge pull request #311 from almostnobody/patch-1
override module doc: fix #310
2021-06-08 14:07:19 -07:00
almostnobody d852305c4c
Update doc/concepts/overrides.md
Co-authored-by: Pacman99 <pachum99@myrdd.info>
2021-06-08 22:24:24 +03:00
almostnobody c30e8c5ca2
override module doc: fix #310 2021-06-08 22:10:17 +03:00
Pacman99 fb41643ed6
Merge pull request #304 from Pacman99/update-docs
docs: general updates
2021-06-05 10:13:06 -07:00
Pacman99 fe3a624930 docs: general updates 2021-06-05 10:10:05 -07:00
Pacman99 30892d83eb gitignore: add flk command results 2021-06-03 22:42:45 -07:00
bors[bot] 1a87b83b5d
Merge #302
302: customBuilds: add digitalOcean r=Pacman99 a=jwygoda

https://github.com/divnix/digga/pull/42

Co-authored-by: Jarosław Wygoda <jaroslaw@wygoda.me>
2021-06-03 07:45:26 +00:00
Jarosław Wygoda 454b27937f customBuilds: add digitalOcean 2021-06-03 08:48:25 +02:00
Pacman99 7110767300
Merge pull request #300 from Pacman99/update-digga
flake: update to new digga api
2021-06-01 12:40:31 -07:00
Pacman99 8e250d5084 flake: add agenix to devShell 2021-06-01 11:32:20 -07:00
Pacman99 d9082066f7 flake: update to new digga api 2021-06-01 11:32:20 -07:00
Benjamin Bädorf 8d5db4dfb2
Add chocolatebar 2021-06-01 10:55:02 +02:00
Benjamin Bädorf 9d1991d6b8
Move fonts into separate flake 2021-05-31 19:57:17 +02:00
Benjamin Bädorf a577bd7333
Encrypt futura 2021-05-30 22:35:18 +02:00
Benjamin Bädorf bc76999a00
Add Futura 2021-05-30 22:01:17 +02:00
Benjamin Bädorf 91c8e77d25
Initial b12f commit 2021-05-30 21:33:09 +02:00
Benjamin Bädorf ddcf369f41
Initial PubSolarOS commit 2021-05-30 21:10:28 +02:00
teutat3s 57291aa029
Init Drone CI for auto rebasing 2021-05-29 20:21:58 +02:00
Pacman99 768e3e7541 Merge branch 'core' into develop 2021-05-27 11:02:41 -07:00
Pacman99 0f72f26a57 Update Changelog for tag 2021-05-27 17:02:40 +00:00
Pacman99 f88acc1608
Merge pull request #297 from Narice/core
Added note about cache in start/index.md docs
2021-05-24 08:22:52 -07:00
Narice 20649fb3a9 Added note about cache in the start index
This resolves #292.
2021-05-24 10:42:57 +02:00
bors[bot] da9f14cab2
Merge #279
279: Agenix integration r=blaggacao a=Pacman99

AFAICT This is mostly a documentation thing. But with divnix/devlib#2 we can now add agenix to the devshell.

Co-authored-by: Pacman99 <pachum99@gmail.com>
2021-05-20 18:53:20 +00:00
David Arnold a81930af36 readme: declare it beta and update some other things 2021-05-20 12:45:16 -04:00
Pacman99 21cba8024d flake: update digga input
no longer builds all packages from overlays in devShell
2021-05-18 11:29:56 -07:00
Pacman99 adaf76e1fb doc/hosts: update to new auto-import style 2021-05-18 10:23:43 -07:00
bors[bot] d1d2a4ca08
Merge #291
291: Remove ´profiles/suites.nix` and fix hardware module in hosts documentation r=blaggacao a=ymarkus

See #282 

As I understand it, this file isn't needed anymore and the hardware module is not defined properly in the documentation.

Co-authored-by: Yannick Markus <ym@ymarkus.dev>
2021-05-18 17:12:56 +00:00
Yannick Markus 564888d1fe
remove profiles/suites.nix 2021-05-18 18:12:36 +02:00
Yannick Markus 629a50975f
hosts doc: fix hardware module in example 2021-05-18 18:11:29 +02:00
Narice cf47170d6f Modified wording of iso documentation 2021-05-17 09:15:08 -04:00
Pacman99 18d4c78ea5 flake: un-comment defaultTemplate
This was accidentally commented.
fixes #288
2021-05-16 19:35:52 -07:00
bors[bot] 3fa96c7793
Merge #286
286: default.nix: fix path to compat r=blaggacao a=Pacman99

Looks like it was just a path error.

fixes #285 

Co-authored-by: Pacman99 <pachum99@myrdd.info>
2021-05-16 23:56:12 +00:00
Pacman99 5151380d61 default.nix: fix path to compat 2021-05-16 10:22:40 -07:00
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 c57925d35a document agenix integration
Co-authored-by: David Arnold <dar@xoe.solutions>
2021-05-14 18:38:55 -07:00