b12f/os
1
0
Fork 0
Code Issues Pull requests Packages Projects Releases Wiki Activity
2184 commits 4 branches 0 tags 7.6 MiB
Commit graph

236 commits

Author SHA1 Message Date
teutat3s 5acbaa3dd5
flake: update nixos + latest inputs 
• Updated input 'latest':
    'github:nixos/nixpkgs/2de8efefb6ce7f5e4e75bdf57376a96555986841' (2023-07-12)
  → 'github:nixos/nixpkgs/5df4d78d54f7a34e9ea1f84a22b4fd9baebc68d0' (2023-07-20)
• Updated input 'nixos':
    'github:nixos/nixpkgs/fcc147b1e9358a8386b2c4368bd928e1f63a7df2' (2023-07-13)
  → 'github:nixos/nixpkgs/08700de174bc6235043cb4263b643b721d936bdb' (2023-07-18)
 2023-07-21 12:23:33 +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 f0d913c22a
fix: fix missing nixd package in overrides 2023-07-18 12:52:02 +02:00
Benjamin Bädorf e7d686feb7
Merge branch 'main' into b12f 2023-07-18 12:44:47 +02:00
teutat3s fd74f59c39
Bump flake inputs nixos + latest in lockfile 
• Updated input 'latest':
    'github:nixos/nixpkgs/645ff62e09d294a30de823cb568e9c6d68e92606' (2023-07-01)
  → 'github:nixos/nixpkgs/2de8efefb6ce7f5e4e75bdf57376a96555986841' (2023-07-12)
• Updated input 'nixos':
    'github:nixos/nixpkgs/b72aa95f7f096382bff3aea5f8fde645bca07422' (2023-06-30)
  → 'github:nixos/nixpkgs/fcc147b1e9358a8386b2c4368bd928e1f63a7df2' (2023-07-13)
 2023-07-14 13:12:50 +02:00
teutat3s 002e6970ed
flake: update lock file 
• Updated input 'darwin':
    'github:LnL7/nix-darwin/7c16d31383a90e0e72ace0c35d2d66a18f90fb4f' (2023-06-09)
  → 'github:LnL7/nix-darwin/b06bab83bdf285ea0ae3c8e145a081eb95959047' (2023-07-02)
• Updated input 'deploy':
    'github:serokell/deploy-rs/65211db63ba1199f09b4c9f27e5eba5ec50d76ac' (2023-06-05)
  → 'github:serokell/deploy-rs/724463b5a94daa810abfc64a4f87faef4e00f984' (2023-06-14)
• Updated input 'home':
    'github:nix-community/home-manager/e753d659c64c7d158433d87ef7d6151ca1d1817a' (2023-06-12)
  → 'github:nix-community/home-manager/07c347bb50994691d7b0095f45ebd8838cf6bc38' (2023-06-27)
• Updated input 'latest':
    'github:nixos/nixpkgs/75a5ebf473cd60148ba9aec0d219f72e5cf52519' (2023-06-11)
  → 'github:nixos/nixpkgs/645ff62e09d294a30de823cb568e9c6d68e92606' (2023-07-01)
• Updated input 'nixos':
    'github:nixos/nixpkgs/d3bb401dcfc5a46ce51cdfb5762e70cc75d082d2' (2023-06-10)
  → 'github:nixos/nixpkgs/b72aa95f7f096382bff3aea5f8fde645bca07422' (2023-06-30)
• Updated input 'nixos-hardware':
    'github:nixos/nixos-hardware/2a807ad6e8dc458db08588b78cc3c0f0ec4ff321' (2023-06-11)
  → 'github:nixos/nixos-hardware/429f232fe1dc398c5afea19a51aad6931ee0fb89' (2023-06-15)
• Updated input 'nvfetcher':
    'github:berberman/nvfetcher/c5ae2cb436a04f4590306589e71638d023a33bd4' (2023-05-27)
  → 'github:berberman/nvfetcher/44196458acc2c28c32e456c50277d6148e71e708' (2023-06-22)
• Updated input 'nvfetcher/flake-utils':
    'github:numtide/flake-utils/cfacdce06f30d2b68473a46042957675eebb3401' (2023-04-11)
  → 'github:numtide/flake-utils/abfb11bd1aec8ced1c9bb9adfe68018230f4fb3c' (2023-06-19)
 2023-07-04 01:42:49 +02:00
