Commit graph

324 commits

Author SHA1 Message Date
teutat3s 33720a4f5a
Bump flake.lock 2023-05-16 11:56:24 +02:00
teutat3s 7869e62028
Bump flake.lock 2023-05-13 18:45:56 +02:00
teutat3s e7ce8e1fb4
deploy-rs: use nixpkgs version, avoid rebuilding
https://github.com/serokell/deploy-rs/pull/207
https://github.com/serokell/deploy-rs/issues/163
2023-05-13 18:43:12 +02:00
teutat3s d4beafe4f0
Bump flake.lock 2023-05-05 18:15:23 +02:00
teutat3s 36c2ea205b
Bump flake.lock
• Updated input 'latest':
    'github:nixos/nixpkgs/6c43a3495a11e261e5f41e5d7eda2d71dae1b2fe' (2023-04-22)
  → 'github:nixos/nixpkgs/e78d25df6f1036b3fa76750ed4603dd9d5fe90fc' (2023-04-23)
• Updated input 'master':
    'github:nixos/nixpkgs/1c7579605bc7730e7d88539704aa1b467952c9bd' (2023-04-24)
  → 'github:nixos/nixpkgs/de91114b6178d85db143d846228edd1d5c1e19d6' (2023-04-24)
2023-04-25 02:25:37 +02:00
teutat3s d36f1e7d9c
flake: bump tritonshell input lock
• Updated input 'tritonshell':
    'git+https://git.greenbaum.cloud/dev/tritonshell?ref=main&rev=054140b3a7b79663b9831923832d43ac0b829be4' (2023-04-15)
  → 'git+https://git.greenbaum.cloud/dev/tritonshell?ref=main&rev=509d92569e8408ca72df5a126a3edfa8b43cbf93' (2023-04-21)
2023-04-21 23:17:58 +02:00
teutat3s 573a45db0b
Bump flake.lock
• Updated input 'latest':
    'github:nixos/nixpkgs/555daa9d339b3df75e58ee558a4fec98ea92521e' (2023-04-18)
  → 'github:nixos/nixpkgs/645bc49f34fa8eff95479f0345ff57e55b53437e' (2023-04-19)
• Updated input 'nixos':
    'github:nixos/nixpkgs/cd749f58ba83f7155b7062dd49d08e5e47e44d50' (2023-04-17)
  → 'github:nixos/nixpkgs/3d302c67ab8647327dba84fbdb443cdbf0e82744' (2023-04-19)
2023-04-21 12:10:12 +02:00
teutat3s 55f339359d
Bump flake.lock
• Updated input 'latest':
    'github:nixos/nixpkgs/abe7316dd51a313ce528972b104f4f04f56eefc4' (2023-04-14)
  → 'github:nixos/nixpkgs/f00994e78cd39e6fc966f0c4103f908e63284780' (2023-04-17)
• Updated input 'nixos':
    'github:nixos/nixpkgs/fda0d99c2cbbb5c89d8855d258cb0821bd9113ad' (2023-04-14)
  → 'github:nixos/nixpkgs/de66115c552acc4e0c0f92c5a5efb32e37dfa216' (2023-04-17)
2023-04-18 10:36:51 +02:00
teutat3s d8d46a4c28
flake: remove nix-autobahn, bump flake.lock 2023-04-15 21:13:27 +02:00
teutat3s 028e148374
Bump flake.lock 2023-04-15 12:43:46 +02:00
teutat3s 650fd97d03
Bump flake.lock 2023-04-11 14:46:02 +02:00
teutat3s ab7ff779cc
Bump flake.lock 2023-04-08 13:56:06 +02:00
teutat3s 0bd3cf9c33
Bump flake.lock 2023-04-07 16:01:43 +02:00
teutat3s 5b2b512f2a
Bump flake.lock 2023-03-28 13:57:06 +02:00
teutat3s b3711c5ec2
Merge branch 'main' into teutat3s 2023-03-27 10:45:49 +02:00
teutat3s aeb90b2322
flake: git.b12f.io -> git.pub.solar, bump flake 2023-03-27 10:39:10 +02:00
teutat3s 76ec848b23
qMasterPassword Qt styles fix got backported 2023-03-27 10:33:50 +02:00
teutat3s b522ac8786
signal-desktop: v6.7.0 got backported to release
22.11 branch nixos-22.11
2023-03-27 10:33:49 +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 d908c99a3c
Bump flake.lock 2023-03-16 11:48:55 +01:00
teutat3s c8adc5cc0c
wip: prevent element-desktop & signal-desktop
from segfaulting by using the version from nixos-22.11

