diff --git a/flake.lock b/flake.lock index 1708d2f..be156ef 100644 --- a/flake.lock +++ b/flake.lock @@ -565,6 +565,22 @@ "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": { "locked": { "lastModified": 1678500271, @@ -786,7 +802,8 @@ "nix-doom-emacs": "nix-doom-emacs", "nix-software-center": "nix-software-center", "nixos-hardware": "nixos-hardware", - "nixpkgs": "nixpkgs_4" + "nixpkgs": "nixpkgs_4", + "nixpkgs-master": "nixpkgs-master" } }, "rotate-text": { diff --git a/flake.nix b/flake.nix index f9d36c3..59acbb7 100644 --- a/flake.nix +++ b/flake.nix @@ -10,7 +10,9 @@ inputs.nixpkgs.follows = "nixpkgs"; }; 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: { diff --git a/users/ultra/home.nix b/users/ultra/home.nix index 3b60d59..2cbdd87 100644 --- a/users/ultra/home.nix +++ b/users/ultra/home.nix @@ -5,6 +5,8 @@ let doomPrivateDir = ./doom.d; }; helix = inputs.helix.packages.${pkgs.system}.default; + nixpkgs-master-pkgs = inputs.nixpkgs-master.legacyPackages.${pkgs.system}; + nixpkgs-master = inputs.nixpkgs-master; in { imports = [ inputs.nix-doom-emacs.hmModule ]; # Allow unfree packages @@ -13,6 +15,13 @@ in { nixpkgs.config.permittedInsecurePackages = [ "electron-21.4.0" ]; + nixpkgs-master.config = { + allowUnfree = true; + allowUnfreePredicate = (pkg: true); + permittedInsecurePackages = [ + "electron-21.4.0" + ]; + }; home = { username = "ultra"; homeDirectory = "/home/ultra/"; @@ -73,6 +82,7 @@ in { spotify appimage-run # xivlauncher # Still fails to build :( + nixpkgs-master-pkgs.xivlauncher # It's fixed on master prismlauncher ghostwriter skypeforlinux