teutat3s
72cc501e5f
Merge branch 'main' into teutat3s
2022-08-25 16:18:24 +02:00
teutat3s
6db8ab0a98
Merge pull request 'Import the full environment again' ( #124 ) from fix/env581a8829 into main
...
Reviewed-on: https://git.b12f.io/pub-solar/os/pulls/124
Reviewed-by: teutat3s <teutates@mailbox.org>
Reviewed-by: hensoko <hensoko@noreply.example.org>
2022-08-25 14:14:16 +00:00
Benjamin Bädorf
dbee2f03e7
Import the full environment again
2022-08-25 15:17:38 +02:00
Benjamin Bädorf
b16299965c
Merge pull request 'Fix hibernation' ( #120 ) from fix/hibernation into main
...
Reviewed-on: https://git.b12f.io/pub-solar/os/pulls/120
Reviewed-by: hensoko <hensoko@noreply.example.org>
2022-08-25 09:58:20 +00:00
Benjamin Bädorf
6d1d683b23
Fix swayidle command, add hibernation on lid close, fix env
...
The swayidle command in the service was straight up broken, this commit
fixes that.
Environment Variables set in the `session-variables` file are now
correctly imported across the system. This fixes `EDITOR` defaulting to
`nano`.
2022-08-25 00:13:23 +02:00
Benjamin Bädorf
40799ed5b6
Merge pull request 'feature/pin-zsh-plugins-to-deterministic-versions' ( #123 ) from feature/pin-zsh-plugins-to-deterministic-versions into main
...
Reviewed-on: https://git.b12f.io/pub-solar/os/pulls/123
Reviewed-by: Benjamin Bädorf <hello@benjaminbaedorf.eu>
2022-08-24 22:05:08 +00:00
teutat3s
de03f0f42f
zsh: correctly pin plugins to commits instead of
...
branch names, to prevent errors like:
error: hash mismatch in fixed-output derivation '/nix/store/n7w9jd46zx4rzy9a24abxv3lcx1ikn1j-source.drv':
specified: sha256-0pzkKPdzyQXTe8usaSaM1Iivi2UHQrSJrh5V2pRd0Gg=
got: sha256-9vc4cMBCNOmPOyzGwnPeMrXXyQUq4pC9Du3AWl9+Rys=
2022-08-24 23:19:18 +02:00
teutat3s
f7eda8ca1c
zsh: bundle plugins within our config
2022-08-24 23:19:13 +02:00
hensoko
ad0402fd93
Merge pull request 'Disable NetworkManager-wait-online system service' ( #121 ) from feature/disable-networkmanager-wait-online into main
...
Reviewed-on: https://git.b12f.io/pub-solar/os/pulls/121
Reviewed-by: Benjamin Bädorf <hello@benjaminbaedorf.eu>
2022-08-24 20:50:45 +00:00
hensoko
9d83f32bd8
Merge pull request 'Use iwd as wifi backend' ( #122 ) from feature/use-iwd-as-networkmanager-wifi-backend into main
...
Reviewed-on: https://git.b12f.io/pub-solar/os/pulls/122
Reviewed-by: Benjamin Bädorf <hello@benjaminbaedorf.eu>
2022-08-24 20:50:18 +00:00
Hendrik Sokolowski
8efc4c2f9e
Use iwd as wifi backend
...
iwd is a lightweight wireless connection backend that was initiated by
developers of intel. It is supposed to be faster.
2022-08-24 21:49:59 +02:00
Hendrik Sokolowski
57f608ecde
Disable NetworkManager-wait-online system service
...
This service is presumably useful for devices that need to ensure there
is an active internet connection before starting other systemd units.
This is neither the case for end-user devices as the an active internet
connection is only needed after login nor the case for server-like
systems as they normally have a static / dhcp-based network configuration
which does not require switchable network configuration profiles.
2022-08-24 21:47:58 +02:00
teutat3s
b4c782e65a
Merge branch 'main' into teutat3s
2022-08-24 20:32:28 +02:00
Benjamin Bädorf
dc8257f31f
Fix hibernation
...
The resumeDevice and kernel `resume` parameter were being used wrong.
Only `boot.resumeDevice` is necessary, and it should point at the _block
device_ that holds the swapfile. If you are running on encrypted
volumes, this means you will need to use the name of the *decrypted
block device* on which the swapfile sits.
2022-08-24 18:46:35 +02:00
Benjamin Bädorf
80e71ca547
Merge pull request 'nix: set nix.package to force overlays/overrides.nix to apply' ( #119 ) from fix/nix-version-from-latest into main
...
Reviewed-on: https://git.b12f.io/pub-solar/os/pulls/119
Reviewed-by: Benjamin Bädorf <hello@benjaminbaedorf.eu>
2022-08-24 13:13:20 +00:00
teutat3s
1203bfc4ef
Bump flake.lock
2022-08-24 00:56:23 +02:00
teutat3s
c63c3da345
nix: set nix.package to force overlays/
...
overrides.nix to apply
use nix as default version alias in devshell as well
2022-08-24 00:55:57 +02:00
teutat3s
63102f33e5
nix: set nix.package to force overlays/
...
overrides.nix to apply
use nix as default version alias in devshell as well
2022-08-24 00:53:38 +02:00
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
teutat3s
dca6ca86b1
Update flake.lock
2022-08-14 17:24:27 +02:00
teutat3s
b263ca4c45
Merge branch 'main' into teutat3s
2022-08-14 17:21:34 +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
teutat3s
b00196aa94
Update flake.lock
2022-08-14 16:48:51 +02:00
teutat3s
820cc40356
Merge branch 'main' into teutat3s
2022-08-14 16:46:33 +02: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