Chris Montgomery
54a9a8366e
ci: workflows on main push should trigger on master push
2021-09-19 07:32:52 -05:00
Anton
a3b2bcf3d5
fix typo in CONTRIBUTING.md
2021-09-18 09:20:09 -05:00
drone
58e4d8ddfa
Merge remote-tracking branch 'origin/master' into teutat3s
2021-09-11 00:22:09 +00:00
drone
51b0baa8f4
Merge remote-tracking branch 'origin/devos'
2021-09-10 00:22:16 +00:00
teutat3s
95bb18093c
Merge branch 'master' into teutat3s
2021-09-08 23:36:51 +02:00
teutat3s
8ff750994e
Use wayland version of element-desktop ( #15 )
...
Reviewed-on: https://git.b12f.io/pub-solar/os/pulls/15
Co-authored-by: teutat3s <teutates@mailbox.org>
Co-committed-by: teutat3s <teutates@mailbox.org>
2021-09-08 09:13:59 +00:00
teutat3s
916cd67458
Use wayland version of element-desktop
2021-09-07 17:39:00 +02:00
teutat3s
efc58fba0a
Follow upstream master branch, it's their new default ( #14 )
...
Reviewed-on: https://git.b12f.io/pub-solar/os/pulls/14
Co-authored-by: teutat3s <teutates@mailbox.org>
Co-committed-by: teutat3s <teutates@mailbox.org>
2021-09-07 14:37:24 +00:00
teutat3s
b66e1465ad
Merge branch 'master' into teutat3s
2021-09-07 15:10:54 +02:00
teutat3s
27ed938aec
Update flake.lock
2021-09-07 12:13:13 +02:00
teutat3s
a5df658fb2
Update flake.lock, enable virtualization
2021-09-06 18:59:46 +02:00
Timothy DeHerrera
61a56569c8
Merge pull request #358 from benneti/patch-1
...
update pkgs documentation
2021-09-02 09:35:08 -06:00
benneti
0536d0de90
update pkgs documentation
2021-09-02 11:37:21 +02:00
teutat3s
02330bc9ce
Merge remote-tracking branch 'devos/master'
2021-09-01 18:45:42 +02:00
teutat3s
9755e48043
Fix backlight hotkeys
2021-08-29 22:50:46 +02:00
Benjamin Bädorf
2a70461248
Merge pull request 'sync with latest core' ( #12 ) from fix/sync-with-latest-core into core
...
Reviewed-on: https://git.b12f.io/pub-solar/os/pulls/12
Reviewed-by: Benjamin Bädorf <b12f@noreply.example.org>
2021-08-24 12:04:49 +00:00
teutat3s
5aea1e8089
Merge remote-tracking branch 'devos/core' into core
2021-08-23 23:22:55 +02:00
teutat3s
91270ead3a
Merge branch 'core' of git.b12f.io:pub-solar/os into core
2021-08-23 23:09:54 +02:00
teutat3s
e33191591c
Merge remote-tracking branch 'devos/main' into teutat3s-develop
2021-08-15 10:20:36 +02:00
David Arnold
079adc4474
fix: more docs w.r.t. bootstrap iso
2021-08-12 20:57:22 -05:00
David Arnold
c46d923876
fix: iso docs w.r.t. bud burn and bootstrap.nix
2021-08-12 20:51:18 -05:00
David Arnold
32bddf6403
fix: docs bootsrtap - swap disk by label (easied copy/paste)
2021-08-12 20:48:30 -05:00
David Arnold
c30870f266
imp: bootstrap docs
2021-08-12 20:46:03 -05:00
Las Safin
5b89e53e7a
Fix typo in README.md
2021-08-11 14:42:33 -05:00
Kid
5c3d6254c3
Fix a typo
2021-08-06 11:37:01 -05: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
b5da406689
fix: dedicated bootstrap config
2021-08-05 20:42:25 -05:00
GTrunSec
768c9b8216
bump: nvfetcher and cleanup
2021-08-02 15:53:14 -05:00
GTrunSec
aba10aa8a4
fix/hm: direnv flakes support
2021-08-02 15:52:41 -05:00
David Arnold
6f5ef6126e
fix: cachix branch
2021-08-02 14:38:30 -05:00
David Arnold
0f98fe0cb3
bump: bud with some corutils missing deps & other fixes
2021-08-02 14:10:01 -05:00
David Arnold
757c107b46
bump: digga
2021-08-02 14:07:04 -05:00
David Arnold
135f1d656d
bump: nixos w upstream fixes
...
specifically
- https://github.com/NixOS/nixpkgs/pull/132363
- https://github.com/NixOS/nixpkgs/pull/131876
2021-08-02 14:05:58 -05:00
David Arnold
4c130410b9
Merge branch 'core' into develop
2021-08-01 16:39:21 -05:00
David Arnold
2fcb3605ee
docs: soft update (fix the most obvious drift)
2021-08-01 16:38:52 -05:00
David Arnold
5bd943f97d
imp: advise removal of */modules-list.nix on merge conflicts
...
During merge conflicts, these lines should appear in the hunks
and give instructions on how to handle them in the face of the
implementation of `rakeLeaves` for modules in https://git.io/JB1Wk via
`importModules`, that knows how to rake leaves by walking the folder
tree on it's own and collecting leaves that are normal nix files or
folers who contain a `default.nix` mmicking strongly a "recursive"
import-ish syntax.
2021-07-31 23:03:19 -05:00
bors[bot]
f69737301f
Merge #350
...
350: Ensure pinning latest channel to nixpkgs nixos-unstable branch r=blaggacao a=teutat3s
Co-authored-by: teutat3s <10206665+teutat3s@users.noreply.github.com>
2021-08-01 03:51:21 +00:00
teutat3s
bf81ed29d1
Ensure pinning latest channel to nixpkgs nixos-unstable branch
2021-07-30 22:22:44 +02:00
teutat3s
3f64c910b0
Correctly pin latest channel to nixpkgs unstable
2021-07-29 16:06:49 +02:00
teutat3s
f66f600b9b
Merge remote-tracking branch 'devos/develop' into teutat3s-develop
2021-07-28 12:04:39 +02:00
Timothy DeHerrera
8b67cae20a
flake: remove ci-agent
2021-07-23 14:38:54 -06:00
David Arnold
3e298b68dd
fix: bump flake-utils-plus with a regression w.r.t exportModules reverted
2021-07-23 15:32:39 -05:00
drone
b3bbfcdab4
Merge remote-tracking branch 'origin/devos' into core
2021-07-23 00:25:04 +00: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
David Arnold
0410acf3d7
Merge branch 'core' into develop
2021-07-20 22:21:18 -05:00
David Arnold
bf8620f8ba
ref: point digga to main (default) branch
2021-07-20 22:19:09 -05:00
David Arnold
31a8e76209
ref: adapt to using plain digga module for boostrap ISO
2021-07-20 21:45:41 -05:00
David Arnold
dcb425341d
update: digga/fup refactoring
2021-07-20 19:13:17 -05:00
teutat3s
0b25f7b11b
Fix git mergetool
2021-07-20 22:14:24 +02:00
teutat3s
f0130f5df7
Make editorconfig linter happy again
2021-07-20 22:08:51 +02:00
drone
