refactor(nixos:options) remove host.admin.sshKey option

This commit is contained in:
ooks-io 2024-06-16 21:19:09 +12:00
parent 479c661b69
commit a6cd3afce0
6 changed files with 8 additions and 17 deletions

View file

@ -1,4 +1,4 @@
{ lib, pkgs, keys, ... }: { lib, pkgs, ... }:
{ {
imports = [ imports = [
@ -13,7 +13,6 @@
admin = { admin = {
name = "ooks"; name = "ooks";
shell = "fish"; shell = "fish";
sshKey = "${keys.users.ooks}";
homeManager = true; homeManager = true;
}; };
networking = { networking = {

View file

@ -1,9 +1,5 @@
{ lib, pkgs, ... }: { lib, pkgs, ... }:
let
key = "ssh-ed25519 AAAAC3NzaC1lZDI1NTE5AAAAIBn3ff3HaZHIyH4K13k8Mwqu/o7jIABJ8rANK+r2PfJk";
in
{ {
imports = [ imports = [
./hardware-configuration.nix ./hardware-configuration.nix
@ -18,7 +14,6 @@ in
admin = { admin = {
name = "ooks"; name = "ooks";
shell = "fish"; shell = "fish";
sshKey = key;
homeManager = true; homeManager = true;
}; };
networking = { networking = {

View file

@ -2,7 +2,6 @@
let let
inherit (lib) mkDefault; inherit (lib) mkDefault;
key = "ssh-ed25519 AAAAC3NzaC1lZDI1NTE5AAAAIBn3ff3HaZHIyH4K13k8Mwqu/o7jIABJ8rANK+r2PfJk";
in in
{ {
@ -19,7 +18,6 @@ in
admin = { admin = {
name = "ooks"; name = "ooks";
shell = "fish"; shell = "fish";
sshKey = key;
homeManager = true; homeManager = true;
}; };
networking = { networking = {

View file

@ -2,7 +2,6 @@
let let
inherit (lib) mkDefault; inherit (lib) mkDefault;
key = "ssh-ed25519 AAAAC3NzaC1lZDI1NTE5AAAAIBn3ff3HaZHIyH4K13k8Mwqu/o7jIABJ8rANK+r2PfJk";
in in
{ {
@ -19,7 +18,6 @@ in
admin = { admin = {
name = "ooks"; name = "ooks";
shell = "fish"; shell = "fish";
sshKey = key;
homeManager = true; homeManager = true;
}; };
networking = { networking = {

View file

@ -2,7 +2,6 @@
let let
inherit (lib) mkDefault; inherit (lib) mkDefault;
key = "ssh-ed25519 AAAAC3NzaC1lZDI1NTE5AAAAIBn3ff3HaZHIyH4K13k8Mwqu/o7jIABJ8rANK+r2PfJk";
in in
{ {
@ -19,7 +18,6 @@ in
admin = { admin = {
name = "ooks"; name = "ooks";
shell = "fish"; shell = "fish";
sshKey = key;
homeManager = true; homeManager = true;
}; };
hardware = { hardware = {
@ -33,6 +31,13 @@ in
"audio" "audio"
"video" "video"
]; ];
monitors = [{
name = "eDP-1";
width = 1920;
height = 1080;
workspace = "1";
primary = true;
}];
battery = { battery = {
powersave = { powersave = {
minFreq = 800; minFreq = 800;

View file

@ -50,10 +50,6 @@ in
type = str; type = str;
default = "ooks@protonmail.com"; default = "ooks@protonmail.com";
}; };
sshKey = mkOption {
type = str;
default = "ssh-ed25519 AAAAC3NzaC1lZDI1NTE5AAAAIBn3ff3HaZHIyH4K13k8Mwqu/o7jIABJ8rANK+r2PfJk";
};
homeManager = mkEnableOption ""; homeManager = mkEnableOption "";
}; };