teutat3s/os
2
0
Fork 0
forked from pub-solar/os
Code Pull requests Activity
2306 commits 8 branches 43 tags 12 MiB
Commit graph

319 commits

Author SHA1 Message Date
teutat3s b1ad71cd35
cachix: remove unused binary caches 2023-03-27 13:52:40 +02:00
teutat3s ef1c8b0946
cachix: remove unused binary caches 2023-03-27 13:43:41 +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 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 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 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 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 8bd5022d70
nvfetcher: remove unnecessary flake, use nixpkgs version 2022-10-19 17:12:12 +02:00
teutat3s a0d6fcdd44
tritonshell: update input URL 2022-10-18 16:49:40 +02:00
teutat3s 0ff91df7fe
Merge branch 'fix/swayidle-waybar-menu' into teutat3s 2022-10-02 01:22:27 +02:00
teutat3s 0a182761ca
Allow unfree software 2022-09-06 11:34:52 +02:00
teutat3s 0fbabc23b9
bootstap: host needs digga's bootstrapIso module 2022-09-01 15:35:04 +02:00
teutat3s 63080c4d4f
Merge branch 'main' into teutat3s 2022-09-01 15:29:52 +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 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 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 b263ca4c45
Merge branch 'main' into teutat3s 2022-08-14 17:21:34 +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 820cc40356
Merge branch 'main' into teutat3s 2022-08-14 16:46:33 +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
teutat3s b25b043176
nvfetcher: use nixpkgs version 2022-08-09 23:16:00 +02:00
teutat3s 90e181040c
nvfetcher: use nixpkgs version 2022-08-09 11:56:42 +02:00
teutat3s ea11c9ed6d
nix-autobahn: switch back to upstream repo 2022-08-09 11:56:42 +02:00
teutat3s de8b7c9a5c
powder: init 2022-07-08 14:20:00 +02:00
teutat3s 6ff469a0ac
wip: first PubSolarOS iso test using the NixOS 
test vm
 2022-06-05 03:06:38 +02:00
teutat3s 528e69af1e
wip: first PubSolarOS iso test using the NixOS 
test suite:

https://nixos.org/manual/nixos/stable/index.html#sec-nixos-tests
 2022-06-04 23:45:06 +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 aabfc4a0dd
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:09:42 +02:00
teutat3s 47239ec1bb
Use forked nix-autobahn with dependency fixes 2022-05-05 16:08:40 +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 d7aa9a8840
cachix: trust pub.solar public keys for nix-dram 2022-04-30 15:10:26 +02:00
teutat3s dccf0baed0
terminal-life: use our hotkeys for pagers like bat 
and less
 2022-04-30 15:10:15 +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 1d0ae71a3c
digga: Remove customBuilds, nixos-generate 
has --flake, Use nixos-* not release-*
 2022-04-09 16:40:03 +02:00
teutat3s a9ea24a39b
export devos template in digga 
devos: remove bud get
 2022-04-09 16:37:22 +02:00
teutat3s 9458395c36
bump flake lock 2022-03-23 11:27:32 +01:00
teutat3s 7bbdc0c4f7
Add yubikey-agent overlay, update to latest git 
commit, add nix-autobahn
 2022-03-23 11:10:04 +01:00
teutat3s 2d68f026ef
tritonshell: init and adjust paths to source scripts in zshrc 2022-03-04 15:11:19 +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 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 b0483a0757
chore: bump flake lock 2022-01-31 17:52:56 +01:00
teutat3s a774ccdb0c
fae: boots PubSolarOS 2022-01-31 17:51:42 +01:00
teutat3s 5dbcf14d1f
iso: use iso suite in PubSolarOS host 2022-01-31 17:47:45 +01:00
teutat3s 82aeb0ec39
iso: default user nixos becomes pub-solar 2022-01-31 17:45:26 +01:00
teutat3s 63f91c864a
Merge branch 'main' into teutat3s-init-fae 2022-01-31 16:19:59 +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 e19388f99b
Merge branch 'feature/basic-iso' into teutat3s-init-fae 2022-01-19 01:16:35 +01:00
teutat3s 082e33c1ed
wip 2022-01-19 01:13:15 +01:00
teutat3s 3c6d815d5c
Merge branch 'main' into teutat3s 2021-12-30 21:55:42 +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 a31706695e
Merge branch 'main' into teutat3s 2021-10-12 00:15:35 +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 62f7de1dba
Fix direnv cache 2021-09-21 22:27:53 +02:00
teutat3s 02330bc9ce
Merge remote-tracking branch 'devos/master' 2021-09-01 18:45:42 +02:00
teutat3s e33191591c
Merge remote-tracking branch 'devos/main' into teutat3s-develop 2021-08-15 10:20:36 +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
teutat3s 3f64c910b0
Correctly pin latest channel to nixpkgs unstable 2021-07-29 16:06:49 +02:00