Benjamin Bädorf
61e87ee30b
Merge branch 'b12f' of git.b12f.io:pub-solar/os into b12f
2021-11-01 10:11:14 +01:00
Benjamin Bädorf
3dc7ffd3a4
Update email signature for OP
2021-11-01 10:11:07 +01:00
Benjamin Bädorf
64e1a4583f
Add ssh hosts
2021-10-31 01:06:50 +02:00
Benjamin Bädorf
097d89d2b2
Remove git crypt form biolimo
2021-10-29 20:21:13 +02:00
Benjamin Bädorf
5a18a7c3c1
Merge branch 'main' into b12f
2021-10-29 18:47:33 +02:00
Benjamin Bädorf
dd3d8ab385
Merge pull request 'nvim, nixos-option cherry-picks' ( #57 ) from fix/cherry-picks-from-teutat3s into main
...
Reviewed-on: https://git.b12f.io/pub-solar/os/pulls/57
Reviewed-by: Benjamin Bädorf <b12f@noreply.example.org>
2021-10-29 16:46:34 +00:00
teutat3s
9bd3f7d871
nvim: sort alphabetically, add gopls (go lsp)
2021-10-29 16:47:11 +02:00
teutat3s
c059af5248
terminal-life: add upstream nixos-option gc fix
2021-10-29 16:47:01 +02:00
Benjamin Bädorf
5a6ec0d6ff
Merge remote-tracking branch 'origin/main' into b12f
2021-10-27 00:07:29 +00:00
drone
42a9306566
Merge remote-tracking branch 'origin/devos'
2021-10-26 00:08:19 +00:00
Benjamin Bädorf
2724982a4f
Merge remote-tracking branch 'origin/main' into b12f
2021-10-26 00:07:47 +00:00
teutat3s
76a2342954
Merge pull request 'fix main branch cron for real' ( #55 ) from fix/cron-for-real into main
...
Reviewed-on: https://git.b12f.io/pub-solar/os/pulls/55
2021-10-25 23:08:18 +00:00
teutat3s
e1404ac969
fix main branch cron for real
2021-10-26 01:07:10 +02:00
Benjamin Bädorf
bcd191b291
Don't scale laptop screen, sway + firefox is broken then
2021-10-25 23:10:18 +02:00
Benjamin Bädorf
0015849858
Merge remote-tracking branch 'origin/main' into b12f
2021-10-25 00:07:45 +00:00
Benjamin Bädorf
d064b27393
Fix build
2021-10-24 23:42:13 +02:00
teutat3s
8a848a789b
overrides: try out docker-compose v2, xdg-desktop-portal from latest
2021-10-24 23:36:57 +02:00
Benjamin Bädorf
6475e7563f
Merge pull request 'cron: reset origin remote url, so that next step's git fetch works' ( #52 ) from fix/main-branch-upstream-cron into main
...
Reviewed-on: https://git.b12f.io/pub-solar/os/pulls/52
Reviewed-by: Benjamin Bädorf <b12f@noreply.example.org>
2021-10-24 21:29:36 +00:00
Benjamin Bädorf
845f5114a1
Merge pull request 'feature: boot from unencrypted /boot partition' ( #53 ) from feature/separate-boot-partition into main
...
Reviewed-on: https://git.b12f.io/pub-solar/os/pulls/53
Reviewed-by: Benjamin Bädorf <b12f@noreply.example.org>
2021-10-24 21:27:04 +00:00
Benjamin Bädorf
ab19dea908
Fix mopidy ownership
2021-10-24 17:30:24 +02:00
Benjamin Bädorf
415223a778
Move biolimo to systemd-boot
2021-10-24 17:30:15 +02:00
Benjamin Bädorf
067ce16246
Remove git crypt
...
Start move to /boot kernel mount
x-os: prepare booting from unencrypted /boot partition
Move to systemd-boot
Remove all unencrypted secrets
2021-10-24 17:13:16 +02:00
teutat3s
c35a38f834
x-os: prepare booting from unencrypted /boot partition
2021-10-24 01:20:31 +02:00
Karolis Labrencis
65db5d30ae
docs: remove outdated nix-rebuild
notes
2021-10-23 17:50:49 -05:00
Benjamin Bädorf
132042220e
Double encrypt ??
2021-10-23 14:49:36 +02:00
Benjamin Bädorf
a44b506724
Merge branch 'b12f' of git.b12f.io:pub-solar/os into b12f
2021-10-23 13:24:28 +02:00
Benjamin Bädorf
87a9d94d0a
secrets via agenix
2021-10-23 13:24:22 +02:00
teutat3s
782f4add01
cron: reset origin remote url, so that next step's git fetch works
2021-10-22 14:04:17 +02:00
Benjamin Bädorf
4c3ddff217
Add 1 git-crypt collaborator
...
New collaborators:
13CD656C Benjamin Bädorf (gitea) <gitea@benjaminbaedorf.eu>
2021-10-22 12:30:39 +02:00
teutat3s
1b1bc8eb97
digga: fix link to new default branch main
2021-10-21 18:28:12 -05:00
teutat3s
8397aa7aa3
workflows: switch to new default branch main
2021-10-21 18:28:12 -05:00
Benjamin Bädorf
cd5e19b10e
Fix byb@miom.space
2021-10-21 23:51:25 +02:00
Benjamin Bädorf
7569a75e65
Add byb@miom.space, update signature
2021-10-21 22:21:05 +02:00
Benjamin Bädorf
814f567fd7
Merge branch 'main' into b12f
2021-10-21 19:48:35 +02:00
Benjamin Bädorf
bdb5132460
Fetch repos before upstream merge, so we have access to main ( #51 )
...
Co-authored-by: Benjamin Bädorf <hello@benjaminbaedorf.eu>
Reviewed-on: https://git.b12f.io/pub-solar/os/pulls/51
Reviewed-by: teutat3s <teutates@mailbox.org>
Co-authored-by: Benjamin Bädorf <b12f@noreply.example.org>
Co-committed-by: Benjamin Bädorf <b12f@noreply.example.org>
2021-10-21 17:39:38 +00:00
Benjamin Bädorf
298f50ba95
Merge branch 'main' into b12f
2021-10-21 19:25:59 +02:00
teutat3s
fc037d9833
drone: fix git fetch for main, too ( #49 )
...
Reviewed-on: https://git.b12f.io/pub-solar/os/pulls/49
Co-authored-by: teutat3s <teutates@mailbox.org>
Co-committed-by: teutat3s <teutates@mailbox.org>
2021-10-20 07:52:46 +00:00
teutat3s
36c6fdd254
drone: fix git fetch for main, too ( #48 )
...
Reviewed-on: https://git.b12f.io/pub-solar/os/pulls/48
Co-authored-by: teutat3s <teutates@mailbox.org>
Co-committed-by: teutat3s <teutates@mailbox.org>
2021-10-20 07:47:12 +00:00
teutat3s
95f5430b2b
drone: git fetch before doing git checkout ( #46 )
...
Reviewed-on: https://git.b12f.io/pub-solar/os/pulls/46
Co-authored-by: teutat3s <teutates@mailbox.org>
Co-committed-by: teutat3s <teutates@mailbox.org>
2021-10-13 22:08:30 +00:00
Benjamin Bädorf
231abe6af4
Merge branch 'main' into b12f
2021-10-13 19:27:04 +02:00
teutat3s
2e2e48b607
Merge pull request 'fix/merge-devos-into-main-conflicts' ( #44 ) from fix/merge-devos-into-main-conflicts into main
...
Reviewed-on: https://git.b12f.io/pub-solar/os/pulls/44
2021-10-12 12:56:46 +00:00
teutat3s
0e965789ff
Merge branch 'devos' into fix/merge-devos-into-main-conflicts
2021-10-12 14:54:20 +02:00
teutat3s
134fcb9a0d
fix/upstreaming-merge-conflicts ( #42 )
...
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>
Co-authored-by: Pacman99 <pachum99@myrdd.info>
Co-authored-by: Joel <joel@joel.tokyo>
Co-authored-by: Trevor Riles <trevor@trevorriles.com>
Reviewed-on: https://git.b12f.io/pub-solar/os/pulls/42
Co-authored-by: teutat3s <teutates@mailbox.org>
Co-committed-by: teutat3s <teutates@mailbox.org>
2021-10-11 22:32:01 +00: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
teutat3s
d67cc230f3
fix/drone-upstream-cron ( #40 )
...
Reviewed-on: https://git.b12f.io/pub-solar/os/pulls/40
Co-authored-by: teutat3s <teutates@mailbox.org>
Co-committed-by: teutat3s <teutates@mailbox.org>
2021-10-11 22:03:38 +00:00
teutat3s
84bb1520ee
fix/drone-upstream-cron ( #39 )
...
Reviewed-on: https://git.b12f.io/pub-solar/os/pulls/39
Co-authored-by: teutat3s <teutates@mailbox.org>
Co-committed-by: teutat3s <teutates@mailbox.org>
2021-10-11 21:47:46 +00:00
teutat3s
1f1d24f1e3
drone: fix cron job for upstream syncing ( #38 )
...
Reviewed-on: https://git.b12f.io/pub-solar/os/pulls/38
Co-authored-by: teutat3s <teutates@mailbox.org>
Co-committed-by: teutat3s <teutates@mailbox.org>
2021-10-11 21:40:27 +00:00
Benjamin Bädorf
038420caed
Gitignore old owners directory ( #37 )
...
Reviewed-on: https://git.b12f.io/pub-solar/os/pulls/37
Co-authored-by: Benjamin Bädorf <b12f@noreply.example.org>
Co-committed-by: Benjamin Bädorf <b12f@noreply.example.org>
2021-10-11 20:54:25 +00:00
bors[bot]
a25d78b9c3
Merge #388
...
388: Update docs and scripts to use main branch. r=Pacman99 a=trevorriles
When following the getting started guide commands were failing due to
the mater branch not existing. I went through and updated all
references in the docs and other scripts from master to main.
Co-authored-by: Trevor Riles <trevor@trevorriles.com>
2021-10-09 20:07:22 +00:00
Trevor Riles
804e972c57
Update docs and scripts to use main branch.
...
When following the getting started guide commands were failing due to
the mater branch not existing. I went through and updated all
references in the docs and other scripts from master to main.
2021-10-09 11:19:52 -05:00