Haven - update unlock script; Update Beeper to use Wayland
This commit is contained in:
parent
49c7f08549
commit
88d9bacff0
|
@ -12,7 +12,8 @@ set -e
|
||||||
|
|
||||||
# local storage partition
|
# local storage partition
|
||||||
echo "Unlocking storage partition:"
|
echo "Unlocking storage partition:"
|
||||||
cryptsetup luksOpen /dev/disk/by-uuid/223582c7-fbad-467d-8f85-4d4cebd3230c storage
|
# 4 TB HDD, partition #2
|
||||||
|
cryptsetup luksOpen /dev/disk/by-uuid/8dc60329-d27c-4a4a-b76a-861b1e28400e storage
|
||||||
|
|
||||||
# mount local storage
|
# mount local storage
|
||||||
if [ ! -f /dev/mapper/storage ]; then
|
if [ ! -f /dev/mapper/storage ]; then
|
||||||
|
|
|
@ -12,7 +12,14 @@ with lib;
|
||||||
config = mkIf cfg.enable {
|
config = mkIf cfg.enable {
|
||||||
nixpkgs.config.allowUnfree = true;
|
nixpkgs.config.allowUnfree = true;
|
||||||
environment.systemPackages = with pkgs; [
|
environment.systemPackages = with pkgs; [
|
||||||
beeper
|
# Install Beeper, but override the InstallPhase so it uses Wayland.
|
||||||
|
# Check Flatpak status here: https://github.com/daegalus/beeper-flatpak-wip/issues/1
|
||||||
|
(beeper.overrideAttrs (oldAttrs: {
|
||||||
|
installPhase = ''
|
||||||
|
wrapProgram $out/bin/beeper \
|
||||||
|
--add-flags "\''${NIXOS_OZONE_WL:+\''${WAYLAND_DISPLAY:+--ozone-platform-hint=wayland --enable-features=WaylandWindowDecorations}} --no-update"
|
||||||
|
'';
|
||||||
|
}))
|
||||||
];
|
];
|
||||||
|
|
||||||
host.ui.flatpak.enable = true;
|
host.ui.flatpak.enable = true;
|
||||||
|
|
Loading…
Reference in a new issue