arch/infra
arch/infra
1
0
Fork 0
Code Actions Packages Activity

Compare commits

base: arch:b6c0175bf30e07503ca300f2f447354748a6eef2
Branches Tags
arch:trunk
arch:woodpecker-ci
..
compare: arch:07d8ed6fc40830568fcf9150579aa6075a243ceb
Branches Tags
arch:trunk
arch:woodpecker-ci

No commits in common. "b6c0175bf30e07503ca300f2f447354748a6eef2" and "07d8ed6fc40830568fcf9150579aa6075a243ceb" have entirely different histories.
b6c0175bf3 ... 07d8ed6fc4

3 changed files with 18 additions and 23 deletions
Show stats Expand all files Collapse all files

17
flake.nix
View file

@ -37,9 +37,9 @@
set +o allexport set +o allexport
''; '';
nativeBuildInputs = [ nativeBuildInputs = [
jq opentofu kubectl jq opentofu kubectl awscli2
k9s terraform-ls kubernetes-helm nodePackages.yaml-language-server
nil k9s terraform-ls kubernetes-helm nil
]; ];
buildInputs = [ ]; buildInputs = [ ];
}; };
@ -64,12 +64,6 @@
}; };
apps = nixinate.nixinate.x86_64-linux self // { apps = nixinate.nixinate.x86_64-linux self // {
x86_64-linux = { x86_64-linux = {
kube-apply = {
type = "app";
program = toString (pkgs.writers.writeBash "diff" ''
${pkgs.kubectl}/bin/kubectl apply -f ${self.packages.x86_64-linux.kubernetes}
'');
};
kube-diff = { kube-diff = {
type = "app"; type = "app";
program = toString (pkgs.writers.writeBash "diff" '' program = toString (pkgs.writers.writeBash "diff" ''
@ -128,6 +122,11 @@
# use it as an overlay # use it as an overlay
nixpkgs.overlays = [ nixpkgs-wayland.overlay ]; nixpkgs.overlays = [ nixpkgs-wayland.overlay ];
# or, pull specific packages (built against inputs.nixpkgs, usually `nixos-unstable`)
environment.systemPackages = [
nixpkgs-wayland.packages.x86_64-linux.waybar
];
}; };
} }
) )

12
nix/glasgow/configuration.nix
View file

@ -62,13 +62,11 @@
packages = with pkgs; [ packages = with pkgs; [
tree tree
]; ];
openssh.authorizedKeys.keys = let openssh.authorizedKeys.keys = [
authorizedKeys = pkgs.fetchurl { "ssh-ed25519 AAAAC3NzaC1lZDI1NTE5AAAAILIztwQxt+jqroFONSgq+xzPMuE2I5Dq/zWPQ8RcTYJr"
url = "https://gmem.ca/ssh"; "sk-ssh-ed25519@openssh.com AAAAGnNrLXNzaC1lZDI1NTE5QG9wZW5zc2guY29tAAAAICCc6k8tl2ahB3HtjpGK403Wkk+nQKgIhSgdBXxmXdsEAAAABHNzaDo="
hash = "sha256-7PpFDgWVfp26c9PuW+2s3O8MBAODtHr4q7WU/l3BoG4="; "ecdsa-sha2-nistp256 AAAAE2VjZHNhLXNoYTItbmlzdHAyNTYAAAAIbmlzdHAyNTYAAABBBMO7u+6hBN3XJfRFZCxADyLJfI8zGO2pj9AxkF0FecSR8GFuzP77wyUzmHosQcxe/P/N1TeNdfIDCatogqft9w4="
}; ];
in pkgs.lib.splitString "\n" (builtins.readFile
authorizedKeys);
}; };
environment.systemPackages = with pkgs; [ environment.systemPackages = with pkgs; [

12
nix/seattle/configuration.nix
View file

@ -61,13 +61,11 @@
packages = with pkgs; [ packages = with pkgs; [
tree tree
]; ];
openssh.authorizedKeys.keys = let openssh.authorizedKeys.keys = [
authorizedKeys = pkgs.fetchurl { "ssh-ed25519 AAAAC3NzaC1lZDI1NTE5AAAAILIztwQxt+jqroFONSgq+xzPMuE2I5Dq/zWPQ8RcTYJr"
url = "https://gmem.ca/ssh"; "sk-ssh-ed25519@openssh.com AAAAGnNrLXNzaC1lZDI1NTE5QG9wZW5zc2guY29tAAAAICCc6k8tl2ahB3HtjpGK403Wkk+nQKgIhSgdBXxmXdsEAAAABHNzaDo="
hash = "sha256-7PpFDgWVfp26c9PuW+2s3O8MBAODtHr4q7WU/l3BoG4="; "ecdsa-sha2-nistp256 AAAAE2VjZHNhLXNoYTItbmlzdHAyNTYAAAAIbmlzdHAyNTYAAABBBMO7u+6hBN3XJfRFZCxADyLJfI8zGO2pj9AxkF0FecSR8GFuzP77wyUzmHosQcxe/P/N1TeNdfIDCatogqft9w4="
}; ];
in pkgs.lib.splitString "\n" (builtins.readFile
authorizedKeys);
}; };
environment.systemPackages = with pkgs; [ environment.systemPackages = with pkgs; [