commit 78b1309ad43695533da8934ff147d4ae087e96d6 · pyrox.dev/nixpkgs

+1 -1

nixos/tests/all-tests.nix

···

       827
       827
        
         qgis = handleTest ./qgis.nix { qgisPackage = pkgs.qgis; };

     

       828
       828
        
         qgis-ltr = handleTest ./qgis.nix { qgisPackage = pkgs.qgis-ltr; };

     

       829
       829
        
         qownnotes = handleTest ./qownnotes.nix {};

     

       830
       830
       -
         qtile = handleTestOn ["x86_64-linux" "aarch64-linux"] ./qtile.nix {};

     

       830
       830
       +
         qtile = handleTestOn ["x86_64-linux" "aarch64-linux"] ./qtile/default.nix {};

     

       831
       831
        
         quake3 = handleTest ./quake3.nix {};

     

       832
       832
        
         quicktun = handleTest ./quicktun.nix {};

     

       833
       833
        
         quickwit = handleTest ./quickwit.nix {};

-34

nixos/tests/qtile.nix

···

       1
       1
       -
       import ./make-test-python.nix ({ lib, ...} : {

     

       2
       2
       -
         name = "qtile";

     

       3
       3
       -
       

     

       4
       4
       -
         meta = {

     

       5
       5
       -
           maintainers = with lib.maintainers; [ sigmanificient ];

     

       6
       6
       -
         };

     

       7
       7
       -
       

     

       8
       8
       -
         nodes.machine = { pkgs, lib, ... }: {

     

       9
       9
       -
           imports = [ ./common/x11.nix ./common/user-account.nix ];

     

       10
       10
       -
           test-support.displayManager.auto.user = "alice";

     

       11
       11
       -
       

     

       12
       12
       -
           services.xserver.windowManager.qtile.enable = true;

     

       13
       13
       -
           services.displayManager.defaultSession = lib.mkForce "qtile";

     

       14
       14
       -
       

     

       15
       15
       -
           environment.systemPackages = [ pkgs.kitty ];

     

       16
       16
       -
         };

     

       17
       17
       -
       

     

       18
       18
       -
         testScript = ''

     

       19
       19
       -
           with subtest("ensure x starts"):

     

       20
       20
       -
               machine.wait_for_x()

     

       21
       21
       -
               machine.wait_for_file("/home/alice/.Xauthority")

     

       22
       22
       -
               machine.succeed("xauth merge ~alice/.Xauthority")

     

       23
       23
       -
       

     

       24
       24
       -
           with subtest("ensure client is available"):

     

       25
       25
       -
               machine.succeed("qtile --version")

     

       26
       26
       -
       

     

       27
       27
       -
           with subtest("ensure we can open a new terminal"):

     

       28
       28
       -
               machine.sleep(2)

     

       29
       29
       -
               machine.send_key("meta_l-ret")

     

       30
       30
       -
               machine.wait_for_window(r"alice.*?machine")

     

       31
       31
       -
               machine.sleep(2)

     

       32
       32
       -
               machine.screenshot("terminal")

     

       33
       33
       -
         '';

     

       34
       34
       -
       })

+19

nixos/tests/qtile/add-widget.patch

···

       1
       1
       +
       --- a/config.py	2024-05-31 14:49:23.852287845 +0200

     

       2
       2
       +
       +++ b/config.py	2024-05-31 14:51:00.935182266 +0200

     

       3
       3
       +
       @@ -29,6 +29,8 @@

     

       4
       4
       +
        from libqtile.lazy import lazy

     

       5
       5
       +
        from libqtile.utils import guess_terminal

     

       6
       6
       +
        

     

       7
       7
       +
       +from qtile_extras import widget

     

       8
       8
       +
       +

     

       9
       9
       +
        mod = "mod4"

     

       10
       10
       +
        terminal = guess_terminal()

     

       11
       11
       +
        

     

       12
       12
       +
       @@ -162,6 +164,7 @@

     

       13
       13
       +
                        # NB Systray is incompatible with Wayland, consider using StatusNotifier instead

     

       14
       14
       +
                        # widget.StatusNotifier(),

     

       15
       15
       +
                        widget.Systray(),

     

       16
       16
       +
       +                widget.AnalogueClock(),

     

       17
       17
       +
                        widget.Clock(format="%Y-%m-%d %a %I:%M %p"),

     

       18
       18
       +
                        widget.QuickExit(),

     

       19
       19
       +
                    ],

