Compare commits

..

2 Commits

Author SHA1 Message Date
Giulio De Pasquale
0d3b2888fe helix: Add nixpkgs-fmt as formatter 2023-02-11 02:23:24 +01:00
Giulio De Pasquale
1913b60db3 flake: Refactored architectures names. Added wrapUtil function to reduce code dup 2023-02-10 23:29:44 +01:00
2 changed files with 20 additions and 24 deletions

View File

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

View File

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