commit d6531168026f9674d81a9a7e21e06f8f53df443b · ryan.freumh.org/nixos

+18

flake.nix

···

       57
       57
        
                   neovim-unwrapped = final.overlay-unstable.neovim-unwrapped;

     

       58
       58
        
                   stig = final.overlay-unstable.stig;

     

       59
       59
        
                   pantalaimon = prev.callPackage ./pkgs/pantalaimon.nix { };

     

       60
       60
       +
                   sway-unwrapped = prev.callPackage ./pkgs/sway-im/package.nix {

     

       61
       61
       +
                     libdrm = final.overlay-unstable.libdrm;

     

       62
       62
       +
                     wlroots = prev.callPackage ./pkgs/wlroots/default.nix {

     

       63
       63
       +
                       # for libdrm >=2.4.120

     

       64
       64
       +
                       mesa = final.overlay-unstable.mesa;

     

       65
       65
       +
                       wayland-protocols = prev.wayland-protocols.overrideAttrs

     

       66
       66
       +
                         (old: rec {

     

       67
       67
       +
                           pname = "wayland-protocols";

     

       68
       68
       +
                           version = "1.33";

     

       69
       69
       +
                           src = prev.fetchurl {

     

       70
       70
       +
                             url =

     

       71
       71
       +
                               "https://gitlab.freedesktop.org/wayland/${pname}/-/releases/${version}/downloads/${pname}-${version}.tar.xz";

     

       72
       72
       +
                             hash =

     

       73
       73
       +
                               "sha256-lPDFCwkNbmGgP2IEhGexmrvoUb5OEa57NvZfi5jDljo=";

     

       74
       74
       +
                           };

     

       75
       75
       +
                         });

     

       76
       76
       +
                     };

     

       77
       77
       +
                   };

     

       60
       78
        
                 })

     

       61
       79
        
               ];

     

       62
       80
        
           in {

+11

pkgs/sway-im/fix-paths.patch

···

       1
       1
       +
       --- a/sway/config.c

     

       2
       2
       +
       +++ b/sway/config.c

     

       3
       3
       +
       @@ -276,7 +276,7 @@

     

       4
       4
       +
        

     

       5
       5
       +
        	if (!(config->active_bar_modifiers = create_list())) goto cleanup;

     

       6
       6
       +
        

     

       7
       7
       +
       -	if (!(config->swaybg_command = strdup("swaybg"))) goto cleanup;

     

       8
       8
       +
       +	if (!(config->swaybg_command = strdup("@swaybg@/bin/swaybg"))) goto cleanup;

     

       9
       9
       +
        

     

       10
       10
       +
        	if (!(config->config_chain = create_list())) goto cleanup;

     

       11
       11
       +
        	config->current_config_path = NULL;

+48

pkgs/sway-im/load-configuration-from-etc.patch

···

       1
       1
       +
       From 92283df3acbffa5c1bb21f23cdd686113d905114 Mon Sep 17 00:00:00 2001

     

       2
       2
       +
       From: Patrick Hilhorst <git@hilhorst.be>

     

       3
       3
       +
       Date: Wed, 31 Mar 2021 21:14:13 +0200

     

       4
       4
       +
       Subject: [PATCH] Load configs from /etc but fallback to /nix/store

     

       5
       5
       +
       

     

       6
       6
       +
       This change will load all configuration files from /etc, to make it easy

     

       7
       7
       +
       to override them, but fallback to /nix/store/.../etc/sway/config to make

     

       8
       8
       +
       Sway work out-of-the-box with the default configuration on non NixOS

     

       9
       9
       +
       systems.

     

       10
       10
       +
       

     

       11
       11
       +
       Original patch by Michael Weiss, updated for Sway 1.6 by Patrick Hilhorst

     

       12
       12
       +
       

     

       13
       13
       +
       Co-authored-by: Michael Weiss <dev.primeos@gmail.com>

     

       14
       14
       +
       ---

     

       15
       15
       +
        meson.build   | 3 ++-

     

       16
       16
       +
        sway/config.c | 3 ++-

     

       17
       17
       +
        2 files changed, 4 insertions(+), 2 deletions(-)

     

       18
       18
       +
       

     

       19
       19
       +
       diff --git a/meson.build b/meson.build

     

       20
       20
       +
       index b7a29660..8ae8ceb3 100644

     

       21
       21
       +
       --- a/meson.build

     

       22
       22
       +
       +++ b/meson.build

     

       23
       23
       +
       @@ -164,7 +164,8 @@ if scdoc.found()

     

       24
       24
       +
        	endforeach

     

       25
       25
       +
        endif

     

       26
       26
       +
        

     

       27
       27
       +
       -add_project_arguments('-DSYSCONFDIR="/@0@"'.format(join_paths(prefix, sysconfdir)), language : 'c')

     

       28
       28
       +
       +add_project_arguments('-DSYSCONFDIR="/@0@"'.format(sysconfdir), language : 'c')

     

       29
       29
       +
       +add_project_arguments('-DNIX_SYSCONFDIR="/@0@"'.format(join_paths(prefix, sysconfdir)), language : 'c')

     

       30
       30
       +
        

     

       31
       31
       +
        version = '"@0@"'.format(meson.project_version())

     

       32
       32
       +
        git = find_program('git', native: true, required: false)

     

       33
       33
       +
       diff --git a/sway/config.c b/sway/config.c

     

       34
       34
       +
       index 76b9ec08..fb5b51aa 100644

     

       35
       35
       +
       --- a/sway/config.c

     

       36
       36
       +
       +++ b/sway/config.c

     

       37
       37
       +
       @@ -374,7 +374,8 @@ static char *get_config_path(void) {

     

       38
       38
       +
        		{ .prefix = home, .config_folder = ".i3"},

     

       39
       39
       +
        		{ .prefix = config_home, .config_folder = "i3"},

     

       40
       40
       +
        		{ .prefix = SYSCONFDIR, .config_folder = "sway"},

     

       41
       41
       +
       -		{ .prefix = SYSCONFDIR, .config_folder = "i3"}

     

       42
       42
       +
       +		{ .prefix = SYSCONFDIR, .config_folder = "i3"},

     

       43
       43
       +
       +		{ .prefix = NIX_SYSCONFDIR, .config_folder = "sway"},

     

       44
       44
       +
        	};

     

       45
       45
       +
        

     

       46
       46
       +
        	size_t num_config_paths = sizeof(config_paths)/sizeof(config_paths[0]);

     

       47
       47
       +
       -- 

     

       48
       48
       +
       2.30.1

+93

pkgs/sway-im/package.nix

···

       1
       1
       +
       { lib, stdenv, fetchFromGitHub, fetchpatch, substituteAll, swaybg, meson, ninja

     

       2
       2
       +
       , pkg-config, wayland-scanner, scdoc, libGL, wayland, libxkbcommon, pcre2

     

       3
       3
       +
       , json_c, libevdev, pango, cairo, libinput, gdk-pixbuf, librsvg, wlroots

     

       4
       4
       +
       , wayland-protocols, libdrm, nixosTests

     

       5
       5
       +
       # Used by the NixOS module:

     

       6
       6
       +
       , isNixOS ? false, enableXWayland ? true, xorg

     

       7
       7
       +
       , systemdSupport ? lib.meta.availableOn stdenv.hostPlatform systemd, systemd

     

       8
       8
       +
       , trayEnabled ? systemdSupport }:

     

       9
       9
       +
       

     

       10
       10
       +
       stdenv.mkDerivation (finalAttrs: {

     

       11
       11
       +
         pname = "sway-unwrapped";

     

       12
       12
       +
         version = "im";

     

       13
       13
       +
       

     

       14
       14
       +
         inherit enableXWayland isNixOS systemdSupport trayEnabled;

     

       15
       15
       +
         src = fetchFromGitHub {

     

       16
       16
       +
           owner = "Decodetalkers";

     

       17
       17
       +
           repo = "sway";

     

       18
       18
       +
           rev = "2c5bf7c4447df67c32a4ee9c8347ce1848901da2";

     

       19
       19
       +
           sha256 = "sha256-UqmdwCTV5LgAQ6z94ZrHBX/QPmBi29fruUzeQk5Vhto=";

     

       20
       20
       +
         };

     

       21
       21
       +
       

     

       22
       22
       +
         patches = [

     

       23
       23
       +
           ./load-configuration-from-etc.patch

     

       24
       24
       +
       

     

       25
       25
       +
           (substituteAll {

     

       26
       26
       +
             src = ./fix-paths.patch;

     

       27
       27
       +
             inherit swaybg;

     

       28
       28
       +
           })

     

       29
       29
       +
         ] ++ lib.optionals (!finalAttrs.isNixOS) [

     

       30
       30
       +
           # References to /nix/store/... will get GC'ed which causes problems when

     

       31
       31
       +
           # copying the default configuration:

     

       32
       32
       +
           ./sway-config-no-nix-store-references.patch

     

       33
       33
       +
         ] ++ lib.optionals finalAttrs.isNixOS [

     

       34
       34
       +
           # Use /run/current-system/sw/share and /etc instead of /nix/store

     

       35
       35
       +
           # references:

     

       36
       36
       +
           ./sway-config-nixos-paths.patch

     

       37
       37
       +
         ];

     

       38
       38
       +
       

     

       39
       39
       +
         strictDeps = true;

     

       40
       40
       +
         depsBuildBuild = [ pkg-config ];

     

       41
       41
       +
       

     

       42
       42
       +
         nativeBuildInputs = [ meson ninja pkg-config wayland-scanner scdoc ];

     

       43
       43
       +
       

     

       44
       44
       +
         buildInputs = [

     

       45
       45
       +
           libGL

     

       46
       46
       +
           wayland

     

       47
       47
       +
           libxkbcommon

     

       48
       48
       +
           pcre2

     

       49
       49
       +
           json_c

     

       50
       50
       +
           libevdev

     

       51
       51
       +
           pango

     

       52
       52
       +
           cairo

     

       53
       53
       +
           libinput

     

       54
       54
       +
           gdk-pixbuf

     

       55
       55
       +
           librsvg

     

       56
       56
       +
           wayland-protocols

     

       57
       57
       +
           libdrm

     

       58
       58
       +
           (wlroots.override { inherit (finalAttrs) enableXWayland; })

     

       59
       59
       +
         ] ++ lib.optionals finalAttrs.enableXWayland [ xorg.xcbutilwm ];

     

       60
       60
       +
       

     

       61
       61
       +
         mesonFlags = let

     

       62
       62
       +
           # The "sd-bus-provider" meson option does not include a "none" option,

     

       63
       63
       +
           # but it is silently ignored iff "-Dtray=disabled".  We use "basu"

     

       64
       64
       +
           # (which is not in nixpkgs) instead of "none" to alert us if this

     

       65
       65
       +
           # changes: https://github.com/swaywm/sway/issues/6843#issuecomment-1047288761

     

       66
       66
       +
           # assert trayEnabled -> systemdSupport && dbusSupport;

     

       67
       67
       +
       

     

       68
       68
       +
           sd-bus-provider = if systemdSupport then "libsystemd" else "basu";

     

       69
       69
       +
         in [ "-Dsd-bus-provider=${sd-bus-provider}" ] ++ [ "-Dwerror=false" ]

     

       70
       70
       +
         ++ lib.optional (!finalAttrs.enableXWayland) "-Dxwayland=disabled"

     

       71
       71
       +
         ++ lib.optional (!finalAttrs.trayEnabled) "-Dtray=disabled";

     

       72
       72
       +
       

     

       73
       73
       +
         passthru.tests.basic = nixosTests.sway;

     

       74
       74
       +
       

     

       75
       75
       +
         meta = with lib; {

     

       76
       76
       +
           description = "An i3-compatible tiling Wayland compositor";

     

       77
       77
       +
           longDescription = ''

     

       78
       78
       +
             Sway is a tiling Wayland compositor and a drop-in replacement for the i3

     

       79
       79
       +
             window manager for X11. It works with your existing i3 configuration and

     

       80
       80
       +
             supports most of i3's features, plus a few extras.

     

       81
       81
       +
             Sway allows you to arrange your application windows logically, rather

     

       82
       82
       +
             than spatially. Windows are arranged into a grid by default which

     

       83
       83
       +
             maximizes the efficiency of your screen and can be quickly manipulated

     

       84
       84
       +
             using only the keyboard.

     

       85
       85
       +
           '';

     

       86
       86
       +
           homepage = "https://swaywm.org";

     

       87
       87
       +
           changelog = "https://github.com/swaywm/sway/releases/tag/${version}";

     

       88
       88
       +
           license = licenses.mit;

     

       89
       89
       +
           platforms = platforms.linux;

     

       90
       90
       +
           maintainers = with maintainers; [ primeos synthetica ];

     

       91
       91
       +
           mainProgram = "sway";

     

       92
       92
       +
         };

     

       93
       93
       +
       })

+21

pkgs/sway-im/sway-config-nixos-paths.patch

···

       1
       1
       +
       diff --git a/config.in b/config.in

     

       2
       2
       +
       index 08703bef..f3872730 100644

     

       3
       3
       +
       --- a/config.in

     

       4
       4
       +
       +++ b/config.in

     

       5
       5
       +
       @@ -22,8 +22,8 @@ set $menu dmenu_path | dmenu | xargs swaymsg exec --

     

       6
       6
       +
        

     

       7
       7
       +
        ### Output configuration

     

       8
       8
       +
        #

     

       9
       9
       +
       -# Default wallpaper (more resolutions are available in @datadir@/backgrounds/sway/)

     

       10
       10
       +
       -output * bg @datadir@/backgrounds/sway/Sway_Wallpaper_Blue_1920x1080.png fill

     

       11
       11
       +
       +# Default wallpaper (more resolutions are available in /run/current-system/sw/share/backgrounds/sway/)

     

       12
       12
       +
       +output * bg /run/current-system/sw/share/backgrounds/sway/Sway_Wallpaper_Blue_1920x1080.png fill

     

       13
       13
       +
        #

     

       14
       14
       +
        # Example configuration:

     

       15
       15
       +
        #

     

       16
       16
       +
       @@ -214,4 +214,4 @@ bar {

     

       17
       17
       +
            }

     

       18
       18
       +
        }

     

       19
       19
       +
        

     

       20
       20
       +
       -include @sysconfdir@/sway/config.d/*

     

       21
       21
       +
       +include /etc/sway/config.d/*

+21

pkgs/sway-im/sway-config-no-nix-store-references.patch

···

       1
       1
       +
       diff --git a/config.in b/config.in

     

       2
       2
       +
       --- a/config.in

     

       3
       3
       +
       +++ b/config.in

     

       4
       4
       +
       @@ -21,8 +21,8 @@ set $menu dmenu_path | dmenu | xargs swaymsg exec

     

       5
       5
       +
        

     

       6
       6
       +
        ### Output configuration

     

       7
       7
       +
        #

     

       8
       8
       +
       -# Default wallpaper (more resolutions are available in @datadir@/backgrounds/sway/)

     

       9
       9
       +
       -output * bg @datadir@/backgrounds/sway/Sway_Wallpaper_Blue_1920x1080.png fill

     

       10
       10
       +
       +# Default wallpaper

     

       11
       11
       +
       +#output * bg ~/.config/sway/backgrounds/Sway_Wallpaper_Blue_1920x1080.png fill

     

       12
       12
       +
        #

     

       13
       13
       +
        # Example configuration:

     

       14
       14
       +
        #

     

       15
       15
       +
       @@ -213,5 +213,3 @@ bar {

     

       16
       16
       +
                inactive_workspace #32323200 #32323200 #5c5c5c

     

       17
       17
       +
            }

     

       18
       18
       +
        }

     

       19
       19
       +
       -

     

       20
       20
       +
       -include @sysconfdir@/sway/config.d/*

     

       21
       21
       +

+83

pkgs/wlroots/default.nix

···

       1
       1
       +
       { lib, stdenv, fetchFromGitLab, fetchpatch, meson, ninja, pkg-config

     

       2
       2
       +
       , wayland-scanner, libGL, wayland, wayland-protocols, libinput, libxkbcommon

     

       3
       3
       +
       , pixman, libcap, mesa, xorg, libpng, ffmpeg_4, ffmpeg, hwdata, seatd

     

       4
       4
       +
       , vulkan-loader, glslang, libliftoff, libdisplay-info, nixosTests

     

       5
       5
       +
       

     

       6
       6
       +
       , enableXWayland ? true, xwayland ? null }:

     

       7
       7
       +
       

     

       8
       8
       +
       stdenv.mkDerivation (finalAttrs: rec {

     

       9
       9
       +
         pname = "wlroots";

     

       10
       10
       +
         version = "0.18.0";

     

       11
       11
       +
       

     

       12
       12
       +
         inherit enableXWayland;

     

       13
       13
       +
       

     

       14
       14
       +
         src = fetchFromGitLab {

     

       15
       15
       +
           domain = "gitlab.freedesktop.org";

     

       16
       16
       +
           owner = "wlroots";

     

       17
       17
       +
           repo = "wlroots";

     

       18
       18
       +
           rev = "b80337a8f2bb5d032f533ed5e0feb6292670528f";

     

       19
       19
       +
           hash = "sha256-EOkgmjRe4v7HtHjJRFplxPZRUzC9N8KgU72BU2JKqKo=";

     

       20
       20
       +
         };

     

       21
       21
       +
       

     

       22
       22
       +
         # $out for the library and $examples for the example programs (in examples):

     

       23
       23
       +
         outputs = [ "out" "examples" ];

     

       24
       24
       +
       

     

       25
       25
       +
         strictDeps = true;

     

       26
       26
       +
         depsBuildBuild = [ pkg-config ];

     

       27
       27
       +
       

     

       28
       28
       +
         nativeBuildInputs = [ meson ninja pkg-config wayland-scanner glslang ];

     

       29
       29
       +
       

     

       30
       30
       +
         buildInputs = [

     

       31
       31
       +
           libGL

     

       32
       32
       +
           libcap

     

       33
       33
       +
           libinput

     

       34
       34
       +
           libpng

     

       35
       35
       +
           libxkbcommon

     

       36
       36
       +
           mesa

     

       37
       37
       +
           pixman

     

       38
       38
       +
           seatd

     

       39
       39
       +
           vulkan-loader

     

       40
       40
       +
           wayland

     

       41
       41
       +
           wayland-protocols

     

       42
       42
       +
           xorg.libX11

     

       43
       43
       +
           xorg.xcbutilerrors

     

       44
       44
       +
           xorg.xcbutilimage

     

       45
       45
       +
           xorg.xcbutilrenderutil

     

       46
       46
       +
           xorg.xcbutilwm

     

       47
       47
       +
           ffmpeg

     

       48
       48
       +
           hwdata

     

       49
       49
       +
           libliftoff

     

       50
       50
       +
           libdisplay-info

     

       51
       51
       +
         ] ++ lib.optional finalAttrs.enableXWayland xwayland;

     

       52
       52
       +
       

     

       53
       53
       +
         mesonFlags = lib.optional (!finalAttrs.enableXWayland) "-Dxwayland=disabled";

     

       54
       54
       +
       

     

       55
       55
       +
         postFixup = ''

     

       56
       56
       +
           # Install ALL example programs to $examples:

     

       57
       57
       +
           # screencopy dmabuf-capture input-inhibitor layer-shell idle-inhibit idle

     

       58
       58
       +
           # screenshot output-layout multi-pointer rotation tablet touch pointer

     

       59
       59
       +
           # simple

     

       60
       60
       +
           mkdir -p $examples/bin

     

       61
       61
       +
           cd ./examples

     

       62
       62
       +
           for binary in $(find . -executable -type f -printf '%P\n' | grep -vE '\.so'); do

     

       63
       63
       +
             cp "$binary" "$examples/bin/wlroots-$binary"

     

       64
       64
       +
           done

     

       65
       65
       +
         '';

     

       66
       66
       +
       

     

       67
       67
       +
         # Test via TinyWL (the "minimum viable product" Wayland compositor based on wlroots):

     

       68
       68
       +
         passthru.tests.tinywl = nixosTests.tinywl;

     

       69
       69
       +
       

     

       70
       70
       +
         meta = {

     

       71
       71
       +
           description = "A modular Wayland compositor library";

     

       72
       72
       +
           longDescription = ''

     

       73
       73
       +
             Pluggable, composable, unopinionated modules for building a Wayland

     

       74
       74
       +
             compositor; or about 50,000 lines of code you were going to write anyway.

     

       75
       75
       +
           '';

     

       76
       76
       +
           inherit (finalAttrs.src.meta) homepage;

     

       77
       77
       +
           changelog =

     

       78
       78
       +
             "https://gitlab.freedesktop.org/wlroots/wlroots/-/tags/${version}";

     

       79
       79
       +
           license = lib.licenses.mit;

     

       80
       80
       +
           platforms = lib.platforms.linux;

     

       81
       81
       +
           maintainers = with lib.maintainers; [ primeos synthetica rewine ];

     

       82
       82
       +
         };

     

       83
       83
       +
       })

+43

pkgs/wlroots/protocols.nix

···

       1
       1
       +
       { lib, stdenv, fetchFromGitLab, wayland-scanner }:

     

       2
       2
       +
       

     

       3
       3
       +
       stdenv.mkDerivation rec {

     

       4
       4
       +
         pname = "wlr-protocols";

     

       5
       5
       +
         version = "unstable-2022-09-05";

     

       6
       6
       +
       

     

       7
       7
       +
         src = fetchFromGitLab {

     

       8
       8
       +
           domain = "gitlab.freedesktop.org";

     

       9
       9
       +
           owner = "wlroots";

     

       10
       10
       +
           repo = "wlr-protocols";

     

       11
       11
       +
           rev = "4264185db3b7e961e7f157e1cc4fd0ab75137568";

     

       12
       12
       +
           sha256 = "Ztc07RLg+BZPondP/r6Jo3Fw1QY/z1QsFvdEuOqQshA=";

     

       13
       13
       +
         };

     

       14
       14
       +
       

     

       15
       15
       +
         strictDeps = true;

     

       16
       16
       +
         nativeBuildInputs = [ wayland-scanner ];

     

       17
       17
       +
       

     

       18
       18
       +
         patchPhase = ''

     

       19
       19
       +
           substituteInPlace wlr-protocols.pc.in \

     

       20
       20
       +
             --replace '=''${pc_sysrootdir}' "=" \

     

       21
       21
       +
             --replace '=@prefix@' "=$out"

     

       22
       22
       +
         '';

     

       23
       23
       +
       

     

       24
       24
       +
         doCheck = true;

     

       25
       25
       +
         checkTarget = "check";

     

       26
       26
       +
       

     

       27
       27
       +
         installFlags = [ "DESTDIR=$(out)" "PREFIX=" ];

     

       28
       28
       +
       

     

       29
       29
       +
         meta = with lib; {

     

       30
       30
       +
           description = "Wayland roots protocol extensions";

     

       31
       31
       +
           longDescription = ''

     

       32
       32
       +
             wlr-protocols contains Wayland protocols that add functionality not

     

       33
       33
       +
             available in the Wayland core protocol, and specific to wlroots-based

     

       34
       34
       +
             compositors. Such protocols either add completely new functionality, or

     

       35
       35
       +
             extend the functionality of some other protocol either in Wayland core,

     

       36
       36
       +
             or some other protocol in wayland-protocols.

     

       37
       37
       +
           '';

     

       38
       38
       +
           homepage = "https://gitlab.freedesktop.org/wlroots/wlr-protocols";

     

       39
       39
       +
           license = licenses.mit; # See file headers

     

       40
       40
       +
           platforms = platforms.linux;

     

       41
       41
       +
           maintainers = with maintainers; [ twitchyliquid64 ];

     

       42
       42
       +
         };

     

       43
       43
       +
       }