Commit graph

191 commits

Author SHA1 Message Date
hensoko c43b96c4d5 Fix core module (#116)
Co-authored-by: Hendrik Sokolowski <hensoko@gssws.de>
Reviewed-on: https://git.b12f.io/pub-solar/os/pulls/116
Reviewed-by: teutat3s <teutates@mailbox.org>
2022-08-14 13:54:19 +00:00
Benjamin Bädorf 70980fba28
Fix droppie config 2022-08-13 20:15:22 +02:00
Benjamin Bädorf ed1396997f
Merge branch 'b12f' into feature/ben-droppie 2022-08-13 19:03:04 +02:00
Hendrik Sokolowski 030e5c0058 Add droppie 2022-08-13 18:08:27 +02:00
Benjamin Bädorf 2dda411388
Merge branch 'main' into b12f 2022-08-13 12:14:16 +02:00
Benjamin Bädorf 4d2ac57dab
Add more logging to VM service script 2022-07-23 17:00:43 +02:00
teutat3s f7fbdb80af
hosts: add missing system.stateVersion 2022-07-08 14:36:17 +02:00
Benjamin Bädorf 5bbb3eca66
Add drone-docker-runner to chocolatebar 2022-05-02 23:49:08 +02:00
Benjamin Bädorf 39e2c7c1ee
Add swapfiles 2022-04-30 23:07:18 +02:00
Benjamin Bädorf d85a796259
Merge branch 'main' into b12f 2022-04-30 19:58:06 +02:00
Benjamin Bädorf d6974e1dfd
Open vnc port 2022-04-30 17:08:58 +02:00
Benjamin Bädorf fa2079ee1d
Remove useless device setting from chocolatebar sway config 2022-04-30 13:48:52 +02:00
Benjamin Bädorf 8f8923203b
Add vnc keyfiles and config 2022-04-28 23:24:33 +02:00
Benjamin Bädorf 7ff9efa51c
Add wayvnc 2022-04-27 15:21:40 +02:00
Benjamin Bädorf f87429c378
Add SSH keys 2022-04-08 21:00:53 +02:00
Benjamin Bädorf 33f03b3f0d
Add paperless, up guest VM RAM to 48GB 2022-03-10 21:32:21 +01:00
Benjamin Bädorf fb821aa722
Update virtualisation 2022-02-14 10:50:26 +01:00
teutat3s 1d2eb2edd0
iso: use iso suite in PubSolarOS host
fae: boots PubSolarOS
2022-02-02 04:00:11 +01:00
Benjamin Bädorf 183d8efded
Add admins@pub.solar 2022-01-16 16:27:36 +01:00
Benjamin Bädorf bcb5fd2d67
Share keyboard and mouse via looking glass client 2022-01-04 13:41:32 +01:00
Benjamin Bädorf 8b71991dba
Update chocolatebar screen configuration 2022-01-04 13:40:59 +01:00
Benjamin Bädorf f53c21f3e0
Update chocolatebar VMs; make USB handover optional, enable looking glass 2021-12-11 21:09:22 +01:00
Benjamin Bädorf 79517658b3
Update vm rom location 2021-11-02 16:45:05 +01:00
Benjamin Bädorf bcd191b291
Don't scale laptop screen, sway + firefox is broken then 2021-10-25 23:10:18 +02:00
teutat3s 74241b459e
switch to pub-solar user and use base-user profile 2021-10-25 22:43:02 +02:00
teutat3s 2588264d88
Make check work 2021-10-24 22:03:28 +02:00
teutat3s b79e92155a
bootstrap: add graphical profile 2021-10-24 20:13:18 +02:00
Benjamin Bädorf 415223a778
Move biolimo to systemd-boot 2021-10-24 17:30:15 +02:00
Benjamin Bädorf 067ce16246
Remove git crypt
Start move to /boot kernel mount
x-os: prepare booting from unencrypted /boot partition
Move to systemd-boot
Remove all unencrypted secrets
2021-10-24 17:13:16 +02:00
Benjamin Bädorf 87a9d94d0a
secrets via agenix 2021-10-23 13:24:22 +02:00
Benjamin Bädorf 9009fa4a52
Merge branch 'b12f-master' into b12f 2021-09-04 16:00:32 +02:00
Benjamin Bädorf f89384cbf0
Works for chocolatebar 2021-09-04 15:56:44 +02:00
teutat3s 34ca8aadb9
fix biolimo host? 2021-09-02 20:55:17 +02:00
Benjamin Bädorf 2293e703cc
Fix suites 2021-09-02 19:16:05 +02:00
teutat3s 3f4d3cf240
Merge branch 'b12f' into b12f-master 2021-09-01 19:12:50 +02:00
teutat3s 02330bc9ce
Merge remote-tracking branch 'devos/master' 2021-09-01 18:45:42 +02:00
David Arnold b5da406689
fix: dedicated bootstrap config 2021-08-05 20:42:25 -05:00
Benjamin Bädorf 6280a04af5
Merge branch 'core' into b12f 2021-06-15 01:33:46 +02:00
Benjamin Bädorf a9e304617b feat/upstreaming (#4)
Co-authored-by: Benjamin Bädorf <hello@benjaminbaedorf.eu>
Co-authored-by: teutat3s <teutates@mailbox.org>
Reviewed-on: https://git.b12f.io/pub-solar/os/pulls/4
Co-authored-by: Benjamin Bädorf <b12f@noreply.example.org>
Co-committed-by: Benjamin Bädorf <b12f@noreply.example.org>
2021-06-14 23:28:23 +00:00
Benjamin Bädorf a9e025c4f9
fix: Make chocolatebar work with the new config 2021-06-14 23:23:30 +02:00
Benjamin Bädorf 83333fa0d6
Merge branch 'b12f' of git.b12f.io:pub-solar/os into b12f 2021-06-14 19:49:32 +02:00
Benjamin Bädorf e437f7fca6
Merge branch 'core' into b12f 2021-06-14 19:45:03 +02:00
Benjamin Bädorf 8d5db4dfb2
Add chocolatebar 2021-06-01 10:55:02 +02:00
Benjamin Bädorf 91c8e77d25
Initial b12f commit 2021-05-30 21:33:09 +02:00
Timothy DeHerrera 2d91946745
doc: move all docs under doc 2021-04-18 20:42:49 -06:00
Pacman99 ec7eff63eb move hosts implementation logic to lib as mkHosts 2021-03-29 09:05:54 -07:00
Pacman99 25a2431ff7 hosts: add cachix 2021-03-23 10:25:42 -07:00
Pacman99 cc52cd9fa2 users: wire up all user profiles to userSuites and pass to home-manager 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
Timothy DeHerrera 9ba1e7f9bc
nix: remove patch for default unstable features 2021-03-22 23:29:30 -06:00
Pacman99 aec7c92cc7 hosts: set nixpkgs.pkgs based on nixpkgs.system 2021-03-19 12:23:23 -07:00
Pacman99 dd494facc3 hosts/devosSystem: pass modules as attrset 2021-03-17 17:28:49 -07:00
Pacman99 6210daff13 add hosts module arg to easily access other host's config 2021-03-16 16:09:52 -07:00
David Arnold 3d324e7533 lib/devos: bake devos repo into live cd (#168)
fix #167 

This worked for me to bootstrap another machine.
2021-03-16 19:50:38 +00:00
Timothy DeHerrera c012f2f4ed treewide cleanups and refactoring for initial tests (#157)
- [x] refactor lib into separate files, similar to NixOS/nixpkgs/lib.
- [x] refactor ci to automatically generate derivations from flake outputs
- [x] remove cluttered indirection statements throughout the codebase
- [x] refactor hosts to allow for upcoming integration tests
- [x] improve ambiguity in the existing docs 
- [x] add [BORS](https://bors.tech) support
- [x] add initial integration test
- [x] write tests documentation
- [x] test lib
- [x] improve version string generation, and do so automatically for pkgs/flake.nix sources

Clean up the codebase as best we can in preparation for #152 and add tests. From now on, all PRs will be merged with BORS.
2021-03-14 07:10:51 +00:00
Timothy DeHerrera 98404a158b
hosts: pass host as reference
Allow easier debugging, in the same vain as
1651913910.
2021-03-01 23:05:32 -07:00
Timothy DeHerrera 44bae21564
nix#registry: update names
Continuing the work from 487fa7ea26,
simplify the registry entries a bit more by simply refering to the
input flakes. Also add alias `orch` for easy search `override`.
2021-03-01 20:11:23 -07:00
Louis Bettens 487fa7ea26 hosts: fix #142 2021-03-01 18:05:58 +01:00
Timothy DeHerrera 1651913910
profiles: simplify profiles to suites
* Leave importing to nixpkgs module implentation. Provide a path
  instead; resolves #136.
* Allow profiles which are not lambdas but simple attribute sets,
  relaxing the constraints a bit.
* Update profile README.md
* defaultImports -> mkProfileAttrs: allow importing subprofiles even
  if parent directory does not contain a default.nix.
2021-02-25 14:47:19 -07:00
Timothy DeHerrera 8939c3401b
project rename: nixflk -> devos 2021-02-17 18:31:33 -07:00
Timothy DeHerrera 0405949ec6
doc: finish flk reference 2021-02-14 17:41:15 -07:00
Timothy DeHerrera 3a735ce70b
core: pin registry by ref
Users may wish to change the default value of override and nixos
inputs. If they do so, we want the registry listing to reflect the
proper ref names afterwards.

Also create a shell alias to easily search every flake in nix.registry.
2021-02-14 15:50:49 -07:00
Timothy DeHerrera bf34d2071f
doc: new mdbook documentation 2021-02-14 02:46:05 -07:00
Timothy DeHerrera 6290f9f1f6
hosts: fix core 2021-02-06 13:26:17 -07:00
Timothy DeHerrera 1d5b489bb2
suites: mv to dir 2021-02-06 01:31:48 -07:00
Timothy DeHerrera c6d25002ed
extern: move specialArgs here 2021-02-04 23:42:46 -07:00
Timothy DeHerrera 0ec0c25238
various refactors
* Move extern lists to their own folder
* Move unstable package and module imports to their own folder
* Create a genPkgs function to avoid using legacyPackages for the whole
  package set
* Move hmActivationPackages to legacyPackages
2021-02-03 23:44:58 -07:00
Timothy DeHerrera fc9c6d48dc
Revert "ci: fix nixos config"
This reverts commit 5703b77484.
2021-02-03 21:02:18 -07:00
Timothy DeHerrera 40b49c52c1
create core branch without any profiles
This core will be used as the new base for the reuse branch, which is
essentiall the same as the existing template branch, except that it is
rebased from this core, simplifying future rebasing.
2021-02-03 18:58:58 -07:00
Timothy DeHerrera bd9878f82a
ci: move into build attribute 2021-02-03 16:41:21 -07:00
Timothy DeHerrera 9234577e7e
suites: add users to suites 2021-02-03 13:16:21 -07:00
Timothy DeHerrera c67b846929
profiles: add concept of suites
* Import attrs of profiles automatically with `defaultImport`.
* Refactor profiles to ensure all are functions returning a module.
* Add a suites.nix with collections of profiles.
* Add suites as `specialArgs` to modules.
* Add suite import to NixOS host.
2021-02-03 13:16:14 -07:00
Timothy DeHerrera 5703b77484
ci: fix nixos config 2021-02-02 01:34:12 -07:00
Timothy DeHerrera 4ae99af29d
Merge pull request #102 from blaggacao/da/iso-sd-netboot
host: add deault implementation for system.build.isoImage target (per…
2021-02-01 19:51:44 -07:00
Timothy DeHerrera fc082b5b0d
hosts: add nixpkgs to NIX_PATH 2021-02-01 09:56:33 -07:00
David Arnold 8cb82a307f
iso: move iso target to ./lib 2021-01-27 21:17:59 -05:00
David Arnold 33bcf093b7
iso-cd: fix by overruling conflicting custom configuration 2021-01-27 21:16:52 -05:00
David Arnold 28ccf4f3f9
host: add deault implementation for system.build.isoImage target (per host) 2021-01-27 21:16:51 -05:00
Timothy DeHerrera d6f50531b2
ci: add explicit ci file
* Build a nixos configuration with all profiles available as part of ci
pipeline.
* Remove darwin packages as we do not have a ci agent for them.
* Build shell as part of ci
2021-01-24 11:14:42 -07:00
Timothy DeHerrera 7c0381f478
hosts: simplify nix_path 2021-01-23 16:45:21 -07:00
Timothy DeHerrera 1b80806516
compat: fixes
* fix nixos-option
* use flake-compat for all backward compat concerns
* rebuild devshell after any nix file changes
* reexport system pkgs as legacyPackages
* provide lib flake output
* provide flake lib to nixos configs via `lib.flk`
* clean up flake.nix
2021-01-23 16:45:10 -07:00
Benedikt Tissot 12188b6ec3 nixos-hardware: use the flake instead of a path 2021-01-19 10:45:06 +01:00
Timothy DeHerrera 58b0f1ae65
Merge branch 'template' into template 2021-01-18 10:03:57 -07:00
Timothy DeHerrera f8f67d2dcb
packages: apply overlays to output packages
Apply overlays to output packages so we can easily use a modified
package.
2021-01-18 02:23:49 -07:00
Benedikt Tissot a9f11b3dca flake/host: add nixos-hardware
- add nixos-hardware flake.
- configuration in hosts/default.nix to be able to include hardware
specifics per host.
- add corresponding documentation in readme
2021-01-18 08:37:11 +01:00
Timothy DeHerrera 36bb3d2649
hosts: enable redistributable firmware by default
Fixes #92
2021-01-17 01:26:38 -07:00
Timothy DeHerrera f2aedb889b
pkgs: simplify override 2021-01-11 19:59:49 -07:00
David Arnold 17fb425844
Hosts: fix mod override
In some occasions the module path was renamed.
To avoid conflicts, the old path must be disabled manually.

E.g.
```nix
{
  unstableModules = [
    "services/ttys/getty.nix"
  ];
  addToDisabledModules = [
    "services/ttys/agetty.nix"
  ];
}
```
2021-01-11 17:27:38 -05:00
Timothy DeHerrera 7ec9a15be3
hosts: left out of #66 by mistake 2020-12-31 14:11:32 -07:00
Timothy DeHerrera 003ab99e35
niximg: install flakes directly within iso
Fixes #63.
2020-12-31 14:02:19 -07:00
Timothy DeHerrera 73bc694bbb
simple mechanism to override modules from master 2020-12-31 14:02:18 -07:00
Timothy DeHerrera 164a672129
hosts: add unstableModulesPath 2020-12-31 14:02:01 -07:00
Timothy DeHerrera 30ffeddc4b
Revert "Add extraArgs to lib.nixosSystem call..."
Fixes #46 by reverting commit 684804ebe0.

If you need the value of system, use `pkgs.system` instead.
2020-12-28 16:36:49 -07:00
Timothy DeHerrera bdfdc4da54
flake: add externModules list
Fixes #44. Easily add external modules from other flakes by dropping
them in the list.
2020-12-28 15:07:15 -07:00
Timothy DeHerrera 3300b5d582
flake: clean up by moving implementation to utils
Fixes #28 by adding an `externOverlays` list to easily import overlays
from external flakes.
2020-12-25 12:53:57 -07:00
Timothy DeHerrera 1aaf9827b0
home-manager: follow project README.md for flakes
home-manager's readme specifies that, at a bare minimum,
`useUserPackages` should be used in addition to `useGlobalPkgs`, when
using a flakes configuration.
2020-12-19 14:55:33 -07:00
Timothy DeHerrera 6cc85a916a
home-manager: fix trying to import <nixpkgs>
Fixes #30.
2020-12-18 13:13:02 -07:00
Timothy DeHerrera 01fe191210
hosts: use stable release as nixpkgs 2020-12-16 14:47:51 -07:00
Timothy DeHerrera 0f4be1b554
systemd: remove systemd override 2020-12-05 18:10:33 -07:00
Adam Scott 684804ebe0 Add extraArgs to lib.nixosSystem call to add system args. 2020-11-18 13:35:08 -05:00