teutat3s/os
2
0
Fork 0
forked from pub-solar/os
Code Pull requests Activity
1069 commits 8 branches 43 tags 12 MiB
Commit graph

1069 commits

This branch
This branch
All branches
Author SHA1 Message Date
drone f43ea392f3 Merge remote-tracking branch 'origin/main' into teutat3s 2021-10-27 00:07:29 +00:00
teutat3s 81647c8447
Merge branch 'main' into teutat3s 2021-10-26 10:28:20 +02:00
drone 42a9306566 Merge remote-tracking branch 'origin/devos' 2021-10-26 00:08:19 +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
teutat3s f3237ea908
drone: fix signature 2021-10-25 01:44:56 +02:00
teutat3s 07c6de8b0d
ryzensun: init agenix 2021-10-25 01:43:19 +02:00
teutat3s 6f5dae8520
agenix: rekey for ryzensun 2021-10-25 01:33:29 +02:00
teutat3s 4b8c24df60
ryzensun: add custom keybindings 2021-10-25 01:16:28 +02:00
teutat3s 6c0585edc7
Merge branch 'main' into teutat3s 2021-10-24 23:42:55 +02:00
teutat3s 5f552149ea
Clean up unused git-crypt dirs/files 2021-10-24 23:42:36 +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
teutat3s c35a38f834
x-os: prepare booting from unencrypted /boot partition 2021-10-24 01:20:31 +02:00
teutat3s 4bc3eaed27
dumpyourvms: switch to unencrypted /boot partition 2021-10-24 01:18:49 +02:00
teutat3s 56ab7a1d28
x-os: prepare booting from unencrypted /boot partition 2021-10-24 01:18:33 +02:00
teutat3s d35fc6d8ae
overrides: try out docker-compose v2, xdg-desktop-portal from latest 2021-10-24 01:17:50 +02:00
teutat3s 3bb6c8bc66
agenix: init environment-secrets 2021-10-24 01:16:58 +02:00
teutat3s f2d20739e0
nixpkgs: bump lock for nixos and latest 2021-10-24 01:13:28 +02:00
Karolis Labrencis 65db5d30ae docs: remove outdated nix-rebuild notes 2021-10-23 17:50:49 -05:00
teutat3s 782f4add01
cron: reset origin remote url, so that next step's git fetch works 2021-10-22 14:04:17 +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
teutat3s 59069b11b1
Merge branch 'main' into teutat3s 2021-10-21 19:40:00 +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
teutat3s 5bf032e2c9
dumpyourvms: networking updates 2021-10-20 10:04:04 +02:00
teutat3s 7d9d924f2b
Merge branch 'main' into teutat3s 2021-10-20 10:03:23 +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 575e8c9fd0
Merge branch 'main' into teutat3s 2021-10-14 00:08:58 +02: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
teutat3s 7c064001e9
Merge branch 'main' into teutat3s 2021-10-12 14:57:36 +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 898fc15023
flake lock bump latest & nixos input 2021-10-12 00:39:16 +02:00
teutat3s f026b8bd44
overrides: sort, clean and add nomad 2021-10-12 00:38:38 +02:00
teutat3s 8da39248c6
core: add mytraceroute 2021-10-12 00:37:16 +02:00
teutat3s 7985b4f33d
teutat3s: add network tools 2021-10-12 00:36:44 +02:00
teutat3s 4de6cd9641
dumpyourvms: update vpn 2021-10-12 00:36:23 +02:00
teutat3s 58b6b7f0ca
Merge branch 'main' into teutat3s 2021-10-12 00:33:23 +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 a31706695e
Merge branch 'main' into teutat3s 2021-10-12 00:15:35 +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
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
teutat3s c653bf0818
Merge branch 'main' into teutat3s 2021-10-08 01:55:03 +02:00