Skip to content

Commit

Permalink
hosts.M299: remove host
Browse files Browse the repository at this point in the history
  • Loading branch information
Gerschtli committed Oct 6, 2023
1 parent 7da0e78 commit 2a19835
Show file tree
Hide file tree
Showing 15 changed files with 4 additions and 478 deletions.
11 changes: 0 additions & 11 deletions .agenix.toml
Original file line number Diff line number Diff line change
Expand Up @@ -5,7 +5,6 @@ bak = "age1kttfv4zpvv0cshe8q7lvakycytn34pja9pcy4ylq94kw90k3yfwsxja79j"
gamer-tobias = "age1xmwue6azg27l7kwsjr7a84gax5ed7tzdzfw4c3vz3aejr539tpdswmlpt8"
krypton-root = "age1vheh9hvezl0k2fe7wpfjnfp6ajcezz78jlhxj6wvzxdvkte4lfys03ktuq"
krypton-tobias = "age1r2maar050kkskxpaestrd738dpphptp886mdt4kta2p3mup3mc9s4r4020"
M299-tobhap = "age1g4a9w7l0sup8n30wya33qstfkggktq55mjmpfuv4vqnkn2wvndqssyyevs"
neon-root = "age16xxy8wcp8as2uc7v04fncsa7x257luygse94khp7c5mglh4wnggs8t4sk5"
neon-tobias = "age1m0cyz2y5vyztmx04x0xheyhhy8uwf53yem6dafmce3hsugwhfp4q0lg267"
pixel7a-nix-on-droid = "age18f5h39n0pcr82knus3tem305kclj75rf3yy3jahtda80ym53rsmqmpc6uh"
Expand All @@ -17,7 +16,6 @@ glob = "secrets/ssh/private/*"
identities = [
"bak",
"gamer-tobias",
"M299-tobhap",
"neon-tobias",
"pixel7a-nix-on-droid",
]
Expand All @@ -29,16 +27,11 @@ identities = [
"bak",
"gamer-tobias",
"krypton-tobias",
"M299-tobhap",
"neon-tobias",
"pixel7a-nix-on-droid",
"xenon-tobias",
]

[[paths]]
glob = "secrets/ssh/sedo/*"
identities = [ "bak", "M299-tobhap" ]

[[paths]]
glob = "secrets/argon/*"
identities = [ "bak", "argon-root" ]
Expand All @@ -47,10 +40,6 @@ identities = [ "bak", "argon-root" ]
glob = "secrets/krypton/*"
identities = [ "bak", "krypton-root" ]

[[paths]]
glob = "secrets/M299/*"
identities = [ "bak", "M299-tobhap" ]

[[paths]]
glob = "secrets/neon/*"
identities = [ "bak", "neon-root" ]
Expand Down
4 changes: 0 additions & 4 deletions .github/workflows/ci.yml
Original file line number Diff line number Diff line change
Expand Up @@ -46,10 +46,6 @@ jobs:

- nix-command: build .#homeConfigurations."tobias@gamer".activationPackage
system: x86_64
- nix-command: build .#homeConfigurations."tobhap@M299".activationPackage
system: x86_64
deploy-agent: M299
deploy-args: --async

- nix-command: build .#nixOnDroidConfigurations.pixel7a.activationPackage --impure
system: aarch64
Expand Down
1 change: 0 additions & 1 deletion README.md
Original file line number Diff line number Diff line change
Expand Up @@ -27,7 +27,6 @@ This is my humble flakes-only collection of all and everything needed to set up
- `neon` (private laptop)
- `xenon` (Raspberry Pi 3B+)
- [home-manager][home-manager]-managed
- `M299` with Ubuntu 22.04 (work laptop)
- `gamer` on WSL2 with Ubuntu 20.04 (windows dual boot for games and stuff)
- [nix-on-droid][nix-on-droid]-managed
- `pixel7a`
Expand Down
5 changes: 1 addition & 4 deletions flake.nix
Original file line number Diff line number Diff line change
Expand Up @@ -98,7 +98,6 @@
{
homeConfigurations = listToAttrs [
(mkHome "x86_64-linux" "tobias@gamer")
(mkHome "x86_64-linux" "tobhap@M299")
];

nixOnDroidConfigurations = listToAttrs [
Expand Down Expand Up @@ -158,7 +157,6 @@
};
};

