pederbs/config
pederbs
/
config
2
1
Fork 0
Code Issues Pull Requests Releases Activity

formatting, unfree unstable

This commit is contained in:
Peder Bergebakken Sundt 2023-07-03 02:23:35 +02:00
parent 6353eb962f
commit 324fa6c9d2
1 changed files with 11 additions and 11 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

22
flake.nix
View File

@ -87,28 +87,28 @@
networking.hostName = hostname;
networking.domain = domain;
networking.search = [ domain ];
nixpkgs.overlays = [ # TODO: consider nixpkgs.config.packageOverrides
nixpkgs.overlays = [
(final: prev: {
unstable = unstable.legacyPackages.${final.system};
#unstable = unstable.legacyPackages.${final.system};
unstable = import unstable { inherit system; config.allowUnfree = true; }; # TODO: inherit nixos config from stable
})
];
# This makes commandline tools like 'nix run nixpkgs#hello'
# and 'nix-shell -p hello' use the same channel as system was built with
nix.registry.nixpkgs.flake = inputs.nixpkgs;
nix.registry.unstable.flake = inputs.unstable;
nix.registry.nixpkgs-unstable.flake = inputs.unstable;
#nix.registry.nixpkgs-unstable.flake = inputs.unstable;
nix.registry.nixpkgs-unstable.flake = "github:NixOS/nixpkgs/nixos-unstable";
nix.nixPath = [
"nixpkgs=${inputs.nixpkgs}"
# TODO: are these needed?
"unstable=${inputs.unstable}"
"nixpkgs-unstable=${inputs.unstable}"
#"nixpkgs-unstable=${inputs.unstable}"
"nixpkgs-unstable=github:NixOS/nixpkgs/nixos-unstable"
];
})];
};
in {
inherit inputs;
packages = forAllSystems({ pkgs, flakes, ... }: {
packages = forAllSystems ({ pkgs, flakes, ... }: {
mpv-webm = pkgs.callPackage ./pkgs/mpv-webm.nix {}; # TODO: https://github.com/NixOS/nixpkgs/pull/238659
nixos-rebuild-nom = with pkgs; writeScriptBin "nixos-rebuild" ''
exec ${nixos-rebuild}/bin/nixos-rebuild "$@" |& ${nix-output-monitor}/bin/nom
@ -117,7 +117,7 @@
lib = {
inherit flake forSystems;
} // forAllSystems({ ... }: {
} // forAllSystems ({ ... }: {
inherit flake forSystems;
});
@ -153,8 +153,8 @@
];
in {
envrc-local = mkShell envrc-pkgs;
envrc-remote = mkShell(envrc-pkgs ++ [
flakes.unstable.pkgs.remote-exec
envrc-remote = mkShell (envrc-pkgs ++ [
flakes.unstable.pkgs.remote-exec # TODO: stable
pkgs.yq
pkgs.rsync
]);