Benjamin Bädorf
2ca921b4a3
Fix path in drone runner exec
2022-08-14 20:24:50 +02:00
Benjamin Bädorf
dded778e7b
Merge branch 'b12f' into feature/ci-runner-onecommit-test
2022-08-14 20:23:52 +02:00
Benjamin Bädorf
d4e949790e
Merge branch 'main' into b12f
2022-08-14 20:23:45 +02:00
Benjamin Bädorf
baee78468b
Merge branch 'b12f' into feature/ci-runner-onecommit-test
2022-08-14 20:22:34 +02:00
Benjamin Bädorf
1cf710be78
Merge pull request 'Add ssh-tunnel systemd unit to enable backups' ( #118 ) from fix/backup-reverse-ssh-tunnel into b12f
...
Reviewed-on: https://git.b12f.io/pub-solar/os/pulls/118
2022-08-14 18:12:42 +00:00
teutat3s
acab42eaef
Add ssh-tunnel systemd unit to enable backups
...
from IPv4-only to IPv6-only host
2022-08-14 20:11:10 +02:00
Benjamin Bädorf
3883f30b74
Use correct sshUser for droppie deployments
2022-08-14 19:24:12 +02:00
Benjamin Bädorf
c6d78a6ff9
Always keep openssh port open
2022-08-14 19:23:58 +02:00
Benjamin Bädorf
5de07c5b8a
Merge pull request 'Improve help and screen recording keybindings in sway' ( #100 ) from feature/screen-recording into main
...
Reviewed-on: https://git.b12f.io/pub-solar/os/pulls/100
Reviewed-by: teutat3s <teutates@mailbox.org>
Reviewed-by: hensoko <hensoko@noreply.example.org>
2022-08-14 16:04:07 +00:00
Benjamin Bädorf
043178172b
Improve help and screen recording keybindings in sway
...
This commit shuffles around some sway keybindings and improves the
screen recording experience by adding a small wrapper around `slurp` and
`wf-recorder` conveniently called `record-screen`.
* `$mod+F5` now reload the sway configuration,
* `$mod+Ctrl+r` starts a screen recording (to stop it, go to workspace 7
and kill the process),
* `record-screen` and the firefox sharing indicator are both on
workspace 7 now, making it the "trash" workspace,
* `$mod+F1` and `$mod+Shift+h` now open Firefox with the docs of our
repository availabe under `help.local`.
* To not infuriate `qMasterPassword` users, that is now available under
`$mod+Shift+m` instead of `$mod+F1`.
2022-08-14 18:03:32 +02:00
Benjamin Bädorf
dec9e54872
Allow unfree on my branch
2022-08-14 17:51:41 +02:00
Benjamin Bädorf
6a09979aa5
Update droppie for x-os rename
2022-08-14 17:51:01 +02:00
Benjamin Bädorf
636eed806b
Merge remote-tracking branch 'origin/main' into b12f
2022-08-14 17:50:21 +02:00
teutat3s
55d5f6938a
Merge pull request 'tree: remove bud and all mentions of it' ( #105 ) from feature/remove-bud into main
...
Reviewed-on: https://git.b12f.io/pub-solar/os/pulls/105
Reviewed-by: hensoko <hensoko@noreply.example.org>
2022-08-14 15:17:40 +00:00
hensoko
cb5c75b1cc
feature/terminal-life-lite-mode ( #117 )
...
Reviewed-on: https://git.b12f.io/pub-solar/os/pulls/117
Reviewed-by: Benjamin Bädorf <hello@benjaminbaedorf.eu>
2022-08-14 15:17:35 +00:00
teutat3s
b42f7b72ad
Remove bud from CI, too
2022-08-14 17:16:56 +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
a0d0b62cf8
Merge pull request 'devos: include upstream commits' ( #106 ) from feature/upstream-fixes into main
...
Reviewed-on: https://git.b12f.io/pub-solar/os/pulls/106
Reviewed-by: hensoko <hensoko@noreply.example.org>
2022-08-14 15:10:01 +00:00
teutat3s
d9057d8281
Merge branch 'main' into feature/upstream-fixes
2022-08-14 16:25:25 +02:00
teutat3s
b149ae0136
Merge pull request 'Remove nix-dram as default nix binary' ( #114 ) from fix/set-nix-dram-default into main
...
Reviewed-on: https://git.b12f.io/pub-solar/os/pulls/114
Reviewed-by: Benjamin Bädorf <hello@benjaminbaedorf.eu>
2022-08-14 14:24:54 +00:00
teutat3s
5dd0a5badb
Merge branch 'main' into fix/set-nix-dram-default
2022-08-14 15:54:51 +02:00
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
teutat3s
71a47f35b4
Merge branch 'main' into fix/set-nix-dram-default
2022-08-14 15:18:55 +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
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
7785744d73
Move some packages from full to default set, move options for modules to
...
default.nix
2022-08-14 15:11:01 +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
Benjamin Bädorf
4f74f6ff80
Merge pull request 'Add AGPLv3 License' ( #111 ) from maintenance/add-license into main
...
Reviewed-on: https://git.b12f.io/pub-solar/os/pulls/111
Reviewed-by: teutat3s <teutates@mailbox.org>
2022-08-14 12:44:23 +00:00
Benjamin Bädorf
b4250fec9c
Merge pull request 'Our first real readme' ( #112 ) from maintenance/update-readme into main
...
Reviewed-on: https://git.b12f.io/pub-solar/os/pulls/112
Reviewed-by: teutat3s <teutates@mailbox.org>
2022-08-14 12:44:10 +00:00
teutat3s
99d5e53ec8
readme: add link to https://ci.b12f.io
2022-08-14 14:41:20 +02:00
teutat3s
2f9225457c
readme: ARM -> aarch64
2022-08-14 14:40:44 +02: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
Benjamin Bädorf
b3a4ae5bbc
Our first real readme
2022-08-14 14:14:17 +02:00
Benjamin Bädorf
9031dacbb5
Add AGPLv3 License
2022-08-14 14:11:10 +02:00
Benjamin Bädorf
b1d8a0490c
Fix typo
2022-08-14 13:03:08 +02:00
Benjamin Bädorf
ba85b33182
Merge branch 'b12f' into feature/ci-runner-onecommit-test
2022-08-14 13:02:21 +02:00
Benjamin Bädorf
2a2148fe75
Update user authentication methods
2022-08-14 12:57:05 +02:00
Benjamin Bädorf
4cdeb7e5c8
Use public keys of biolimo and pihole
2022-08-14 12:47:20 +02:00
Benjamin Bädorf
d01753bbfa
Merge pull request 'Theme change for fzf' ( #104 ) from fix/fzf-colors into main
...
Reviewed-on: https://git.b12f.io/pub-solar/os/pulls/104
Reviewed-by: teutat3s <teutates@mailbox.org>
2022-08-13 21:16:31 +00:00
Benjamin Bädorf
dc1e707925
Move ci-runner to user and add git, virsh and nix to path
2022-08-13 22:36:12 +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
Benjamin Bädorf
4f881ee6a5
Merge branch 'feature/ci-runner-onecommit' into feature/ci-runner-onecommit-test
2022-08-13 22:32:53 +02:00
Benjamin Bädorf
0b229a771e
Barebones ci-runner module
...
This adds a barebones CI-runner module with the following option:
`pub-solar.ci-runner.enable`
If enabled, this will start a systemd service on boot that runs
`drone-runner-exec`. The configuration expects you to have a file called
`secrets/drone-runner-exec-config` handled by agenix that gets put into
`/run/agenix/drone-runner-exec-config` and is owned by root.
This file should contain a configuration similar to the following:
```
CLIENT_DRONE_RPC_PROTO=https
CLIENT_DRONE_RPC_HOST=drone.company.com
CLIENT_DRONE_RPC_SECRET=super-duper-secret
```
2022-08-13 22:08:02 +02:00
teutat3s
616b7af858
devos: include upstream commits
...
780620d865
e6b14d39d6
dd51f64bc5
2022-08-13 21:50:23 +02:00
Benjamin Bädorf
669ab6b6ba
Open SSH on the network by default, but don't allow password authentication
2022-08-13 20:17:00 +02:00
Benjamin Bädorf
ded0dd7d15
Change pub-solar.user.publicKeys to an actual key string list
2022-08-13 20:16:35 +02:00
Benjamin Bädorf
70980fba28
Fix droppie config
2022-08-13 20:15:22 +02:00