Merge pull request #12 from Ruixi-rebirth/master

优化flake

README.md

@@ -66,6 +66,32 @@ exec dwm
 ```sh
 nix run github:yaocccc/dwm
 ```
+下面是在 nixos configuration中使用它的示例
+```nix
+{
+  description = "My configuration";
+
+  inputs = {
+    nixpkgs.url = "github:NixOS/nixpkgs/nixos-unstable";
+    dwm.url = "./dwm";
+  };
+
+  outputs = { nixpkgs, dwm, ... }:
+    {
+      nixosConfigurations = {
+        hostname = nixpkgs.lib.nixosSystem
+          {
+            system = "x86_64-linux";
+            modules = [
+              {
+                nixpkgs.overlays = [ dwm.overlays.default ];
+              }
+            ];
+          };
+      };
+    };
+}
+```
 
 ## 状态栏
 

flake.nix

@@ -1,27 +1,53 @@
 {
   description = "A very basic flake";
+  inputs = {
+    nixpkgs.url = "nixpkgs/nixos-unstable";
+    flake-utils.url = "github:numtide/flake-utils";
+  };
 
-  inputs.flake-utils.url = "github:numtide/flake-utils";
-
-  outputs = {
-    self,
-    nixpkgs,
-    flake-utils,
-  }:
-    flake-utils.lib.eachDefaultSystem (
-      system: let
-        pkgs = nixpkgs.legacyPackages.${system};
-      in rec {
-        packages = flake-utils.lib.flattenTree {
-          dwm = pkgs.dwm.overrideAttrs (old: {
-            src = pkgs.lib.cleanSource self;
+  outputs =
+    { self
+    , nixpkgs
+    , flake-utils
+    ,
+    }:
+    let
+      overlay =
+        final: prev: {
+          dwm = prev.dwm.overrideAttrs (oldAttrs: rec {
+            postPatch = (oldAttrs.postPatch or "") + ''
+              cp -r DEF/* .
+            '';
+            version = "master";
+            src = ./.;
           });
         };
-        defaultPackage = packages.dwm;
-        apps.default = flake-utils.lib.mkApp {
-          drv = packages.dwm;
-          exePath = "/bin/dwm";
-        };
-      }
-    );
+    in
+    flake-utils.lib.eachDefaultSystem
+      (
+        system:
+        let
+          pkgs = import nixpkgs {
+            inherit system;
+            overlays = [
+              self.overlays.default
+            ];
+          };
+        in
+        rec {
+          # apps = {
+          #   dwm = {
+          #     type = "app";
+          #     program = "${packages.default}/bin/st";
+          #   };
+          # };
+          packages.dwm = pkgs.dwm;
+          # apps.default = apps.dwm;
+          packages.default = pkgs.dwm;
+          devShells.default = pkgs.mkShell {
+            buildInputs = with pkgs; [ xorg.libX11 xorg.libXft xorg.libXinerama gcc ];
+          };
+        }
+      )
+    // { overlays.default = overlay; };
 }