Benjamin Bädorf
59c1a23660
Merge branch 'main' into b12f
2022-05-02 15:01:30 +02:00
Benjamin Bädorf
91605af135
Revert "Merge pull request 'fix/boostrap-iso' ( #75 ) from fix/boostrap-iso into main"
...
This reverts commit 48be9cfa75
, reversing
changes made to 281d7b56b4
.
2022-05-02 09:49:14 +02:00
Benjamin Bädorf
b648055b60
Merge branch 'main' into b12f
2022-05-01 21:00:50 +02:00
Benjamin Bädorf
a94a41f444
Use our patched version of digga
2022-04-30 22:12:52 +02:00
Benjamin Bädorf
d85a796259
Merge branch 'main' into b12f
2022-04-30 19:58:06 +02:00
teutat3s
970e6de8a7
Merge branch 'main' into feature/basic-iso
2022-04-30 16:04:59 +02:00
Benjamin Bädorf
2f54c4e25c
Merge branch 'main' into b12f
2022-04-27 15:24:22 +02:00
teutat3s
88bb8f3eb8
cachix: trust pub.solar public keys for nix-dram
2022-04-26 11:36:59 +02:00
Benjamin Bädorf
c2b6ec5acc
Merge branch 'main' into b12f
2022-04-10 14:02:28 +02:00
teutat3s
11ea007899
digga: Remove customBuilds, nixos-generate
...
has --flake, Use nixos-* not release-*
2022-04-09 16:52:04 +02:00
teutat3s
2cbaf25a27
export devos template in digga
...
devos: remove bud get
2022-04-09 16:51:44 +02:00
Benjamin Bädorf
d047a4aac0
Merge branch 'main' into b12f
2022-03-09 13:37:26 +01:00
teutat3s
2666453e8c
Merge branch 'devos'
2022-02-24 23:41:36 +01:00
teutat3s
4052b39c6e
nix-dram: ensure nixpkgs follows latest input
2022-02-22 16:51:08 +01:00
Parthiv Seetharaman
b0aadda88c
flake: switch back to serokell deploy input
...
There is a bug in the input-output-hk fork
2022-02-17 16:22:48 -08:00
Benjamin Bädorf
e3ff8c5441
Merge branch 'main' into b12f
2022-02-14 10:54:00 +01:00
teutat3s
74b4ec148c
Merge branch 'main' into feature/basic-iso
2022-02-02 04:38:30 +01:00
teutat3s
dca27eda2e
Fix up rebase
2022-02-02 04:21:40 +01:00
teutat3s
f99159df93
chore: bump flake lock
2022-02-02 04:00:14 +01:00
teutat3s
1d2eb2edd0
iso: use iso suite in PubSolarOS host
...
fae: boots PubSolarOS
2022-02-02 04:00:11 +01:00
teutat3s
0cf1c0e9b0
iso: default user nixos becomes pub-solar
2022-02-02 04:00:11 +01:00
teutat3s
f07010445e
Reference nix-dram package directly from inputs
...
This should avoid patches not working because our pkgs
follows nixos = release-21.11 and nix-dram follows nixos-unstable
2022-02-02 04:00:10 +01:00
teutat3s
0629024cf5
chore: clean up after upstream updates
2022-02-02 03:33:20 +01:00
teutat3s
a4dbe4fa78
Reference nix-dram package directly from inputs
...
This should avoid patches not working because our pkgs
follows nixos = release-21.11 and nix-dram follows nixos-unstable
2022-01-31 16:19:36 +01:00
Benjamin Bädorf
87e48217d0
Merge branch 'main' into b12f
2022-01-06 14:14:13 +01:00
teutat3s
b8b3404d4c
Merge branch 'devos'
2021-12-30 21:54:42 +01:00
Parthiv Seetharaman
87f1d7da18
bud: move to shell and use git clone for get
2021-12-29 15:41:58 -08:00
David Arnold
a319aed9f4
imp: move follows responsibility downstream
...
- also remove unimportant (small) depenencies from follows management
- so that it is less complex as errors occur, since:
- it seems there are still follows issues present upstream
2021-12-29 14:00:25 -08:00
David Arnold
6151d02b8d
rm: use of patched nix for nixos 21.11 enabled digga
...
- patched nix held the follows patch which is now upstreamed
2021-12-29 14:00:25 -08:00
teutat3s
2340270d81
All the option are with us now
2021-10-24 22:55:28 +02:00
teutat3s
2588264d88
Make check work
2021-10-24 22:03:28 +02:00
Benjamin Bädorf
411a0e3e74
Add basic ISO setup
2021-10-21 20:06:57 +02:00
Benjamin Bädorf
231abe6af4
Merge branch 'main' into b12f
2021-10-13 19:27:04 +02:00
teutat3s
1a4ab1a93f
fix/upstreaming-merge-conflicts ( #41 )
...
Co-authored-by: Anton <fetsorn@gmail.com>
Co-authored-by: Chris Montgomery <chris@cdom.io>
Co-authored-by: Timothy DeHerrera <tim.deh@pm.me>
Co-authored-by: Parthiv Seetharaman <pachum99@myrdd.info>
Co-authored-by: bors[bot] <26634292+bors[bot]@users.noreply.github.com>
Co-authored-by: GTrunSec <gtrunsec@hardenedlinux.org>
Reviewed-on: https://git.b12f.io/pub-solar/os/pulls/41
Co-authored-by: teutat3s <teutates@mailbox.org>
Co-committed-by: teutat3s <teutates@mailbox.org>
2021-10-11 22:11:36 +00:00
GTrunSec
950199ef2c
update deploy-rs overlay
2021-09-29 11:45:46 -07:00
Parthiv Seetharaman
e0da74c87c
Update flake to use new moddules options
2021-09-27 16:23:06 -07:00
Benjamin Bädorf
3cec4a51f2
Add mobile profile to ben user
2021-09-27 14:52:21 +02:00
Benjamin Bädorf
2e6fe672d2
Fix direnv cache
2021-09-21 22:21:29 +02:00
Benjamin Bädorf
3dcc90fc24
feat(chocolatebar): enable virtualisation
2021-09-05 22:18:08 +02:00
Benjamin Bädorf
e29ad5c23f
Enable the gaming suit for b12f
2021-09-05 00:47:56 +02:00
Benjamin Bädorf
f89384cbf0
Works for chocolatebar
2021-09-04 15:56:44 +02:00
Benjamin Bädorf
d132638c8e
Fix flake lock imports
2021-09-02 20:00:22 +02:00
Benjamin Bädorf
2293e703cc
Fix suites
2021-09-02 19:16:05 +02:00
teutat3s
3f4d3cf240
Merge branch 'b12f' into b12f-master
2021-09-01 19:12:50 +02:00
teutat3s
02330bc9ce
Merge remote-tracking branch 'devos/master'
2021-09-01 18:45:42 +02:00
David Arnold
5657ddf3c1
fix: input ref / bump digga
...
the indirect reference started failing with
```
warning: Git tree '/home/blaggacao/ghq/github.com/divnix/devos' is dirty
error: NAR hash mismatch in input 'github:NixOS/nixpkgs/release-21.05' (/nix/store/0r0xrqj5l88071cama7hlha5ajya06c8-source), expected 'sha256-MhVtkVt1MFfaDY3ObJu54NBcsaPk19vOBZ8ouhjO4qs=', got 'sha256-jQgXeJ9NQQS0Eobb/qQOvS+RRULkqRikAeXkkFKOPDA='
```
2021-08-05 20:42:26 -05:00
David Arnold
2fcb3605ee
docs: soft update (fix the most obvious drift)
2021-08-01 16:38:52 -05:00
teutat3s
bf81ed29d1
Ensure pinning latest channel to nixpkgs nixos-unstable branch
2021-07-30 22:22:44 +02:00
Timothy DeHerrera
8b67cae20a
flake: remove ci-agent
2021-07-23 14:38:54 -06:00
David Arnold
a3ec0d2814
imp: use bud nixos-/devhsllModules and hide rebiding
...
both modules depend on `self`/`inputs` available as special args for
both, devshell & nixos modules, so bump to an improved `digga`, as well.
2021-07-20 23:36:41 -05:00