It seems the electron version bundled with those pkgs from
nixos-unstable is indeed unstable when used via overlays
2023-03-14 14:30:03 +01:00
teutat3s c989fd9bf0
Bump flake.lock 2023-03-07 17:00:44 +01:00
teutat3s 51aad91f90
Bump nvfetcher, flake.lock
Adjust new waybar config, add calendar actions
2023-03-07 01:07:29 +01:00
teutat3s 5cdeaa93ff
Bump flake.lock 2023-03-04 01:15:56 +01:00
teutat3s 6deaea3fad
Bump flake.lock 2023-02-28 14:01:09 +01:00
teutat3s d371c57e30
Bump flake.lock 2023-02-26 21:46:57 +01:00
teutat3s a010a0d66b
Bump flake.lock 2023-02-24 17:58:45 +01:00
teutat3s 001a1de2e8
Merge branch 'main' into teutat3s-bash 2023-02-01 19:05:57 +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
teutat3s 05c3ad8207
Bump flake.lock 2023-01-28 22:58:56 +01:00
teutat3s f0ea096a62
Bump flake.lock, use fork for qMasterPassword
use 22.05 to pin terraform version to 1.2.3
2023-01-28 22:02:35 +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 d16bb7b3a5
Merge branch 'main' into teutat3s 2022-11-26 16:00:22 +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 a006bed2ea
Bump flake.lock 2022-11-20 23:14:07 +01:00
teutat3s 06ed2a78a9
Bump flake.lock 2022-11-07 11:26:58 +01:00
teutat3s 8bd5022d70
nvfetcher: remove unnecessary flake, use nixpkgs version 2022-10-19 17:12:12 +02:00
teutat3s e69c8fe9c7
Bump flake.lock 2022-10-18 17:02:23 +02:00
teutat3s 1c58fdee89
Bump flake.lock 2022-10-18 16:52:12 +02:00
teutat3s 0b155bc7dd
Merge branch 'main' into teutat3s 2022-10-02 14:06:18 +02:00
teutat3s e801958494
Update inputs in flake.lock 2022-10-02 04:10:50 +02:00
teutat3s ed25801ecf
Bump flake.lock 2022-09-20 14:16:01 +02:00
teutat3s 9ef3d58d2e
Merge branch 'main' into teutat3s 2022-08-29 15:39:48 +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 1203bfc4ef
Bump flake.lock 2022-08-24 00:56:23 +02:00
teutat3s dca6ca86b1
Update flake.lock 2022-08-14 17:24:27 +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 b00196aa94
Update flake.lock 2022-08-14 16:48:51 +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
teutat3s c9b84430f9
Bump flake.lock 2022-08-13 17:58:56 +02:00
Benjamin Bädorf d11b90d830
Update lock file so deploy-rs is available 2022-08-13 12:06:24 +02:00
teutat3s 8a843caf57
Bump flake.lock 2022-08-10 14:07:51 +02:00
teutat3s ea11c9ed6d
nix-autobahn: switch back to upstream repo 2022-08-09 11:56:42 +02:00
teutat3s eae1f5aaba
Update flake.lock 2022-07-15 12:36:15 +02:00
teutat3s 65545ac0eb
Bump flake.lock 2022-07-08 14:18:57 +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
teutat3s 578537227e
Update flake.lock 2022-05-05 16:43:31 +02:00
teutat3s cba5562e35
Update flake.lock 2022-05-03 14:26:33 +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
teutat3s f025fa681a
Update flake lock 2022-05-01 23:34:18 +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 2f38edecf7
Merge branch 'main' into teutat3s 2022-04-09 16:57:20 +02:00
teutat3s f731adc060
Update flake lock 2022-04-09 16:54:06 +02:00
teutat3s 6f7e01a3e5
chore: update flake lock 2022-04-03 18:48:12 +02:00
teutat3s f44e3f06ed
Merge branch 'main' into teutat3s 2022-04-03 18:46:34 +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
teutat3s 9458395c36
bump flake lock 2022-03-23 11:27:32 +01:00
teutat3s d399532b58
bump flake lock 2022-03-23 11:11:30 +01:00
Benjamin Bädorf 60ce668bc9
Update flake lock 2022-03-23 11:02:44 +01:00
teutat3s 72637fba7b
bump flake lock 2022-03-15 19:06:14 +01:00
teutat3s 090575759b
bump flake lock 2022-03-04 15:14:09 +01:00
teutat3s dcb04e9769
bump flake lock 2022-03-04 15:11:25 +01:00
teutat3s c889aa96dc
bump flake lock 2022-03-01 14:53:36 +01:00
teutat3s 17b2a84d23
update flake.lock 2022-02-25 10:52:07 +01:00
teutat3s 50675323f7
Merge branch 'main' into teutat3s-init-fae 2022-02-24 23:45:15 +01:00
teutat3s 2666453e8c
Merge branch 'devos' 2022-02-24 23:41:36 +01:00
teutat3s 6eb0925aaf
update flake.lock 2022-02-22 16:50:18 +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 b0483a0757
chore: bump flake lock 2022-01-31 17:52:56 +01:00
teutat3s f33597926e
Merge branch 'main' into teutat3s-init-fae 2022-01-31 14:09:28 +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 082e33c1ed
wip 2022-01-19 01:13:15 +01: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
Pacman99 634cfcb301 flake: update digga
includes fix for flk config generation
2021-05-14 21:27:49 -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 923ce7feff tree: rename devlib -> digga 2021-05-14 10:20:02 -07:00
Pacman99 7793ab42da flake: update devlib input
includes nixos option improvements and importHosts change
2021-05-13 16:59:52 -07:00
Pacman99 67f545123c flake: format and update to devlib api changes 2021-05-12 12:31:43 -07:00
Pacman99 858e8546fe flake: update devlib input
includes ability to customize shell from template
2021-05-12 08:17:40 -07:00
Pacman99 a081a922a5 flake: update devlib input
drop ca experimental features and filterPackages improvements
2021-05-11 23:41:34 -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 7bf605d08c lib/modules: pull devlib module arg from pkgs
So any overlays affecting devlib also affect the module argument
2021-05-02 21:05:21 -07:00
Pacman99 deb47dbfae move otherArguments to right side of merge
for overlay list ordering, otherArguments should have priority
2021-05-02 11:15:44 -07:00