Merge branch 'main' into Alpha-v9.4

Author: CyanVoxel

.envrc renamed to .envrc.recommended

@@ -1,4 +1,7 @@
 # vi: ft=bash
+#
+# If you wish to use this file, copy or symlink it to `.envrc` for direnv to read it.
+# This will use the flake development shell.
 
 if ! has nix_direnv_version || ! nix_direnv_version 3.0.5; then
     source_url "https://raw.githubusercontent.com/nix-community/nix-direnv/3.0.5/direnvrc" "sha256-RuwIS+QKFj/T9M2TFXScjBsLR6V3A17YVoEW/Q6AZ1w="

.gitignore

@@ -254,5 +254,6 @@ compile_commands.json
 TagStudio.ini
 # End of https://www.toptal.com/developers/gitignore/api/visualstudiocode,python,qt
 
+.envrc
 .direnv
 .devenv

flake.nix

@@ -27,19 +27,35 @@
     systems.url = "github:nix-systems/default-linux";
   };
 
-  outputs = { flake-parts, nixpkgs, nixpkgs-qt6, self, systems, ... }@inputs:
+  outputs =
+    {
+      flake-parts,
+      nixpkgs,
+      nixpkgs-qt6,
+      self,
+      systems,
+      ...
+    }@inputs:
     flake-parts.lib.mkFlake { inherit inputs; } {
       imports = [ inputs.devenv.flakeModule ];
 
       systems = import systems;
 
-      perSystem = { config, pkgs, system, ... }:
+      perSystem =
+        {
+          config,
+          pkgs,
+          system,
+          ...
+        }:
         let
           inherit (nixpkgs) lib;
 
           qt6Pkgs = import nixpkgs-qt6 { inherit system; };
         in
         {
+          formatter = pkgs.nixfmt-rfc-style;
+
           devenv.shells = rec {
             default = tagstudio;
 
@@ -68,50 +84,53 @@
                 name = "TagStudio";
 
                 # Derived from previous flake iteration.
-                packages = (with pkgs; [
-                  cmake
-                  binutils
-                  coreutils
-                  dbus
-                  fontconfig
-                  freetype
-                  gdb
-                  glib
-                  libGL
-                  libGLU
-                  libgcc
-                  libxkbcommon
-                  mypy
-                  ruff
-                  xorg.libxcb
-                  zstd
-                ])
-                ++ (with qt6Pkgs; [
-                  qt6.full
-                  qt6.qtbase
-                  qt6.qtwayland
-                  qtcreator
-                ]);
+                packages =
+                  (with pkgs; [
+                    cmake
+                    binutils
+                    coreutils
+                    dbus
+                    fontconfig
+                    freetype
+                    gdb
+                    glib
+                    libGL
+                    libGLU
+                    libgcc
+                    libxkbcommon
+                    mypy
+                    ruff
+                    xorg.libxcb
+                    zstd
+                  ])
+                  ++ (with qt6Pkgs; [
+                    qt6.full
+                    qt6.qtbase
+                    qt6.qtwayland
+                    qtcreator
+                  ]);
 
                 enterShell =
                   let
-                    setQtEnv = pkgs.runCommand "set-qt-env"
-                      {
-                        buildInputs = with qt6Pkgs.qt6; [
-                          qtbase
-                        ];
-
-                        nativeBuildInputs = (with pkgs; [
-                          makeShellWrapper
-                        ])
-                        ++ (with qt6Pkgs.qt6; [
-                          wrapQtAppsHook
-                        ]);
-                      }
-                      ''
-                        makeShellWrapper "$(type -p sh)" "$out" "''${qtWrapperArgs[@]}"
-                        sed "/^exec/d" -i "$out"
-                      '';
+                    setQtEnv =
+                      pkgs.runCommand "set-qt-env"
+                        {
+                          buildInputs = with qt6Pkgs.qt6; [
+                            qtbase
+                          ];
+
+                          nativeBuildInputs =
+                            (with pkgs; [
+                              makeShellWrapper
+                            ])
+                            ++ (with qt6Pkgs.qt6; [
+                              wrapQtAppsHook
+                            ]);
+                        }
+                        ''
+                          makeShellWrapper "$(type -p sh)" "$out" "''${qtWrapperArgs[@]}"
+                          sed "/^exec/d" -i "$out"
+                        '';
                   in
                   ''
                     source ${setQtEnv}
@@ -162,9 +181,11 @@
                     quiet = true;
                     requirements =
                       let
-                        excludeDeps = req: deps: builtins.concatStringsSep "\n"
-                          (builtins.filter (line: !(lib.any (elem: lib.hasPrefix elem line) deps))
-                            (lib.splitString "\n" req));
+                        excludeDeps =
+                          req: deps:
+                          builtins.concatStringsSep "\n" (
+                            builtins.filter (line: !(lib.any (elem: lib.hasPrefix elem line) deps)) (lib.splitString "\n" req)
+                          );
                       in
                       ''
                         ${builtins.readFile ./requirements.txt}