Benjamin Bädorf ad4a358ba1
Fix concourse & caddy startup 2023-07-03 13:20:13 +02:00
Benjamin Bädorf a6ae2da25b
Add keycloak theme to flake 2023-07-02 12:48:54 +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 97239d1fbb
inputs: switch to nixos-23.05 2023-06-13 14:24:52 +02:00
Benjamin Bädorf cf29402d32
Update user ben to NixOS 23.05 2023-06-11 22:54:30 +02:00
Benjamin Bädorf 260eb077d0
Merge branch 'main' into b12f 2023-06-01 18:39:23 +02:00
Benjamin Bädorf 47ea05007d
Add flake lock back in 2023-06-01 18:10:43 +02:00
Benjamin Bädorf 39ff71b6d3
Merge branch 'b12f' of git.pub.solar:pub-solar/os into b12f 2023-06-01 18:10:27 +02:00
teutat3s 6cb3ab687f
flake: fix lastModified for input flake agenix 
Retrieved using:
❯ nix flake metadata --json github:ryantm/agenix/2994d002dcff5353ca1ac48ec584c7f6589fe447
 2023-05-18 04:14:01 +02:00
teutat3s 0c8763808a
flake: update inputs 
• Updated input 'agenix':
    'github:ryantm/agenix/b7ffcfe77f817d9ee992640ba1f270718d197f28' (2023-01-31)
  → 'github:ryantm/agenix/2994d002dcff5353ca1ac48ec584c7f6589fe447' (2023-04-21)
• Updated input 'darwin':
    'github:LnL7/nix-darwin/87b9d090ad39b25b2400029c64825fc2a8868943' (2023-01-09)
  → 'github:LnL7/nix-darwin/252541bd05a7f55f3704a3d014ad1badc1e3360d' (2023-05-10)
• Updated input 'deploy':
    'github:serokell/deploy-rs/8c9ea9605eed20528bf60fae35a2b613b901fd77' (2023-01-19)
  → 'github:serokell/deploy-rs/c80189917086e43d49eece2bd86f56813500a0eb' (2023-05-11)
• Updated input 'home':
    'github:nix-community/home-manager/65c47ced082e3353113614f77b1bc18822dc731f' (2023-01-23)
  → 'github:nix-community/home-manager/f9edbedaf015013eb35f8caacbe0c9666bbc16af' (2023-04-10)
• Updated input 'latest':
    'github:nixos/nixpkgs/2caf4ef5005ecc68141ecb4aac271079f7371c44' (2023-01-30)
  → 'github:nixos/nixpkgs/897876e4c484f1e8f92009fd11b7d988a121a4e7' (2023-05-06)
• Updated input 'nixos':
    'github:nixos/nixpkgs/0218941ea68b4c625533bead7bbb94ccce52dceb' (2023-01-31)
  → 'github:nixos/nixpkgs/9656e85a15a0fe67847ee8cdb99a20d8df499962' (2023-05-12)
• Updated input 'nixos-hardware':
    'github:nixos/nixos-hardware/b7ac0a56029e4f9e6743b9993037a5aaafd57103' (2023-01-24)
  → 'github:nixos/nixos-hardware/81cd886719e10d4822b2a6caa96e95d56cc915ef' (2023-05-13)
 2023-05-13 18:09:10 +02:00
Benjamin Bädorf 6fc5b2553c
Add concepts-and-training test infra config 2023-04-21 11:20:23 +02:00
Benjamin Bädorf dcb77f9056
Merge branch 'main' into b12f 2023-04-03 11:46:57 +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 2468acd8e0
Update flake lock 2023-02-24 18:32:36 +01:00
Benjamin Bädorf fd3cf376c3
Update paperless module 2023-02-21 12:37:18 +01:00
Benjamin Bädorf b6b7720382
Update b12f for paperless 2023-02-07 15:56:30 +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
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
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 f51e4f3633
nixos: 22.11 racoon, bump flake.lock 2022-11-26 04:48:58 +01:00
teutat3s 162a1cc06c
Bump flake.lock 2022-11-20 23:28:16 +01:00
teutat3s 06ed2a78a9
Bump flake.lock 2022-11-07 11:26:58 +01:00
teutat3s e69c8fe9c7
Bump flake.lock 2022-10-18 17:02:23 +02:00
teutat3s e801958494
Update inputs in flake.lock 2022-10-02 04:10:50 +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 6122021435
Bump flake.lock 2022-08-27 13:48:32 +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 9d25b3ee9b
Fix build of rnix-lsp for nix verion 2.10+ 
This fix didn't land in a released tag of rnix-lsp
yet.
Build it from the master branch until next release
Upstream PR:
https://github.com/nix-community/rnix-lsp/pull/94

