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

refactor: further progress

Browse Source
This commit is contained in:
Jelle Spreeuwenberg
2026-04-25 00:19:20 +02:00
parent 55fbe82a42
commit 0500aab3cb
31 changed files with 680 additions and 398 deletions
Download Patch File Download Diff File Expand all files Collapse all files
modules/hosts/orion/default.nix
+5 -4
View File
@@ -1,19 +1,21 @@
{
inputs,
config,
lib,
...
}:
let
nixosModules = config.flake.modules.nixos;
hmModules = config.flake.modules.homeManager;
accounts = config.repo.accounts;
in
{
repo.machines.orion = {
buildFunction = config.repo.helpers.mkHost;
module = nixosModules.orion;
accounts = lib.getAttrs [ "kiri" ] config.repo.accounts;
users.kiri = {
account = accounts.kiri;
syncthingId = "NNRNQKZ-OWPHSVA-B6KKBHE-SDYLSTV-7SVHGPR-NEWLKPL-4MWNJG4-G5FHUAI";
};
stateVersion = "24.05";
hmStateVersion = "24.05";
@@ -23,7 +25,6 @@ in
{ ... }:
{
imports = [
nixosModules.host-base
nixosModules.sops-host-ssh-key
nixosModules.openssh
nixosModules.caddy
modules/hosts/polaris/default.nix
+37 -40
View File
@@ -6,18 +6,24 @@
let
nixosModules = config.flake.modules.nixos;
homeModules = config.flake.modules.homeManager;
metaLib = config.meta.lib;
workstationHomeImports = [ homeModules.workstation ];
kiriHomeImports = workstationHomeImports ++ [
homeModules.syncthing
homeModules.qbittorrent-client
homeModules.noctalia
];
ergonHomeImports = workstationHomeImports ++ [ homeModules.noctalia ];
accounts = config.repo.accounts;
in
{
flake.modules.nixos.polaris = metaLib.mkHost {
name = "polaris";
repo.machines.polaris = {
buildFunction = config.repo.helpers.mkWorkstationHost;
module = nixosModules.polaris;
users = {
kiri = {
account = accounts.kiri;
syncthingId = "6HBAKXB-DB3B4H2-BODCAXF-KD23H5W-6X5LGLC-ZJHZHLG-7U7YMGO-BB6IXQ3";
};
ergon.account = accounts.ergon;
};
stateVersion = "24.05";
hmStateVersion = "24.05";
displays = {
"LG Electronics LG ULTRAGEAR 103NTYT8R290" = {
@@ -31,35 +37,26 @@ in
y = 0;
};
};
input = {
mouse.accelSpeed = 0.4;
};
users = {
kiri = {
account = metaLib.accounts.kiri;
needsPassword = true;
homeImports = kiriHomeImports;
};
ergon = {
account = metaLib.accounts.ergon;
needsPassword = true;
homeImports = ergonHomeImports;
};
};
imports = [
nixosModules.workstation
nixosModules.steam
./_hardware.nix
]
++ (with inputs.nixos-hardware.nixosModules; [
common-pc
common-pc-ssd
common-cpu-amd
common-gpu-amd
]);
};
flake.modules.nixos.polaris =
{ ... }:
{
imports = [
nixosModules.qbittorrent-client
nixosModules.steam
./_hardware.nix
]
++ (with inputs.nixos-hardware.nixosModules; [
common-pc
common-pc-ssd
common-cpu-amd
common-gpu-amd
]);
home-manager.users = {
kiri.imports = [ homeModules.noctalia ];
ergon.imports = [ homeModules.noctalia ];
};
};
}
modules/hosts/zenith/default.nix
+56 -72
View File
@@ -6,87 +6,71 @@
let
nixosModules = config.flake.modules.nixos;
homeModules = config.flake.modules.homeManager;
metaLib = config.meta.lib;
workstationHomeImports = [ homeModules.workstation ];
portableNoctalia = homeModules.noctalia-portable;
kiriHomeImports = workstationHomeImports ++ [
homeModules.syncthing
homeModules.qbittorrent-client
portableNoctalia
];
ergonHomeImports = workstationHomeImports ++ [
portableNoctalia
(
{ pkgs, ... }:
{
home.packages = [
pkgs.usql
];
programs.git.ignores = [
# Devenv stuff
"devenv.*"
".devenv*"
".direnv"
"pre-commit-config.yaml"
".envrc"
];
}
)
];
accounts = config.repo.accounts;
in
{
flake.modules.nixos.zenith = metaLib.mkHost {
name = "zenith";
repo.machines.zenith = {
buildFunction = config.repo.helpers.mkWorkstationHost;
module = nixosModules.zenith;
displays = {
"California Institute of Technology 0x1410 Unknown" = {
primary = true;
x = 0;
y = 0;
scale = 1.5;
mode = {
width = 3072;
height = 1920;
refresh = 120.002;
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";
};
};
};
input = {
mouse.accelSpeed = 0.4;
};
sourceControl.users = {
ergon = {
personal.publicKey = "ssh-ed25519 AAAAC3NzaC1lZDI1NTE5AAAAIPdR3KP2U84i7f7MlRqcML/3YyMw8JL3hdm637SkMUwO ergon@zenith#personal";
work.publicKey = "ssh-ed25519 AAAAC3NzaC1lZDI1NTE5AAAAIIHJz5uHKm0/TiMNh/cmzrODHNZ8NgEEZe+47XnJwQGk ergon@zenith#work";
displays = {
"California Institute of Technology 0x1410 Unknown" = {
primary = true;
scale = 1.5;
width = 3072;
height = 1920;
refresh = 120.002;
};
};
users = {
kiri = {
account = metaLib.accounts.kiri;
needsPassword = true;
homeImports = kiriHomeImports;
};
ergon = {
account = metaLib.accounts.ergon;
needsPassword = true;
homeImports = ergonHomeImports;
};
};
imports = [
nixosModules.workstation
nixosModules.laptop-power
{
hardware.enableRedistributableFirmware = true;
services.fwupd.enable = true;
}
./_hardware.nix
inputs.nixos-hardware.nixosModules.lenovo-yoga-7-14ARH7-amdgpu
];
stateVersion = "24.05";
hmStateVersion = "24.05";
};
flake.modules.nixos.zenith =
{ ... }:
{
imports = [
nixosModules.qbittorrent-client
nixosModules.laptop-power
{
hardware.enableRedistributableFirmware = true;
services.fwupd.enable = true;
}
./_hardware.nix
inputs.nixos-hardware.nixosModules.lenovo-yoga-7-14ARH7-amdgpu
];
home-manager.users = {
kiri.imports = [ homeModules.noctalia-portable ];
ergon.imports = [
homeModules.noctalia-portable
(
{ pkgs, ... }:
{
home.packages = [ pkgs.usql ];
programs.git.ignores = [
"devenv.*"
".devenv*"
".direnv"
"pre-commit-config.yaml"
".envrc"
];
}
)
];
};
};
}