From 63597639c9a018d4134e2dd78f898283fce3a6f8 Mon Sep 17 00:00:00 2001
From: Asmir A <asmir.abdulahovic@gmail.com>
Date: Mon, 1 Dec 2025 14:13:13 +0100
Subject: [PATCH] nixy: update syntax for 25.11, add userborn service

---
 nixy/configuration.nix | 65 ++++++++++++++++--------------------------
 1 file changed, 24 insertions(+), 41 deletions(-)

diff --git a/nixy/configuration.nix b/nixy/configuration.nix
index 7ede2f7..8d285aa 100644
--- a/nixy/configuration.nix
+++ b/nixy/configuration.nix
@@ -1,5 +1,4 @@
 { config
-, nix-xilinx
 , nvim
 , pkgs
 , system
@@ -7,16 +6,16 @@
 , ...
 }:
 let
-  USER = "akill";
+    USER = "akill";
 in
 {
   imports = [ ];
 
-  system.stateVersion = "23.05";
-  system.autoUpgrade.enable = false;
-  system.switch = {
-    enable = true;
-    enableNg = true;
+  system = {
+    stateVersion = "23.05";
+    autoUpgrade.enable = false;
+    #etc.overlay.enable = true;
+    nixos-init.enable = true;
   };
 
   sops = {
@@ -101,7 +100,7 @@ in
       enable = true;
       memtest86.enable = true;
     };
-    readOnlyNixStore = true;
+    nixStoreMountOpts = [ "ro" ];
     supportedFilesystems = [
       "xfs"
     ];
@@ -205,7 +204,6 @@ in
 
   nixpkgs.config.allowUnfree = true;
   nixpkgs.overlays = [
-    nix-xilinx.overlay
     nvim.overlays.${system}.overlay
   ];
   environment = {
@@ -256,8 +254,8 @@ in
 
   # List services that you want to enable:
   systemd = {
+    #sysusers.enable = true;
     services = {
-
       # Fix issue where systemd-vconsole-setup failes to find keymap
       systemd-vconsole-setup = {
         unitConfig = {
@@ -294,9 +292,9 @@ in
         description = "wg network interface";
         bindsTo = [ "netns@wg.service" ];
         requires = [ "network-online.target" ];
-        wants = [ "dnscrypt-proxy2_proton.service" ];
+        wants = [ "dnscrypt-proxy_proton.service" ];
         after = [ "netns@wg.service" ];
-        before = [ "dnscrypt-proxy2_proton.service" ];
+        before = [ "dnscrypt-proxy_proton.service" ];
         serviceConfig = {
           Type = "oneshot";
           RemainAfterExit = true;
@@ -326,7 +324,7 @@ in
         };
       };
 
-      "dnscrypt-proxy2_proton" = {
+      "dnscrypt-proxy_proton" = {
         description = "DNSCrypt-proxy client proton";
         wants = [
           "network-online.target"
@@ -339,7 +337,7 @@ in
           AmbientCapabilities = "CAP_NET_BIND_SERVICE";
           CacheDirectory = "dnscrypt-proxy";
           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;
           LogsDirectory = "dnscrypt-proxy";
           MemoryDenyWriteExecute = true;
@@ -379,10 +377,10 @@ in
     };
 
     coredump.enable = false;
-    extraConfig = ''
-      DefaultTimeoutStartSec=30s
-      DefaultTimeoutStopSec=30s
-    '';
+    settings.Manager = {
+      DefaultTimeoutStartSec = "30s";
+      DefaultTimeoutStopSec = "30s";
+    };
   };
 
   services = {
@@ -395,6 +393,7 @@ in
     ntp.enable = true;
     openssh.enable = true;
     printing.enable = true;
+    userborn.enable = true;
 
     pipewire = {
       enable = true;
@@ -497,7 +496,7 @@ in
       ];
     };
 
-    dnscrypt-proxy2 = {
+    dnscrypt-proxy = {
       enable = true;
       settings = {
         ipv6_servers = true;
@@ -556,26 +555,10 @@ in
       SystemMaxUse=50M
     '';
 
-    logind.extraConfig = ''
-      KillUserProcesses=yes
-    '';
-
-    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;
-        };
-      };
+    logind.settings.Login = {
+      KillUserProcesses = true;
     };
+
   };
 
   fonts = {
@@ -602,13 +585,12 @@ in
       noto-fonts
       noto-fonts-cjk-sans
       noto-fonts-color-emoji
-      noto-fonts-emoji
       proggyfonts
       siji
       terminus_font
       terminus_font_ttf
-      ubuntu_font_family
-      vistafonts
+      ubuntu-classic
+      vista-fonts
     ];
   };
 
@@ -640,6 +622,7 @@ in
       enable = true;
       settings = {
         General = {
+          Experimental = true;
           Enable = "Source,Sink,Media,Socket";
         };
       };