refactor: Tidy up Flake and bump lockfile

Author: shymega

codid.nix

@@ -1,7 +1,7 @@
-{ lib
-, pkgs ? import <nixpkgs>
-, rustPlatform
-,
+{
+  lib,
+  pkgs,
+  rustPlatform,
 }:
 rustPlatform.buildRustPackage {
   name = "codid";
@@ -17,11 +17,10 @@ rustPlatform.buildRustPackage {
     "--features=stock-codi,codios-codi,nixos"
   ];
 
-  nativeBuildInputs = with pkgs; [ pkg-config protobuf ];
-  buildInputs = with pkgs; [ systemd.dev ];
+  nativeBuildInputs = with pkgs; [pkg-config protobuf];
+  buildInputs = with pkgs; [systemd.dev];
 
   meta = with lib; {
-    description = "";
     homepage = "https://github.com/Cosmo-CoDiOS/codid";
     license = licenses.mit;
   };

default.nix

@@ -1,10 +1,13 @@
-(import
+(
+  import
   (
-    let lock = builtins.fromJSON (builtins.readFile ./flake.lock); in
-    fetchTarball {
-      url = "https://github.com/edolstra/flake-compat/archive/${lock.nodes.flake-compat.locked.rev}.tar.gz";
-      sha256 = lock.nodes.flake-compat.locked.narHash;
-    }
+    let
+      lock = builtins.fromJSON (builtins.readFile ./flake.lock);
+    in
+      fetchTarball {
+        url = "https://github.com/edolstra/flake-compat/archive/${lock.nodes.flake-compat.locked.rev}.tar.gz";
+        sha256 = lock.nodes.flake-compat.locked.narHash;
+      }
   )
-  { src = ./.; }
+  {src = ./.;}
 ).defaultNix

flake.lock

@@ -7,26 +7,23 @@
       flake = false;
     };
   };
-  outputs = { self, ... } @ inputs:
-    inputs.flake-utils.lib.eachDefaultSystem
-      (system:
-        let
-          pkgs = inputs.nixpkgs.outputs.legacyPackages.${system};
-        in
-        {
-          packages.codid = pkgs.callPackage ./codid.nix { };
-          packages.default = self.outputs.packages.${system}.codid;
+  outputs = inputs: let
+    inherit (inputs) self flake-utils nixpkgs;
+  in
+    flake-utils.lib.eachDefaultSystem
+    (system: let
+      pkgs = nixpkgs.legacyPackages.${system};
+    in {
+      packages = {
+        codid = pkgs.callPackage ./codid.nix {};
+        default = self.packages.${system}.codid;
+      };
 
-          devShells.default = self.packages.${system}.default.overrideAttrs (super: {
-            nativeBuildInputs = with pkgs;
-              super.nativeBuildInputs
-              ++ [
-                clippy
-                rustfmt
-              ];
-            RUST_SRC_PATH = "${pkgs.rustPlatform.rustLibSrc}";
-          });
-        })
+      devShells.default = pkgs.mkShell {
+        inputsFrom = with self.packages.${system}; [codid];
+        RUST_SRC_PATH = "${pkgs.rustPlatform.rustLibSrc}";
+      };
+    })
     // {
       overlays.default = final: prev: {
         inherit (self.packages.${final.system}) codid;

flake.nix

@@ -1,10 +1,13 @@
-(import
+(
+  import
   (
-    let lock = builtins.fromJSON (builtins.readFile ./flake.lock); in
-    fetchTarball {
-      url = "https://github.com/edolstra/flake-compat/archive/${lock.nodes.flake-compat.locked.rev}.tar.gz";
-      sha256 = lock.nodes.flake-compat.locked.narHash;
-    }
+    let
+      lock = builtins.fromJSON (builtins.readFile ./flake.lock);
+    in
+      fetchTarball {
+        url = "https://github.com/edolstra/flake-compat/archive/${lock.nodes.flake-compat.locked.rev}.tar.gz";
+        sha256 = lock.nodes.flake-compat.locked.narHash;
+      }
   )
-  { src = ./.; }
+  {src = ./.;}
 ).shellNix