Merge pull request #279 from nix-community/flake/utils

flake: switch to flake-utils and treefmt-nix

Author: Scrumplex

.github/workflows/format.yaml

@@ -15,4 +15,4 @@ jobs:
     - uses: DeterminateSystems/magic-nix-cache-action@main
     - name: Check formatting
       run: |
-        nix fmt -- --check
+        nix fmt -- --ci

README-template.md

@@ -28,7 +28,7 @@ is to add the input `github:nix-community/nixpkgs-xr` to your flake
 and import the convenient NixOS module `nixpkgs-xr.nixosModules.nixpkgs-xr`.
 See the example below.
 
-> [!IMPORTANT]
+> \[!IMPORTANT\]
 > This module adds the Nixpkgs overlay as well as [the binary cache][binary-cache] for this repository.
 > If you don't want the binary cache see [manual setup](#manually-setup-flake-overlay) below.
 
@@ -84,7 +84,7 @@ Assuming your NixOS configuration is right in your `flake.nix`, you can write th
 
 ### Traditional setup
 
-Compatibility for traditional NixOS setups is provided using [flake-compat][flake-compat].
+Compatibility for traditional NixOS setups is provided using [flake-compat].
 You can just add the following snippet to your configuration:
 
 ```nix
@@ -102,7 +102,7 @@ in
   }
 ```
 
-You can also pin the tarball url using tools like [niv][niv].
+You can also pin the tarball url using tools like [niv].
 
 ## Packages
 

README.md

@@ -28,7 +28,7 @@ is to add the input `github:nix-community/nixpkgs-xr` to your flake
 and import the convenient NixOS module `nixpkgs-xr.nixosModules.nixpkgs-xr`.
 See the example below.
 
-> [!IMPORTANT]
+> \[!IMPORTANT\]
 > This module adds the Nixpkgs overlay as well as [the binary cache][binary-cache] for this repository.
 > If you don't want the binary cache see [manual setup](#manually-setup-flake-overlay) below.
 
@@ -84,7 +84,7 @@ Assuming your NixOS configuration is right in your `flake.nix`, you can write th
 
 ### Traditional setup
 
-Compatibility for traditional NixOS setups is provided using [flake-compat][flake-compat].
+Compatibility for traditional NixOS setups is provided using [flake-compat].
 You can just add the following snippet to your configuration:
 
 ```nix
@@ -102,7 +102,7 @@ in
   }
 ```
 
-You can also pin the tarball url using tools like [niv][niv].
+You can also pin the tarball url using tools like [niv].
 
 ## Packages
 

development.nix

@@ -0,0 +1,35 @@
+# SPDX-FileCopyrightText: 2024 Sefa Eyeoglu <[email protected]>
+#
+# SPDX-License-Identifier: MIT
+{
+  flake-utils,
+  nixpkgs,
+  self,
+  treefmt-nix,
+  ...
+}:
+flake-utils.lib.eachDefaultSystem (
+  system:
+  let
+    pkgs = nixpkgs.legacyPackages.${system};
+    inherit (pkgs.lib) mapAttrs' nameValuePair;
+
+    treefmtEval = treefmt-nix.lib.evalModule pkgs ./treefmt.nix;
+
+    devShellChecks = mapAttrs' (n: nameValuePair "devShell-${n}") self.devShells.${system};
+  in
+  {
+    devShells.default = pkgs.mkShellNoCC {
+      packages = [
+        pkgs.nvfetcher
+        pkgs.reuse
+      ];
+    };
+
+    checks = devShellChecks // {
+      formatting = treefmtEval.config.build.check self;
+    };
+
+    formatter = treefmtEval.config.build.wrapper;
+  }
+)

flake.lock