cachixDeployOutputHomeManager = cachixDeployOutput (module: module.activationPackage);
cachixDeployOutputNixos = cachixDeployOutput (module: module.config.system.build.toplevel);
in
nixpkgs.lib.foldl
Expand All @@ -171,7 +169,6 @@

x86_64-linux.installer-image = import ./files/nix/installer-image.nix { inherit nixpkgs; };
}
(nixpkgs.lib.mapAttrsToList cachixDeployOutputNixos self.nixosConfigurations
++ [ (cachixDeployOutputHomeManager "M299" self.homeConfigurations."tobhap@M299") ]);
(nixpkgs.lib.mapAttrsToList cachixDeployOutputNixos self.nixosConfigurations);
};
}
27 changes: 2 additions & 25 deletions home/misc/homeage.nix
Original file line number Diff line number Diff line change
Expand Up @@ -47,7 +47,7 @@ in

custom.misc.homeage = {
secrets = mkOption {
type = types.listOf (types.enum [ "cachix-agent-token-M299" "sedo" "ssh-private" "ssh-sedo" "ssh-vcs" ]);
type = types.listOf (types.enum [ "ssh-private" "ssh-vcs" ]);
default = [ ];
description = ''
Secrets to install.
Expand Down Expand Up @@ -87,34 +87,11 @@ in
map
(entry: nameValuePair entry.name (removeAttrs entry [ "name" ]))
(flatten (
(optional (elem "cachix-agent-token-M299" cfg.secrets) [
{
name = "cachix-agent-token-M299";
source = "${rootPath}/secrets/M299/cachix-agent-token.age";
}
])
++ (optional (elem "sedo" cfg.secrets) [
{
name = "sedo-aliases";
source = "${rootPath}/secrets/M299/aliases.sh.age";
copies = [ "${config.home.homeDirectory}/.aliases.sh" ];
}
{
name = "sedo-settings";
source = "${rootPath}/secrets/M299/settings.xml.age";
copies = [ "${config.home.homeDirectory}/.m2/settings.xml" ];
}
])
++ (optional (elem "ssh-private" cfg.secrets) [
(optional (elem "ssh-private" cfg.secrets) [
(buildSshConfig "private")
(buildSshKey "private" "private")
(buildSshKey "private" "strato")
])
++ (optional (elem "ssh-sedo" cfg.secrets) [
(buildSshConfig "sedo")
(buildSshKey "sedo" "sedo")
(buildSshKey "sedo" "sedo-integration")
])
++ (optional (elem "ssh-vcs" cfg.secrets) [
(buildSshConfig "vcs")
(buildSshKey "vcs" "vcs")
Expand Down
2 changes: 1 addition & 1 deletion home/programs/ssh/default.nix
Original file line number Diff line number Diff line change
Expand Up @@ -40,7 +40,7 @@ in
};

modules = mkOption {
type = types.listOf (types.enum [ "private" "sedo" "vcs" ]);
type = types.listOf (types.enum [ "private" "vcs" ]);
default = [ ];
description = "SSH modules to enable.";
};
Expand Down
100 changes: 0 additions & 100 deletions hosts/M299/home-tobhap.nix

This file was deleted.

27 changes: 0 additions & 27 deletions secrets/M299/aliases.sh.age

This file was deleted.

15 changes: 0 additions & 15 deletions secrets/M299/cachix-agent-token.age

This file was deleted.

55 changes: 0 additions & 55 deletions secrets/M299/settings.xml.age

This file was deleted.

23 changes: 0 additions & 23 deletions secrets/ssh/sedo/config.age

This file was deleted.

25 changes: 0 additions & 25 deletions secrets/ssh/sedo/id-rsa-sedo-integration-pub.age

This file was deleted.

Loading

0 comments on commit 2a19835

Please sign in to comment.