Commit graph

2069 commits

Author SHA1 Message Date
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
Chris Montgomery 252769ce46 ci: update release workflow to checkout code from master branch 2021-09-20 08:10:31 -05:00
Chris Montgomery 57a14bb411 docs: update links to point to master instead of core 2021-09-20 08:10:31 -05:00
Chris Montgomery 19666a06a7 fix: bud get should init flake based off master 2021-09-20 08:10:31 -05:00
Chris Montgomery 955b9ce1c1 docs(bud): replace references to flk 2021-09-20 08:10:31 -05:00
Timothy DeHerrera f13c11ea17
README.md: fix broken links 2021-09-19 11:17:01 -06:00
Chris Montgomery c3461cd2c3 docs: master is the current target branch for pull requests 2021-09-19 07:32:52 -05:00
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