Commit graph

309 commits

Author SHA1 Message Date
Benjamin Bädorf b90170a587
Update to NixOS 23.05 2023-06-11 22:54:11 +02:00
Benjamin Bädorf 260eb077d0
Merge branch 'main' into b12f 2023-06-01 18:39:23 +02:00
Hendrik Sokolowski 647c80ae4b disable test because of outdated test framework in digga 2023-05-14 15:49:43 +02:00
Benjamin Bädorf dcb77f9056
Merge branch 'main' into b12f 2023-04-03 11:46:57 +02:00
teutat3s b1ad71cd35
cachix: remove unused binary caches 2023-03-27 13:52:40 +02:00
Akshay Mankar 1f5b2b9d10
flake: Remove nur
It was perhaps added manually, not sure if the overlay was actually useful to
anyone.
2023-03-26 15:14:33 +02:00
Benjamin Bädorf fd3cf376c3
Update paperless module 2023-02-21 12:37:18 +01:00
Benjamin Bädorf a97bf09324
Merge branch 'main' into b12f 2023-02-01 13:52:00 +01:00
teutat3s 2ed21e3b94
flake: make digga, deploy, agenix follow existing
inputs

This should reduce merge conflicts in the flake.lock file by reducing
the number of locked inputs
2023-02-01 11:29:34 +01:00
teutat3s 8ef0827565
Bump flake.lock, fix agenix overlay
agenix now uses overlays.default to export its overlay
See: 64b0574514
2023-02-01 11:20:35 +01:00
Benjamin Bädorf d249983e20
Fix allowUnfree 2023-01-29 19:55:22 +01:00
teutat3s 158f336517
base-user: fix home-manager stateVersion
See: bca4b89f49
2023-01-29 02:40:14 +01:00
Benjamin Bädorf 7d09488513
Fix main merge 2023-01-28 22:34:24 +01:00
Benjamin Bädorf 9b53a8c982
Merge branch 'main' into b12f 2023-01-28 22:27:52 +01:00
teutat3s 00677fb11f
Merge branch 'main' into feature/alejandra-treefmt 2023-01-28 21:40:44 +01:00
teutat3s 0e8caa25d3
nvfetcher: remove unnecessary flake, use nixpkgs version
from shell/devos.nix
2023-01-28 15:34:25 +01:00
Benjamin Bädorf d4303ccab3
Merge branch 'main' into b12f 2022-11-27 22:35:23 +01:00
teutat3s f51e4f3633
nixos: 22.11 racoon, bump flake.lock 2022-11-26 04:48:58 +01:00
teutat3s 73bf158392
Run treefmt command 2022-11-20 23:28:23 +01:00
teutat3s 02c145697b
Pull in upstream commits from https://github.com/divnix/digga/pull/490
Improved flake-compat

Get the rev from the flake.lock file. Shouldn't be an issue for
first time users as the guide instructs users to generate a lock
file. `builtins.file` was used in accordance with nix.dev
reccommendations.

https://nix.dev/anti-patterns/language#reproducibility-referencing-top-level-directory-with

Rm tempfix
2022-11-07 11:24:59 +01:00
Benjamin Bädorf 87c3630dfb
Add factorio 2022-10-17 15:56:48 +02:00
Benjamin Bädorf b8ab1d87e2
Merge branch 'main' into b12f 2022-09-13 15:14:06 +02:00
teutat3s 0fbabc23b9
bootstap: host needs digga's bootstrapIso module 2022-09-01 15:35:04 +02:00
teutat3s b7ba1b7ba9
Fix hosts rebuilding with ISO config after #125
See: https://github.com/divnix/digga/pull/455#issuecomment-1231789444

Upstream fix found in e1b09712fe/nixos/default.nix (L85-L88)
2022-09-01 14:34:57 +02:00
Benjamin Bädorf 341f88b21a
Merge branch 'main' into b12f 2022-08-29 17:00:00 +02:00
teutat3s 242de215d6
Switch to our digga fork, include upstream PR
divnix/digga#455 to fix bootstrap iso builds
2022-08-27 13:49:55 +02:00
teutat3s 8be1bd53d3
wip: first PubSolarOS iso test using the NixOS
test suite:

