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/features/ai.nix
+1 -1
View File
@@ -61,7 +61,7 @@ in
"context-remaining"
"five-hour-limit"
];
projects.${config.meta.user.nixosConfigurationPath}.trust_level = "trusted";
projects.${config.meta.user.account.nixosConfigurationPath}.trust_level = "trusted";
sandbox_mode = "workspace-write";
personality = "pragmatic";
features.undo = true;
modules/features/bitwarden.nix
+4 -4
View File
@@ -3,7 +3,7 @@
...
}:
let
metaRepo = config.meta.lib.repo;
repo = config.repo;
in
{
flake.modules.homeManager.bitwarden =
@@ -13,14 +13,14 @@ in
...
}:
let
user = config.meta.user;
account = config.meta.user.account;
in
{
programs.rbw = {
enable = true;
settings = {
base_url = metaRepo.services.vaultwarden.url;
email = user.primaryEmail.address;
base_url = repo.services.vaultwarden.url;
email = account.primaryEmail.address;
pinentry = pkgs.pinentry-gnome3;
};
};
modules/features/email.nix
+4 -4
View File
@@ -7,7 +7,7 @@
...
}:
let
user = config.meta.user;
account = config.meta.user.account;
mkOffice365Account =
{
address,
@@ -17,7 +17,7 @@
{
enable = true;
inherit address primary;
realName = user.realName;
realName = account.realName;
userName = address;
thunderbird = {
enable = true;
@@ -37,7 +37,7 @@
{
enable = true;
inherit address primary;
realName = user.realName;
realName = account.realName;
userName = address;
thunderbird.enable = true;
imap = {
@@ -81,6 +81,6 @@
};
};
accounts.email.accounts = lib.mapAttrs (_: mkEmailAccount) user.emails;
accounts.email.accounts = lib.mapAttrs (_: mkEmailAccount) account.emails;
};
}
modules/features/git.nix
+3 -3
View File
@@ -6,7 +6,7 @@
...
}:
let
user = config.meta.user;
account = config.meta.user.account;
in
{
programs.git = {
@@ -19,8 +19,8 @@
settings = {
init.defaultBranch = "main";
user = {
name = user.realName;
email = user.primaryEmail.address;
name = account.realName;
email = account.primaryEmail.address;
};
};
};
modules/features/input.nix
-27
View File
@@ -1,27 +0,0 @@
{
config,
...
}:
let
metaLib = config.meta.lib;
in
{
flake.modules.nixos.input =
{
lib,
config,
...
}:
let
inputProfiles = metaLib.mkInputProfiles config.meta.host.input;
in
{
services.libinput = lib.mkIf inputProfiles.hasPointerConfig {
enable = true;
inherit (inputProfiles.libinput)
mouse
touchpad
;
};
};
}
modules/features/local-apps.nix
+5 -4
View File
@@ -1,18 +1,19 @@
{ config, ... }:
let
metaRepo = config.meta.lib.repo;
repo = config.repo;
repoHelpers = repo.helpers;
in
{
flake.modules.homeManager.local-apps =
{ pkgs, ... }:
let
browserPackage = config.meta.lib.resolvePackagePath {
browserPackage = repoHelpers.resolvePackagePath {
inherit pkgs;
path = metaRepo.desktop.browser.packagePath;
path = repo.desktop.browser.packagePath;
};
in
{
home.sessionVariables.BROWSER = metaRepo.desktop.browser.command;
home.sessionVariables.BROWSER = repo.desktop.browser.command;
home.packages =
with pkgs;
modules/features/neovim/default.nix
+3 -3
View File
@@ -1,6 +1,6 @@
{ config, ... }:
let
repoTheme = config.meta.lib.repo.theme.kanagawa;
repoTheme = config.repo.theme.kanagawa;
in
{
flake.modules.homeManager.neovim =
@@ -113,8 +113,8 @@ in
# Hostname/ConfigDir needed for nixd
nixdExtras = {
nixpkgs = "import ${pkgs.path} {}";
nixos_options = ''(builtins.getFlake "path://${config.meta.user.nixosConfigurationPath}").nixosConfigurations.${config.meta.host.name}.options'';
home_manager_options = ''(builtins.getFlake "path://${config.meta.user.nixosConfigurationPath}").nixosConfigurations.${config.meta.host.name}.options.home-manager.users.type.getSubOptions []'';
nixos_options = ''(builtins.getFlake "path://${config.meta.user.account.nixosConfigurationPath}").nixosConfigurations.${config.meta.machine.name}.options'';
home_manager_options = ''(builtins.getFlake "path://${config.meta.user.account.nixosConfigurationPath}").nixosConfigurations.${config.meta.machine.name}.options.home-manager.users.type.getSubOptions []'';
};
themeSetup = import ./_kanagawa-theme.nix {
modules/features/nh.nix
+1 -1
View File
@@ -4,7 +4,7 @@
{
programs.nh = {
enable = true;
flake = config.meta.user.nixosConfigurationPath;
flake = config.meta.user.account.nixosConfigurationPath;
};
};
}
modules/features/niri/default.nix
+28 -24
View File
@@ -4,8 +4,8 @@
...
}:
let
metaLib = config.meta.lib;
metaRepo = metaLib.repo;
repo = config.repo;
repoHelpers = repo.helpers;
in
{
flake.modules.nixos.niri =
@@ -31,11 +31,15 @@ in
...
}:
let
repoTheme = metaRepo.theme.kanagawa;
browserCommand = metaRepo.desktop.browser.command;
fileManagerPackage = metaLib.resolvePackagePath {
repoTheme = repo.theme.kanagawa;
browserCommand = repo.desktop.browser.command;
fileManagerPackage = repoHelpers.resolvePackagePath {
inherit pkgs;
path = metaRepo.desktop.fileManager.packagePath;
path = repo.desktop.fileManager.packagePath;
};
terminalPackage = repoHelpers.resolvePackagePath {
inherit pkgs;
path = repo.desktop.terminal.packagePath;
};
outputs = lib.mapAttrs (
_: display:
@@ -51,19 +55,24 @@ in
// lib.optionalAttrs (display.scale != null) {
inherit (display) scale;
}
// lib.optionalAttrs (display.mode != null) {
inherit (display) mode;
// lib.optionalAttrs (display.width != null && display.height != null && display.refresh != null) {
mode = {
inherit (display)
width
height
refresh
;
};
}
) config.meta.host.displays;
inputProfiles = metaLib.mkInputProfiles config.meta.host.input;
terminal = metaLib.resolveRepoTerminal {
inherit pkgs;
};
) config.meta.machine.displays;
in
{
assertions = metaLib.mkTerminalAssertions {
inherit terminal;
};
assertions = [
{
assertion = fileManagerPackage != null;
message = "Unknown file manager package `${lib.showAttrPath repo.desktop.fileManager.packagePath}`.";
}
];
home.sessionVariables.NIXOS_OZONE_WL = "1";
@@ -138,27 +147,22 @@ in
input = {
focus-follows-mouse.enable = true;
mouse."accel-speed" = 0.4;
keyboard = {
repeat-delay = 300;
repeat-rate = 50;
xkb.options = "caps:escape";
};
}
// lib.optionalAttrs (inputProfiles.niri.mouse != { }) {
mouse = inputProfiles.niri.mouse;
}
// lib.optionalAttrs (inputProfiles.niri.touchpad != { }) {
touchpad = inputProfiles.niri.touchpad;
};
binds =
if terminal.hasPackage then
if terminalPackage != null then
import ./_bindings.nix {
inherit
browserCommand
lib
;
terminalPackage = terminal.package;
terminalPackage = terminalPackage;
}
else
{ };
modules/features/noctalia.nix
+47 -52
View File
@@ -4,8 +4,9 @@
...
}:
let
homeModules = config.flake.modules.homeManager;
metaLib = config.meta.lib;
repo = config.repo;
repoHelpers = repo.helpers;
mkNoctaliaSettings =
{
lib,
@@ -17,6 +18,25 @@ let
terminalPackage
;
};
mkBaseSettings =
{
lib,
pkgs,
}:
let
terminalPackage = repoHelpers.resolvePackagePath {
inherit pkgs;
path = repo.desktop.terminal.packagePath;
};
in
if terminalPackage == null then
{ }
else
mkNoctaliaSettings {
inherit lib terminalPackage;
};
mkPortableSettings =
baseSettings:
lib.recursiveUpdate baseSettings {
@@ -40,55 +60,20 @@ let
};
in
{
flake.modules.homeManager.noctalia-base =
{
config,
lib,
pkgs,
...
}:
let
terminal = metaLib.resolveRepoTerminal {
inherit pkgs;
};
baseSettings =
if terminal.hasPackage then
mkNoctaliaSettings {
inherit lib;
terminalPackage = terminal.package;
}
else
{ };
in
{
options.meta.lib.noctaliaBaseSettings = lib.mkOption {
type = lib.types.attrs;
internal = true;
readOnly = true;
};
config = {
meta.lib.noctaliaBaseSettings = baseSettings;
assertions = metaLib.mkTerminalAssertions {
inherit terminal;
};
};
};
flake.modules.homeManager.noctalia =
{
config,
inputs,
lib,
pkgs,
...
}:
let
baseSettings = mkBaseSettings {
inherit lib pkgs;
};
in
{
imports = [
homeModules.noctalia-base
inputs.noctalia.homeModules.default
];
imports = [ inputs.noctalia.homeModules.default ];
programs.noctalia-shell = {
enable = true;
@@ -98,23 +83,33 @@ in
}
);
settings = config.meta.lib.noctaliaBaseSettings;
settings = baseSettings;
};
};
flake.modules.homeManager.noctalia-portable =
{
config,
inputs,
lib,
pkgs,
...
}:
let
baseSettings = mkBaseSettings {
inherit lib pkgs;
};
in
{
imports = [ homeModules.noctalia ];
programs.noctalia-shell.settings = lib.mkForce (
if config.meta.lib.noctaliaBaseSettings == { } then
{ }
else
mkPortableSettings config.meta.lib.noctaliaBaseSettings
);
imports = [ inputs.noctalia.homeModules.default ];
programs.noctalia-shell = {
enable = true;
package = lib.mkForce (
inputs.noctalia.packages.${pkgs.stdenv.hostPlatform.system}.default.override {
calendarSupport = true;
}
);
settings = if baseSettings == { } then { } else mkPortableSettings baseSettings;
};
};
}
modules/features/pim.nix
+2 -2
View File
@@ -3,7 +3,7 @@
...
}:
let
metaRepo = config.meta.lib.repo;
repo = config.repo;
in
{
flake.modules.homeManager.pim =
@@ -51,7 +51,7 @@ in
};
remote = {
url = metaRepo.services.radicale.url;
url = repo.services.radicale.url;
type = "caldav";
userName = config.home.username;
passwordCommand = [
modules/features/services/actual.nix
+4 -4
View File
@@ -1,8 +1,8 @@
{ config, ... }:
let
metaRepo = config.meta.lib.repo;
metaLib = config.meta.lib;
service = metaRepo.services.actual;
repo = config.repo;
repoHelpers = repo.helpers;
service = repo.services.actual;
in
{
flake.modules.nixos.actual =
@@ -19,7 +19,7 @@ in
};
}
(metaLib.mkCaddyReverseProxy {
(repoHelpers.mkCaddyReverseProxy {
inherit (service)
domain
port
modules/features/services/caddy.nix
+2 -2
View File
@@ -1,12 +1,12 @@
{ config, ... }:
let
metaRepo = config.meta.lib.repo;
repo = config.repo;
in
{
flake.modules.nixos.caddy = {
services.caddy = {
enable = true;
email = metaRepo.contact.email;
email = repo.contact.email;
openFirewall = true;
};
};
modules/features/services/gitea.nix
+4 -4
View File
@@ -1,8 +1,8 @@
{ config, ... }:
let
metaRepo = config.meta.lib.repo;
metaLib = config.meta.lib;
service = metaRepo.services.gitea;
repo = config.repo;
repoHelpers = repo.helpers;
service = repo.services.gitea;
in
{
flake.modules.nixos.gitea =
@@ -32,7 +32,7 @@ in
services.openssh.settings.AllowUsers = [ "gitea" ];
}
(metaLib.mkCaddyReverseProxy {
(repoHelpers.mkCaddyReverseProxy {
inherit (service)
domain
port
modules/features/services/openssh.nix
+1 -1
View File
@@ -20,7 +20,7 @@
settings = {
PermitRootLogin = "no";
PasswordAuthentication = false;
AllowUsers = builtins.attrNames config.meta.host.users;
AllowUsers = builtins.attrNames config.meta.machine.users;
};
};
};
modules/features/services/radicale.nix
+4 -4
View File
@@ -1,8 +1,8 @@
{ config, ... }:
let
metaRepo = config.meta.lib.repo;
metaLib = config.meta.lib;
service = metaRepo.services.radicale;
repo = config.repo;
repoHelpers = repo.helpers;
service = repo.services.radicale;
in
{
flake.modules.nixos.radicale =
@@ -25,7 +25,7 @@ in
};
}
(metaLib.mkCaddyReverseProxy {
(repoHelpers.mkCaddyReverseProxy {
inherit (service)
domain
port
modules/features/services/vaultwarden.nix
+4 -4
View File
@@ -1,8 +1,8 @@
{ config, ... }:
let
metaRepo = config.meta.lib.repo;
metaLib = config.meta.lib;
service = metaRepo.services.vaultwarden;
repo = config.repo;
repoHelpers = repo.helpers;
service = repo.services.vaultwarden;
in
{
flake.modules.nixos.vaultwarden =
@@ -21,7 +21,7 @@ in
};
}
(metaLib.mkCaddyReverseProxy {
(repoHelpers.mkCaddyReverseProxy {
inherit (service)
domain
port
modules/features/sops-password.nix
+17
View File
@@ -0,0 +1,17 @@
{ lib, ... }:
{
flake.modules.nixos.sops-password =
{ config, ... }:
{
sops.secrets = lib.mapAttrs' (
userName: _:
lib.nameValuePair "hashed-password-${userName}" {
neededForUsers = true;
}
) config.meta.machine.users;
users.users = lib.mapAttrs (userName: _: {
hashedPasswordFile = config.sops.secrets."hashed-password-${userName}".path;
}) config.meta.machine.users;
};
}
modules/features/source-control.nix
+21 -12
View File
@@ -10,22 +10,19 @@ in
...
}:
let
host = config.meta.host;
machine = config.meta.machine;
user = config.meta.user;
sourceControl = user.sourceControl;
sourceControlScopes = sourceControl.scopes;
hostSourceControlUsers = host.sourceControl.users;
hostUserSourceControl = hostSourceControlUsers.${user.name} or { };
account = user.account;
sourceControl = account.sourceControl;
scopeConfig = scope: hostUserSourceControl.${scope} or null;
scopeIdentity = scope: sourceControlScopes.${scope} or null;
scopeConfig = scope: user.sourceControl.${scope} or null;
emailForScope =
scope:
let
identity = scopeIdentity scope;
scopedEmails = lib.filter (email: email.scope == scope) (builtins.attrValues account.emails);
in
if identity == null then null else identity.email;
if builtins.length scopedEmails == 1 then (builtins.head scopedEmails).address else null;
scopeHasSigningKey =
scope:
@@ -51,7 +48,12 @@ in
in
if keyConfig == null then null else keyConfig.publicKey;
scopesInUse = builtins.attrNames sourceControlScopes;
scopesInUse = lib.unique [
"personal"
sourceControl.projectScope
];
missingEmailScopes = builtins.filter (scope: emailForScope scope == null) scopesInUse;
allowedSignersLines = map (scope: "${emailForScope scope} ${publicKeyForScope scope}") (
builtins.filter (scope: emailForScope scope != null && scopeHasSigningKey scope) scopesInUse
@@ -62,7 +64,7 @@ in
lib.recursiveUpdate
{
user = {
name = user.realName;
name = account.realName;
email = emailForScope scope;
};
}
@@ -75,7 +77,7 @@ in
gitRoots = [
{
root = user.nixosConfigurationPath;
root = account.nixosConfigurationPath;
scope = "personal";
}
{
@@ -87,6 +89,13 @@ in
{
imports = [ homeModules.git ];
assertions = [
{
assertion = missingEmailScopes == [ ];
message = "Missing source-control email scope for `${account.name}`: ${lib.concatStringsSep ", " missingEmailScopes}.";
}
];
xdg.configFile."git/allowed_signers".text = lib.concatStringsSep "\n" (
allowedSignersLines ++ [ "" ]
);
modules/features/syncthing.nix
+25 -13
View File
@@ -1,19 +1,31 @@
{
config,
lib,
...
}:
let
syncthingMesh = lib.listToAttrs (
lib.concatMap (
machine:
lib.mapAttrsToList (
userName: user:
let
name = "${userName}@${machine.name}";
in
{
inherit name;
value = {
inherit name;
id = user.syncthingId;
};
}
) (lib.filterAttrs (_: user: user.syncthingId != null) machine.users)
) (builtins.attrValues config.repo.machines)
);
in
{
flake.modules.homeManager.syncthing =
{ ... }:
let
syncthingMesh = {
"kiri@orion" = {
name = "kiri@orion";
id = "NNRNQKZ-OWPHSVA-B6KKBHE-SDYLSTV-7SVHGPR-NEWLKPL-4MWNJG4-G5FHUAI";
};
"kiri@polaris" = {
name = "kiri@polaris";
id = "6HBAKXB-DB3B4H2-BODCAXF-KD23H5W-6X5LGLC-ZJHZHLG-7U7YMGO-BB6IXQ3";
};
};
in
{
services.syncthing = {
enable = true;
modules/features/terminal.nix
+24 -10
View File
@@ -1,32 +1,46 @@
{ config, ... }:
let
metaLib = config.meta.lib;
metaRepo = metaLib.repo;
repo = config.repo;
repoHelpers = repo.helpers;
in
{
flake.modules.homeManager.terminal =
{
config,
lib,
pkgs,
...
}:
let
repoTheme = metaRepo.theme.kanagawa;
repoTheme = repo.theme.kanagawa;
palette = repoTheme.palette;
terminal = metaLib.resolveRepoTerminal {
terminalPackage = repoHelpers.resolvePackagePath {
inherit pkgs;
path = repo.desktop.terminal.packagePath;
};
terminalDesktopId = repo.desktop.terminal.desktopId;
in
{
assertions = metaLib.mkTerminalAssertions {
inherit terminal;
requireDesktopEntry = true;
};
assertions = [
{
assertion = terminalPackage != null;
message = "Unknown terminal package `${lib.showAttrPath repo.desktop.terminal.packagePath}`.";
}
{
assertion = repo.desktop.terminal.command == "kitty";
message = "The terminal feature currently only supports kitty.";
}
{
assertion =
terminalPackage == null
|| terminalDesktopId == null
|| builtins.pathExists "${terminalPackage}/share/applications/${terminalDesktopId}";
message = "Terminal package `${lib.showAttrPath repo.desktop.terminal.packagePath}` must provide `${terminalDesktopId}`.";
}
];
xdg.terminal-exec = {
enable = true;
settings.default = lib.optional (terminal.desktopId != null) terminal.desktopId;
settings.default = lib.optional (terminalDesktopId != null) terminalDesktopId;
};
programs.kitty = {
modules/features/theme.nix
+6 -6
View File
@@ -3,8 +3,8 @@
...
}:
let
metaLib = config.meta.lib;
metaRepo = metaLib.repo;
repo = config.repo;
repoHelpers = repo.helpers;
in
{
flake.modules.nixos.theme =
@@ -13,9 +13,9 @@ in
...
}:
let
repoTheme = metaRepo.theme;
repoTheme = repo.theme;
cursorTheme = repoTheme.cursor // {
package = metaLib.resolvePackagePath {
package = repoHelpers.resolvePackagePath {
inherit pkgs;
path = repoTheme.cursor.packagePath;
};
@@ -35,9 +35,9 @@ in
flake.modules.homeManager.theme =
{ config, pkgs, ... }:
let
repoTheme = metaRepo.theme;
repoTheme = repo.theme;
cursorTheme = repoTheme.cursor // {
package = metaLib.resolvePackagePath {
package = repoHelpers.resolvePackagePath {
inherit pkgs;
path = repoTheme.cursor.packagePath;
};
modules/features/vicinae.nix
+2 -2
View File
@@ -1,6 +1,6 @@
{ config, ... }:
let
metaRepo = config.meta.lib.repo;
repo = config.repo;
in
{
flake.modules.homeManager.vicinae =
@@ -10,7 +10,7 @@ in
...
}:
let
repoTheme = metaRepo.theme.kanagawa;
repoTheme = repo.theme.kanagawa;
palette = repoTheme.palette;
in
{
modules/features/workstation-base.nix
+3 -4
View File
@@ -4,18 +4,17 @@ let
homeModules = config.flake.modules.homeManager;
in
{
flake.modules.nixos.workstation = {
flake.modules.nixos.workstation-base = {
imports = [
nixosModules.audio
nixosModules.bluetooth
nixosModules.flatpak
nixosModules.fonts
nixosModules.host-base
nixosModules.input
nixosModules.networking
nixosModules.niri
nixosModules.plymouth
nixosModules.printing
nixosModules.sops-password
nixosModules.sddm
nixosModules.sops-admin-key-file
nixosModules.standard-boot
@@ -30,7 +29,7 @@ in
environment.localBinInPath = true;
};
flake.modules.homeManager.workstation = {
flake.modules.homeManager.workstation-base = {
imports = [
homeModules.ai
homeModules.bitwarden
modules/features/xdg.nix
+6 -6
View File
@@ -1,19 +1,19 @@
{ config, ... }:
let
metaLib = config.meta.lib;
metaRepo = metaLib.repo;
repo = config.repo;
repoHelpers = repo.helpers;
in
{
flake.modules.homeManager.xdg =
{ config, pkgs, ... }:
let
browserPackage = metaLib.resolvePackagePath {
browserPackage = repoHelpers.resolvePackagePath {
inherit pkgs;
path = metaRepo.desktop.browser.packagePath;
path = repo.desktop.browser.packagePath;
};
fileManagerPackage = metaLib.resolvePackagePath {
fileManagerPackage = repoHelpers.resolvePackagePath {
inherit pkgs;
path = metaRepo.desktop.fileManager.packagePath;
path = repo.desktop.fileManager.packagePath;
};
homeDir = config.home.homeDirectory;
localDir = "${homeDir}/.local";