Commit graph

73 commits

Author SHA1 Message Date
teutat3s 63102f33e5
nix: set nix.package to force overlays/
overrides.nix to apply

use nix as default version alias in devshell as well
2022-08-24 00:53:38 +02:00
teutat3s b263ca4c45
Merge branch 'main' into teutat3s 2022-08-14 17:21:34 +02:00
teutat3s 1c015508e1
tree: remove bud and all mentions of it
Include upstream update doc updates
2022-08-14 17:16:54 +02:00
teutat3s d9057d8281
Merge branch 'main' into feature/upstream-fixes 2022-08-14 16:25:25 +02:00
teutat3s bf581d1e9c
nix-dram: remove nix-dram as default nix binary
nix-dram as default nix binary isn't worth the
maintenance work anymore, CI builds started
failing because of it:
https://ci.b12f.io/pub-solar/os/533/1/2

Automatic builds still happen each night and can be
checked in our fork of nix-dram:
https://github.com/pub-solar/nix-dram/actions

Users of nix-dram can continue to use it via devshells
or nix run github:dramforever/nix-dram -- --version
2022-08-14 15:12:23 +02:00
teutat3s 616b7af858
devos: include upstream commits
780620d865

e6b14d39d6

dd51f64bc5
2022-08-13 21:50:23 +02:00
teutat3s 0cc621a4ec
deploy-rs: use nixpkgs version 2022-08-09 23:16:06 +02:00
teutat3s b25b043176
nvfetcher: use nixpkgs version 2022-08-09 23:16:00 +02:00
teutat3s 624bbf36c6
deploy-rs: use nixpkgs version 2022-08-09 11:56:43 +02:00
teutat3s 90e181040c
nvfetcher: use nixpkgs version 2022-08-09 11:56:42 +02:00
teutat3s 0fc1a7fe20
hooks: apply upstream pre-commit changes 2022-08-09 11:56:42 +02:00
teutat3s 8540db683a
devos: use nix instead of nixFlakes alias, now that version
2.8 is stable in NixOS 22.05
2022-06-02 10:48:19 +02:00
teutat3s cf5dd8c72c
clean up bud 2022-04-30 17:03:13 +02:00
teutat3s 970e6de8a7
Merge branch 'main' into feature/basic-iso 2022-04-30 16:04:59 +02:00
teutat3s 2cbaf25a27
export devos template in digga
devos: remove bud get
2022-04-09 16:51:44 +02:00
teutat3s a9ea24a39b
export devos template in digga
devos: remove bud get
2022-04-09 16:37:22 +02:00
teutat3s b911badb8a
pre-commit hook: only format modified lines
instead of entire files
2022-04-09 16:37:19 +02:00
teutat3s 03e6c47086
pre-commit hook: fix shellcheck SCSC2181
Check exit code directly with e.g. if mycmd;
not indirectly with $?

https://github.com/koalaman/shellcheck/wiki/SC2181
2022-04-09 15:42:36 +02:00
teutat3s 7ecfcf5814
pre-commit hook: fix shellcheck SC2207
Prefer mapfile or read -a to split command output

https://github.com/koalaman/shellcheck/wiki/SC2207
2022-04-09 15:22:37 +02:00
teutat3s 67d48485d0
add --eval-store local flag to nix CI commands
see https://github.com/nix-community/naersk/issues/217

and https://kevincox.ca/2022/01/02/nix-in-docker-caching/
2022-02-03 11:44:40 +01:00
teutat3s 82c9283639
Follow upstream devshell with nixUnstable, important fixes
for docker needed, see:

https://github.com/NixOS/nix/issues/5777

