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

refactor

Browse Source
This commit is contained in:
kiri committed 2026-08-22 16:55:00 +02:00
1 parent 81e576a877
commit cde67e4d75
46 files changed
+619 -518
Download Patch File Download Diff File Expand all files Collapse all files

No files matched your search

modules/capabilities/_kanagawa.nix
+41
View File
@@ -0,0 +1,41 @@
{
displayName = "Kanagawa Wave";
palette = {
background = "#1F1F28";
foreground = "#DCD7BA";
secondaryBackground = "#16161D";
subtleBorder = "#54546D";
selectionBackground = "#2D4F67";
selectionForeground = "#C8C093";
url = "#72A7BC";
cursor = "#C8C093";
muted = "#727169";
accents = {
blue = "#7E9CD8";
red = "#E82424";
};
terminal = {
color0 = "#16161D";
color1 = "#C34043";
color2 = "#76946A";
color3 = "#C0A36E";
color4 = "#7E9CD8";
color5 = "#957FB8";
color6 = "#6A9589";
color7 = "#C8C093";
color8 = "#727169";
color9 = "#E82424";
color10 = "#98BB6C";
color11 = "#E6C384";
color12 = "#7FB4CA";
color13 = "#938AA9";
color14 = "#7AA89F";
color15 = "#DCD7BA";
color16 = "#FFA066";
color17 = "#FF5D62";
};
};
}
modules/capabilities/_svelte-language-server.nix
+25
View File
@@ -0,0 +1,25 @@
{ pkgs }:
pkgs.svelte-language-server.overrideAttrs (
finalAttrs: _: {
version = "0.18.3";
src = pkgs.fetchFromGitHub {
owner = "sveltejs";
repo = "language-tools";
tag = "svelte-language-server@${finalAttrs.version}";
hash = "sha256-FTOkJPXbsG6R53yr4n0/IR2lzFCovrdV0+epOi07lBQ=";
};
pnpmDeps = pkgs.fetchPnpmDeps {
inherit (finalAttrs)
pname
version
src
pnpmWorkspaces
;
pnpm = pkgs.pnpm_10;
fetcherVersion = 3;
hash = "sha256-fY3hrCkr/soJk1gp39/jec8lT2ZJI27xRBCZi006oWA=";
};
}
)
modules/capabilities/_theme.nix
-69
View File
@@ -1,69 +0,0 @@
{
cursor = {
name = "phinger-cursors-light";
packageName = "phinger-cursors";
size = 24;
};
kanagawa = {
displayName = "Kanagawa Wave";
name = "kanagawa-wave";
gtkThemeName = "Kanagawa-BL-LB";
iconThemeName = "Kanagawa";
owner = "Fausto-Korpsvart";
repo = "Kanagawa-GKT-Theme";
rev = "55ca4ba249eba21f861b9866b71ab41bb8930318";
hash = "sha256-UdMoMx2DoovcxSp/zBZ3PRv/Qpj+prd0uPm1gmdak2E=";
version = "unstable-2025-10-23";
palette = {
background = "#1F1F28";
foreground = "#DCD7BA";
secondaryBackground = "#16161D";
border = "#2A2A37";
selectionBackground = "#2D4F67";
selectionForeground = "#C8C093";
url = "#72A7BC";
cursor = "#C8C093";
muted = "#727169";
accents = {
blue = "#7E9CD8";
green = "#98BB6C";
magenta = "#D27E99";
orange = "#FFA066";
purple = "#957FB8";
red = "#E82424";
yellow = "#E6C384";
cyan = "#7AA89F";
};
niri.border = {
active = "#7E9CD8";
inactive = "#54546D";
urgent = "#E82424";
};
terminal = {
color0 = "#16161D";
color1 = "#C34043";
color2 = "#76946A";
color3 = "#C0A36E";
color4 = "#7E9CD8";
color5 = "#957FB8";
color6 = "#6A9589";
color7 = "#C8C093";
color8 = "#727169";
color9 = "#E82424";
color10 = "#98BB6C";
color11 = "#E6C384";
color12 = "#7FB4CA";
color13 = "#938AA9";
color14 = "#7AA89F";
color15 = "#DCD7BA";
color16 = "#FFA066";
color17 = "#FF5D62";
};
};
};
}
modules/capabilities/ai.nix
+2
View File
@@ -27,6 +27,8 @@ in
flake.modules.homeManager.ai =
{ pkgs, ... }:
{
imports = [ hmModules.podman ];
services.podman = {
volumes = {
grounded-docs-config = { };
modules/capabilities/desktop-defaults.nix
+45 -41
View File
@@ -1,66 +1,72 @@
{ config, ... }:
let
homeModules = config.flake.modules.homeManager;
in
{ ... }:
{
flake.modules.homeManager.browser-vivaldi =
{ pkgs, ... }:
flake.modules.homeManager.desktop-commands =
{ lib, ... }:
{
home.packages = [ pkgs.vivaldi ];
options.desktop = {
commands = {
browser = lib.mkOption {
type = lib.types.nonEmptyListOf lib.types.nonEmptyStr;
};
launcher = lib.mkOption {
type = lib.types.nonEmptyListOf lib.types.nonEmptyStr;
};
terminal = lib.mkOption {
type = lib.types.nonEmptyListOf lib.types.nonEmptyStr;
};
};
autostart = lib.mkOption {
type = lib.types.listOf (lib.types.nonEmptyListOf lib.types.nonEmptyStr);
default = [ ];
};
};
};
flake.modules.homeManager.primary-browser-vivaldi =
flake.modules.homeManager.vivaldi =
{ lib, pkgs, ... }:
let
browser = pkgs.vivaldi;
browserCommand = lib.getExe browser;
command = lib.getExe pkgs.vivaldi;
in
{
imports = [ homeModules.browser-vivaldi ];
facts.desktop.browserCommand = browserCommand;
home.sessionVariables.BROWSER = browserCommand;
xdg.mimeApps.defaultApplicationPackages = [ browser ];
desktop.commands.browser = [ command ];
home = {
packages = [ pkgs.vivaldi ];
sessionVariables.BROWSER = command;
};
xdg.mimeApps.defaultApplicationPackages = [ pkgs.vivaldi ];
};
flake.modules.homeManager.file-manager-nautilus =
{ pkgs, ... }:
flake.modules.homeManager.nautilus =
{ config, pkgs, ... }:
{
home.packages = [ pkgs.nautilus ];
};
flake.modules.homeManager.primary-file-manager-nautilus =
{ pkgs, ... }:
{
imports = [ homeModules.file-manager-nautilus ];
gtk.gtk3.bookmarks = [
"sftp://${config.facts.topology.server.sshAlias} Orion VPS"
];
xdg.mimeApps.defaultApplicationPackages = [ pkgs.nautilus ];
};
flake.modules.homeManager.image-viewer-imv = {
programs.imv.enable = true;
};
flake.modules.homeManager.default-image-viewer-imv =
flake.modules.homeManager.imv =
{ pkgs, ... }:
{
imports = [ homeModules.image-viewer-imv ];
programs.imv.enable = true;
xdg.mimeApps.defaultApplicationPackages = [ pkgs.imv ];
};
flake.modules.homeManager.document-viewer-sioyek = {
programs.sioyek.enable = true;
};
flake.modules.homeManager.default-document-viewer-sioyek =
flake.modules.homeManager.sioyek =
{ pkgs, ... }:
{
imports = [ homeModules.document-viewer-sioyek ];
programs.sioyek.enable = true;
xdg.mimeApps.defaultApplicationPackages = [ pkgs.sioyek ];
};
flake.modules.homeManager.discord = {
programs.discord = {
enable = true;
settings.SKIP_HOST_UPDATE = true;
};
};
flake.modules.homeManager.workstation-apps =
{ pkgs, ... }:
{
@@ -110,9 +116,7 @@ in
templates = "${localDir}/templates";
};
mimeApps = {
enable = true;
};
mimeApps.enable = true;
};
};
}
modules/capabilities/dev-tools.nix
-4
View File
@@ -46,8 +46,4 @@
};
};
};
flake.modules.nixos.openvpn = {
programs.openvpn3.enable = true;
services.resolved.enable = true;
};
}
modules/capabilities/git.nix
+2 -1
View File
@@ -18,7 +18,8 @@ in
email = account.emails.${scope}.address;
key = machine.sshKeys.${scope} or null;
hasSigningKey = key != null;
privateKeyPath = key.privateKeyPath or "~/.ssh/id_${scope}";
privateKeyPath =
if hasSigningKey && key.privateKeyPath != null then key.privateKeyPath else "~/.ssh/id_${scope}";
in
{
allowedSigners = lib.optional hasSigningKey "${email} ${key.publicKey}";
modules/capabilities/helix.nix
+14 -26
View File
@@ -1,6 +1,9 @@
{ inputs, ... }:
{ config, inputs, ... }:
let
homeModules = config.flake.modules.homeManager;
in
{
flake.modules.nixos.helix = {
flake.modules.nixos.helix-cache = {
nix.settings = {
extra-substituters = [ "https://helix.cachix.org" ];
extra-trusted-public-keys = [
@@ -12,30 +15,11 @@
flake.modules.homeManager.helix =
{ pkgs, ... }:
let
svelteLanguageServer = pkgs.svelte-language-server.overrideAttrs (
finalAttrs: previousAttrs: {
version = "0.18.3";
src = pkgs.fetchFromGitHub {
owner = "sveltejs";
repo = "language-tools";
tag = "svelte-language-server@${finalAttrs.version}";
hash = "sha256-FTOkJPXbsG6R53yr4n0/IR2lzFCovrdV0+epOi07lBQ=";
};
pnpmDeps = pkgs.fetchPnpmDeps {
inherit (finalAttrs)
pname
version
src
pnpmWorkspaces
;
pnpm = pkgs.pnpm_10;
fetcherVersion = 3;
hash = "sha256-fY3hrCkr/soJk1gp39/jec8lT2ZJI27xRBCZi006oWA=";
};
svelteLanguageServer = (import ./_svelte-language-server.nix { inherit pkgs; }).overrideAttrs (
_: previousAttrs: {
postInstall = (previousAttrs.postInstall or "") + ''
# @vscode/emmet-helper only enables JSX expansion for JSX syntax;
# Helix's Svelte HTML regions also need it for HTML syntax.
substituteInPlace \
"$out/lib/node_modules/svelte-language-server/packages/language-server/node_modules/@vscode/emmet-helper/lib/cjs/emmetHelper.js" \
--replace-fail \
@@ -48,7 +32,6 @@
{
programs.helix = {
enable = true;
defaultEditor = true;
package = inputs.helix.packages.${pkgs.stdenv.hostPlatform.system}.default;
extraPackages = with pkgs; [
vtsls
@@ -179,4 +162,9 @@
};
};
};
flake.modules.homeManager.primary-editor-helix = {
imports = [ homeModules.helix ];
programs.helix.defaultEditor = true;
};
}
modules/capabilities/limine.nix
+7 -5
View File
@@ -1,6 +1,6 @@
{ config, lib, ... }:
let
palette = config.facts.theme.kanagawa.palette;
palette = (import ./_kanagawa.nix).palette;
hex = lib.removePrefix "#";
terminalPalette = palette.terminal;
mkPalette = colors: lib.concatStringsSep ";" (map hex colors);
@@ -9,11 +9,11 @@ in
flake.modules.nixos.limine =
{ config, lib, ... }:
let
displayValues = builtins.attrValues (config.facts.machine.displays or { });
primaryDisplays = lib.filter (display: display.primary or false) displayValues;
displayValues = builtins.attrValues config.facts.machine.displays;
primaryDisplays = lib.filter (display: display.primary) displayValues;
primaryDisplay = if primaryDisplays == [ ] then null else builtins.head primaryDisplays;
interfaceResolution =
if primaryDisplay != null && primaryDisplay ? width && primaryDisplay ? height then
if primaryDisplay != null && primaryDisplay.width != null then
"${toString primaryDisplay.width}x${toString primaryDisplay.height}"
else
null;
@@ -24,7 +24,6 @@ in
limine = {
enable = true;
maxGenerations = 10;
resolution = "2560x1440";
style = {
backdrop = hex palette.secondaryBackground;
@@ -69,6 +68,9 @@ in
resolution = interfaceResolution;
};
};
}
// lib.optionalAttrs (interfaceResolution != null) {
resolution = interfaceResolution;
};
};
};
modules/capabilities/locale-nl.nix → modules/capabilities/locale.nix
+1 -2
View File
@@ -1,6 +1,5 @@
{ ... }:
{
flake.modules.nixos.locale-nl = {
flake.modules.nixos.locale = {
time.timeZone = "Europe/Amsterdam";
i18n.defaultLocale = "en_US.UTF-8";
modules/capabilities/neovim/default.nix
+15 -37
View File
@@ -1,15 +1,9 @@
{ config, ... }:
let
account = config.facts.account;
theme = config.facts.theme.kanagawa;
homeModules = config.flake.modules.homeManager;
in
{
flake.modules.homeManager.default-editor-neovim =
{ pkgs, ... }:
{
xdg.mimeApps.defaultApplicationPackages = [ pkgs.neovim ];
};
flake.modules.homeManager.neovim =
{
pkgs,
@@ -20,30 +14,7 @@ in
}:
let
nvimTreesitter = pkgs.vimPlugins.nvim-treesitter;
svelteLanguageServer = pkgs.svelte-language-server.overrideAttrs (
finalAttrs: _: {
version = "0.18.3";
src = pkgs.fetchFromGitHub {
owner = "sveltejs";
repo = "language-tools";
tag = "svelte-language-server@${finalAttrs.version}";
hash = "sha256-FTOkJPXbsG6R53yr4n0/IR2lzFCovrdV0+epOi07lBQ=";
};
pnpmDeps = pkgs.fetchPnpmDeps {
inherit (finalAttrs)
pname
version
src
pnpmWorkspaces
;
pnpm = pkgs.pnpm_10;
fetcherVersion = 3;
hash = "sha256-fY3hrCkr/soJk1gp39/jec8lT2ZJI27xRBCZi006oWA=";
};
}
);
svelteLanguageServer = import ../_svelte-language-server.nix { inherit pkgs; };
svelteGrammar = nvimTreesitter.builtGrammars.svelte.overrideAttrs (_: {
version = "0.0.0+rev=c2457b9";
src = pkgs.fetchFromGitHub {
@@ -61,11 +32,6 @@ in
);
in
{
home.sessionVariables = {
EDITOR = "nvim";
VISUAL = "nvim";
};
imports = [
(inputs.nix-wrapper-modules.lib.getInstallModule {
name = "neovim";
@@ -195,7 +161,7 @@ in
};
themeSetup = import ./_kanagawa-theme.nix {
themeName = theme.name;
themeName = "kanagawa-wave";
};
typstPreviewDependencies = {
@@ -209,4 +175,16 @@ in
binName = "nvim";
};
};
flake.modules.homeManager.primary-editor-neovim =
{ pkgs, ... }:
{
imports = [ homeModules.neovim ];
home.sessionVariables = {
EDITOR = "nvim";
VISUAL = "nvim";
};
xdg.mimeApps.defaultApplicationPackages = [ pkgs.neovim ];
};
}
modules/capabilities/networking.nix
+6 -7
View File
@@ -8,13 +8,12 @@ in
};
flake.modules.nixos.network-manager = {
networking = {
networkmanager.enable = true;
firewall.allowedTCPPorts = [
5173
5174
];
};
networking.networkmanager.enable = true;
};
flake.modules.nixos.openvpn = {
programs.openvpn3.enable = true;
services.resolved.enable = true;
};
flake.modules.nixos.server-firewall =
modules/capabilities/niri/_bindings.nix
+6 -11
View File
@@ -1,29 +1,24 @@
{
browserCommand,
launcherCommand,
browser,
launcher,
shortcutCommands,
terminalCommand,
terminal,
}:
{
# Application and utility launchers
"Mod+Return" = {
action.spawn = terminalCommand;
action.spawn = terminal;
hotkey-overlay.title = "Terminal";
};
"Mod+B" = {
action.spawn = browserCommand;
action.spawn = browser;
hotkey-overlay.title = "Browser";
};
"Mod+Space" = {
repeat = false;
action.spawn = launcherCommand;
action.spawn = launcher;
hotkey-overlay.title = "App Launcher";
};
"Mod+E" = {
repeat = false;
action.spawn = shortcutCommands.neovimProjects;
hotkey-overlay.title = "Neovim Projects";
};
"Mod+Ctrl+Return" = {
repeat = false;
action.spawn = shortcutCommands.nixosTerminal;
modules/capabilities/niri/_shortcuts.nix
+2 -10
View File
@@ -1,11 +1,10 @@
{
config,
facts,
lib,
pkgs,
}:
let
nixosConfigDir = facts.account.nixosConfigurationPath;
nixosConfigDir = config.facts.account.nixosConfigurationPath;
mkTerminalScript =
{
name,
@@ -28,7 +27,7 @@ let
text = lib.concatStringsSep "\n" [
"# shellcheck disable=SC2016"
"cd ${lib.escapeShellArg workdir}"
"exec ${lib.escapeShellArg config.facts.desktop.terminalCommand} ${argString}"
"exec ${lib.escapeShellArgs config.desktop.commands.terminal} ${argString}"
];
};
in
@@ -83,13 +82,6 @@ rec {
'';
};
neovimProjects = mkTerminalScript {
name = "niri-shortcut-neovim-projects";
command = ''
nvim -c 'Telescope projects'
'';
};
pickColor = pkgs.writeShellApplication {
name = "niri-shortcut-pick-color";
runtimeInputs = [
modules/capabilities/niri/default.nix
+19 -18
View File
@@ -4,7 +4,7 @@
...
}:
let
facts = config.facts;
kanagawa = import ../_kanagawa.nix;
hmModules = config.flake.modules.homeManager;
in
{
@@ -41,11 +41,10 @@ in
...
}:
let
borderPalette = facts.theme.kanagawa.palette.niri.border;
palette = kanagawa.palette;
shortcuts = import ./_shortcuts.nix {
inherit
config
facts
lib
pkgs
;
@@ -60,6 +59,7 @@ in
[
playerctl
brightnessctl
wireplumber
xwayland-satellite
]
++ lib.attrValues shortcuts.scripts;
@@ -72,17 +72,16 @@ in
_: display:
{
position = {
x = display.x or 0;
y = display.y or 0;
inherit (display) x y;
};
}
// lib.optionalAttrs (display.primary or false) {
// lib.optionalAttrs display.primary {
"focus-at-startup" = true;
}
// lib.optionalAttrs (display ? scale) {
// lib.optionalAttrs (display.scale != null) {
inherit (display) scale;
}
// lib.optionalAttrs (display ? width && display ? height && display ? refresh) {
// lib.optionalAttrs (display.width != null) {
mode = {
inherit (display)
height
@@ -95,16 +94,16 @@ in
environment.DISPLAY = ":0";
spawn-at-startup = [
{ command = [ "xwayland-satellite" ]; }
{ command = [ "noctalia" ]; }
];
{ command = [ (lib.getExe pkgs.xwayland-satellite) ]; }
]
++ map (command: { inherit command; }) config.desktop.autostart;
prefer-no-csd = true;
hotkey-overlay.skip-at-startup = true;
screenshot-path = "${config.xdg.userDirs.pictures}/screenshots/%Y-%m-%dT%H:%M:%S.png";
animations.slowdown = 0.6;
cursor = {
cursor = lib.mkIf config.home.pointerCursor.enable {
inherit (config.home.pointerCursor) size;
theme = config.home.pointerCursor.name;
hide-after-inactive-ms = 3000;
@@ -120,9 +119,9 @@ in
border = {
enable = true;
width = 3;
active.color = borderPalette.active;
inactive.color = borderPalette.inactive;
urgent.color = borderPalette.urgent;
active.color = palette.accents.blue;
inactive.color = palette.subtleBorder;
urgent.color = palette.accents.red;
};
};
@@ -157,9 +156,11 @@ in
};
binds = import ./_bindings.nix {
browserCommand = config.facts.desktop.browserCommand;
launcherCommand = config.facts.desktop.launcherCommand;
terminalCommand = config.facts.desktop.terminalCommand;
inherit (config.desktop.commands)
browser
launcher
terminal
;
shortcutCommands = shortcuts.commands;
};
};
modules/capabilities/noctalia.nix
+5 -40
View File
@@ -9,27 +9,12 @@
let
homeDir = config.home.homeDirectory;
wallpaper = "${homeDir}/media/images/wallpapers/green-leaves.png";
loginBox = output: {
box_height = 70.0;
box_width = 400.0;
cx = 1280.0;
cy = 1317.0;
inherit output;
rotation = 0.0;
type = "login_box";
settings = {
background_color = "surface_variant";
background_opacity = 0.88;
background_radius = 12.0;
input_opacity = 1.0;
input_radius = 6.0;
show_login_button = true;
};
};
in
{
imports = [ inputs.noctalia.homeModules.default ];
desktop.autostart = [ [ (lib.getExe config.programs.noctalia.package) ] ];
programs.noctalia = {
enable = true;
settings = {
@@ -49,7 +34,7 @@
"bluetooth"
"volume"
]
++ lib.optionals config.facts.machine.portable [
++ lib.optionals (config.facts.machine.name == "zenith") [
"network"
"battery"
]
@@ -70,7 +55,7 @@
account.radicale = {
name = "Personal";
provider = "custom";
server_url = config.facts.services.radicale.url;
server_url = "${config.facts.services.radicale.origin}/";
type = "caldav";
username = config.facts.account.name;
};
@@ -97,23 +82,7 @@
tint_intensity = 0.5;
};
lockscreen_widgets = {
enabled = true;
schema_version = 2;
widget_order = [
"lockscreen-login-box@DP-2"
"lockscreen-login-box@DP-3"
];
grid = {
cell_size = 16;
major_interval = 4;
visible = true;
};
widget = {
"lockscreen-login-box@DP-2" = loginBox "DP-2";
"lockscreen-login-box@DP-3" = loginBox "DP-3";
};
};
lockscreen_widgets.enabled = true;
nightlight = {
enabled = true;
@@ -168,10 +137,6 @@
directory = "${homeDir}/media/images/wallpapers";
default.path = wallpaper;
last.path = wallpaper;
monitors = {
DP-2.path = wallpaper;
DP-3.path = wallpaper;
};
};
weather.refresh_minutes = 15;
modules/capabilities/passwords.nix
+2 -2
View File
@@ -19,8 +19,8 @@ in
programs.rbw = {
enable = true;
settings = {
base_url = facts.services.vaultwarden.url;
email = account.primaryEmail.address;
base_url = facts.services.vaultwarden.origin;
email = account.emails.${account.primaryEmail}.address;
pinentry = pinentryPackage;
};
};
modules/capabilities/pim.nix
+12 -13
View File
@@ -5,6 +5,7 @@
let
facts = config.facts;
account = facts.account;
homeModules = config.flake.modules.homeManager;
in
{
flake.modules.homeManager.email =
@@ -17,12 +18,11 @@ in
mkOffice365Account =
{
address,
primary ? false,
...
}:
{
enable = true;
inherit address primary;
inherit address;
realName = account.realName;
userName = address;
thunderbird = {
@@ -37,12 +37,11 @@ in
mkMxrouteAccount =
{
address,
primary ? false,
...
}:
{
enable = true;
inherit address primary;
inherit address;
realName = account.realName;
userName = address;
thunderbird.enable = true;
@@ -60,13 +59,11 @@ in
};
};
mkEmailAccount =
email:
if email.type == "office365" then
mkOffice365Account email
else if email.type == "mxrouting" then
mkMxrouteAccount email
else
throw "Unsupported email type `${email.type}` for ${config.home.username}";
name: email:
(if email.type == "office365" then mkOffice365Account email else mkMxrouteAccount email)
// {
primary = name == account.primaryEmail;
};
in
{
programs.thunderbird = {
@@ -87,7 +84,7 @@ in
};
};
accounts.email.accounts = lib.mapAttrs (_: mkEmailAccount) account.emails;
accounts.email.accounts = lib.mapAttrs mkEmailAccount account.emails;
};
flake.modules.homeManager.calendar-tasks =
@@ -100,6 +97,8 @@ in
calendarsPath = "${config.xdg.dataHome}/calendars";
in
{
imports = [ homeModules.sops ];
programs.pimsync.enable = true;
services.pimsync.enable = true;
@@ -138,7 +137,7 @@ in
};
remote = {
url = facts.services.radicale.url;
url = "${facts.services.radicale.origin}/";
type = "caldav";
userName = config.home.username;
passwordCommand = [
modules/capabilities/qbittorrent.nix
+2 -6
View File
@@ -1,11 +1,7 @@
{ config, ... }:
let
account = config.facts.account;
in
{
flake.modules.nixos.qbittorrent =
flake.modules.homeManager.qbittorrent =
{ pkgs, ... }:
{
home-manager.users.${account.name}.home.packages = [ pkgs.qbittorrent ];
home.packages = [ pkgs.qbittorrent ];
};
}
modules/capabilities/sddm.nix
+4
View File
@@ -16,6 +16,10 @@
extraPackages = with pkgs; [
kdePackages.qtmultimedia
];
settings.Theme = {
CursorTheme = "phinger-cursors-light";
CursorSize = 24;
};
};
};
}
modules/capabilities/services/actual.nix
+6 -4
View File
@@ -1,19 +1,21 @@
{ config, ... }:
let
service = config.facts.services.actual;
nixosModules = config.flake.modules.nixos;
in
{
flake.modules.nixos.actual = {
imports = [ nixosModules.caddy ];
services.actual = {
enable = true;
openFirewall = false;
settings = {
inherit (service) port;
hostname = service.host;
hostname = "127.0.0.1";
port = 3000;
};
};
services.caddy.virtualHosts.${service.domain}.extraConfig =
"reverse_proxy :${toString service.port}";
services.caddy.virtualHosts.${service.domain}.extraConfig = "reverse_proxy 127.0.0.1:3000";
};
}
modules/capabilities/services/caddy.nix
+1 -1
View File
@@ -6,7 +6,7 @@ in
flake.modules.nixos.caddy = {
services.caddy = {
enable = true;
email = facts.account.primaryEmail.address;
email = facts.account.emails.${facts.account.primaryEmail}.address;
openFirewall = true;
};
};
modules/capabilities/services/gitea.nix
+10 -5
View File
@@ -1,18 +1,24 @@
{ config, ... }:
let
service = config.facts.services.gitea;
nixosModules = config.flake.modules.nixos;
in
{
flake.modules.nixos.gitea = {
imports = [
nixosModules.caddy
nixosModules.openssh
];
services.gitea = {
enable = true;
settings = {
server = {
DOMAIN = service.domain;
ROOT_URL = service.url;
HTTP_PORT = service.port;
HTTP_ADDR = service.host;
ROOT_URL = "${service.origin}/";
HTTP_PORT = 3001;
HTTP_ADDR = "127.0.0.1";
START_SSH_SERVER = false;
SSH_PORT = 22;
@@ -24,7 +30,6 @@ in
services.openssh.settings.AllowUsers = [ "gitea" ];
services.caddy.virtualHosts.${service.domain}.extraConfig =
"reverse_proxy :${toString service.port}";
services.caddy.virtualHosts.${service.domain}.extraConfig = "reverse_proxy 127.0.0.1:3001";
};
}
modules/capabilities/services/openssh.nix
+2 -2
View File
@@ -3,8 +3,8 @@ let
account = config.facts.account;
personalPublicKeys =
machines:
map (machine: (machine.sshKeys or { }).personal.publicKey) (
lib.filter (machine: (machine.sshKeys or { }) ? personal) (builtins.attrValues machines)
map (machine: machine.sshKeys.personal.publicKey) (
lib.filter (machine: machine.sshKeys ? personal) (builtins.attrValues machines)
);
in
{
modules/capabilities/services/radicale.nix
+5 -2
View File
@@ -1,13 +1,16 @@
{ config, ... }:
let
service = config.facts.services.radicale;
nixosModules = config.flake.modules.nixos;
in
{
flake.modules.nixos.radicale = {
imports = [ nixosModules.caddy ];
services.radicale = {
enable = true;
settings = {
server.hosts = [ "${service.host}:${toString service.port}" ];
server.hosts = [ "127.0.0.1:5232" ];
auth = {
type = "htpasswd";
@@ -20,7 +23,7 @@ in
};
services.caddy.virtualHosts.${service.domain}.extraConfig = ''
reverse_proxy :${toString service.port} {
reverse_proxy 127.0.0.1:5232 {
header_up X-Script-Name /
header_up X-Forwarded-For {remote}
header_up X-Remote-User {http.auth.user.id}
modules/capabilities/services/vaultwarden.nix
+7 -4
View File
@@ -1,21 +1,24 @@
{ config, ... }:
let
service = config.facts.services.vaultwarden;
nixosModules = config.flake.modules.nixos;
in
{
flake.modules.nixos.vaultwarden = {
imports = [ nixosModules.caddy ];
services.vaultwarden = {
enable = true;
backupDir = "/var/backup/vaultwarden";
config = {
DOMAIN = service.url;
DOMAIN = service.origin;
SIGNUPS_ALLOWED = false;
ROCKET_PORT = service.port;
ROCKET_ADDRESS = "127.0.0.1";
ROCKET_PORT = 8100;
ROCKET_LOG = "critical";
};
};
services.caddy.virtualHosts.${service.domain}.extraConfig =
"reverse_proxy :${toString service.port}";
services.caddy.virtualHosts.${service.domain}.extraConfig = "reverse_proxy 127.0.0.1:8100";
};
}
modules/capabilities/services/vps-insights.nix
+18 -11
View File
@@ -1,13 +1,20 @@
{ ... }:
{
flake.modules.nixos.vps-insights =
{ config, pkgs, ... }:
{
config,
lib,
pkgs,
...
}:
let
localAddress = "127.0.0.1";
grafanaDataDir = config.services.grafana.dataDir;
lokiDataDir = config.services.loki.dataDir;
lokiUrl = "http://${localAddress}:3100";
prometheusUrl = "http://${localAddress}:9090";
hasCaddy = config.services.caddy.enable;
hasOpenSSH = config.services.openssh.enable;
in
{
environment = {
@@ -64,21 +71,17 @@
# Detect and block common attacks against SSH and Caddy.
crowdsec = {
enable = true;
hub.collections = [
"crowdsecurity/linux"
"crowdsecurity/caddy"
];
localConfig.acquisitions = [
{
hub.collections = [ "crowdsecurity/linux" ] ++ lib.optional hasCaddy "crowdsecurity/caddy";
localConfig.acquisitions =
lib.optional hasOpenSSH {
source = "journalctl";
journalctl_filter = [ "_SYSTEMD_UNIT=sshd.service" ];
labels.type = "syslog";
}
{
++ lib.optional hasCaddy {
filenames = [ "/var/log/caddy/*.log" ];
labels.type = "caddy";
}
];
};
};
crowdsec-firewall-bouncer = {
@@ -86,11 +89,15 @@
registerBouncer.bouncerName = "${config.networking.hostName}-firewall-bouncer";
};
# Grafana defaults to 127.0.0.1:3000; add secrets and datasources only.
# Keep Grafana local and separate from Actual's port.
grafana = {
enable = true;
settings = {
analytics.reporting_enabled = false;
server = {
http_addr = localAddress;
http_port = 3002;
};
security = {
admin_password = "$__file{${grafanaDataDir}/admin-password}";
secret_key = "$__file{${grafanaDataDir}/secret-key}";
modules/capabilities/shell.nix
+7 -7
View File
@@ -7,6 +7,10 @@
pkgs,
...
}:
let
gardenctl = "${config.home.homeDirectory}/.garden/gardenctl";
uuidgen = lib.getExe' pkgs.util-linux "uuidgen";
in
{
home.sessionVariables = {
STARSHIP_CACHE = "${config.xdg.cacheHome}/starship";
@@ -62,16 +66,12 @@
'';
initContent = ''
source <(/home/kiri/.garden/gardenctl completion zsh)
[ -n "$GCTL_SESSION_ID" ] || [ -n "$TERM_SESSION_ID" ] || export GCTL_SESSION_ID=$(uuidgen)
source <(${gardenctl} completion zsh)
if [ -z "$GCTL_SESSION_ID" ] && [ -z "$TERM_SESSION_ID" ]; then
export GCTL_SESSION_ID=$(uuidgen)
export GCTL_SESSION_ID=$(${uuidgen})
fi
eval $(/home/kiri/.garden/gardenctl kubectl-env zsh)
eval $(${gardenctl} kubectl-env zsh)
bindkey -v
modules/capabilities/ssh.nix
+14 -5
View File
@@ -1,19 +1,28 @@
{ config, ... }:
let
homeModules = config.flake.modules.homeManager;
in
{
flake.modules.homeManager.ssh-client =
{ config, ... }:
let
server = config.facts.topology.server;
in
{
imports = [ homeModules.sops ];
programs.ssh = {
enable = true;
enableDefaultConfig = false;
includes = [
config.sops.templates."ssh-config-orion".path
config.sops.templates."ssh-config-${server.machine}".path
];
};
sops.secrets."orion-ip" = { };
sops.templates."ssh-config-orion".content = ''
Host orion
HostName ${config.sops.placeholder."orion-ip"}
sops.secrets."${server.machine}-ip" = { };
sops.templates."ssh-config-${server.machine}".content = ''
Host ${server.sshAlias}
HostName ${config.sops.placeholder."${server.machine}-ip"}
ForwardAgent yes
'';
};
modules/capabilities/syncthing.nix
+13 -11
View File
@@ -14,20 +14,18 @@ let
inherit name;
id = machine.syncthingId;
}
) (lib.filterAttrs (_: machine: (machine.syncthingId or null) != null) config.facts.machines);
) (lib.filterAttrs (_: machine: machine.syncthingId != null) config.facts.machines);
syncPhones = {
"pixel-10" = {
name = "pixel-10";
id = "MTJHEHA-UMZDQZ7-BTMRRLQ-Y7BFPUJ-ZTY6LZX-PDXV3IS-XVJCU7B-EPETBQZ";
};
};
syncExternalDevices = lib.mapAttrs (name: device: {
inherit name;
id = device.syncthingId;
}) (lib.filterAttrs (_: device: device.syncthingId != null) config.facts.externalDevices);
syncDevices = syncMachines // syncPhones;
syncDevices = syncMachines // syncExternalDevices;
in
{
flake.modules.homeManager.syncthing =
{ ... }:
{ config, ... }:
{
services.syncthing = {
enable = true;
@@ -38,12 +36,16 @@ in
settings = {
folders = {
sync = {
path = "~/sync";
path = "${config.home.homeDirectory}/sync";
label = "sync";
devices = builtins.attrNames syncDevices;
};
bruno = {
path = "~/dev/bruno";
path =
if config.facts.machine.name == "orion" then
"${config.home.homeDirectory}/bruno"
else
"${config.xdg.userDirs.projects}/bruno";
label = "bruno";
devices = builtins.attrNames syncDevices;
};
modules/capabilities/terminal.nix
+10 -13
View File
@@ -1,6 +1,7 @@
{ lib, config, ... }:
let
facts = config.facts;
kanagawa = import ./_kanagawa.nix;
homeModules = config.flake.modules.homeManager;
kittySingleInstance =
pkgs:
@@ -25,13 +26,12 @@ in
...
}:
let
palette = facts.theme.kanagawa.palette;
palette = kanagawa.palette;
hex = lib.removePrefix "#";
in
{
programs.foot = {
enable = true;
package = pkgs.foot;
settings = {
main = {
font = "JetBrains Mono:style=Medium:size=11:fontfeatures=-liga:fontfeatures=-calt";
@@ -86,7 +86,7 @@ in
flake.modules.homeManager.terminal-kitty =
{ pkgs, ... }:
let
theme = facts.theme.kanagawa;
theme = kanagawa;
palette = theme.palette;
kitty = kittySingleInstance pkgs;
in
@@ -167,11 +167,11 @@ in
};
flake.modules.homeManager.primary-terminal-foot =
{ lib, pkgs, ... }:
{ config, lib, ... }:
{
imports = [ config.flake.modules.homeManager.terminal-foot ];
imports = [ homeModules.terminal-foot ];
facts.desktop.terminalCommand = lib.getExe pkgs.foot;
desktop.commands.terminal = [ (lib.getExe config.programs.foot.package) ];
xdg.terminal-exec = {
enable = true;
@@ -180,14 +180,11 @@ in
};
flake.modules.homeManager.primary-terminal-kitty =
{ lib, pkgs, ... }:
let
kitty = kittySingleInstance pkgs;
in
{ config, lib, ... }:
{
imports = [ config.flake.modules.homeManager.terminal-kitty ];
imports = [ homeModules.terminal-kitty ];
facts.desktop.terminalCommand = lib.getExe kitty;
desktop.commands.terminal = [ (lib.getExe config.programs.kitty.package) ];
xdg.terminal-exec = {
enable = true;
modules/capabilities/theme.nix
+22 -47
View File
@@ -1,58 +1,36 @@
{
config,
...
}:
{ config, ... }:
let
facts = config.facts;
hmModules = config.flake.modules.homeManager;
mkCursorTheme =
pkgs:
facts.theme.cursor
// {
package = pkgs.${facts.theme.cursor.packageName};
};
cursor = {
name = "phinger-cursors-light";
packageName = "phinger-cursors";
size = 24;
};
mkCursor = pkgs: cursor // { package = pkgs.${cursor.packageName}; };
in
{
flake.modules.nixos.theme =
{
pkgs,
...
}:
{ pkgs, ... }:
let
cursorTheme = mkCursorTheme pkgs;
cursorTheme = mkCursor pkgs;
in
{
home-manager.sharedModules = [ hmModules.theme ];
environment.systemPackages = [ cursorTheme.package ];
services.displayManager.sddm.settings = {
Theme = {
CursorTheme = cursorTheme.name;
CursorSize = cursorTheme.size;
};
};
};
flake.modules.homeManager.theme =
{ config, pkgs, ... }:
{ pkgs, ... }:
let
theme = facts.theme;
cursorTheme = mkCursorTheme pkgs;
kanagawaThemeSrc = pkgs.fetchFromGitHub {
inherit (theme.kanagawa)
hash
owner
repo
rev
;
};
kanagawaOverride = {
version = theme.kanagawa.version;
src = kanagawaThemeSrc;
cursorTheme = mkCursor pkgs;
version = "unstable-2025-10-23";
src = pkgs.fetchFromGitHub {
owner = "Fausto-Korpsvart";
repo = "Kanagawa-GKT-Theme";
rev = "55ca4ba249eba21f861b9866b71ab41bb8930318";
hash = "sha256-UdMoMx2DoovcxSp/zBZ3PRv/Qpj+prd0uPm1gmdak2E=";
};
override = { inherit src version; };
in
{
home.pointerCursor = {
@@ -68,17 +46,14 @@ in
gtk = {
enable = true;
gtk3.bookmarks = [
"sftp://orion Orion VPS"
];
theme = {
name = theme.kanagawa.gtkThemeName;
package = pkgs.kanagawa-gtk-theme.overrideAttrs (_: kanagawaOverride);
name = "Kanagawa-BL-LB";
package = pkgs.kanagawa-gtk-theme.overrideAttrs (_: override);
};
gtk4.theme = null;
iconTheme = {
name = theme.kanagawa.iconThemeName;
package = pkgs.kanagawa-icon-theme.overrideAttrs (_: kanagawaOverride);
name = "Kanagawa";
package = pkgs.kanagawa-icon-theme.overrideAttrs (_: override);
};
};
modules/capabilities/walker.nix
+16 -23
View File
@@ -3,7 +3,9 @@ let
homeModules = config.flake.modules.homeManager;
in
{
flake.modules.nixos.walker-cache = {
flake.modules.nixos.walker = {
home-manager.sharedModules = [ homeModules.walker ];
nix.settings = {
extra-substituters = [
"https://walker.cachix.org"
@@ -16,14 +18,22 @@ in
};
};
flake.modules.homeManager.walker-base =
{
config,
...
}:
flake.modules.homeManager.walker =
{ lib, pkgs, ... }:
let
launcher = pkgs.writeShellApplication {
name = "walker-launcher";
runtimeInputs = [ pkgs.libressl.nc ];
text = ''
exec nc -U "$XDG_RUNTIME_DIR/walker/walker.sock"
'';
};
in
{
imports = [ inputs.walker.homeManagerModules.default ];
desktop.commands.launcher = [ (lib.getExe launcher) ];
programs.walker = {
enable = true;
runAsService = true;
@@ -36,21 +46,4 @@ in
];
};
};
flake.modules.homeManager.primary-launcher-walker =
{
config,
lib,
pkgs,
...
}:
{
imports = [ homeModules.walker-base ];
facts.desktop.launcherCommand = [
(lib.getExe' pkgs.libressl.nc "nc")
"-U"
"/run/user/1000/walker/walker.sock"
];
};
}
modules/capabilities/yookr-dev.nix
+7 -2
View File
@@ -3,8 +3,13 @@
{ config, ... }:
{
security.pki.certificateFiles = [
../hosts/zenith/mkcert-rootCA.pem
../hosts/polaris/mkcert-rootCA.pem
./yookr-dev/zenith-rootCA.pem
./yookr-dev/polaris-rootCA.pem
];
networking.firewall.allowedTCPPorts = [
5173
5174
];
networking.extraHosts = ''
modules/capabilities/yookr-dev/polaris-rootCA.pem
+26
View File
@@ -0,0 +1,26 @@
-----BEGIN CERTIFICATE-----
MIIEeTCCAuGgAwIBAgIQfVRHKMDYi6CwYW2V9xAZXjANBgkqhkiG9w0BAQsFADBV
MR4wHAYDVQQKExVta2NlcnQgZGV2ZWxvcG1lbnQgQ0ExFTATBgNVBAsMDGtpcmlA
cG9sYXJpczEcMBoGA1UEAwwTbWtjZXJ0IGtpcmlAcG9sYXJpczAeFw0yNjA3MTAy
MDAyMzZaFw0zNjA3MTAyMDAyMzZaMFUxHjAcBgNVBAoTFW1rY2VydCBkZXZlbG9w
bWVudCBDQTEVMBMGA1UECwwMa2lyaUBwb2xhcmlzMRwwGgYDVQQDDBNta2NlcnQg
a2lyaUBwb2xhcmlzMIIBojANBgkqhkiG9w0BAQEFAAOCAY8AMIIBigKCAYEAtjZR
dUXirk/gMKXD58D+SbGHZIMKvRbWg1xPMWoXpPZWfu8XDuCYV0LSzOb2bWxSV2bo
zb2tgUVyxwwsBS1UyOkYiGREz+s/0O2drHPDZCxvw1xPbAIIO8CsxWbpyNV/CMpQ
NDH7DRvNJ19K49wvB2B9/K3iVipK55Sz7oCUZnbfkFQ887K4u+m7HvYhyagKX/Wc
NCFYOxDexABozIiGnP42RjziBZxOxARnIpqyWixqSY8JpDmy5QsAeZDikpckLh36
yU8GORVMCy2J6gBd7IW9+iIyCtHi7p5uGJAB94wCgQpiJ9W5/L1rFh3IhGK2HIdd
UmIArNRoL17NAYnxeYV+Ew6dsKXXNIpHu6tWLoscu4tXZO8njSz8c9nuYYFlsgM+
exDpcOCMrRny4P3QAsrRWJPXfxfmvcthWas0fWnM2G1bFvOQ0p0FXb/dfh/+qlLZ
BFxgeys2stfyH0qKsA1074CGJ+3rHfQDnVasT0bZdEoySSOLnvvnfyEVYIF/AgMB
AAGjRTBDMA4GA1UdDwEB/wQEAwICBDASBgNVHRMBAf8ECDAGAQH/AgEAMB0GA1Ud
DgQWBBT7QjaWKqbU38Su80x41Ao3c00vxTANBgkqhkiG9w0BAQsFAAOCAYEAc+ft
ZuKFXK+3GwMgisy3223GbjqzW/PpvlUaG5wQMUZyrJd7ejbLY8ot6lfTH3EUtq/D
11IxMAXbjwV5bjzURS2E33b22RT/e/+m3I9pgTITipbHcwfEj6VINsIn3dpsxXbx
uiZaq9RF7LiyhttWBR8qCL9XJaKTYbVc8pr+Rdi5TJr7TA9Dtlzo0ZaF3QFW0/kw
oh0tOoIx4vQ7szl7imtri+Ym4CBgGP3S4gToNrpleJaAg4wQgwoMC/ZY9BO2SQ0P
5hic5yy0fw2XgStGRsxuMhI95BXhXEqGCPvoE5mRXe8ze3kh6Pa/2LlfwSU0fk7E
nKxT20AY4EAu1Eq1nzYCqQMyzRw2g6p6xXSe/CSPa6HazHe/MS6jBDZqhHUKIHGo
N4s1776ibjUbMN6kqtfqEJZKdzkcsFYPJMhwSFktEU76s00SHnJhuQ8FwA/MOmal
090f0qcX3EdwbJWMs+gP03R6Dq9ZQPFc6bWeGig7sf8+DN2ZPPa9YeFhQpdB
-----END CERTIFICATE-----
modules/capabilities/yookr-dev/zenith-rootCA.pem
+26
View File
@@ -0,0 +1,26 @@
-----BEGIN CERTIFICATE-----
MIIEdjCCAt6gAwIBAgIRAOJuuQ6BjvYPVrr3/QgaFz0wDQYJKoZIhvcNAQELBQAw
UzEeMBwGA1UEChMVbWtjZXJ0IGRldmVsb3BtZW50IENBMRQwEgYDVQQLDAtraXJp
QHplbml0aDEbMBkGA1UEAwwSbWtjZXJ0IGtpcmlAemVuaXRoMB4XDTI2MDcxNjA3
MTQ0M1oXDTM2MDcxNjA3MTQ0M1owUzEeMBwGA1UEChMVbWtjZXJ0IGRldmVsb3Bt
ZW50IENBMRQwEgYDVQQLDAtraXJpQHplbml0aDEbMBkGA1UEAwwSbWtjZXJ0IGtp
cmlAemVuaXRoMIIBojANBgkqhkiG9w0BAQEFAAOCAY8AMIIBigKCAYEAn6JVWaP9
1f+NjudJPWnvMxEJyqYQuQBpMd/6O8XCBjp0LVcKl3sub/tieK4LEJhDHxDw6K7h
I8ZByu7WOpbKCJ59fDyOR2nauo7z443dJLZtqQEfaqVhyvungVFEwEskJWYWK9a4
vCYb0C1096WRd0sT2QEWGWzwc45Q6NG18RXQ7NDM6ou8wiUZXHfd0JDhOmWYwDC1
f123uQBCaZgstb/2PclB7v/ubpZEks1Zsi5kgek3fmspzSHpYN3sjfK9nydl8xBW
5Mv6Qq27BPBZpeFdDIQHB/xwRSFBUwvfwNoYN1Mpk5vwNp97u7Kqxk/zIAvwZd52
QS4WbZobHxC0pOL6opxEweuPELnSmr9xngjOAix3bJIZAv+PrrjOM2mrBjRQCzmu
dxkRUA7PTazzUhFvE6aTfJcDU99Wig+aBLrfe8/FHzSER54+f2LsF+kyoZx3qhJM
hPvgMjRuDG8aVHNEW++sjXOi1l/8YravH+wbiHIY0J/rwlRAqpfkzKg3AgMBAAGj
RTBDMA4GA1UdDwEB/wQEAwICBDASBgNVHRMBAf8ECDAGAQH/AgEAMB0GA1UdDgQW
BBSoh/jhmHEsqe0PODpM/Zshi8wJDzANBgkqhkiG9w0BAQsFAAOCAYEANpe6D8+b
O1SEd1NUiyssPBCgKtx88vvV7P1a3a1askanm7Qq64byrMzs0a5ukU4Be4xOaPlz
o+s4Nk23PYbBHf+uZW4nq5b3eLGIPK17xtToEJlMZoWZx7E960Iql4fywFpt+how
U9K0GMPC8OIOCSkwuhvozrwoyxnErc3lVhTf16DOAYoiMvpH62kk3aSqkqL89hgh
jiMzwhzD9LgNBSq+tyHQMLPAEvwNWOI2U1tDErCcCDia7faP0ppLqpCfd7FAeCBT
DsWpU4eXALbHwljQyzkz5U30GU+UoQAuyKfmWyu5Mwywdvwo94xH/YdkWxr3MqUy
cLEkvuX5dgPHhm8xJs5NqHe6qP4yf0SbiZ8IFtwt1YRchTx2tHDDFfVuFb80KDFp
9wGQ/DoO6Qs8J8QPdCHPh/wsIojgJtw2RO/JmcLEYBJnU9egn6Iko5Ih0YgnVgyw
KrBe9F9HPKJ9CT7s/DrR5rySyomZt0VwFbug7rFeJ4h35M1Nwm81E6Ux
-----END CERTIFICATE-----
modules/capabilities/hidraw-access.nix → modules/capabilities/yunzi-b75-pro.nix
+1 -1
View File
@@ -1,5 +1,5 @@
{
flake.modules.nixos.hidraw-access = {
flake.modules.nixos.yunzi-b75-pro = {
services.udev.extraRules = ''
# ROYUAN YUNZII B75 PRO
KERNEL=="hidraw*", SUBSYSTEM=="hidraw", ATTRS{idVendor}=="3151", ATTRS{idProduct}=="4015", MODE="0660", GROUP="users"