https://nixos.org/manual/nixos/stable/index.html#sec-nixos-tests
2022-08-25 16:06:25 +02:00
Benjamin Bädorf 3883f30b74
Use correct sshUser for droppie deployments 2022-08-14 19:24:12 +02:00
Benjamin Bädorf dec9e54872
Allow unfree on my branch 2022-08-14 17:51:41 +02:00
Benjamin Bädorf 636eed806b
Merge remote-tracking branch 'origin/main' into b12f 2022-08-14 17:50:21 +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 71a47f35b4
Merge branch 'main' into fix/set-nix-dram-default 2022-08-14 15:18:55 +02:00
Benjamin Bädorf e436443bd2 Merge pull request 'Rework of x-os module / core profile' (#115) from feature/integrate-core-profile-into-x-os-and-rename-x-os-to-core into main
Reviewed-on: https://git.b12f.io/pub-solar/os/pulls/115
Reviewed-by: Benjamin Bädorf <b12f@noreply.example.org>
2022-08-14 13:13:27 +00: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
Hendrik Sokolowski 4190818304 Rework of x-os module / core profile
* move core settings to x-os
* add option to only install a lite core
* rename x-os module to core
* remove core profile from flake.nix
2022-08-14 14:47:44 +02:00
Benjamin Bädorf be016c44fb Merge pull request 'Remove nonfree software' (#113) from feat/fucking-free into main
Reviewed-on: https://git.b12f.io/pub-solar/os/pulls/113
Reviewed-by: teutat3s <teutates@mailbox.org>
2022-08-14 12:47:32 +00:00
teutat3s c2c9a65fc4
devos: move common overlays to sharedOverlays for
fup passthrough
See:
89d9b3ea97
2022-08-14 14:21:11 +02:00
Benjamin Bädorf 552b2ee53e
Remove nonfree software
This commit removes the default, global `allowUnfree = true;` setting
and removes nonfree packages where I could find them. Tested by building
the `PubSolarOS` host once.
2022-08-14 14:15:02 +02:00
hensoko 18e9b4a009 feature/restructure-core-profile (#109)
Co-authored-by: Hendrik Sokolowski <hensoko@gssws.de>
Reviewed-on: https://git.b12f.io/pub-solar/os/pulls/109
Reviewed-by: Benjamin Bädorf <b12f@noreply.example.org>
Reviewed-by: teutat3s <teutates@mailbox.org>
2022-08-13 20:35:43 +00:00
Benjamin Bädorf 70980fba28
Fix droppie config 2022-08-13 20:15:22 +02:00
Benjamin Bädorf f764cfa36d
Add server specific user 2022-08-13 18:53:50 +02:00
Hendrik Sokolowski 030e5c0058 Add droppie 2022-08-13 18:08:27 +02:00
Benjamin Bädorf 2dda411388
Merge branch 'main' into b12f 2022-08-13 12:14:16 +02:00
teutat3s b25b043176
nvfetcher: use nixpkgs version 2022-08-09 23:16:00 +02:00
Benjamin Bädorf ca6843ab44
Use override for yubikey-agent 2022-06-04 22:11:46 +02:00
Benjamin Bädorf efc52114f3
Merge branch 'main' into b12f 2022-06-04 02:59:32 +02:00
teutat3s 8e43046dee
nixos: follow release-22.05
home: follow release-22.05 branch

Fixes for upstream changes:

ag renamed to silver-searcher, extfat-utils is now exfat, lot's of
overrides no longer needed, as they're now in the release branch,
services.caddy.config split up into globalConfig and extraConfig
2022-06-02 10:13:17 +02:00
Benjamin Bädorf 88be4b7afa
Add socials to b12f module 2022-05-03 00:04:52 +02:00
Benjamin Bädorf 59c1a23660
Merge branch 'main' into b12f 2022-05-02 15:01:30 +02:00
Benjamin Bädorf 91605af135
Revert "Merge pull request 'fix/boostrap-iso' (#75) from fix/boostrap-iso into main"
This reverts commit 48be9cfa75, reversing
changes made to 281d7b56b4.
2022-05-02 09:49:14 +02:00
Benjamin Bädorf b648055b60
Merge branch 'main' into b12f 2022-05-01 21:00:50 +02:00
Benjamin Bädorf a94a41f444
Use our patched version of digga 2022-04-30 22:12:52 +02:00
Benjamin Bädorf d85a796259
Merge branch 'main' into b12f 2022-04-30 19:58:06 +02:00
teutat3s 970e6de8a7
Merge branch 'main' into feature/basic-iso 2022-04-30 16:04:59 +02:00
Benjamin Bädorf 2f54c4e25c
Merge branch 'main' into b12f 2022-04-27 15:24:22 +02:00
teutat3s 88bb8f3eb8
cachix: trust pub.solar public keys for nix-dram 2022-04-26 11:36:59 +02:00
Benjamin Bädorf c2b6ec5acc
Merge branch 'main' into b12f 2022-04-10 14:02:28 +02:00
teutat3s 11ea007899
digga: Remove customBuilds, nixos-generate
has --flake, Use nixos-* not release-*
2022-04-09 16:52:04 +02:00
teutat3s 2cbaf25a27
export devos template in digga
devos: remove bud get
2022-04-09 16:51:44 +02:00
Benjamin Bädorf d047a4aac0
Merge branch 'main' into b12f 2022-03-09 13:37:26 +01:00
teutat3s 2666453e8c
Merge branch 'devos' 2022-02-24 23:41:36 +01:00
teutat3s 4052b39c6e
nix-dram: ensure nixpkgs follows latest input 2022-02-22 16:51:08 +01:00
Parthiv Seetharaman b0aadda88c flake: switch back to serokell deploy input
There is a bug in the input-output-hk fork
2022-02-17 16:22:48 -08:00
Benjamin Bädorf e3ff8c5441
Merge branch 'main' into b12f 2022-02-14 10:54:00 +01:00
teutat3s 74b4ec148c
Merge branch 'main' into feature/basic-iso 2022-02-02 04:38:30 +01:00
teutat3s dca27eda2e
Fix up rebase 2022-02-02 04:21:40 +01:00
teutat3s f99159df93
chore: bump flake lock 2022-02-02 04:00:14 +01:00
teutat3s 1d2eb2edd0
iso: use iso suite in PubSolarOS host
fae: boots PubSolarOS
2022-02-02 04:00:11 +01:00
teutat3s 0cf1c0e9b0
iso: default user nixos becomes pub-solar 2022-02-02 04:00:11 +01:00
teutat3s f07010445e
Reference nix-dram package directly from inputs
This should avoid patches not working because our pkgs
follows nixos = release-21.11 and nix-dram follows nixos-unstable
2022-02-02 04:00:10 +01:00
teutat3s 0629024cf5
chore: clean up after upstream updates 2022-02-02 03:33:20 +01:00
teutat3s a4dbe4fa78
Reference nix-dram package directly from inputs
This should avoid patches not working because our pkgs
follows nixos = release-21.11 and nix-dram follows nixos-unstable
2022-01-31 16:19:36 +01:00
Benjamin Bädorf 87e48217d0
Merge branch 'main' into b12f 2022-01-06 14:14:13 +01:00
teutat3s b8b3404d4c
Merge branch 'devos' 2021-12-30 21:54:42 +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
David Arnold 6151d02b8d rm: use of patched nix for nixos 21.11 enabled digga
- patched nix held the follows patch which is now upstreamed
2021-12-29 14:00:25 -08:00
teutat3s 2340270d81
All the option are with us now 2021-10-24 22:55:28 +02:00
teutat3s 2588264d88
Make check work 2021-10-24 22:03:28 +02:00
Benjamin Bädorf 411a0e3e74
Add basic ISO setup 2021-10-21 20:06:57 +02:00
Benjamin Bädorf 231abe6af4
Merge branch 'main' into b12f 2021-10-13 19:27:04 +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 950199ef2c
update deploy-rs overlay 2021-09-29 11:45:46 -07:00
Parthiv Seetharaman e0da74c87c Update flake to use new moddules options 2021-09-27 16:23:06 -07:00
Benjamin Bädorf 3cec4a51f2
Add mobile profile to ben user 2021-09-27 14:52:21 +02:00
Benjamin Bädorf 2e6fe672d2
Fix direnv cache 2021-09-21 22:21:29 +02:00
Benjamin Bädorf 3dcc90fc24
feat(chocolatebar): enable virtualisation 2021-09-05 22:18:08 +02:00
Benjamin Bädorf e29ad5c23f
Enable the gaming suit for b12f 2021-09-05 00:47:56 +02:00
Benjamin Bädorf f89384cbf0
Works for chocolatebar 2021-09-04 15:56:44 +02:00
Benjamin Bädorf d132638c8e
Fix flake lock imports 2021-09-02 20:00:22 +02:00
Benjamin Bädorf 2293e703cc
Fix suites 2021-09-02 19:16:05 +02:00
teutat3s 3f4d3cf240
Merge branch 'b12f' into b12f-master 2021-09-01 19:12:50 +02:00
teutat3s 02330bc9ce
Merge remote-tracking branch 'devos/master' 2021-09-01 18:45:42 +02:00
David Arnold 5657ddf3c1
fix: input ref / bump digga
the indirect reference started failing with
```
warning: Git tree '/home/blaggacao/ghq/github.com/divnix/devos' is dirty
error: NAR hash mismatch in input 'github:NixOS/nixpkgs/release-21.05' (/nix/store/0r0xrqj5l88071cama7hlha5ajya06c8-source), expected 'sha256-MhVtkVt1MFfaDY3ObJu54NBcsaPk19vOBZ8ouhjO4qs=', got 'sha256-jQgXeJ9NQQS0Eobb/qQOvS+RRULkqRikAeXkkFKOPDA='
```
2021-08-05 20:42:26 -05:00
David Arnold 2fcb3605ee
docs: soft update (fix the most obvious drift) 2021-08-01 16:38:52 -05:00
teutat3s bf81ed29d1
Ensure pinning latest channel to nixpkgs nixos-unstable branch 2021-07-30 22:22:44 +02:00
Timothy DeHerrera 8b67cae20a
flake: remove ci-agent 2021-07-23 14:38:54 -06: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 bf8620f8ba
ref: point digga to main (default) branch 2021-07-20 22:19:09 -05:00
David Arnold 31a8e76209
ref: adapt to using plain digga module for boostrap ISO 2021-07-20 21:45:41 -05:00