Unverified Commit aa7197b0 authored by Nick Cao's avatar Nick Cao Committed by GitHub
Browse files

Merge pull request #230539 from OPNA2608/update/miriway 

miriway: unstable-2023-03-17 -> unstable-2023-04-25
parents 6ab2d1c3 fc3c5947

nixos/modules/programs/miriway.nix

+19 −1
Original line number Diff line number Diff line
@@ -8,7 +8,7 @@ in { 
      Miriway, a Mir based Wayland compositor. You can manually launch Miriway by

      executing "exec miriway" on a TTY, or launch it from a display manager. Copy

      /etc/xdg/xdg-miriway/miriway-shell.config to ~/.config/miriway-shell.config

      to modify the default configuration. See <https://github.com/Miriway/Miriway>,

      to modify the system-wide configuration on a per-user basis. See <https://github.com/Miriway/Miriway>,

      and "miriway --help" for more information'');



    config = lib.mkOption {
@@ -19,6 +19,15 @@ in { 
        ctrl-alt=t:miriway-terminal # Default "terminal emulator finder"



        shell-component=dbus-update-activation-environment --systemd DISPLAY WAYLAND_DISPLAY



        meta=Left:@dock-left

        meta=Right:@dock-right

        meta=Space:@toggle-maximized

        meta=Home:@workspace-begin

        meta=End:@workspace-end

        meta=Page_Up:@workspace-up

        meta=Page_Down:@workspace-down

        ctrl-alt=BackSpace:@exit

      '';

      example = ''

        idle-timeout=300
@@ -31,6 +40,15 @@ in { 
        shell-component=wbg Pictures/wallpaper



        shell-meta=a:synapse



        meta=Left:@dock-left

        meta=Right:@dock-right

        meta=Space:@toggle-maximized

        meta=Home:@workspace-begin

        meta=End:@workspace-end

        meta=Page_Up:@workspace-up

        meta=Page_Down:@workspace-down

        ctrl-alt=BackSpace:@exit

      '';

      description = lib.mdDoc ''

        Miriway's config. This will be installed system-wide.

pkgs/applications/window-managers/miriway/default.nix

+3 −3
Original line number Diff line number Diff line
@@ -11,13 +11,13 @@ 


stdenv.mkDerivation rec {

  pname = "miriway";

  version = "unstable-2023-03-17";

  version = "unstable-2023-04-25";



  src = fetchFromGitHub {

    owner = "Miriway";

    repo = "Miriway";

    rev = "f4c52fee6c1aeba40fc3e8cb1d6ec7354da0765b";

    hash = "sha256-/Av/gRTK3y0TlW3BqS+LPj8nS/4SXQpavYDpdvHwPqI=";

    rev = "55ef5bd188e2b86dfbd1b9b360d832d4cd454eb7";

    hash = "sha256-kooyL5up+SBHmnv/eEnsg0ujJlHBqbE+n/YHqmpXscI=";

  };



  strictDeps = true;