I tried to add nixpkgs master...

Signed-off-by: Alex Stan <stan.alexandru@ichb.ro>
This commit is contained in:
Alex Stan 2023-05-13 12:09:24 +03:00
parent 0761bbb7d6
commit f00e202523
3 changed files with 31 additions and 2 deletions

View file

@ -565,6 +565,22 @@
"type": "github" "type": "github"
} }
}, },
"nixpkgs-master": {
"locked": {
"lastModified": 1683964299,
"narHash": "sha256-4wzIhSjf+r3UC+1oS/hKW/kjMBEn7Bbvy9cIok6jZPY=",
"owner": "NixOS",
"repo": "nixpkgs",
"rev": "1f68716877f8fde4c9f70ee2b237b3f405792b98",
"type": "github"
},
"original": {
"owner": "NixOS",
"ref": "master",
"repo": "nixpkgs",
"type": "github"
}
},
"nixpkgsV1": { "nixpkgsV1": {
"locked": { "locked": {
"lastModified": 1678500271, "lastModified": 1678500271,
@ -786,7 +802,8 @@
"nix-doom-emacs": "nix-doom-emacs", "nix-doom-emacs": "nix-doom-emacs",
"nix-software-center": "nix-software-center", "nix-software-center": "nix-software-center",
"nixos-hardware": "nixos-hardware", "nixos-hardware": "nixos-hardware",
"nixpkgs": "nixpkgs_4" "nixpkgs": "nixpkgs_4",
"nixpkgs-master": "nixpkgs-master"
} }
}, },
"rotate-text": { "rotate-text": {

View file

@ -10,7 +10,9 @@
inputs.nixpkgs.follows = "nixpkgs"; inputs.nixpkgs.follows = "nixpkgs";
}; };
helix.url = "github:helix-editor/helix"; helix.url = "github:helix-editor/helix";
nixos-hardware.url = "github:NixOS/nixos-hardware"; nixos-hardware.url = "github:NixOS/nixos-hardware";
nixpkgs-master.url = "github:NixOS/nixpkgs/master";
}; };
outputs = { self, nixpkgs, home-manager, ... }@inputs: { outputs = { self, nixpkgs, home-manager, ... }@inputs: {

View file

@ -5,6 +5,8 @@ let
doomPrivateDir = ./doom.d; doomPrivateDir = ./doom.d;
}; };
helix = inputs.helix.packages.${pkgs.system}.default; helix = inputs.helix.packages.${pkgs.system}.default;
nixpkgs-master-pkgs = inputs.nixpkgs-master.legacyPackages.${pkgs.system};
nixpkgs-master = inputs.nixpkgs-master;
in { in {
imports = [ inputs.nix-doom-emacs.hmModule ]; imports = [ inputs.nix-doom-emacs.hmModule ];
# Allow unfree packages # Allow unfree packages
@ -13,6 +15,13 @@ in {
nixpkgs.config.permittedInsecurePackages = [ nixpkgs.config.permittedInsecurePackages = [
"electron-21.4.0" "electron-21.4.0"
]; ];
nixpkgs-master.config = {
allowUnfree = true;
allowUnfreePredicate = (pkg: true);
permittedInsecurePackages = [
"electron-21.4.0"
];
};
home = { home = {
username = "ultra"; username = "ultra";
homeDirectory = "/home/ultra/"; homeDirectory = "/home/ultra/";
@ -73,6 +82,7 @@ in {
spotify spotify
appimage-run appimage-run
# xivlauncher # Still fails to build :( # xivlauncher # Still fails to build :(
nixpkgs-master-pkgs.xivlauncher # It's fixed on master
prismlauncher prismlauncher
ghostwriter ghostwriter
skypeforlinux skypeforlinux