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

1043 commits

This branch
This branch
All branches
Author SHA1 Message Date
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
teutat3s e833c6cdae fix/merge-conflict (#36) 
Co-authored-by: Anton <fetsorn@gmail.com>
Co-authored-by: Chris Montgomery <chris@cdom.io>
Co-authored-by: Timothy DeHerrera <tim.deh@pm.me>
Reviewed-on: https://git.b12f.io/pub-solar/os/pulls/36
Co-authored-by: teutat3s <teutates@mailbox.org>
Co-committed-by: teutat3s <teutates@mailbox.org>
 2021-10-07 23:53:20 +00:00
teutat3s e41f1a1317 chore: fix merge conflict (#34) 
Reviewed-on: https://git.b12f.io/pub-solar/os/pulls/34
Co-authored-by: teutat3s <teutates@mailbox.org>
Co-committed-by: teutat3s <teutates@mailbox.org>
 2021-10-07 23:40:32 +00:00
Timothy DeHerrera a819ff2d1f
Merge pull request #387 from jyooru/patch-1 
docs: fix typos in concepts/suites
 2021-10-07 09:38:27 -06:00
Joel 8684105d21
docs: fix typos in concepts/suites 2021-10-07 19:11:21 +10:00
Pacman99 cc663a22d2
Merge pull request #386 from Pacman99/update-bud 
flake: update bud input and add check for bud
 2021-10-06 12:46:00 -07:00
teutat3s 916a812af1 core: fix nix search with dram (again) (#32) 
This somehow got lost in our commit history

Reviewed-on: https://git.b12f.io/pub-solar/os/pulls/32
Co-authored-by: teutat3s <teutates@mailbox.org>
Co-committed-by: teutat3s <teutates@mailbox.org>
 2021-10-06 07:27:50 +00:00
teutat3s 0f4f8eca37 Drone: follow new upstream default branch main, cron fixes (#30) 
Reviewed-on: https://git.b12f.io/pub-solar/os/pulls/30
Co-authored-by: teutat3s <teutates@mailbox.org>
Co-committed-by: teutat3s <teutates@mailbox.org>
 2021-10-05 19:32:54 +00:00
Parthiv Seetharaman 74208fb88f workflows: add check to run bud 2021-10-04 12:20:46 -07:00
Parthiv Seetharaman 469b3746cf flake: update bud input 2021-10-04 11:59:33 -07:00
bors[bot] 287cb82d1c
Merge #380 
380: chore: update deploy-rs, nvfetcher, devshell r=nrdxp a=GTrunSec

- waiting for https://github.com/divnix/digga/pull/108

Co-authored-by: GTrunSec <gtrunsec@hardenedlinux.org>
 2021-09-30 16:38:05 +00:00
GTrunSec 1df67a3f2a
update digga lock 2021-09-30 00:33:01 -07:00
GTrunSec f10a8fdd33
chore: update nvfecher 2021-09-29 11:49:43 -07:00
GTrunSec 950199ef2c
update deploy-rs overlay 2021-09-29 11:45:46 -07:00
bors[bot] 2976777ba9
Merge #378 
378: Update flake to use new modules options r=nrdxp a=Pacman99

connected to divnix/digga#107

Co-authored-by: Parthiv Seetharaman <pachum99@myrdd.info>
 2021-09-29 15:23:41 +00:00
Parthiv Seetharaman e0da74c87c Update flake to use new moddules options 2021-09-27 16:23:06 -07:00
teutat3s be2419645d
Merge branch 'master' into teutat3s 2021-09-23 01:11:03 +02:00
teutat3s 9d0e9efb47 fix/mimeapps-tweaks (#20) 
Reviewed-on: https://git.b12f.io/pub-solar/os/pulls/20
Reviewed-by: Benjamin Bädorf <b12f@noreply.example.org>
Co-authored-by: teutat3s <teutates@mailbox.org>
Co-committed-by: teutat3s <teutates@mailbox.org>
 2021-09-22 20:21:11 +00:00
teutat3s 2032775826
Merge branch 'master' into teutat3s 2021-09-21 22:35:50 +02:00
teutat3s 1c47036e79 Fix drone step competing for git lock (#19) 
Reviewed-on: https://git.b12f.io/pub-solar/os/pulls/19
Co-authored-by: teutat3s <teutates@mailbox.org>
Co-committed-by: teutat3s <teutates@mailbox.org>
 2021-09-21 20:33:10 +00:00
teutat3s 25d605d45b
Merge branch 'master' into teutat3s 2021-09-21 22:28:43 +02:00
teutat3s 62f7de1dba
Fix direnv cache 2021-09-21 22:27:53 +02:00
Benjamin Bädorf 9b248f9fb4 Remove direnv (#18) 
Co-authored-by: Benjamin Bädorf <hello@benjaminbaedorf.eu>
Reviewed-on: https://git.b12f.io/pub-solar/os/pulls/18
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-09-21 20:27:18 +00:00
Chris Montgomery e5660cdf83 ci: remove lingering references to main in workflow configs 
`main` is no longer in use.

See #369
 2021-09-20 08:10:55 -05:00
Chris Montgomery 95f89c0b44 docs: use single quotes in example to avoid shell expansion 2021-09-20 08:10:31 -05:00
Chris Montgomery ccf160dd21 docs: deploy command example is run from repo root 2021-09-20 08:10:31 -05:00
Chris Montgomery 0770c7f900 docs: bud get creates a directory named devos by default 
As mentioned in #370 it would not result in a directory called `bud`, as
can be seen in the custom `get.bash` command where the directory name
defaults to `devos`.
 2021-09-20 08:10:31 -05:00