chore: merge 'upstream/master' branch

flake.nix

@@ -1,52 +1,68 @@
 {
   inputs = {
-    nixpkgs.url = "github:NixOS/nixpkgs/nixpkgs-unstable";
-    base16.url = "github:SenchoPens/base16.nix";
-
-    # Used for documentation
-    home-manager = {
-      url = "github:nix-community/home-manager";
-      inputs.nixpkgs.follows = "nixpkgs";
-    };
-
-    flake-compat = {
-      url = "github:edolstra/flake-compat";
-      flake = false;
-    };
-
-    # Templates
     base16-alacritty = {
-      url = "github:aarowill/base16-alacritty";
       flake = false;
+      url = "github:aarowill/base16-alacritty";
     };
+
     base16-alacritty-yaml = {
-      url = "github:aarowill/base16-alacritty/63d8ae5dfefe5db825dd4c699d0cdc2fc2c3eaf7";
       flake = false;
+      url = "github:aarowill/base16-alacritty/63d8ae5dfefe5db825dd4c699d0cdc2fc2c3eaf7";
     };
+
     base16-fish = {
-      url = "github:tomyun/base16-fish";
       flake = false;
+      url = "github:tomyun/base16-fish";
     };
+
     base16-foot = {
-      url = "github:tinted-theming/base16-foot";
       flake = false;
+      url = "github:tinted-theming/base16-foot";
     };
+
     base16-helix = {
+      flake = false;
       url = "github:tinted-theming/base16-helix";
+    };
+
+    base16-tmux = {
       flake = false;
+      url = "github:tinted-theming/base16-tmux";
     };
+
     base16-kitty = {
+      flake = false;
       url = "github:kdrag0n/base16-kitty";
+    };
+
+    base16-vim = {
       flake = false;
+      url = "github:chriskempson/base16-vim";
     };
-    base16-tmux = {
-      url = "github:tinted-theming/base16-tmux";
+
+    base16.url = "github:SenchoPens/base16.nix";
+
+    flake-compat = {
       flake = false;
+      url = "github:edolstra/flake-compat";
     };
-    base16-vim = {
-      url = "github:chriskempson/base16-vim";
+
+    gnome-shell = {
       flake = false;
+
+      # TODO: Unlocking the input and pointing to official repository requires
+      # updating the patch:
+      # https://github.com/danth/stylix/pull/224#discussion_r1460339607.
+      url = "github:GNOME/gnome-shell/45.1";
     };
+
+    # The 'home-manager' input is used to generate the documentation.
+    home-manager = {
+      inputs.nixpkgs.follows = "nixpkgs";
+      url = "github:nix-community/home-manager";
+    };
+
+    nixpkgs.url = "github:NixOS/nixpkgs/nixpkgs-unstable";
   };
 
   outputs =

modules/gnome/theme.nix

@@ -1,4 +1,4 @@
-{ pkgs, config, ... }:
+{ config, pkgs, ... }:
 
 let
   colors = config.lib.stylix.colors {
@@ -8,15 +8,7 @@ let
 
 in pkgs.stdenv.mkDerivation {
   name = "${config.lib.stylix.colors.slug}-gnome-shell-theme";
-
-  src = pkgs.fetchFromGitLab {
-    domain = "gitlab.gnome.org";
-    owner = "GNOME";
-    repo = "gnome-shell";
-    rev = "45.1";
-    sha256 = "/TIkZ8y5Wv3QHLFp79Poao9fINurKs5pa4z0CRe+F8s=";
-  };
-
+  src = config.lib.stylix.templates.gnome-shell;
   patches = [ ./shell_colors.patch ];
   postPatch = ''
     rm data/theme/gnome-shell-sass/{_colors.scss,_palette.scss}

modules/plymouth/nixos.nix

@@ -59,6 +59,10 @@ in {
       description = mdDoc "Logo to be used on the boot screen.";
       type = with types; either path package;
       defaultText = literalMD "NixOS logo";
+
+      # Considering that Flake inputs are currently unable to fetch individual
+      # files, the SVG file is fetched with `pkgs.fetchurl` to avoid downloading
+      # the entire repository for a single SVG file.
       default = pkgs.fetchurl {
         url = "https://raw.githubusercontent.com/NixOS/nixos-artwork/master/logo/nix-snowflake.svg";
         # Reduce size

modules/qutebrowser/hm.nix

@@ -267,7 +267,9 @@ in {
             standard = sansSerif.name;
           };
 
-          size.default = "${toString sizes.applications}pt";
+          # TODO: Use the pixel unit:
+          # https://github.com/danth/stylix/issues/251.
+          size.default = builtins.floor (sizes.applications * 4 / 3 + 0.5);
         };
       };
 

stylix/templates.nix

@@ -10,6 +10,7 @@ inputs:
       base16-kitty
       base16-tmux
       base16-vim
+      gnome-shell
       ;
   };
 }