penix changes

flake.lock

@@ -717,18 +717,18 @@
     },
     "xpk": {
       "inputs": {
-        "n": [
+        "nix": [
           "nixpkgs"
         ]
       },
       "locked": {
         "lastModified": 1,
-        "narHash": "sha256-33znjEupgc23gsIfPZ+XIN++QWoitcyXRlrIS9KJfz8=",
-        "path": "pkgs",
+        "narHash": "sha256-IHmIr08BcHsPpc6YOnUTeQXvTKggn2XkoYOQSb7kBmk=",
+        "path": "xpackages",
         "type": "path"
       },
       "original": {
-        "path": "pkgs",
+        "path": "xpackages",
         "type": "path"
       }
     }

flake.nix

@@ -1,9 +1,11 @@
 {
   description = ''
+
      _  _  _        ___   ___      __  _        _        
     | \| |(_)__ __ / _ \ / __|    / _|| | __ _ | |__ ___ 
     | .` || |\ \ /| (_) |\__ \   |  _|| |/ _` || / // -_)
     |_|\_||_|/_\_\ \___/ |___/   |_|  |_|\__,_||_\_\\___|
+
   '';
 
   outputs = x: import ./xlib x;
@@ -41,8 +43,8 @@
     };
 
     xpk = {
-      url = "path:pkgs";
-      inputs.n.follows = "nixpkgs";
+      url = "path:xpackages";
+      inputs.nix.follows = "nixpkgs";
     };
     base16 = {
       url = "sourcehut:~neverness/design/base16";

pkgs/flake.nix

@@ -1,4 +0,0 @@
-{
-  outputs = x: import ./outputs.nix x;
-  inputs.n.url = "github:NixOS/nixpkgs/nixos-unstable";
-}

xlib/default.nix

@@ -1,23 +1,29 @@
-{
+inputs@{
   self,
   ...
-}@inputs:
+}:
 
 let
   inherit (inputs) nixpkgs;
-  pkgs = nixpkgs.legacyPackages.x86_64-linux;
+  pkgs = import inputs.nix { system = "x86_64-linux"; };
   build = import ./builder { inherit self inputs; };
+  devShells = import ./devShells.nix { inherit pkgs; };
+
+  forAllSystems = i: nixpkgs.lib.genAttrs sys i;
+  sys = [
+    "x86_64-linux"
+    "aarch64-linux"
+    "x86_64-darwin"
+    "aarch64-darwin"
+  ];
 in
 
 {
   nixosConfigurations = build (import "${self}/machines").nixos;
 
-  formatter =
-    let
-      mk = nixpkgs.lib.genAttrs [
-        "x86_64-linux"
-        "x86_64-darwin"
-      ];
-    in
-    mk (system: pkgs.nixfmt-rfc-style);
+  devShells = forAllSystems (system: devShells);
+
+  formatter = forAllSystems (system: {
+    ${system} = pkgs.nixfmt-rfc-style;
+  });
 }

xlib/devShells.nix

@@ -0,0 +1,17 @@
+{
+  pkgs,
+  ...
+}:
+
+let
+  inherit (pkgs) mkShell;
+in
+
+{
+  nixDev = mkShell {
+    nativeBuildInputs = with pkgs; [
+      nixfmt-rfc-style
+      cachix
+    ];
+  };
+}

xpackages/flake.nix

@@ -0,0 +1,4 @@
+{
+  outputs = x: import ./outputs.nix x;
+  inputs.nix.url = "github:NixOS/nixpkgs/nixos-unstable";
+}

xpackages/outputs.nix

@@ -3,8 +3,8 @@
 
 inputs:
 let
-  pkgs = inputs.n.legacyPackages."x86_64-linux";
-  lib = inputs.n.lib;
+  pkgs = import inputs.nix { system = "x86_64-linux"; };
+  lib = inputs.nix.lib;
 
   flattenPkgs =
     separator: path: value:

xpackages/pkgs/base16-preview/package.nix

@@ -3,7 +3,7 @@
 pkgs.writeScriptBin "base16-preview" (
   builtins.readFile (
     pkgs.fetchurl {
-      url = ""https://raw.githubusercontent.com/xmozoid/base16/refs/heads/master/tools/base16-preview/base16-preview.py;
+      url = "https://raw.githubusercontent.com/xmozoid/base16/refs/heads/master/tools/base16-preview/base16-preview.py";
       sha256 = "sha256-NQdCm73E7BS6EXrygIS6TmjwkVIwZwIyBaHuvo6p8B0=";
     }
   )

xpackages/pkgs/macrecovery/package.nix

@@ -0,0 +1,10 @@
+{ pkgs }:
+
+pkgs.writeScriptBin "macrecovery.py" (
+  builtins.readFile (
+    pkgs.fetchurl {
+      url = "https://raw.githubusercontent.com/acidanthera/OpenCorePkg/refs/heads/master/Utilities/macrecovery/macrecovery.py";
+      sha256 = "sha256-aO3GxEt/K2W7I9XlCDzRInp/UvS/qnFvf6pY0lvlVLk=";
+    }
+  )
+)