Compare commits
5 Commits
5b962cde64
...
88583bcb82
Author | SHA1 | Date | |
---|---|---|---|
|
88583bcb82 | ||
|
7c3f8c55f9 | ||
|
2082c5e16e | ||
|
b616b33c2f | ||
|
d06cf1298b |
21
flake.nix
21
flake.nix
@ -6,16 +6,15 @@
|
||||
url = "github:nix-community/home-manager/release-22.11";
|
||||
inputs.nixpkgs.follows = "nixpkgs";
|
||||
};
|
||||
pepe.url = "git+https://git.giugl.io/peperunas/nixos";
|
||||
};
|
||||
|
||||
outputs = { self, nixpkgs, nixos-unstable, home-manager, pepe }:
|
||||
outputs = { self, nixpkgs, nixos-unstable, home-manager }:
|
||||
let
|
||||
sysLinuxX64 = "x86_64-linux";
|
||||
sysDarwin = "aarch64-darwin";
|
||||
sysLinuxAarch = "aarch64-linux";
|
||||
|
||||
wrapPkgsSystem = { system }:
|
||||
wrapPkgsSystem = system:
|
||||
import nixpkgs rec {
|
||||
inherit system;
|
||||
|
||||
@ -26,7 +25,7 @@
|
||||
];
|
||||
};
|
||||
|
||||
wrapUnstablePkgsSystem = { system }:
|
||||
wrapUnstablePkgsSystem = system:
|
||||
import nixos-unstable {
|
||||
inherit system;
|
||||
|
||||
@ -39,7 +38,7 @@
|
||||
inherit (pkgs) newScope;
|
||||
in
|
||||
makeScope newScope (self: rec {
|
||||
inherit nixpkgs home-manager nixos-unstable pepe;
|
||||
inherit nixpkgs home-manager nixos-unstable;
|
||||
inherit (self.callPackage ./lib/utils.nix { }) mkSysRole mkHomeRole;
|
||||
inherit (user) mkUser;
|
||||
|
||||
@ -48,16 +47,16 @@
|
||||
});
|
||||
|
||||
|
||||
pkgsLinuxX64 = wrapPkgsSystem { system = sysLinuxX64; };
|
||||
unstableLinuxX64 = wrapUnstablePkgsSystem { system = sysLinuxX64; };
|
||||
pkgsLinuxX64 = wrapPkgsSystem sysLinuxX64;
|
||||
unstableLinuxX64 = wrapUnstablePkgsSystem sysLinuxX64;
|
||||
utilsLinuxX64 = wrapUtils { system = sysLinuxX64; pkgs = pkgsLinuxX64; unstablePkgs = unstableLinuxX64; };
|
||||
|
||||
pkgsLinuxAarch = wrapPkgsSystem { system = sysLinuxAarch; };
|
||||
unstableLinuxAarch = wrapUnstablePkgsSystem { system = sysLinuxAarch; };
|
||||
pkgsLinuxAarch = wrapPkgsSystem sysLinuxAarch;
|
||||
unstableLinuxAarch = wrapUnstablePkgsSystem sysLinuxAarch;
|
||||
utilsLinuxAarch = wrapUtils { system = sysLinuxAarch; pkgs = pkgsLinuxAarch; unstablePkgs = unstableLinuxAarch; };
|
||||
|
||||
pkgsDarwin = wrapPkgsSystem { system = sysDarwin; };
|
||||
unstableDarwin = wrapUnstablePkgsSystem { system = sysDarwin; };
|
||||
pkgsDarwin = wrapPkgsSystem sysDarwin;
|
||||
unstableDarwin = wrapUnstablePkgsSystem sysDarwin;
|
||||
utilsDarwin = wrapUtils { system = sysDarwin; pkgs = pkgsDarwin; unstablePkgs = unstableDarwin; };
|
||||
in
|
||||
{
|
||||
|
@ -3,7 +3,6 @@
|
||||
, nixos-unstable
|
||||
, unstablePkgs
|
||||
, home-manager
|
||||
, pepe
|
||||
, system
|
||||
, mkHomeRole
|
||||
, mkSysRole
|
||||
@ -44,7 +43,6 @@
|
||||
registry = {
|
||||
nixpkgs.flake = nixpkgs;
|
||||
unstable.flake = nixos-unstable;
|
||||
pepe.flake = pepe;
|
||||
};
|
||||
};
|
||||
|
||||
|
@ -1,8 +0,0 @@
|
||||
{ ... }:
|
||||
|
||||
{
|
||||
programs.zsh = {
|
||||
enableBashCompletion = true;
|
||||
enableCompletion = true;
|
||||
};
|
||||
}
|
Loading…
Reference in New Issue
Block a user