Unverified Commit 9303a605 authored by github-actions[bot]'s avatar github-actions[bot] Committed by GitHub
Browse files

Merge master into staging-next

parents c578584f f32dd9ae

.github/CODEOWNERS

+0 −1
Original line number Diff line number Diff line
@@ -371,7 +371,6 @@ nixos/tests/lxd/ @adamcstephens 
pkgs/by-name/in/incus/                  @adamcstephens

pkgs/by-name/lx/lxc*                    @adamcstephens

pkgs/by-name/lx/lxd*                    @adamcstephens

pkgs/os-specific/linux/lxc/             @adamcstephens



# ExpidusOS, Flutter

/pkgs/development/compilers/flutter @RossComputerGuy

maintainers/maintainer-list.nix

+1 −1
Original line number Diff line number Diff line
@@ -485,7 +485,7 @@ 
  };

  adamcstephens = {

    email = "happy.plan4249@valkor.net";

    matrix = "@adam:valkor.net";

    matrix = "@adam:robins.wtf";

    github = "adamcstephens";

    githubId = 2071575;

    name = "Adam C. Stephens";

nixos/modules/services/desktop-managers/lomiri.nix

+1 −1
Original line number Diff line number Diff line
@@ -63,7 +63,7 @@ in { 


    fonts.packages = with pkgs; [

      # Applications tend to default to Ubuntu font

      ubuntu_font_family

      ubuntu-classic

    ];



    # Copy-pasted basic stuff

nixos/tests/lomiri-calculator-app.nix

+1 −1
Original line number Diff line number Diff line
@@ -24,7 +24,7 @@ 


      fonts.packages = with pkgs; [

        # Intended font & helps with OCR

        ubuntu_font_family

        ubuntu-classic

      ];

    };

nixos/tests/lomiri-clock-app.nix

+1 −1
Original line number Diff line number Diff line
@@ -24,7 +24,7 @@ 


      fonts.packages = with pkgs; [

        # Intended font & helps with OCR

        ubuntu_font_family

        ubuntu-classic

      ];

    };