fixes & cleanup

flake.nix

@@ -36,16 +36,31 @@
     };
   };
 
-  outputs = inputs:
+  outputs =
+    inputs:
     let
       lib = inputs.nixpkgs.lib;
-      linuxSystems = [ "x86_64-linux" "aarch64-linux" ];
+      supportedSystems = [
-      supportedSystems = linuxSystems ++ [ "x86_64-darwin" "aarch64-darwin" ];
+        "x86_64-linux"
+        "aarch64-linux"
+        "x86_64-darwin"
+        "aarch64-darwin"
+      ];
+      linuxSystems = [
+        "x86_64-linux"
+        "aarch64-linux"
+      ];
+      forEachSystem = lib.genAttrs;
       overlays = import ./overlays { inherit inputs; };
-      mkPkgs = system:
+      mkPkgs =
+        system:
         import inputs.nixpkgs {
           inherit system;
-          inherit overlays;
+          overlays = overlays ++ [
+            (final: prev: {
+              custom = import ./packages { pkgs = final; };
+            })
+          ];
           config.allowUnfree = true;
         };
       gen = import ./generator.nix { inherit inputs mkPkgs supportedSystems; };
@@ -59,14 +74,40 @@
           && builtins.pathExists (systemsDir + "/${name}/cfg.nix")
         ) (builtins.readDir systemsDir)
       );
