kiri/lux
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

feat: move to single-user config

Browse Source
This commit is contained in:
Jelle Spreeuwenberg
2026-04-26 18:08:48 +02:00
parent 75ba00929e
commit dba24ce5f3
27 changed files with 160 additions and 300 deletions
Download Patch File Download Diff File Expand all files Collapse all files
modules/hosts/orion/default.nix
+5 -9
View File
@@ -5,17 +5,11 @@
}:
let
nixosModules = config.flake.modules.nixos;
accounts = config.repo.accounts;
account = config.repo.account;
in
{
repo.machines.orion = {
buildFunction = config.repo.helpers.mkHost;
module = nixosModules.orion;
users.kiri = {
account = accounts.kiri;
syncthingId = "NNRNQKZ-OWPHSVA-B6KKBHE-SDYLSTV-7SVHGPR-NEWLKPL-4MWNJG4-G5FHUAI";
};
syncthingId = "NNRNQKZ-OWPHSVA-B6KKBHE-SDYLSTV-7SVHGPR-NEWLKPL-4MWNJG4-G5FHUAI";
stateVersion = "24.05";
hmStateVersion = "24.05";
@@ -25,6 +19,8 @@ in
{ ... }:
{
imports = [
nixosModules.host-base
nixosModules.sops-host-ssh-key
nixosModules.openssh
nixosModules.caddy
@@ -38,7 +34,7 @@ in
./_disk.nix
];
users.users.kiri = {
users.users.${account.name} = {
linger = true;
openssh.authorizedKeys.keys = [
"ssh-ed25519 AAAAC3NzaC1lZDI1NTE5AAAAIAU2LydkXRTtNFY7oyX8JQURwXLVhB71DeK8XzrXeFX1 openpgp:0xA490D93A"
modules/hosts/polaris/default.nix
+4 -17
View File
@@ -5,22 +5,13 @@
}:
let
nixosModules = config.flake.modules.nixos;
homeModules = config.flake.modules.homeManager;
accounts = config.repo.accounts;
in
{
repo.machines.polaris = {
buildFunction = config.repo.helpers.mkWorkstationHost;
module = nixosModules.polaris;
sourceControl.personal.publicKey = "ssh-ed25519 AAAAC3NzaC1lZDI1NTE5AAAAIEVORk45HKkX7gaGGp90KsVyUy6t+fKhbWN/grjkf3cQ kiri@polaris";
sourceControl.work.publicKey = "ssh-ed25519 AAAAC3NzaC1lZDI1NTE5AAAAIEVORk45HKkX7gaGGp90KsVyUy6t+fKhbWN/grjkf3cQ kiri@polaris#work";
users = {
kiri = {
account = accounts.kiri;
syncthingId = "6HBAKXB-DB3B4H2-BODCAXF-KD23H5W-6X5LGLC-ZJHZHLG-7U7YMGO-BB6IXQ3";
};
ergon.account = accounts.ergon;
};
syncthingId = "6HBAKXB-DB3B4H2-BODCAXF-KD23H5W-6X5LGLC-ZJHZHLG-7U7YMGO-BB6IXQ3";
stateVersion = "24.05";
hmStateVersion = "24.05";
@@ -43,6 +34,7 @@ in
{ ... }:
{
imports = [
nixosModules.workstation-base
nixosModules.qbittorrent-client
nixosModules.steam
./_hardware.nix
@@ -53,10 +45,5 @@ in
common-cpu-amd
common-gpu-amd
]);
home-manager.users = {
kiri.imports = [ homeModules.noctalia ];
ergon.imports = [ homeModules.noctalia ];
};
};
}
modules/hosts/zenith/default.nix
+5 -15
View File
@@ -5,23 +5,14 @@
}:
let
nixosModules = config.flake.modules.nixos;
homeModules = config.flake.modules.homeManager;
accounts = config.repo.accounts;
in
{
repo.machines.zenith = {
buildFunction = config.repo.helpers.mkWorkstationHost;
module = nixosModules.zenith;
portable = true;
users = {
kiri.account = accounts.kiri;
ergon = {
account = accounts.ergon;
sourceControl = {
personal.publicKey = "ssh-ed25519 AAAAC3NzaC1lZDI1NTE5AAAAIPdR3KP2U84i7f7MlRqcML/3YyMw8JL3hdm637SkMUwO ergon@zenith#personal";
work.publicKey = "ssh-ed25519 AAAAC3NzaC1lZDI1NTE5AAAAIIHJz5uHKm0/TiMNh/cmzrODHNZ8NgEEZe+47XnJwQGk ergon@zenith#work";
};
};
sourceControl = {
personal.publicKey = "ssh-ed25519 AAAAC3NzaC1lZDI1NTE5AAAAIEVORk45HKkX7gaGGp90KsVyUy6t+fKhbWN/grjkf3cQ kiri@polaris";
work.publicKey = "ssh-ed25519 AAAAC3NzaC1lZDI1NTE5AAAAIIHJz5uHKm0/TiMNh/cmzrODHNZ8NgEEZe+47XnJwQGk kiri@zenith#work";
};
displays = {
@@ -42,6 +33,7 @@ in
{ ... }:
{
imports = [
nixosModules.workstation-base
nixosModules.qbittorrent-client
nixosModules.laptop-power
{
@@ -51,7 +43,5 @@ in
./_hardware.nix
inputs.nixos-hardware.nixosModules.lenovo-yoga-7-14ARH7-amdgpu
];
home-manager.sharedModules = [ homeModules.noctalia-portable ];
};
}