Benjamin Bädorf
0f6eb3d6df
Merge pull request 'Always hibernate' ( #74 ) from feat/hibernate-always into main
...
Reviewed-on: https://git.b12f.io/pub-solar/os/pulls/74
Reviewed-by: hensoko <hensoko@noreply.example.org>
2022-08-14 19:18:43 +00:00
Benjamin Bädorf
f9b7c9e3c9
Fix build
2022-08-14 20:09:38 +02:00
Benjamin Bädorf
46992c46d6
Add parameter for swapfile offset
2022-08-14 19:59:01 +02:00
Benjamin Bädorf
ba6dfdcf53
Fix sway mode_system config import
2022-08-14 19:48:45 +02:00
Benjamin Bädorf
963212893e
Merge branch 'main' into feat/hibernate-always
2022-08-14 19:15:25 +02:00
Benjamin Bädorf
aabe96a335
Fix hibernation config
2022-08-14 18:11:25 +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
26803ccf4f
Merge branch 'feat/hibernate-always' of git.b12f.io:pub-solar/os into feat/hibernate-always
2022-08-14 17:20:14 +02:00
Benjamin Bädorf
ca4262b84f
Fix hibernation enabling in paranoia mode
2022-08-14 17:20:09 +02:00
Benjamin Bädorf
932bd05c41
Merge branch 'main' into feat/hibernate-always
2022-08-14 15:18:01 +00: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
Benjamin Bädorf
762e78677b
Fix hibernation enabling in paranoia mode
2022-08-14 17:15:50 +02:00
Benjamin Bädorf
4c0991c7e1
Put always hibernate behind a flag
...
Hibernation is now a core option:
```
pub-solar.core.hibernation.enable = true;
```
And there's a paranoia mode, that keeps the disk encrypted as much as
possible by enabling hibernation and removing the options for sleep,
screen locking.
Idle locking now hibernates, and it does it on very short notice.
2022-08-14 17:10:30 +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
Benjamin Bädorf
d3d4c6f498
Merge remote-tracking branch 'origin/main' into feat/hibernate-always
2022-08-14 16:28:59 +02: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
Benjamin Bädorf
98a537d287
Merge branch 'main' into feat/hibernate-always
2022-08-14 15:27:01 +02: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
Benjamin Bädorf
e3bfdc71fc
Merge branch 'main' into feat/hibernate-always
2022-08-14 15:05:32 +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
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
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
616b7af858
devos: include upstream commits
...
780620d865
e6b14d39d6
dd51f64bc5
2022-08-13 21:50:23 +02:00
vlalentim
6817fb3d5f
Theme change for fzf
2022-08-13 20:05:51 +02:00
teutat3s
524845a460
Merge pull request 'Various neovim cherry-picks' ( #96 ) from fix/neovim-cherry-picks into main
...
Reviewed-on: https://git.b12f.io/pub-solar/os/pulls/96
Reviewed-by: Benjamin Bädorf <b12f@noreply.example.org>
2022-08-13 15:36:31 +00:00
teutat3s
e11c91f86e
Merge branch 'main' into fix/neovim-cherry-picks
2022-08-13 17:35:16 +02:00
teutat3s
a5848ad06e
Bump flake.lock, fix error:
...
attribute 'deploy-rs' missing
2022-08-13 17:08:26 +02:00
vlalentim
cb3141d354
Merge pull request 'Make cryptroot optional' ( #102 ) from feat/optional-cryptroot into main
...
Reviewed-on: https://git.b12f.io/pub-solar/os/pulls/102
Reviewed-by: vlalentim <vlalentim@noreply.example.org>
2022-08-13 10:33:44 +00:00
Benjamin Bädorf
93aaab2685
Make cryptroot optional
2022-08-13 12:32:37 +02:00
Benjamin Bädorf
69a48b4225
Merge pull request 'Update lock file so deploy-rs is available' ( #101 ) from maintenance/update-flake-lock into main
...
Reviewed-on: https://git.b12f.io/pub-solar/os/pulls/101
Reviewed-by: hensoko <hensoko@noreply.example.org>
Reviewed-by: vlalentim <vlalentim@noreply.example.org>
2022-08-13 10:08:48 +00:00