Commit graph

245 commits

Author SHA1 Message Date
teutat3s 7715a89401
Fix deploy-rs, use flake binary again
Can be reverted once deploy-rs nixpkgs binary is up-to-date
See: https://github.com/serokell/deploy-rs/issues/232
2023-09-15 12:13:47 +02:00
teutat3s 12307872d6
Merge branch 'main' into chore/infra-merge-main 2023-09-13 13:17:11 +02:00
teutat3s dfd80c0e95
Fix nvfetcher by using forked nixpkgs
See upstream issue: https://github.com/NixOS/nixpkgs/issues/249962
2023-09-13 12:38:12 +02:00
teutat3s 93ccb899ba
Fix git ref git.b12f.io -> git.pub.solar 2023-09-13 12:06:28 +02:00
teutat3s 2d27b9c315
nvfetcher: use version 0.6.1.0 from latest instead of flake 2023-07-21 12:04:14 +02:00
Benjamin Bädorf d909f093b2
Merge branch 'main' into chore/update-infra-07-23 2023-07-13 18:16:02 +02:00
teutat3s b2d0c80f79
flake: fix broken deploy-rs usage
Still doesn't use deploy-rs from nixpkgs because of usage in digga:
https://github.com/divnix/digga/blob/main/src/generators.nix#L77
2023-07-04 01:42:50 +02:00
teutat3s c36a22c556
flake: fix broken deploy-rs usage
Still doesn't use deploy-rs from nixpkgs because of usage in digga:
https://github.com/divnix/digga/blob/main/src/generators.nix#L77
2023-07-02 17:56:17 +02:00
teutat3s 91a89f172d
flake: fix leftover merge conflict 2023-07-02 13:27:04 +02:00
teutat3s 38ebdcf0dc
Merge branch 'main' into infra 2023-07-02 13:26:12 +02:00
teutat3s 2b9def0a76
Merge branch main into origin/nixos-23.05 2023-06-28 19:20:11 +02:00
teutat3s f964dd3803
flake: use nixos-23.05
Use overlay for nvfetcher for recent fixes from master branch
2023-06-13 14:42:53 +02:00
teutat3s a3ad8e57f8
deploy-rs: use nixpkgs version, avoid rebuilding
https://github.com/serokell/deploy-rs/pull/207
https://github.com/serokell/deploy-rs/issues/163
2023-06-13 14:33:56 +02:00
teutat3s 97239d1fbb
inputs: switch to nixos-23.05 2023-06-13 14:24:52 +02:00
Hendrik Sokolowski 647c80ae4b disable test because of outdated test framework in digga 2023-05-14 15:49:43 +02:00
teutat3s e02a5b0e50
Merge branch 'main' into infra-merge-main 2023-04-17 14:44:01 +02:00
teutat3s 141f950607
Disable unused test on infra branch 2023-04-11 19:19:28 +02:00
teutat3s ae2439a93a
Merge branch 'main' into infra-merge-main-bump-flake-lock 2023-04-11 18:59:36 +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
teutat3s f00a009115
Merge branch 'main' into feature/mailman 2023-02-01 12:26:18 +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
teutat3s f49bc2b4b2
Bump flake.lock, fix agenix overlay
agenix now uses overlays.default to export its overlay
2023-02-01 11:14:50 +01:00
teutat3s 2a756869e3
Merge branch 'main' into feature/mailman 2023-02-01 10:10:28 +01:00
teutat3s 158f336517
base-user: fix home-manager stateVersion
See: bca4b89f49
2023-01-29 02:40:14 +01:00
teutat3s 9732e4edf1
Apply treefmt 2023-01-28 23:51:33 +01:00
teutat3s 90b182e499
Merge branch 'main' into infra 2023-01-28 23:27:21 +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
teutat3s f2c5739c97
Update flake.lock, remove fork flake input
gitea gpg PR got merged into nixos-unstable in
https://github.com/NixOS/nixpkgs/pull/203183
2023-01-21 23:21:16 +01:00
teutat3s 492b8695a3
Merge remote-tracking branch 'origin/nixos-22-11-racoon' into infra-22.11 2022-11-28 21:53:32 +01:00
teutat3s 7655260456
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-27 22:01:21 +01:00
teutat3s a795bf4429
Rename flora6 -> flora-6 2022-11-27 21:56:40 +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
teutat3s 0e6df4e33b
flora6: init host 2022-10-05 12:02:28 +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
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
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