flake.nix

@@ -11,8 +11,8 @@
   outputs =
     inputs@{ self, nixpkgs, nixos-unstable, home-manager }:
     let
-      sysLinuxX64 = "x86_64-linux";
-      sysDarwin = "aarch64-darwin";
+      sysLinuxX86 = "x86_64-linux";
+      sysDarwinAarch = "aarch64-darwin";
       sysLinuxAarch = "aarch64-linux";
 
       wrapPkgsSystem = { system }:
@@ -31,20 +31,32 @@
           config.allowUnfree = true;
         };
 
-      wrapUtils = { pkgs, unstable, system }:
-        import ./lib { inherit nixpkgs nixos-unstable home-manager system pkgs unstable; };
-        
-      pkgsLinuxX64 = wrapPkgsSystem { system = sysLinuxX64; };
-      unstableLinuxX64 = wrapUnstablePkgsSystem { system = sysLinuxX64; };
-      utilsLinuxX64 = wrapUtils { system = sysLinuxX64; pkgs = pkgsLinuxX64; unstable = unstableLinuxX64; };
+      pkgsLinuxX64 = wrapPkgsSystem { system = sysLinuxX86; };
+      unstableLinuxX64 = wrapUnstablePkgsSystem { system = sysLinuxX86; };
+      utilsLinuxX64 = import ./lib {
+        inherit nixpkgs nixos-unstable home-manager;
+        pkgs = pkgsLinuxX64;
+        unstable = unstableLinuxX64;
+        system = sysLinuxX86;
+      };
 
       pkgsLinuxAarch = wrapPkgsSystem { system = sysLinuxAarch; };
       unstableLinuxAarch = wrapUnstablePkgsSystem { system = sysLinuxAarch; };
-      utilsLinuxAarch = wrapUtils { system = sysLinuxAarch; pkgs = pkgsLinuxAarch; unstable = unstableLinuxAarch; };
+      utilsLinuxAarch = import ./lib {
+        inherit nixpkgs nixos-unstable home-manager;
+        pkgs = pkgsLinuxAarch;
+        unstable = unstableLinuxAarch;
+        system = sysLinuxAarch;
+      };
 
-      pkgsDarwin = wrapPkgsSystem { system = sysDarwin; };
-      unstableDarwin = wrapUnstablePkgsSystem { system = sysDarwin; };
-      utilsDarwin = wrapUtils { system = sysDarwin; pkgs = pkgsDarwin; unstable = unstableDarwin; };
+      pkgsDarwin = wrapPkgsSystem { system = sysDarwinAarch; };
+      unstableDarwin = wrapUnstablePkgsSystem { system = sysDarwinAarch; };
+      utilsDarwin = import ./lib {
+        inherit nixpkgs nixos-unstable home-manager;
+        pkgs = pkgsDarwin;
+        unstable = unstableDarwin;
+        system = sysDarwinAarch;
+      };
     in
     {
       nixosConfigurations = {

roles/home/helix.nix

@@ -24,13 +24,6 @@
 
       [editor.indent-guides]
       render = true
-
-    '';
-
-    file.".config/helix/languages.toml".text = ''
-      [[language]]
-      name = "nix"
-      formatter = { command = "nixpkgs-fmt" }
     '';
 
     packages = with pkgs.unstable; [
@@ -44,7 +37,6 @@
       nodePackages.typescript
       nodePackages.svelte-language-server
       swiProlog
-      nixpkgs-fmt
     ];
   };
 }