diff --git a/hosts/pbp/default.nix b/hosts/pbp/default.nix index 0418194..c1374f3 100644 --- a/hosts/pbp/default.nix +++ b/hosts/pbp/default.nix @@ -3,5 +3,4 @@ imports = [ ./configuration.nix ] ++ suites.base; - } diff --git a/pkgs/default.nix b/pkgs/default.nix index 2f51ffb..2dac6a8 100644 --- a/pkgs/default.nix +++ b/pkgs/default.nix @@ -18,6 +18,7 @@ in amule = prev.callPackage (import ./amule) { }; digikam = nixpkgsUnstable.digikam; cura = nixpkgsUnstable.cura; + qutebrowser = import ./qutebrowser { pkgs = prev; }; #firefox-unwrapped = nixpkgsUnstable.firefox-unwrapped; xdg-desktop-portal = nixpkgsUnstable.xdg-desktop-portal; xdg-desktop-portal-gtk = nixpkgsUnstable.xdg-desktop-portal-gtk; diff --git a/pkgs/qutebrowser/default.nix b/pkgs/qutebrowser/default.nix new file mode 100644 index 0000000..2b3c6ad --- /dev/null +++ b/pkgs/qutebrowser/default.nix @@ -0,0 +1,9 @@ +{ pkgs }: + +pkgs.qutebrowser.overrideAttrs (old: { + buildInputs = old.buildInputs ++ [ pkgs.makeWrapper ]; + postInstall = old.postInstall or "" + '' + wrapProgram "$out/bin/qutebrowser" --set QT_QPA_PLATFORM wayland --set QT_WAYLAND_DISABLE_WINDOWDECORATION 1 + ''; +}) + diff --git a/users/profiles/sway/default.nix b/users/profiles/sway/default.nix index 88b9dfc..aa10dab 100644 --- a/users/profiles/sway/default.nix +++ b/users/profiles/sway/default.nix @@ -1,6 +1,7 @@ { pkgs, lib, ... }: { home.packages = with pkgs; [ wl-clipboard ]; + wayland = { windowManager.sway = let @@ -60,6 +61,8 @@ "${modifier}+x" = "exec emacsclient -c"; "${modifier}+b" = "exec firefox"; "${modifier}+s" = "exec ${screenshotScript}"; + "XF86MonBrightnessUp" = "exec ${pkgs.brightnessctl}/bin/brightnessctl s +5%"; + "XF86MonBrightnessDown" = "exec ${pkgs.brightnessctl}/bin/brightnessctl s 5%-"; }; }; extraConfig = '' @@ -125,8 +128,8 @@ backlight = { format = "nit {percent}%"; - on-scroll-up = "${pkgs.light}/bin/light -A 2"; - on-scroll-down = "${pkgs.light}/bin/light -U 2"; + on-scroll-up = "${pkgs.brightnessctl}/bin/brightnessctl s +5%"; + on-scroll-down = "${pkgs.brightnessctl}/bin/brightnessctl s 5%-"; }; tray.spacing = 10;