Commit graph

1061 commits

Author SHA1 Message Date
Timothy DeHerrera 633ccde1b1
Merge pull request #398 from KarolisL/doc_deploy_hm
Document using deploy-rs to deploy home-manager
2021-11-13 14:07:41 -07:00
Benjamin Bädorf 3fa5612b37
Merge branch 'main' of git.b12f.io:pub-solar/os 2021-11-07 20:45:22 +01:00
teutat3s d670aee07d
neovim: fix jsonls, fix cursor jumping into diagnostics buffer 2021-11-07 20:42:50 +01:00
teutat3s 7ea95e90f5
terminal-life: add glow, a tui markdown viewer; sort packages 2021-11-07 20:42:39 +01:00
Benjamin Bädorf 1d3a737fe5 Merge pull request 'Fix mailto-mutt EDITOR variable' (#58) from fix/mailto-mutt-ff into main
Reviewed-on: https://git.b12f.io/pub-solar/os/pulls/58
2021-11-05 22:47:38 +00:00
Benjamin Bädorf 767592185b
Fix mailto-mutt EDITOR variable 2021-11-05 23:43:01 +01:00
Karolis Labrencis 89b3cf78fd Document using deploy-rs to deploy home-manager 2021-11-02 23:44:20 +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
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
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 6962aab06c
Remove .gitattributes files 2021-10-24 19:39:23 +02:00
Benjamin Bädorf 243116e228
Remove git crypt, update docs 2021-10-24 19:36:56 +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
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
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 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
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
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