reorganize and fix searxng

flake.nix

@@ -58,7 +58,7 @@
             );
 
         homes = let 
-            dir = builtins.readDir ./system/users;
+            dir = builtins.readDir ./homes;
             filtered = builtins.filter (x: dir.${x} == "directory") (builtins.attrNames dir);
         in (builtins.listToAttrs 
             (builtins.map 
@@ -67,7 +67,7 @@
                         
                     value = { ... } @ exputs: {
                         imports = [
-                            (./system/users/${name}/home-manager (inputs // exputs))
+                            (./homes/${name}/home-manager (inputs // exputs))
                         ];
                     };
                 })) filtered)

homes/nathan/flake.nix

@@ -4,10 +4,10 @@
 
     inputs = {
 
-        nixpkgs.url = "github:nixos/nixpkgs/nixos-25.05";
+        nixpkgs.url = "github:nixos/nixpkgs/nixos-25.11";
 
         home-manager = {
-            url = "github:nix-community/home-manager/release-25.05";
+            url = "github:nix-community/home-manager/release-25.11";
             inputs.nixpkgs.follows = "nixpkgs";
         };
 

homes/nathan/home.nix

@@ -1,11 +1,11 @@
-{ ... }:
+{ lib, ... }:
 
 {
 
     config = {                    
         homeconfig = {
-            graphical = false;
+            graphical = lib.mkDefault false;
-            minimal = false;
+            minimal = lib.mkDefault false;
         };
     };
  }

system/users/default.nix

@@ -6,11 +6,7 @@
         (file: (dir.${file} == "directory"))
         (builtins.attrNames dir)
     );
-
+    
-    /*imports = [
-        ./nathan
-    ];*/
-
     options.sysconfig = with lib; {
         
         sshHostKeys = lib.mkOption {

system/users/nathan/default.nix

@@ -1,5 +1,24 @@
-{ ... }: {
+{ config, lib, pkgs, ... }: {
-    imports = [
+
-        ./system
+    config = lib.mkIf (
-    ];
+        config.sysconfig.users ? nathan && config.sysconfig.users.nathan.usePresets
+    ) {
+            
+        sops.secrets."nathan/pass".neededForUsers = true;
+
+        users.users.nathan = {
+            shell = lib.mkDefault pkgs.zsh;
+            name = lib.mkDefault "nathan";
+            isNormalUser = lib.mkDefault true;
+            #hashedPasswordFile = lib.mkIf (cfg.hashedPasswordFile != null) cfg.hashedPasswordFile;
+            extraGroups = [ "networkmanager" "docker" ];
+            openssh.authorizedKeys.keys = with config.sysconfig.users.nathan; lib.mkIf config.sysconfig.services.openssh.enable (
+                ssh.keys ++ (map (z: config.sysconfig.sshHostKeys.${z}) ssh.hosts)
+            );
+            packages = lib.mkIf (
+                config.sysconfig.users.nathan.home-manager.enable && config.sysconfig.users.nathan.home-manager.standalone
+            ) [ pkgs.home-manager ];
+
+        };
+    };
 }

system/users/nathan/system/default.nix

@@ -1,19 +0,0 @@
-{ config, lib, pkgs, ... }: {
-
-    config = with config.sysconfig; 
-    lib.mkIf (users ? nathan && users.nathan.usePresets) {
-            
-        sops.secrets."nathan/pass".neededForUsers = true;
-
-        users.users.nathan = {
-            shell = lib.mkDefault pkgs.zsh;
-            name = lib.mkDefault "nathan";
-            isNormalUser = lib.mkDefault true;
-            #hashedPasswordFile = lib.mkIf (cfg.hashedPasswordFile != null) cfg.hashedPasswordFile;
-            extraGroups = [ "networkmanager" "docker" ];
-            openssh.authorizedKeys.keys = with config.sysconfig.users.nathan; lib.mkIf config.sysconfig.services.openssh.enable (ssh.keys ++ (map (z: config.sysconfig.sshHostKeys.${z}) ssh.hosts));
-            packages = lib.mkIf (config.sysconfig.users.nathan.home-manager.enable && config.sysconfig.users.nathan.home-manager.standalone) [ pkgs.home-manager ];
-
-        };
-    };
-}

system/virtualization/default.nix

@@ -6,4 +6,13 @@
         (file: (dir.${file} == "directory"))
         (builtins.attrNames dir)
     );
+
+    config = {
+        programs.virt-manager.enable = true;
+
+        virtualisation.libvirtd.enable = true;
+
+        virtualisation.spiceUSBRedirection.enable = true;
+    };
+
 }

system/virtualization/docker/searxng/default.nix

@@ -13,6 +13,8 @@
             };
         };
 
+        environment.etc."searxng/settings.yml".source = ./settings.yml;
+
         virtualisation.oci-containers.containers.searxng = {
             image = "searxng/searxng:latest";
 
@@ -45,6 +47,7 @@
             volumes = [
                 "vol_searxng_settings:/etc/searxng/"
                 "vol_searxng_data:/var/cache/searxng/"
+                "/etc/searxng/settings.yml:/etc/searxng/settings.yml"
             ];
 
             environment = {