diff --git a/flake.nix b/flake.nix index 6d3d734d5b0af4b6a401a117d1d5c350aa361013..963b492996bff5ce374770132a9820904ba62dfd 100644 --- a/flake.nix +++ b/flake.nix @@ -1,5 +1,15 @@ { - inputs.nixpkgs.url = github:nixos/nixpkgs/nixpkgs-unstable; + inputs = { + nixpkgs.url = github:nixos/nixpkgs/nixos-unstable; + #homemanager = { + # url = github:nix-community/home-manager; + # inputs.nixpkgs.follows = "nixpkgs"; + #}; + #qauth = { + # url = gitlab:jens/qauth?host=git.c3pb.de; + # inputs.nixpkgs.follows = "nixpkgs"; + #}; + }; outputs = { ... }: { overlay = import ./pkgs; }; diff --git a/machine-manager.nix b/machine-manager.nix index 32a7acb04b8afe3c9b9b27924d16b5cb88fd4c7d..7f35df850350c832b6b871f756e48f9fc2b5843f 100644 --- a/machine-manager.nix +++ b/machine-manager.nix @@ -18,7 +18,7 @@ let # allChannels :: { *: path (channel) } #allChannels = with helpers; keysToAttrs loadChannel (readFilterDir (filterAnd [(not filterDirHidden) filterDirDirs]) channelsDir); # getMachineChannel :: string -> path - getMachineChannel = _: flakeInputs.nixpkgs-unstable; + getMachineChannel = _: flakeInputs.nixpkgs; #getMachineChannel = { name, path }: # let # channelFile = path + "/channel.nix"; @@ -35,7 +35,7 @@ let evaluateConfig = pkgs: args: (import "${pkgs}/nixos/lib/eval-config.nix" args).config; mkNixosSystemDerivation = { name, path }: let - channel = flakeInputs.nixpkgs-unstable; + channel = flakeInputs.nixpkgs; system = "x86_64-linux"; mkMachineConfig = { name, path, isIso }: { imports = [