-      hostsByType = systemType:
+      hostsByType =
-        lib.filter (host: ((import (systemsDir + "/${host}/cfg.nix")).syscfg.type or "nixos") == systemType) systemNames;
+        systemType:
-      generateHosts = systemType:
+        lib.filter (host: (import (systemsDir + "/${host}/cfg.nix")).syscfg.type == systemType) systemNames;
-        lib.genAttrs (hostsByType systemType) (host: gen.generate { inherit host; });
+      generateHosts =
-    in {
+        systemType: lib.genAttrs (hostsByType systemType) (host: gen.generate { inherit host; });
+      flattenPackages =
+        prefix: attrs:
+        lib.concatMapAttrs (
+          name: value:
+          let
+            packageName = lib.concatStringsSep "-" (prefix ++ [ name ]);
+            defaultPackageName = lib.concatStringsSep "-" prefix;
+          in
+          if lib.isDerivation value then
+            {
+              "${if name == "default" && prefix != [ ] then defaultPackageName else packageName}" = value;
+            }
+          else if lib.isAttrs value then
+            flattenPackages (if name == "default" then prefix else prefix ++ [ name ]) value
+          else
+            { }
+        ) attrs;
+      mkPackages =
+        system:
+        let
+          pkgs = mkPkgs system;
+        in
+        lib.optionalAttrs pkgs.stdenv.isLinux (flattenPackages [ ] pkgs.custom);
+    in
+    {
+      packages = forEachSystem linuxSystems mkPackages;
       devShells = import ./shells {
         inherit inputs mkPkgs;
-        systems = linuxSystems;
+        supportedSystems = linuxSystems;
       };
 
       nixosConfigurations = generateHosts "nixos";

generator.nix

@@ -1,6 +1,12 @@
-{ inputs, mkPkgs, supportedSystems, ... }:
 {
-  generate = { host }:
+  inputs,
+  mkPkgs,
+  supportedSystems,
+  ...
+}:
+{
+  generate =
+    { host }:
     let
       syscfg = import ./systems/${host}/cfg.nix;
       nameValuePair = name: value: { inherit name value; };
@@ -12,76 +18,85 @@
           home = "x86_64-linux";
         }
         .${systemType} or (throw "Unsupported system type: ${systemType}");
-      requestedSystem = syscfg.syscfg.system or defaultSystem;
+      system = syscfg.syscfg.system or defaultSystem;
-      system =
+      checkedSystem =
-        if builtins.elem requestedSystem supportedSystems then
+        if builtins.elem system supportedSystems then
-          requestedSystem
+          system
         else
-          throw "Unsupported system '${requestedSystem}' for host '${host}'";
+          throw "Unsupported system '${system}' for host '${host}'";
-      users = syscfg.syscfg.users or [ ];
+      pkgs = mkPkgs checkedSystem;
-      mkLinuxHomeImports =
-        userConfig:
-        [
-          ./modules/shared/syscfg
-          ./modules/shared/colors
-          ./modules/home
-          syscfg
-          { usercfg = userConfig; }
-          inputs.nix-colors.homeManagerModule
-          inputs.sops-nix.homeManagerModules.sops
-        ];
-      mkDarwinHomeImports = [ inputs.nix-colors.homeManagerModule inputs.sops-nix.homeManagerModules.sops ];
-      mkHomeUsers = importsForUser:
-        builtins.listToAttrs (
-          map (userConfig: nameValuePair userConfig.username { imports = importsForUser userConfig; }) users
-        );
-      mkHomeManager = importsForUser: {
-        home-manager.useGlobalPkgs = true;
-        home-manager.useUserPackages = true;
-        home-manager.extraSpecialArgs = { inherit inputs; };
-        home-manager.users = mkHomeUsers importsForUser;
-      };
-      sharedModules = [
-        ./modules/shared/syscfg
-        ./modules/shared/sops
-        syscfg
-        ./systems/${host}
-      ];
-      defaultUser =
-        builtins.head (
-          builtins.filter (user: user.username == syscfg.syscfg.defaultUser) users
-          ++ [ { username = syscfg.syscfg.defaultUser; } ]
-        );
     in
     (
       {
         "nixos" = inputs.nixpkgs.lib.nixosSystem {
-          inherit system;
+          system = checkedSystem;
           specialArgs = { inherit inputs; };
-          modules = sharedModules ++ [
+          modules = [
+            ./modules/shared/syscfg
+            ./modules/shared/sops
             ./modules/nixos
+            syscfg
+            ./systems/${host}
             inputs.sops-nix.nixosModules.sops
             inputs.home-manager.nixosModules.home-manager
 
             inputs.nixos-wsl.nixosModules.wsl
             inputs.vscode-server.nixosModules.default
 
-            (mkHomeManager mkLinuxHomeImports)
+            {
+              home-manager.useGlobalPkgs = true;
+              home-manager.useUserPackages = true;
+              home-manager.extraSpecialArgs = { inherit inputs; };
+              home-manager.users = builtins.listToAttrs (
+                map (
+                  userConfig:
+                  nameValuePair userConfig.username {
+                    imports = [
+                      ./modules/shared/syscfg
+                      ./modules/shared/colors
+                      ./modules/home
+                      syscfg
+                      { usercfg = userConfig; }
+                      inputs.nix-colors.homeManagerModule
+                      inputs.sops-nix.homeManagerModules.sops
+                    ];
+                  }
+                ) (syscfg.syscfg.users or [ ])
+              );
+            }
           ];
         };
 
         "macos" = inputs.darwin.lib.darwinSystem {
-          inherit system;
+          system = checkedSystem;
-          modules = sharedModules ++ [
+          modules = [
+            ./modules/shared/syscfg
+            ./modules/shared/sops
+            syscfg
+            ./systems/${host}
             inputs.sops-nix.darwinModules.sops
             inputs.home-manager.darwinModules.home-manager
-            (mkHomeManager (_: mkDarwinHomeImports))
+            {
+              home-manager.useGlobalPkgs = true;
+              home-manager.useUserPackages = true;
+              home-manager.extraSpecialArgs = { inherit inputs; };
+              home-manager.users = builtins.listToAttrs (
+                map (
+                  userConfig:
+                  nameValuePair userConfig.username {
+                    imports = [
+                      inputs.nix-colors.homeManagerModule
+                      inputs.sops-nix.homeManagerModules.sops
+                    ];
+                  }
+                ) (syscfg.syscfg.users or [ ])
+              );
+            }
           ];
         };
         "home" = inputs.home-manager.lib.homeManagerConfiguration {
-          pkgs = mkPkgs system;
+          inherit pkgs;
-          extraSpecialArgs = { inherit inputs; };
+          modules = [ ./modules/home ];
-          modules = mkLinuxHomeImports defaultUser;
         };
         _ = throw "Unsupported system";
       }

modules/home/base/default.nix

@@ -1,16 +1,12 @@
-{ lib, config, pkgs, ... }: {
+{ lib, config, ... }: {
 
   #environment.sessionVariables.SOPS_AGE_KEY_FILE = keyFilePath;
-  systemd.user.startServices = lib.mkIf pkgs.stdenv.isLinux "sd-switch";
+  systemd.user.startServices = "sd-switch";
   programs.home-manager.enable = true;
 
   home = {
     username = "${config.usercfg.username}";
-    homeDirectory =
+    homeDirectory = "/home/${config.usercfg.username}";
-      if pkgs.stdenv.isDarwin then
-        "/Users/${config.usercfg.username}"
-      else
-        "/home/${config.usercfg.username}";
 
     stateVersion = "26.05";
   };

modules/home/cli/fastfetch/default.nix

@@ -28,7 +28,7 @@ let
   logoColor1 = p.base07;
   logoColor2 = p.base07;
   # ─────────────────────────────────────────────────────────────────────────
-in lib.mkIf config.syscfg.make.gui {
+in {
   home.packages = with pkgs; [ fastfetch ];
   xdg.configFile."neofetch/config.conf".source = ./config.conf;
   xdg.configFile."fastfetch/logo.txt".source = ./logo.txt;

modules/home/cli/kitty/default.nix

@@ -1,5 +1,5 @@
-{ config, lib, ... }: {
+{ config, ... }: {
-  programs.kitty = lib.mkIf config.syscfg.make.gui {
+  programs.kitty = {
     enable = true;
     settings = {
       foreground = "#${config.colorScheme.palette.base07}";

modules/home/cli/other/default.nix

@@ -1,16 +1,16 @@
-{ config, lib, pkgs, ... }: {
+{ pkgs, ... }: {
   home.packages = with pkgs; [
     ripgrep
     unzip
 
     socat
 
+    appimage-run
+
     cbonsai
     pipes-rs
     cmatrix
     #cava
     sl
-  ] ++ lib.optionals (config.syscfg.make.gui || config.syscfg.make.develop) [
-    pkgs.appimage-run
   ];
 }

modules/home/gui/apps/develop/vscodium/default.nix

@@ -1,22 +1,18 @@
-{ lib, config, pkgs, ... }: 
+{ lib, config, pkgs, ... }: {
-let
-  exts = with pkgs.vscode-extensions; [
-    bbenoist.nix
-    esbenp.prettier-vscode
-
-    anthropic.claude-code
-    # openai.codex
-  ];
-in {
 
   config = lib.mkIf (config.syscfg.make.develop) {
     programs.vscodium = {
       enable = true;
-      profiles.default.extensions = exts;
+      #profiles.default = {
-    };
+        profiles.default.extensions = with pkgs.vscode-extensions; [
-    programs.antigravity = {
+          bbenoist.nix
-      enable = true;
+          esbenp.prettier-vscode
-      profiles.default.extensions = exts;
+          golang.go
+          ms-python.vscode-pylance
+          ms-vscode.cpptools
+          dbaeumer.vscode-eslint
+        ];
+      #};
     };
   };
 }

modules/home/gui/apps/images/default.nix

@@ -4,9 +4,8 @@
     programs.imv.enable = true;
 
     programs.obs-studio.enable = true;
-    services.jellyfin-mpv-shim.enable = true;
 
-    home.packages = with pkgs; [ krita gimp darktable ];
+    home.packages = with pkgs; [ jellyfin-mpv-shim krita gimp darktable ];
   };
 
 }

modules/home/gui/apps/mpv/default.nix

@@ -6,11 +6,13 @@ in{
   config = lib.mkIf (config.syscfg.make.gui) {
     programs.mpv = {
       enable = true;
-      scripts = with pkgs.mpvScripts; [ mpris ];
+      scripts = with pkgs.mpvScripts; [ mpris modernz ];
       config = {
         hwdec ="auto";
         profile ="high-quality";
         ytdl-format = "bestvideo+bestaudio";
+        osc ="no";
+
       };
 
       bindings =

modules/home/wayland/apps/kanshi/default.nix

@@ -18,7 +18,7 @@ let
   aocT = "AOC 24E1W1 GNSKCHA086899";
   aocB = "AOC 24E1W1 GNSKBHA080346";
   lgM = "LG Electronics LG ULTRAGEAR+ 511NTDVGC194";
-  valinorM = "Lenovo Group Limited *";
+
 in {
 
   config = lib.mkIf (config.usercfg.wm == "Wayland") {
@@ -42,9 +42,17 @@ in {
           mode = "1920x1080@60.000";
         };}
         {output = baseOutput//{
-          criteria = "Lenovo Group Limited *";
+          criteria = "LG UNKNOWN_TBD";
+          mode = "1920x1080@144.000";
+        };}
+        {output = baseOutput//{
+          criteria = "LG Display 0x060A Unknown";
           mode = "1920x1080@60.020";
         };}
+        {output = baseOutput//{
+          criteria = "CEX CX133 0x00000001";
+          mode = "2560x1600@59.972";
+        };}
         {output = baseOutput//{
           criteria = "AOC 16G3 1DDP7HA000348";
           mode = "1920x1080@144.000";
@@ -91,7 +99,7 @@ in {
           ];
         };}
         {profile = {
-          name = "tower_01";
+          name = "tower_0";
           outputs = [
             {
               criteria = "AOC 24E1W1 GNSKCHA086899";
@@ -126,33 +134,54 @@ in {
            ];
         };}
         {profile = {
-          name = "valinor00";
+          name = "tower_1";
           outputs = [
             {
-              criteria = "Lenovo Group Limited *";
+              criteria = "AOC 24E1W1 GNSKCHA086899";
+              position = "0,0";
+            }
+            {
+              criteria = "AOC 24E1W1 GNSKBHA080346";
+              position = "0,0";
+            }
+            {
+              criteria = "LG UNKNOWN_TBD";
               position = "0,0";
             }
           ];
-          exec = [
+        };}
-            "${pkgs.writeShellScript "kanshi-hyprland-init" ''
+        {profile = {
-              #!/usr/bin/env bash
+          name = "laptop_0";
-              ${pkgs.hyprland}/bin/hyprctl eval '
+          outputs = [{
-                hl.workspace_rule({ workspace = "1", monitor = "eDP-1", default = true })
+            criteria = "LG Display 0x060A Unknown";
-                hl.workspace_rule({ workspace = "2", monitor = "eDP-1", default = true })
+            position = "0,0";
-                hl.workspace_rule({ workspace = "3", monitor = "eDP-1", default = true })
+          }];
-                hl.workspace_rule({ workspace = "4", monitor = "eDP-1", default = true })
+        };}
-                hl.workspace_rule({ workspace = "5", monitor = "eDP-1", default = true })
+        {profile = {
-                hl.workspace_rule({ workspace = "6", monitor = "eDP-1", default = true })
+          name = "laptop_1";
-                hl.workspace_rule({ workspace = "7", monitor = "eDP-1", default = true })
+          outputs = [
-                hl.workspace_rule({ workspace = "8", monitor = "eDP-1", default = true })
+            {
-                hl.workspace_rule({ workspace = "9", monitor = "eDP-1", default = true })
+              criteria = "CEX CX133 0x00000001";
-              '
+              position = "0,0";
-              ${pkgs.hyprland}/bin/hyprctl eval 'hl.dispatch(hl.dsp.focus({ monitor = "eDP-1" })); hl.dispatch(hl.dsp.focus({ workspace = "1" }));'
+            }
-          
+            {
-            ''}"
+              criteria = "LG Display 0x060A Unknown";
-            "${pkgs.awww}/bin/awww restore"
+              position = "2560,0";
-            (moveOrOpenBar 0)
+            }
-           ];
+          ];
+        };}
+        {profile = {
+          name = "laptop_2";
+          outputs = [
+            {
+              criteria = "AOC 16G3 1DDP7HA000348";
+              position = "0,0";
+            }
+            {
+              criteria = "LG Display 0x060A Unknown";
+              position = "1920,0";
+            }
+          ];
         };}
       ];
     };

modules/home/wayland/hyprland/config.nix

@@ -31,6 +31,7 @@
     sleep 2
     keepassxc &
     firefox &
+    jellyfin-mpv-shim &
     easyeffects --gapplication-service &
 
     sleep 2

modules/home/xorg/bspwm/config.nix

@@ -109,6 +109,7 @@
 
       telegram-desktop &
       nextcloud &
+      jellyfin-mpv-shim &
       #flameshot &
 
       sleep 2

modules/nixos/system/default.nix

@@ -1,5 +1,5 @@
 { config, lib, ... }: {
-  imports = [ ./dbus ./docs ./fonts ./hw ./locale ./network ./nix ./security ./xdg ];
+  imports = [ ./dbus ./fonts ./hw ./locale ./network ./nix ./security ./xdg ];
 
   services.journald.extraConfig = ''
     SystemMaxUse=512M

modules/nixos/system/docs/default.nix

@@ -1,14 +0,0 @@
-{ config, lib, ... }:
-let
-  cfg = config.syscfg.make;
-  withDocs = cfg.gui || cfg.develop || cfg.serverExtras;
-in
-{
-  documentation = lib.mkIf (!withDocs) {
-    enable = false;
-    man.enable = false;
-    info.enable = false;
-    doc.enable = false;
-    nixos.enable = false;
-  };
-}

modules/nixos/system/fonts/default.nix

@@ -1,6 +1,6 @@
-{ config, lib, pkgs, ... }: {
+{ pkgs, ... }: {
 
-  fonts = lib.mkIf (config.syscfg.make.gui || config.syscfg.make.serverExtras) {
+  fonts = {
     enableDefaultPackages = false;
     fontDir.enable = true;
 

modules/nixos/system/hw/base/default.nix

@@ -1,5 +1,5 @@
-{ config, lib, ... }: {
+{ lib, ... }: {
-  services.fwupd.enable = lib.mkDefault (config.syscfg.make.gui || config.syscfg.make.power);
+  services.fwupd.enable = true;
   hardware.enableAllFirmware = false;
-  services.power-profiles-daemon.enable = lib.mkDefault config.syscfg.make.gui;
+  services.power-profiles-daemon.enable = lib.mkDefault true;
 }

modules/nixos/system/hw/fs/default.nix

@@ -1,9 +1,6 @@
-{ config, lib, pkgs, ... }:
+{ pkgs, ... }: {
-let
-  hasNfsFileSystems = lib.any (fs: fs.fsType == "nfs" || fs.fsType == "nfs4") (lib.attrValues config.fileSystems);
-in {
   services.fstrim.enable = true; # Improves SSD life
-  services.gvfs.enable = config.syscfg.make.gui; # User Mounted FS
+  services.gvfs.enable = true; # User Mounted FS
 
-  environment.systemPackages = lib.optionals hasNfsFileSystems [ pkgs.nfs-utils ];
+  environment.systemPackages = with pkgs; [ nfs-utils ];
 }

modules/nixos/system/hw/graphics/default.nix

@@ -1,4 +1,4 @@
-{ config, ... }: {
+{ ... }: {
-  hardware.graphics.enable = config.syscfg.make.gui || config.syscfg.make.serverExtras || config.syscfg.make.game;
+  hardware.graphics.enable = true;
-  hardware.graphics.enable32Bit = config.syscfg.make.game;
+  hardware.graphics.enable32Bit = true;
 }

modules/nixos/system/nix/default.nix

@@ -1,10 +1,14 @@
-{ config, inputs, lib, pkgs, ... }: {
+{ inputs, pkgs, ... }: {
   nixpkgs.config = {
     permittedInsecurePackages = [ ];
     allowUnfree = true;
     android_sdk.accept_license = true;
+    packageOverrides = pkgs: rec {
+      custom = import ../../../../packages { inherit pkgs; };
+    };
+
   };
-  nixpkgs.overlays = import ../../../../overlays { inherit inputs; };
+  nixpkgs.overlays = import ../../../../overlays { inherit inputs pkgs; };
   nix = {
     package = pkgs.nixVersions.stable;
     extraOptions = ''
@@ -33,9 +37,7 @@
       ];
     };
   };
-  programs.nix-ld = lib.mkIf (
+  programs.nix-ld = {
-    config.syscfg.make.gui || config.syscfg.make.develop || config.syscfg.make.serverExtras
-  ) {
     enable = true;
     libraries = with pkgs; [
       libx11 libxcb libxi libxext libxkbfile xcbutilcursor

modules/nixos/system/security/polkit/default.nix

@@ -1,12 +1,10 @@
-{ config, lib, pkgs, ... }: {
+{ pkgs, ... }: {
-  config = lib.mkIf config.syscfg.make.gui {
+  security.polkit.enable = true;
-    security.polkit.enable = true;
+  security.pam.services.hyprlock = { #swaylock
-    security.pam.services.hyprlock = { #swaylock
+    text = ''
-      text = ''
+      auth include login
-        auth include login
+    '';
-      '';
-    };
-
-    environment.systemPackages = [ pkgs.polkit_gnome ];
   };
+
+  environment.systemPackages = with pkgs; [ polkit_gnome ];
 }

modules/nixos/tools/debug/default.nix

@@ -3,7 +3,6 @@
   config = lib.mkIf (config.syscfg.make.develop) {
 
     programs.wireshark.enable = true;
-    programs.dconf.enable = true;
 
     environment.systemPackages = with pkgs; [ wget dconf wireshark mtr android-tools ];
   };

modules/nixos/tools/default.nix

@@ -1,5 +1,5 @@
-{ config, lib, pkgs, ... }: {
+{ pkgs, ... }: {
   imports = [ ./debug ./develop ./telegraf ];
 
-  environment.systemPackages = lib.optionals config.syscfg.make.gui [ pkgs.engrampa ];
+  environment.systemPackages = with pkgs; [ pkgs.engrampa ];
 }

modules/server/containers/apps/miniflux.nix

@@ -1,2 +0,0 @@
-{ name, ... }:
-throw "Container app `${name}` is not implemented yet."

modules/server/containers/apps/trmnl.nix

@@ -1,2 +1,3 @@
-{ name, ... }:
+{...}:{
-throw "Container app `${name}` is not implemented yet."
+    
+}

modules/server/containers/builder.nix

@@ -37,9 +37,7 @@ let
       environment = {
         TZ = config.time.timeZone;
       } // extraEnv;
-      autoRemoveOnStop = false;
+
-      autoStart = true;
-      pull = "newer";
       labels = (if subdomain!=null then ({
         "traefik.enable" = "true";
         "traefik.http.routers.${routerName}.entrypoints" = "web-secure";

modules/server/containers/default.nix

@@ -16,9 +16,7 @@ let
   basePathConfigs =
     lib.mapAttrsToList (_: cfg: cfg) (lib.filterAttrs (name: _: name != "config" && name != "data") serverCfg.path);
   runtimePathConfigs = concatRuntimeLists "paths";
-  allSetupConfigs = builtins.filter
+  allSetupConfigs = map (app: ({ name = app.name; envFile = ""; } // app.runtime.setup)) appsList;
-    (setup: setup.script != null)
-    (map (app: ({ name = app.name; envFile = [ ]; } // app.runtime.setup)) appsList);
   allCronsConfigs = concatRuntimeLists "cron";
   allVMConfigs = builtins.filter (app: app.runtime.vm != null) appsList;
   mkPathSetup = cfg:
@@ -90,7 +88,7 @@ in {
         value = {
           description = "Run ${e.name} setup";
           after = [ "podman-${e.name}-${e.trigger}.service" ];
-          # wants = [ "podman-${e.name}-${e.trigger}.service" ];
+          wants = [ "podman-${e.name}-${e.trigger}.service" ];
           partOf = [ "podman-${e.name}-${e.trigger}.service" ];
           wantedBy = [ "multi-user.target" ];
           restartTriggers = [ e.script ];
@@ -98,8 +96,7 @@ in {
             Type = "simple";
             Restart = "on-failure";
             RestartSec = "15s";
-            # TimeoutStartSec = "360s";
+            TimeoutStartSec = "360s";
-            TimeoutStartSec = "30s"; 
             EnvironmentFile = e.envFile;
             ExecStart = e.script;
             RemainAfterExit = true;

modules/server/sops/default.nix

@@ -3,9 +3,7 @@ let
   listNames = config.syscfg.server.db;
   containerNames = lib.concatMap (app: app.requires.secrets) (builtins.attrValues config.syscfg.server.loadedContainers);
   allApps = lib.unique (listNames ++ containerNames);
-  needsServerSops = config.syscfg.server.loadedContainers != {} || allApps != [];
 in{
-  config = lib.mkIf needsServerSops {
     sops.secrets = {
       CUSTOM = { 
         mode = "0444";
@@ -15,5 +13,4 @@ in{
       mode = "0444";
       sopsFile = ./server.yaml;
     }));
-  };
 }

modules/shared/syscfg/default.nix

@@ -1,15 +1,11 @@
-{ lib, ... }:
+{ inputs, lib, ... }:
 let
   systemsDir = ../../../systems;
-  isIgnoredSystemDir = name: lib.hasPrefix "_" name || lib.hasPrefix "." name;
+  systemNames = lib.attrNames (lib.filterAttrs 
-  systemNames = lib.attrNames (
+    (name: type: type == "directory" && builtins.pathExists (systemsDir + "/${name}/cfg.nix")) 
-    lib.filterAttrs
+    (builtins.readDir systemsDir));
-      (name: type:
+
-        type == "directory"
+
-        && !isIgnoredSystemDir name
-        && builtins.pathExists (systemsDir + "/${name}/cfg.nix"))
-      (builtins.readDir systemsDir)
-  );
 in with lib; {
   options.usercfg = import ./user.nix  {inherit lib;};
   options.syscfg = {

modules/shared/syscfg/extra.nix

@@ -6,6 +6,6 @@ with lib; {
         domain = mkOption { type = types.str; default = ""; };
         port = mkOption { type = types.str; default = ""; };
         noProxy = mkOption { type = types.str; default = ""; };
-        cert = mkOption { type = types.nullOr types.path; default = null; };
+        cert = mkOption { type = types.path; default = null; };
     };
 }

modules/shared/syscfg/make.nix

@@ -2,7 +2,6 @@
 with lib; {
     cli = mkOption { type = types.bool; default = true; };
     gui = mkOption { type = types.bool; default = false; };
-    serverExtras = mkOption { type = types.bool; default = false; };
     virt = mkOption { type = types.bool; default = false; };
     power = mkOption { type = types.bool; default = false; };
     game = mkOption { type = types.bool; default = false; };

overlays/default.nix

@@ -5,7 +5,6 @@
     #yarn-berry = import ./yarn-berry { inherit final prev; };
     #eww = import ./eww { inherit final prev; };
     # ags =  import ./ags { inherit final prev; };
-    custom = import ../packages { pkgs = final; };
     wine = final.unstable.wineWow64Packages.unstableFull;
     unstable = import inputs.nixUnstable {
       system = final.stdenv.hostPlatform.system;

packages/default.nix

@@ -5,4 +5,12 @@
   repalette = pkgs.callPackage ./repalette { };
 
   vosk = pkgs.callPackage ./vosk { };
+
+  pythonPackages = {
+
+  };
+
+  nodePackages = {
+
+  };
 }

shells/default.nix

@@ -1,8 +1,18 @@
-{ inputs, mkPkgs, systems, ... }:
+{
-inputs.nixpkgs.lib.genAttrs systems (
+  inputs,
+  mkPkgs,
+  supportedSystems,
+  ...
+}:
+let
+  forEachSystem = inputs.nixpkgs.lib.genAttrs supportedSystems;
+in
+forEachSystem (
   system:
-  let pkgs = mkPkgs system;
+  let
-  in {
+    pkgs = mkPkgs system;
+  in
+  {
     default = import ./devsh { inherit pkgs; };
     devsh = import ./devsh { inherit pkgs; };
   }

systems/gateway/default.nix

@@ -17,9 +17,4 @@
     10.10.1.2     avalon.helcel.net
   '';
 
-  swapDevices = [ {
-    device = "/swapfile";
-    size = 2 * 1024; # Size in megabytes (4 GB)
-  } ];
-
 }

systems/gateway/hardware.nix

@@ -5,12 +5,10 @@
   nixpkgs.hostPlatform = lib.mkDefault "x86_64-linux";
 
   boot.loader.systemd-boot.enable = lib.mkForce false;
-  boot.loader.efi.canTouchEfiVariables = lib.mkForce false;
   boot.loader.grub = {
     enable = true;
     device = "/dev/sda";
     efiSupport = true;
-    efiInstallAsRemovable = true;
   };
 
   boot.initrd.availableKernelModules =

systems/sandbox/cfg.nix

@@ -32,7 +32,6 @@
         # ===== BASE =====
         traefik.subdomain = "traefik";
         traefik.extra={provider="infomaniak";};
-        robotstxt.extra = {};
         umami.subdomain = "umami";
         authentik.subdomain = "sso";
         searxng.subdomain = "searx";
@@ -43,19 +42,14 @@
         collabora.subdomain = "office";
         etherpad.subdomain = "pad";
         # ethercalc.subdomain = "calc";
-        drawio.subdomain = "draw";
         immich.subdomain = "pic";
         # ===== FLIX =====
         # invidious.subdomain = "yt";
         # jellyfin.subdomain = "flix";
-        # suwayomi.subdomain = "manga";
-        # calibre.subdomain = "books";
-        # ===== ARR =====
         # servarr.subdomain = "arr";
         # servarr.extra.modules = ["prowlarr" "sonarr" "radarr" "flaresolverr" ];
         # transmission = { subdomain = "arr"; subpath = "transmission"; };
         # handbrake = { subdomain = "arr"; subpath = "hb"; };
-        # selfmark = { subdomain = "arr"; subpath = "selfmark"; };
         # ===== DEV =====
         gitea.subdomain = "git";
         # ===== HOME =====
@@ -64,6 +58,9 @@
         influx.subdomain = "metrum";
 
         freshrss.subdomain = "rss";
+        suwayomi.subdomain = "manga";
+        calibre.subdomain = "books";
+        selfmark = { subdomain = "arr"; subpath = "selfmark"; };
 
         favicon.extra = {
           mappings = {