+24

nixos/tests/qtile/config.nix

···

       1
       1
       +
       { stdenvNoCC, fetchurl }:

     

       2
       2
       +
       stdenvNoCC.mkDerivation {

     

       3
       3
       +
         name = "qtile-config";

     

       4
       4
       +
         version = "0.0.1";

     

       5
       5
       +
       

     

       6
       6
       +
         src = fetchurl {

     

       7
       7
       +
           url = "https://raw.githubusercontent.com/qtile/qtile/v0.28.1/libqtile/resources/default_config.py";

     

       8
       8
       +
           hash = "sha256-Y5W277CWVNSi4BdgEW/f7Px/MMjnN9W9TDqdOncVwPc=";

     

       9
       9
       +
         };

     

       10
       10
       +
       

     

       11
       11
       +
         prePatch = ''

     

       12
       12
       +
           cp $src config.py

     

       13
       13
       +
         '';

     

       14
       14
       +
       

     

       15
       15
       +
         patches = [ ./add-widget.patch ];

     

       16
       16
       +
       

     

       17
       17
       +
         dontUnpack = true;

     

       18
       18
       +
         dontBuild = true;

     

       19
       19
       +
       

     

       20
       20
       +
         installPhase = ''

     

       21
       21
       +
           mkdir -p $out

     

       22
       22
       +
           cp config.py $out/config.py

     

       23
       23
       +
         '';

     

       24
       24
       +
       }

+45

nixos/tests/qtile/default.nix

···

       1
       1
       +
       import ../make-test-python.nix ({ lib, ...} : {

     

       2
       2
       +
         name = "qtile";

     

       3
       3
       +
       

     

       4
       4
       +
         meta = {

     

       5
       5
       +
           maintainers = with lib.maintainers; [ sigmanificient ];

     

       6
       6
       +
         };

     

       7
       7
       +
       

     

       8
       8
       +
         nodes.machine = { pkgs, lib, ... }: let

     

       9
       9
       +
           # We create a custom Qtile configuration file that adds a widget from

     

       10
       10
       +
           # qtile-extras to the bar. This ensure that the qtile-extras package

     

       11
       11
       +
           # also works, and that extraPackages behave as expected.

     

       12
       12
       +
       

     

       13
       13
       +
           config-deriv = pkgs.callPackage ./config.nix { };

     

       14
       14
       +
         in {

     

       15
       15
       +
           imports = [ ../common/x11.nix ../common/user-account.nix ];

     

       16
       16
       +
           test-support.displayManager.auto.user = "alice";

     

       17
       17
       +
       

     

       18
       18
       +
           services.xserver.windowManager.qtile = {

     

       19
       19
       +
             enable = true;

     

       20
       20
       +
             configFile = "${config-deriv}/config.py";

     

       21
       21
       +
             extraPackages = ps: [ ps.qtile-extras ];

     

       22
       22
       +
           };

     

       23
       23
       +
       

     

       24
       24
       +
           services.displayManager.defaultSession = lib.mkForce "qtile";

     

       25
       25
       +
       

     

       26
       26
       +
           environment.systemPackages = [ pkgs.kitty ];

     

       27
       27
       +
         };

     

       28
       28
       +
       

     

       29
       29
       +
         testScript = ''

     

       30
       30
       +
           with subtest("ensure x starts"):

     

       31
       31
       +
               machine.wait_for_x()

     

       32
       32
       +
               machine.wait_for_file("/home/alice/.Xauthority")

     

       33
       33
       +
               machine.succeed("xauth merge ~alice/.Xauthority")

     

       34
       34
       +
       

     

       35
       35
       +
           with subtest("ensure client is available"):

     

       36
       36
       +
               machine.succeed("qtile --version")

     

       37
       37
       +
       

     

       38
       38
       +
           with subtest("ensure we can open a new terminal"):

     

       39
       39
       +
               machine.sleep(2)

     

       40
       40
       +
               machine.send_key("meta_l-ret")

     

       41
       41
       +
               machine.wait_for_window(r"alice.*?machine")

     

       42
       42
       +
               machine.sleep(2)

     

       43
       43
       +
               machine.screenshot("terminal")

     

       44
       44
       +
         '';

     

       45
       45
       +
       })