@@ -13,26 +13,21 @@
 
   inputs = {
     nixpkgs.url = "github:NixOS/nixpkgs/nixos-unstable";
-    flake-parts = {
-      url = "github:hercules-ci/flake-parts";
-      inputs.nixpkgs-lib.follows = "nixpkgs";
-    };
+    flake-utils.url = "github:numtide/flake-utils";
     flake-compat.url = "https://flakehub.com/f/edolstra/flake-compat/1.tar.gz";
+    treefmt-nix = {
+      url = "github:numtide/treefmt-nix";
+      inputs.nixpkgs.follows = "nixpkgs";
+    };
   };
 
   outputs =
-    inputs@{ flake-parts, ... }:
-    flake-parts.lib.mkFlake { inherit inputs; } {
-      systems = [
-        "x86_64-linux"
-        "aarch64-linux"
-      ];
-      imports = [
-        ./parts/checks.nix
-        ./parts/dev.nix
-        ./parts/module.nix
-        ./parts/readme.nix
-        ./pkgs
-      ];
-    };
+    { flake-utils, ... }@inputs:
+    flake-utils.lib.meld inputs [
+      ./development.nix
+      ./nixos
+      ./pkgs
+      ./pkgs/overlay.nix
+      ./tools/update-readme.nix
+    ];
 }

flake.nix

@@ -1,28 +1,20 @@
 # SPDX-FileCopyrightText: 2023 Sefa Eyeoglu <[email protected]>
+# SPDX-FileCopyrightText: 2024 Sefa Eyeoglu <[email protected]>
 #
 # SPDX-License-Identifier: MIT
 { self, ... }:
 {
-  flake.nixosModules.nixpkgs-xr =
+  nixosModules.nixpkgs-xr =
     { config, lib, ... }:
     let
       inherit (lib)
         mkEnableOption
         mkIf
         mkOption
-        mkRemovedOptionModule
         ;
       cfg = config.nixpkgs.xr;
     in
     {
-      imports = [
-        (mkRemovedOptionModule [
-          "nixpkgs"
-          "xr"
-          "enableUnstripped"
-        ] "The nixpkgs-xr unstripped overlay has been removed. Please create your own overlay.")
-      ];
-
       options.nixpkgs.xr.enable = mkEnableOption "nixpkgs-xr overlay" // mkOption { default = true; };
 
       config = mkIf cfg.enable {

parts/module.nix renamed to nixos/default.nix

@@ -3,25 +3,25 @@
 # SPDX-License-Identifier: CC0-1.0
 
 [envision-unwrapped]
-src.git = "https://gitlab.com/gabmus/envision.git"
+cargo_locks = ["Cargo.lock"]
 fetch.git = "https://gitlab.com/gabmus/envision.git"
+src.git = "https://gitlab.com/gabmus/envision.git"
+
+[index_camera_passthrough]
 cargo_locks = ["Cargo.lock"]
+fetch.git = "https://github.com/yshui/index_camera_passthrough.git"
+src.git = "https://github.com/yshui/index_camera_passthrough.git"
 
 [monado]
-src.git = "https://gitlab.freedesktop.org/monado/monado.git"
 fetch.git = "https://gitlab.freedesktop.org/monado/monado.git"
+src.git = "https://gitlab.freedesktop.org/monado/monado.git"
 
 [opencomposite]
-src.git = "https://gitlab.com/znixian/OpenOVR.git"
 fetch.git = "https://gitlab.com/znixian/OpenOVR.git"
 git.fetchSubmodules = true
-
-[index_camera_passthrough]
-src.git = "https://github.com/yshui/index_camera_passthrough.git"
-fetch.git = "https://github.com/yshui/index_camera_passthrough.git"
-cargo_locks = ["Cargo.lock"]
+src.git = "https://gitlab.com/znixian/OpenOVR.git"
 
 [wlx-overlay-s]
-src.git = "https://github.com/galister/wlx-overlay-s.git"
-fetch.git = "https://github.com/galister/wlx-overlay-s.git"
 cargo_locks = ["Cargo.lock"]
+fetch.git = "https://github.com/galister/wlx-overlay-s.git"
+src.git = "https://github.com/galister/wlx-overlay-s.git"