diff --git a/pkgs/keys/keys/dadada.pub b/keys/dadada.pub similarity index 100% rename from pkgs/keys/keys/dadada.pub rename to keys/dadada.pub diff --git a/nixos/modules/profiles/server.nix b/nixos/modules/profiles/server.nix index dcad8d2..996eef7 100644 --- a/nixos/modules/profiles/server.nix +++ b/nixos/modules/profiles/server.nix @@ -1,10 +1,12 @@ { config, pkgs, lib, ... }: with lib; -{ +let + keys = [ ../../../keys/dadada.pub ]; +in { networking.domain = mkDefault "dadada.li"; dadada.admin.users = { - "dadada" = [ "${pkgs.keys}/dadada.pub" ]; + "dadada" = keys; }; dadada.autoUpgrade.enable = mkDefault true; diff --git a/nixos/surgat/configuration.nix b/nixos/surgat/configuration.nix index 63611ae..4d0f879 100644 --- a/nixos/surgat/configuration.nix +++ b/nixos/surgat/configuration.nix @@ -38,7 +38,7 @@ in dadada.admin = { enable = true; users = { - "dadada" = [ "${pkgs.keys}/dadada.pub" ]; + "dadada" = [ ../../keys/dadada.pub ]; }; }; diff --git a/outputs.nix b/outputs.nix index ca35c14..decc855 100644 --- a/outputs.nix +++ b/outputs.nix @@ -53,7 +53,6 @@ }; packages = flake-utils.lib.flattenTree { deploy = pkgs.callPackage ./pkgs/deploy.nix { }; - keys = pkgs.callPackage ./pkgs/keys { }; recipemd = pkgs.python3Packages.toPythonApplication python3Packages.recipemd; }; })) // { @@ -68,6 +67,7 @@ nixosModules = import ./nixos/modules inputs; overlays = import ./overlays; pythonPackages = import ./pkgs/python-pkgs; + keys = ./keys; hydraJobs = ( nixpkgs.lib.mapAttrs' diff --git a/overlays/default.nix b/overlays/default.nix index 4ac07d5..ef7b17c 100644 --- a/overlays/default.nix +++ b/overlays/default.nix @@ -3,9 +3,6 @@ let in { #tubslatex = import ./tubslatex.nix; - keys = final: prev: { - keys = prev.callPackage ../pkgs/keys { }; - }; recipemd = final: prev: { recipemd = prev.python3Packages.toPythonApplication prev.python3Packages.recipemd; }; diff --git a/pkgs/keys/default.nix b/pkgs/keys/default.nix deleted file mode 100644 index faee440..0000000 --- a/pkgs/keys/default.nix +++ /dev/null @@ -1,22 +0,0 @@ -{ stdenv, lib }: - -stdenv.mkDerivation rec { - name = "dadadaKeys"; - version = "1"; - - src = ./keys; - - buildPhase = ""; - - installPhase = '' - mkdir $out - cp * $out - ''; - - meta = with lib; { - description = "Public keys for my infrastructure"; - license = licenses.publicDomain; - platforms = platforms.all; - maintainers = [ "dadada" ]; - }; -}