https://github.com/NixOS/nix/pull/5787
2022-02-03 00:33:21 +01:00
teutat3s 9d0eb01b1a
Add mdbook from pr 1306 with multilang support 2022-02-03 00:30:49 +01:00
teutat3s 74b4ec148c
Merge branch 'main' into feature/basic-iso 2022-02-02 04:38:30 +01:00
Benjamin Bädorf 8442a936e5
Remove git crypt, update docs 2022-02-02 04:21:43 +01:00
teutat3s dca27eda2e
Fix up rebase 2022-02-02 04:21:40 +01:00
Parthiv Seetharaman 7d67ba1caf
bud: switch back to pulling devos as template 2022-02-02 03:45:20 +01:00
teutat3s 0629024cf5
chore: clean up after upstream updates 2022-02-02 03:33:20 +01:00
teutat3s f33597926e
Merge branch 'main' into teutat3s-init-fae 2022-01-31 14:09:28 +01:00
Parthiv Seetharaman 9fd3a1085e bud: switch back to pulling devos as template 2022-01-29 19:48:26 -08:00
teutat3s 082e33c1ed
wip 2022-01-19 01:13:15 +01:00
Parthiv Seetharaman 87f1d7da18 bud: move to shell and use git clone for get 2021-12-29 15:41:58 -08:00
David Arnold a319aed9f4 imp: move follows responsibility downstream
- also remove unimportant (small) depenencies from follows management
- so that it is less complex as errors occur, since:
- it seems there are still follows issues present upstream
2021-12-29 14:00:25 -08:00
Benjamin Bädorf 243116e228
Remove git crypt, update docs 2021-10-24 19:36:56 +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
GTrunSec f10a8fdd33
chore: update nvfecher 2021-09-29 11:49:43 -07:00
Parthiv Seetharaman e0da74c87c Update flake to use new moddules options 2021-09-27 16:23:06 -07:00
GTrunSec 768c9b8216
bump: nvfetcher and cleanup 2021-08-02 15:53:14 -05:00
David Arnold a3ec0d2814
imp: use bud nixos-/devhsllModules and hide rebiding
both modules depend on `self`/`inputs` available as special args for
both, devshell & nixos modules, so bump to an improved `digga`, as well.
2021-07-20 23:36:41 -05:00
David Arnold a088edd77a fmt 2021-07-16 16:57:57 -05:00
David Arnold 33fb25e011 ref: move devshell module here to devos again 2021-07-07 21:03:31 -05:00
Pacman99 ac4c26755b init pkgs-lib, move tests and shell there 2021-04-10 13:36:54 -07:00
Pacman99 e10fd4b319 shell: get extern and overrides to pass to mkpkgs 2021-03-27 10:09:05 -07:00
Pacman99 dc9d9877b8 export homeConfigurations for all user@host pairs and add better home-manager only defaults 2021-03-23 09:43:37 -07:00
Timothy DeHerrera 9ba1e7f9bc
nix: remove patch for default unstable features 2021-03-22 23:29:30 -06:00
Timothy DeHerrera 9537daee32
flake: nixos -> nixos-unstable
20.09 is getting stale as we move toward a new release so track
unstable for now.
2021-03-22 23:20:40 -06:00
David Arnold 3d324e7533 lib/devos: bake devos repo into live cd (#168)
fix #167 

This worked for me to bootstrap another machine.
2021-03-16 19:50:38 +00:00
Timothy DeHerrera d51cd34fb7
subflakes: make first class citizens
Subflakes should provide their wares as outputs, so wire up the pkgs
flake to reflect that.

Due to the unstable nature of flakes, updating the root flake doesn't
currently update the subflake lock file. Therefore, add additional
logic to flk update script in order to do this behind the scenes.

Nix is now pulled in from the "nix" registry flake in order for users
to take advantage of improvements to the UI since its last update in
nixpkgs.
2021-03-14 21:27:58 -06:00
Timothy DeHerrera c012f2f4ed treewide cleanups and refactoring for initial tests (#157)
- [x] refactor lib into separate files, similar to NixOS/nixpkgs/lib.
- [x] refactor ci to automatically generate derivations from flake outputs
- [x] remove cluttered indirection statements throughout the codebase
- [x] refactor hosts to allow for upcoming integration tests
- [x] improve ambiguity in the existing docs 
- [x] add [BORS](https://bors.tech) support
- [x] add initial integration test
- [x] write tests documentation
- [x] test lib
- [x] improve version string generation, and do so automatically for pkgs/flake.nix sources

Clean up the codebase as best we can in preparation for #152 and add tests. From now on, all PRs will be merged with BORS.
2021-03-14 07:10:51 +00:00
Timothy DeHerrera 25180a5e6e
pkgs: use subflake to manage package sources
* Resolves #118
* Leverage flakes to manage package sources & hashes
* Update documentation with an example.
* Add `mkVersion` function to autogenerate a version string.
* Add srcs package via overlay containing all sources defined in
  _pkgs/flake.nix_
* Extend `flk update` with the ability to only update the given input
2021-02-26 00:15:45 -07:00
Timothy DeHerrera 4e95e1ee72
shell: fix #131 2021-02-19 16:25:28 -07:00