pub-solar/os
5
0
Fork 2
Code Issues 4 Pull requests Packages Projects 1 Releases Wiki Activity
1680 commits 29 branches 43 tags 39 MiB
Commit graph

245 commits

Author SHA1 Message Date
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
teutat3s b25b043176
nvfetcher: use nixpkgs version 2022-08-09 23:16:00 +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 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 a94a41f444
Use our patched version of digga 2022-04-30 22:12:52 +02:00
teutat3s 970e6de8a7
Merge branch 'main' into feature/basic-iso 2022-04-30 16:04:59 +02:00
teutat3s 88bb8f3eb8
cachix: trust pub.solar public keys for nix-dram 2022-04-26 11:36:59 +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
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
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
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
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
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
David Arnold dcb425341d
update: digga/fup refactoring 2021-07-20 19:13:17 -05:00
teutat3s 81a70f7063
Merge remote-tracking branch 'devos/develop' into core 2021-07-17 15:43:05 +02:00
David Arnold a088edd77a fmt 2021-07-16 16:57:57 -05:00
David Arnold 6c25e77f6f add flake's nixConfig values that go well with this repo 2021-07-16 16:57:57 -05:00
David Arnold aa45592c17 imp: add digga's nixConfig and patchedNix 2021-07-16 16:57:57 -05:00
David Arnold 4b9cab40cb imp: add portable user definition 
According to https://github.com/nix-community/home-manager/issues/2161
there might be a better formal distinction between host-spaced and
portable arch-spaced hm users in the future.
 2021-07-16 11:22:10 -05:00
