fix: update and improve flake (#1032)

* fix: update and improve flake * chore: update changelog
elkowar · Feb 24, 2024 · 7bfd47e · 7bfd47e
1 parent d96586c
commit 7bfd47e
Show file tree

Hide file tree

Showing 5 changed files with 81 additions and 72 deletions.
diff --git a/CHANGELOG.md b/CHANGELOG.md
@@ -6,6 +6,7 @@ All notable changes to eww will be listed here, starting at changes since versio
 
 ### Fixes
 - The `shell-completions` subcommand is now run before anything is set up
+- Fix nix flake
 
 ## [0.5.0] (17.02.2024)
 

diff --git a/default.nix b/default.nix
@@ -1,13 +1,6 @@
-(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;
-    }
-  )
-  {
-    src = ./.;
-  }).defaultNix
+(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;
+}) { src = ./.; }).defaultNix
diff --git a/flake.lock b/flake.lock
diff --git a/flake.nix b/flake.nix
@@ -1,26 +1,28 @@
 {
   inputs = {
-    flake-compat = { url = "github:edolstra/flake-compat"; flake = false; };
-    rust-overlay.url = "github:oxalica/rust-overlay";
+    flake-compat = {
+      url = "github:edolstra/flake-compat";
+      flake = false;
+    };
     nixpkgs.url = "github:nixos/nixpkgs/nixpkgs-unstable";
-    rust-overlay.inputs.nixpkgs.follows = "nixpkgs";
+    rust-overlay = {
+      url = "github:oxalica/rust-overlay";
+      inputs.nixpkgs.follows = "nixpkgs";
+    };
   };
 
-  outputs = { self, nixpkgs, rust-overlay, flake-compat, ... }:
+  outputs = { self, nixpkgs, rust-overlay, flake-compat }:
     let
-      pkgsFor = system: import nixpkgs {
-        inherit system;
-
-        overlays = [
-          self.overlays.default
-          rust-overlay.overlays.default
-        ];
-      };
+      pkgsFor = system:
+        import nixpkgs {
+          inherit system;
+          overlays = [ self.overlays.default rust-overlay.overlays.default ];
+        };
 
       targetSystems = [ "aarch64-linux" "x86_64-linux" ];
-      mkRustToolchain = pkgs: pkgs.rust-bin.fromRustupToolchainFile ./rust-toolchain.toml;
-    in
-    {
+      mkRustToolchain = pkgs:
+        pkgs.rust-bin.fromRustupToolchainFile ./rust-toolchain.toml;
+    in {
       overlays.default = final: prev:
         let
           rust = mkRustToolchain final;
@@ -29,33 +31,33 @@
             cargo = rust;
             rustc = rust;
           };
-        in
-        {
-          eww = (prev.eww.override { inherit rustPlatform; }).overrideAttrs (old: {
-            version = self.rev or "dirty";
-            src = builtins.path { name = "eww"; path = prev.lib.cleanSource ./.; };
-            cargoDeps = rustPlatform.importCargoLock { lockFile = ./Cargo.lock; };
-            patches = [ ];
-          });
+        in {
+          eww = (prev.eww.override { inherit rustPlatform; }).overrideAttrs
+            (old: {
+              version = self.rev or "dirty";
+              src = builtins.path {
+                name = "eww";
+                path = prev.lib.cleanSource ./.;
+              };
+              cargoDeps =
+                rustPlatform.importCargoLock { lockFile = ./Cargo.lock; };
+              patches = [ ];
+            });
 
-          eww-wayland = final.eww.override { withWayland = true; };
+          eww-wayland = final.eww;
         };
 
       packages = nixpkgs.lib.genAttrs targetSystems (system:
-        let
-          pkgs = pkgsFor system;
-        in
-        (self.overlays.default pkgs pkgs) // {
+        let pkgs = pkgsFor system;
+        in (self.overlays.default pkgs pkgs) // {
           default = self.packages.${system}.eww;
-        }
-      );
+        });
 
       devShells = nixpkgs.lib.genAttrs targetSystems (system:
         let
           pkgs = pkgsFor system;
           rust = mkRustToolchain pkgs;
-        in
-        {
+        in {
           default = pkgs.mkShell {
             packages = with pkgs; [
               rust
@@ -70,7 +72,9 @@
 
             RUST_SRC_PATH = "${rust}/lib/rustlib/src/rust/library";
           };
-        }
-      );
+        });
+
+      formatter =
+        nixpkgs.lib.genAttrs targetSystems (system: (pkgsFor system).nixfmt);
     };
 }
diff --git a/shell.nix b/shell.nix
@@ -1,13 +1,6 @@
-(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;
-    }
-  )
-  {
-    src = ./.;
-  }).shellNix
+(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;
+}) { src = ./.; }).shellNix