This commit is contained in:
Peder Bergebakken Sundt 2023-12-10 09:46:02 +01:00
parent d76fdbf81b
commit 173588996c
4 changed files with 16 additions and 14 deletions

View File

@ -15,6 +15,7 @@ keys: # https://github.com/getsops/sops/pull/1123
- &host_eple age1fha09v5edg88ys45a0u3tpjqfyl29fsy9xaz8xxfy60zjhmas5psfdxynp
- &host_nord age19xrvt0gjl4fcfjyy62mrl9uuzrq9e0wgemtkykr07ewz7nqn9cwshngel5
#- &host_bjarte age1gy6gyp9qqt5vlkzymfxsrdqm6rctl39tx53jx6n0hgd3escy844q55d6ey
# https://github.com/getsops/sops#key-groups
creation_rules:
# global

View File

@ -185,11 +185,20 @@
};
in {
inherit inputs;
inherit inputs-2311;
lib = {
inherit flake forSystems;
} // forAllSystems ({ ... }: {
inherit flake forSystems;
});
nixosModules = mkHosts mkModule;
nixosConfigurations = mkHosts mkConfig;
packages = forAllSystems ({ pkgs, flakes, ... }: {
mpv-webm = pkgs.callPackage ./pkgs/mpv-webm.nix {}; # TODO: https://github.com/NixOS/nixpkgs/pull/238659, remove when i switch to 23.11
packages = forAllSystems ({ pkgs, flakes, ... }: let
nm = nixos-hardware.nixosModules;
in {
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
'';
@ -203,15 +212,6 @@
};
});
lib = {
inherit flake forSystems;
} // forAllSystems ({ ... }: {
inherit flake forSystems;
});
nixosModules = mkHosts mkModule;
nixosConfigurations = mkHosts mkConfig;
homeConfigurations = forAllSystems ({ pkgs, flakes, ... }: let
mkHome = user: home: modules: inputs.home-manager.lib.homeManagerConfiguration {
inherit pkgs;

View File

@ -12,7 +12,6 @@
../../profiles/sshd.nix
../../users/pbsds
../../users/daniel
../../profiles/shell/base.nix
../../profiles/shell/archives.nix

View File

@ -132,6 +132,8 @@
killall = "killall -v";
bin = "python -c 'import sys; sys.stdout.write(sys.stdin.read().strip())' | curl -is -X POST https://i.kuklef.se/upload -F content=@- -F expiration=10d | grep '^location:' | cut -d' ' -f2-";
denix = "sed -E 's@/nix/store/[^ /]+/@@g'";
};
# TODO: auto-update db