David Arnold 6ebdf3adb4 imp: reduce flake inputs footprint and increase conciseness 2021-07-15 19:26:27 -05:00
teutat3s a3961f7c52 move back from neovim-nightly to neovim from unstable (#10) 
https://github.com/neovim/neovim/releases/tag/v0.5.0

Co-authored-by: teutat3s <10206665+teutat3s@users.noreply.github.com>
Reviewed-on: https://git.b12f.io/pub-solar/os/pulls/10
Co-authored-by: teutat3s <teutates@mailbox.org>
Co-committed-by: teutat3s <teutates@mailbox.org>
 2021-07-13 16:33:15 +00:00
David Arnold fe73d2a083
fix: hm pin to corresponding nixos version 2021-07-09 11:46:42 -05:00
David Arnold bf59976063 work-around for https://github.com/NixOS/nix/pull/4641 2021-07-07 21:03:31 -05:00
David Arnold 33fb25e011 ref: move devshell module here to devos again 2021-07-07 21:03:31 -05:00
GTrunSec f1117f27ec
fix hasekllPackages overlay 2021-06-24 22:58:26 -07:00
GTrunSec ee89bf3f2a
feature: Add pkgs fetch manager nvfetcher 
Co-authored-by: David Arnold <dar@xoe.solutions>
 2021-06-24 21:37:50 -05:00
David Arnold 3cc28b3adb
bump digga to latest develop 2021-06-24 18:11:24 -05:00
David Arnold 62683b24ac
ref: pass our lib as lib.our to the module system 
At least we don't find ourselves with strange module signatures
and use something that looks like a dedicated namespace within
he module system: `config.lib`
 2021-06-13 23:30:05 -05:00
Benjamin Bädorf 52b6a54d28
Merge upstream 2021-06-09 18:37:21 +02:00
Pacman99 5831adb061 flake: switch to digga master 
To use the now released v0.2.0
 2021-06-08 18:14:32 -07:00
Pacman99 8e250d5084 flake: add agenix to devShell 2021-06-01 11:32:20 -07:00
Pacman99 d9082066f7 flake: update to new digga api 2021-06-01 11:32:20 -07:00
Benjamin Bädorf ddcf369f41
Initial PubSolarOS commit 2021-05-30 21:10:28 +02:00
Pacman99 768e3e7541 Merge branch 'core' into develop 2021-05-27 11:02:41 -07:00
bors[bot] da9f14cab2
Merge #279 
279: Agenix integration r=blaggacao a=Pacman99

AFAICT This is mostly a documentation thing. But with divnix/devlib#2 we can now add agenix to the devshell.

Co-authored-by: Pacman99 <pachum99@gmail.com>
 2021-05-20 18:53:20 +00:00
Pacman99 18d4c78ea5 flake: un-comment defaultTemplate 
This was accidentally commented.
fixes #288
 2021-05-16 19:35:52 -07:00
Pacman99 2ab4df3f60 suites: re-add rec to simplify suite definitions 2021-05-15 10:31:54 -07:00
Pacman99 64b7892f6e Add agenix integration to secrets and flake 2021-05-14 18:38:55 -07:00
Pacman99 2f474e37f7 flake: update to latest digga api 
allows overlays to also be used with `imports` and renames importHosts
 2021-05-14 16:49:12 -07:00
Pacman99 dd6c481791 flake: format ourlib for consistency with digga 2021-05-14 11:01:44 -07:00
Pacman99 923ce7feff tree: rename devlib -> digga 2021-05-14 10:20:02 -07:00
Pacman99 ccc0fc97fe flake.nix: use imports for auto-import of hosts 
This makes the auto-importing of hosts obvious and explicitly indicates
how the options would end up getting merged.
 2021-05-13 17:03:51 -07:00
Pacman99 c89dfed81c don't import cachix in suites 
its already imported in the core profile
 2021-05-12 19:18:11 -07:00
Pacman99 67f545123c flake: format and update to devlib api changes 2021-05-12 12:31:43 -07:00
Pacman99 3ee831f852
flake.nix: explicitly append overlays from path 
Co-authored-by: David Arnold <dar@xoe.solutions>
 2021-05-12 12:29:00 -07:00
Pacman99 f4cd79194a add in-tree local lib, ourlib 2021-05-05 13:44:39 -07:00
Pacman99 8dabd0f569 switch to devlib repo and remove in-tree lib 2021-05-05 13:24:08 -07:00
Pacman99 b8f7cdbe63 improve home-manager and deploy-rs integration 
move both to be setup in template
only set home-manager options if they exist
 2021-05-03 19:20:41 -05:00
Pacman99 e98e595704 pass builderArgs to config and extract builds 
have mkHomeConfiguration create its own custom build within the function
create a externalModule for customBuilds so its easy to add more
 2021-04-30 10:52:35 -07:00
Pacman99 a5dcb5fae9 fix flake by removing flake-compat follows 2021-04-27 18:41:51 -07:00
Pacman99 5bc88ad2c2 don't use lockfile to get flake-compat 
lock file format isn't very reliable with naming inputs
 2021-04-27 16:36:07 -07:00
Pacman99 aa825b87a6 auto import hosts in flake.nix 
this allows host-specific settings to be overriden with mkMerge
 2021-04-27 10:26:45 -07:00
Pacman99 d5276195f7 move overrides.nix to overlays 
also update overrides docs
it is a pure devos overlay now, it makes sense to go in overlays
 2021-04-27 09:47:04 -07:00
Pacman99 e67b49c280 auto-flatten coercedListOf and type fixes 2021-04-27 09:35:44 -07:00
Pacman99 e9675330a7 add cachix to base suite 
to follow the new api
 2021-04-26 19:34:18 -07:00
Pacman99 b766c693ab add pkgs overlay, pkgs.overlay is just for srcs 2021-04-26 13:21:40 -07:00
David Arnold c3d8805ad6 update devos template to use new api 2021-04-26 11:51:39 -07:00
David Arnold 239386b5f8
Merge branch 'core' into api-next 2021-04-19 00:10:47 -05:00
David Arnold a714cf466d
fix: various left-overs 2021-04-18 23:48:19 -05:00
Timothy DeHerrera e1e0f99af9
suites: move to profles/suites.nix 2021-04-18 21:13:12 -06:00
Timothy DeHerrera e13a65b33c
overrides: move to extern 2021-04-18 21:06:47 -06:00
David Arnold 19c900e293 workarround for unkown problem 2021-04-18 19:11:26 -05:00
David Arnold 5f89d27428 ref: extract lib into subflake 2021-04-18 19:11:26 -05:00
Pacman99 ac4c26755b init pkgs-lib, move tests and shell there 2021-04-10 13:36:54 -07:00
Timothy DeHerrera be4b612b23
treewide: format with nixpkgs-fmt 2021-04-09 19:22:08 -06:00
Pacman99 d068d79bfd flake: use mkFlake 
this is where we create devos's template structure
 2021-04-06 12:45:04 -07:00
Pacman99 92700888b7 flake: update to use mkSuites and mkHosts 2021-03-29 09:05:54 -07:00
bors[bot] ef1ee6e6b8
Merge #217 
217: lib/mkPkgs: don't import external files and get inputs as argument r=nrdxp a=Pacman99

Changes mkPkgs to take extern, overrides, and pkgs as an argument. This improves their ability to be used as lib functions.

Co-authored-by: Pacman99 <pachum99@gmail.com>
 2021-03-27 17:31:26 +00:00
Pacman99 e10fd4b319 shell: get extern and overrides to pass to mkpkgs 2021-03-27 10:09:05 -07:00
Pacman99 562f476fb5 lib/mkPkgs: fix function arguments 
take extern and overrides as arguments as to not import external files
get inputs as a function dependency from callLib
 2021-03-27 10:09:05 -07:00
Pacman99 58814fe741 flake: use filterPackages instead of flattenTreeSystem 2021-03-26 17:03:23 -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
Pacman99 416a52fcd3 users: add and export user modules and import them in hosts 2021-03-23 09:43:37 -07:00
Pacman99 0e5aa6568e flake/home: release -> master 2021-03-23 09:43:37 -07:00
Timothy DeHerrera 44623b5979
nix: don't use nix flake 
I originally wanted to use the nix flake to allow users to take
advantage of the latest changes. Just so happened that nixpkgs was
recently updated with a new version around the same time, and this
just adds complexity for no real gain.
 2021-03-22 23:29:31 -06:00