Also bump flake.lock
 2022-08-14 15:16:57 +02:00
Benjamin Bädorf d11b90d830
Update lock file so deploy-rs is available 2022-08-13 12:06:24 +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 895cdc30b9
Update flake lock 2022-04-26 11:38:26 +02:00
teutat3s f731adc060
Update flake lock 2022-04-09 16:54:06 +02:00
teutat3s a884368d8d
chore: update flake lock 2022-04-03 18:42:02 +02:00
Benjamin Bädorf 03911fda34
Update flake lock 2022-03-29 19:32:41 +02:00
Benjamin Bädorf 60ce668bc9
Update flake lock 2022-03-23 11:02:44 +01:00
teutat3s 090575759b
bump flake lock 2022-03-04 15:14:09 +01:00
teutat3s 2666453e8c
Merge branch 'devos' 2022-02-24 23:41:36 +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 821565aea4
Fix up rebase 2022-02-02 05:13:01 +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
Parthiv Seetharaman c36ec0b546
flake: update digga, home, nixos, latest 2022-02-02 03:44:17 +01:00
teutat3s 34777780b6
Merge branch 'devos' 2022-01-31 12:16:36 +01:00
Parthiv Seetharaman adf005b5c8 flake: update digga, home, nixos, latest 2022-01-29 19:48:26 -08:00
teutat3s b8b3404d4c
Merge branch 'devos' 2021-12-30 21:54:42 +01:00
Parthiv Seetharaman 1cbf28f445 flake: update bud input 
fixes #406
 2021-12-29 19:49:19 -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 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 134fcb9a0d fix/upstreaming-merge-conflicts (#42) 
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>
Co-authored-by: Pacman99 <pachum99@myrdd.info>
Co-authored-by: Joel <joel@joel.tokyo>
Co-authored-by: Trevor Riles <trevor@trevorriles.com>
Reviewed-on: https://git.b12f.io/pub-solar/os/pulls/42
Co-authored-by: teutat3s <teutates@mailbox.org>
Co-committed-by: teutat3s <teutates@mailbox.org>
 2021-10-11 22:32:01 +00: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
Parthiv Seetharaman 469b3746cf flake: update bud input 2021-10-04 11:59:33 -07: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
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
GTrunSec 768c9b8216
bump: nvfetcher and cleanup 2021-08-02 15:53:14 -05:00
David Arnold 0f98fe0cb3
bump: bud with some corutils missing deps & other fixes 2021-08-02 14:10:01 -05:00
David Arnold 757c107b46
bump: digga 2021-08-02 14:07:04 -05:00
David Arnold 135f1d656d
bump: nixos w upstream fixes 
specifically
- https://github.com/NixOS/nixpkgs/pull/132363
- https://github.com/NixOS/nixpkgs/pull/131876
 2021-08-02 14:05:58 -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 3e298b68dd
fix: bump flake-utils-plus with a regression w.r.t exportModules reverted 2021-07-23 15:32:39 -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 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 0c2defad98
Update flake.lock 2021-07-17 15:47:54 +02:00
David Arnold aa45592c17 imp: add digga's nixConfig and patchedNix 2021-07-16 16:57:57 -05:00
David Arnold b05f95065e
bump: point to tip of squashed digga develop branch 2021-07-16 13:18:10 -05:00
David Arnold bd0ef12149 bump: pull in latest bud fixes & additions 
- portble home profiles
- missing coreutils
 2021-07-16 13:02:49 -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 000329f6a7
fix: bump digga with infinite recursion hotfix 2021-07-15 22:19:38 -05:00
David Arnold 6ebdf3adb4 imp: reduce flake inputs footprint and increase conciseness 2021-07-15 19:26:27 -05: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 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 1c80b508ca
bump: nixpkgs to avoid https://github.com/NixOS/nixpkgs/pull/127720 2021-06-24 18:15:15 -05:00
David Arnold 3cc28b3adb
bump digga to latest develop 2021-06-24 18:11:24 -05: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 d9082066f7 flake: update to new digga api 2021-06-01 11:32:20 -07: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 21cba8024d flake: update digga input 
no longer builds all packages from overlays in devShell
 2021-05-18 11:29:56 -07:00