peperunas/nixos
1
0
Fork 0
Code Issues Pull Requests Projects Releases Wiki Activity

Compare commits

base: peperunas:0d3b2888fe111f46ab68474977503b9b564900d5
Branches Tags
peperunas:master
peperunas:nixos-21.11
peperunas:laptopshit
..
compare: peperunas:99cf228d80ef5ac56420fd717241d6a767038bae
Branches Tags
peperunas:master
peperunas:nixos-21.11
peperunas:laptopshit

No commits in common. "0d3b2888fe111f46ab68474977503b9b564900d5" and "99cf228d80ef5ac56420fd717241d6a767038bae" have entirely different histories.
0d3b2888fe ... 99cf228d80

2 changed files with 24 additions and 20 deletions
Show Stats Expand all files Collapse all files

36
flake.nix
View File

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

8
roles/home/helix.nix
View File

@ -24,13 +24,6 @@
[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; [
@ -44,7 +37,6 @@
nodePackages.typescript nodePackages.typescript
nodePackages.svelte-language-server nodePackages.svelte-language-server
swiProlog swiProlog
nixpkgs-fmt
]; ];
}; };
} }