nixy: update syntax for 25.11, add userborn service

This commit is contained in:
2025-12-01 14:13:13 +01:00
parent 262afbacee
commit 63597639c9

View File

@@ -1,5 +1,4 @@
{ config { config
, nix-xilinx
, nvim , nvim
, pkgs , pkgs
, system , system
@@ -12,11 +11,11 @@ in
{ {
imports = [ ]; imports = [ ];
system.stateVersion = "23.05"; system = {
system.autoUpgrade.enable = false; stateVersion = "23.05";
system.switch = { autoUpgrade.enable = false;
enable = true; #etc.overlay.enable = true;
enableNg = true; nixos-init.enable = true;
}; };
sops = { sops = {
@@ -101,7 +100,7 @@ in
enable = true; enable = true;
memtest86.enable = true; memtest86.enable = true;
}; };
readOnlyNixStore = true; nixStoreMountOpts = [ "ro" ];
supportedFilesystems = [ supportedFilesystems = [
"xfs" "xfs"
]; ];
@@ -205,7 +204,6 @@ in
nixpkgs.config.allowUnfree = true; nixpkgs.config.allowUnfree = true;
nixpkgs.overlays = [ nixpkgs.overlays = [
nix-xilinx.overlay
nvim.overlays.${system}.overlay nvim.overlays.${system}.overlay
]; ];
environment = { environment = {
@@ -256,8 +254,8 @@ in
# List services that you want to enable: # List services that you want to enable:
systemd = { systemd = {
#sysusers.enable = true;
services = { services = {
# Fix issue where systemd-vconsole-setup failes to find keymap # Fix issue where systemd-vconsole-setup failes to find keymap
systemd-vconsole-setup = { systemd-vconsole-setup = {
unitConfig = { unitConfig = {
@@ -294,9 +292,9 @@ in
description = "wg network interface"; description = "wg network interface";
bindsTo = [ "netns@wg.service" ]; bindsTo = [ "netns@wg.service" ];
requires = [ "network-online.target" ]; requires = [ "network-online.target" ];
wants = [ "dnscrypt-proxy2_proton.service" ]; wants = [ "dnscrypt-proxy_proton.service" ];
after = [ "netns@wg.service" ]; after = [ "netns@wg.service" ];
before = [ "dnscrypt-proxy2_proton.service" ]; before = [ "dnscrypt-proxy_proton.service" ];
serviceConfig = { serviceConfig = {
Type = "oneshot"; Type = "oneshot";
RemainAfterExit = true; RemainAfterExit = true;
@@ -326,7 +324,7 @@ in
}; };
}; };
"dnscrypt-proxy2_proton" = { "dnscrypt-proxy_proton" = {
description = "DNSCrypt-proxy client proton"; description = "DNSCrypt-proxy client proton";
wants = [ wants = [
"network-online.target" "network-online.target"
@@ -339,7 +337,7 @@ in
AmbientCapabilities = "CAP_NET_BIND_SERVICE"; AmbientCapabilities = "CAP_NET_BIND_SERVICE";
CacheDirectory = "dnscrypt-proxy"; CacheDirectory = "dnscrypt-proxy";
DynamicUser = true; DynamicUser = true;
ExecStart = "${pkgs.dnscrypt-proxy}/bin/dnscrypt-proxy -config ${config.services.dnscrypt-proxy2.configFile}"; ExecStart = "${pkgs.dnscrypt-proxy}/bin/dnscrypt-proxy -config ${config.services.dnscrypt-proxy.configFile}";
LockPersonality = true; LockPersonality = true;
LogsDirectory = "dnscrypt-proxy"; LogsDirectory = "dnscrypt-proxy";
MemoryDenyWriteExecute = true; MemoryDenyWriteExecute = true;
@@ -379,10 +377,10 @@ in
}; };
coredump.enable = false; coredump.enable = false;
extraConfig = '' settings.Manager = {
DefaultTimeoutStartSec=30s DefaultTimeoutStartSec = "30s";
DefaultTimeoutStopSec=30s DefaultTimeoutStopSec = "30s";
''; };
}; };
services = { services = {
@@ -395,6 +393,7 @@ in
ntp.enable = true; ntp.enable = true;
openssh.enable = true; openssh.enable = true;
printing.enable = true; printing.enable = true;
userborn.enable = true;
pipewire = { pipewire = {
enable = true; enable = true;
@@ -497,7 +496,7 @@ in
]; ];
}; };
dnscrypt-proxy2 = { dnscrypt-proxy = {
enable = true; enable = true;
settings = { settings = {
ipv6_servers = true; ipv6_servers = true;
@@ -556,26 +555,10 @@ in
SystemMaxUse=50M SystemMaxUse=50M
''; '';
logind.extraConfig = '' logind.settings.Login = {
KillUserProcesses=yes KillUserProcesses = true;
''; };
seafile = {
enable = false;
initialAdminPassword = "admin";
adminEmail = "asmir.abdulahovic@gmail.com";
ccnetSettings = {
General = {
SERVICE_URL = "http://127.0.0.1:8020";
};
};
seafileSettings = {
fileserver = {
host = "0.0.0.0";
port = 8082;
};
};
};
}; };
fonts = { fonts = {
@@ -602,13 +585,12 @@ in
noto-fonts noto-fonts
noto-fonts-cjk-sans noto-fonts-cjk-sans
noto-fonts-color-emoji noto-fonts-color-emoji
noto-fonts-emoji
proggyfonts proggyfonts
siji siji
terminus_font terminus_font
terminus_font_ttf terminus_font_ttf
ubuntu_font_family ubuntu-classic
vistafonts vista-fonts
]; ];
}; };
@@ -640,6 +622,7 @@ in
enable = true; enable = true;
settings = { settings = {
General = { General = {
Experimental = true;
Enable = "Source,Sink,Media,Socket"; Enable = "Source,Sink,Media,Socket";
}; };
}; };