Update Valinor and vscodium

flake.nix

@@ -39,25 +39,35 @@
   outputs = inputs:
     let
       lib = inputs.nixpkgs.lib;
-      gen = import ./generator.nix { inherit inputs; };
+      linuxSystems = [ "x86_64-linux" "aarch64-linux" ];
+      supportedSystems = linuxSystems ++ [ "x86_64-darwin" "aarch64-darwin" ];
+      overlays = import ./overlays { inherit inputs; };
+      mkPkgs = system:
+        import inputs.nixpkgs {
+          inherit system;
+          inherit overlays;
+          config.allowUnfree = true;
+        };
+      gen = import ./generator.nix { inherit inputs mkPkgs supportedSystems; };
       systemsDir = ./systems;
       isIgnoredSystemDir = name: lib.hasPrefix "_" name || lib.hasPrefix "." name;
-      systemNames = lib.attrNames (lib.filterAttrs
+      systemNames = lib.attrNames (
-        (name: type:
+        lib.filterAttrs (
+          name: type:
           type == "directory"
           && !isIgnoredSystemDir name
-          && builtins.pathExists (systemsDir + "/${name}/cfg.nix"))
+          && builtins.pathExists (systemsDir + "/${name}/cfg.nix")
-        (builtins.readDir systemsDir));
+        ) (builtins.readDir systemsDir)
+      );
       hostsByType = systemType:
-        lib.filter
+        lib.filter (host: ((import (systemsDir + "/${host}/cfg.nix")).syscfg.type or "nixos") == systemType) systemNames;
-          (host: (import (systemsDir + "/${host}/cfg.nix")).syscfg.type == systemType)
-          systemNames;
       generateHosts = systemType:
-        lib.genAttrs
+        lib.genAttrs (hostsByType systemType) (host: gen.generate { inherit host; });
-          (hostsByType systemType)
-          (host: gen.generate { inherit host; });
     in {
-      devShells = import ./shells { inherit inputs; };
+      devShells = import ./shells {
+        inherit inputs mkPkgs;
+        systems = linuxSystems;
+      };
 
       nixosConfigurations = generateHosts "nixos";
       darwinConfigurations = generateHosts "macos";
@@ -76,8 +86,8 @@
   # diyu - ?
   # tirnanog - ?
   # valhalla - ?
-  # arcadia - ? 
+  # arcadia - ?
-  # elysium - ? 
+  # elysium - ?
   # empyrean - ?
   # duat - ?
   # sheol - ?

generator.nix

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

modules/home/base/default.nix

@@ -1,12 +1,16 @@
-{ lib, config, ... }: {
+{ lib, config, pkgs, ... }: {
 
   #environment.sessionVariables.SOPS_AGE_KEY_FILE = keyFilePath;
-  systemd.user.startServices = "sd-switch";
+  systemd.user.startServices = lib.mkIf pkgs.stdenv.isLinux "sd-switch";
   programs.home-manager.enable = true;
 
   home = {
     username = "${config.usercfg.username}";
-    homeDirectory = "/home/${config.usercfg.username}";
+    homeDirectory =
+      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 {
+in lib.mkIf config.syscfg.make.gui {
   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, ... }: {
+{ config, lib, ... }: {
-  programs.kitty = {
+  programs.kitty = lib.mkIf config.syscfg.make.gui {
     enable = true;
     settings = {
       foreground = "#${config.colorScheme.palette.base07}";

modules/home/cli/other/default.nix

@@ -1,16 +1,16 @@
-{ pkgs, ... }: {
+{ config, lib, 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,18 +1,22 @@
-{ 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 = {
+      profiles.default.extensions = exts;
-        profiles.default.extensions = with pkgs.vscode-extensions; [
+    };
-          bbenoist.nix
+    programs.antigravity = {
-          esbenp.prettier-vscode
+      enable = true;
-          golang.go
+      profiles.default.extensions = exts;
-          ms-python.vscode-pylance
-          ms-vscode.cpptools
-          dbaeumer.vscode-eslint
-        ];
-      #};
     };
   };
 }

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

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

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

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

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

@@ -8,14 +8,11 @@
       settings = {
         global = {
           follow = "mouse";
-          height = "200";
+          height = "(0, 200)";
           width = "350";
           scale = "0";
-          origin = "top-right";
+          origin = "bottom-right";
-          offset = "${
+          offset = "(${config.colorScheme.palette.gaps-screen},${config.colorScheme.palette.gaps-screen})";
-              toString ((lib.strings.toInt config.colorScheme.palette.gaps-bar)
-                + (lib.strings.toInt config.colorScheme.palette.gaps-screen))
-            }x${config.colorScheme.palette.gaps-screen}";
           notification_limit = "0";
           progress_bar = "true";
           progress_bar_height = "10";
@@ -62,8 +59,8 @@
           corner_radius = "${config.colorScheme.palette.border-radius}";
           ignore_dbusclose = "false";
           layer = "top";
-          force_xwayland = "true";
+          # force_xwayland = "true";
-          force_xinerama = "false";
+          # force_xinerama = "false";
 
           mouse_left_click = "close_current";
           mouse_middle_click = "context";
@@ -91,6 +88,9 @@
           timeout = "10";
           highlight = "#${config.colorScheme.palette.base0E}";
         };
+        experimental = {
+          per_monitor_dpi = true;
+        };
       };
     };
   };

modules/home/wayland/apps/eww/bar/css/_clock.scss

@@ -61,8 +61,8 @@ calendar {
 }
 
 .quick-btn-active {
-  .quick-icon  { @include color-accent; }
+  .quick-icon  { color: $base0E; }
-  .quick-label { @include color-accent; }
+  .quick-label { color: $base0E; }
 }
 
 .quick-icon  { font-size: 1.5em; @include color-body; }

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,17 +42,9 @@ in {
           mode = "1920x1080@60.000";
         };}
         {output = baseOutput//{
-          criteria = "LG UNKNOWN_TBD";
+          criteria = "Lenovo Group Limited *";
-          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";
@@ -99,7 +91,7 @@ in {
           ];
         };}
         {profile = {
-          name = "tower_0";
+          name = "tower_01";
           outputs = [
             {
               criteria = "AOC 24E1W1 GNSKCHA086899";
@@ -134,54 +126,33 @@ in {
            ];
         };}
         {profile = {
-          name = "tower_1";
+          name = "valinor00";
           outputs = [
             {
-              criteria = "AOC 24E1W1 GNSKCHA086899";
+              criteria = "Lenovo Group Limited *";
-              position = "0,0";
-            }
-            {
-              criteria = "AOC 24E1W1 GNSKBHA080346";
-              position = "0,0";
-            }
-            {
-              criteria = "LG UNKNOWN_TBD";
               position = "0,0";
             }
           ];
-        };}
+          exec = [
-        {profile = {
+            "${pkgs.writeShellScript "kanshi-hyprland-init" ''
-          name = "laptop_0";
+              #!/usr/bin/env bash
-          outputs = [{
+              ${pkgs.hyprland}/bin/hyprctl eval '
-            criteria = "LG Display 0x060A Unknown";
+                hl.workspace_rule({ workspace = "1", monitor = "eDP-1", default = true })
-            position = "0,0";
+                hl.workspace_rule({ workspace = "2", monitor = "eDP-1", default = true })
-          }];
+                hl.workspace_rule({ workspace = "3", monitor = "eDP-1", default = true })
-        };}
+                hl.workspace_rule({ workspace = "4", monitor = "eDP-1", default = true })
-        {profile = {
+                hl.workspace_rule({ workspace = "5", monitor = "eDP-1", default = true })
-          name = "laptop_1";
+                hl.workspace_rule({ workspace = "6", monitor = "eDP-1", default = true })
-          outputs = [
+                hl.workspace_rule({ workspace = "7", monitor = "eDP-1", default = true })
-            {
+                hl.workspace_rule({ workspace = "8", monitor = "eDP-1", default = true })
-              criteria = "CEX CX133 0x00000001";
+                hl.workspace_rule({ workspace = "9", monitor = "eDP-1", default = true })
-              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";
+            ''}"
-              position = "2560,0";
+            "${pkgs.awww}/bin/awww restore"
-            }
+            (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/base/default.nix

@@ -1,4 +1,17 @@
-{ lib, config, pkgs, ... }: {
+{ lib, config, pkgs, ... }: 
+let
+  #Bookmark: javascript:(function(){window.location.href='mpv://'+encodeURIComponent(window.location.href);})();
+  mpvHandler = pkgs.writeShellScriptBin "mpv-handler" ''
+    #!/bin/bash
+    exec 2>> /tmp/mpv-handler-debug.log
+    set -x
+    RAW_URL="$1"
+    STRIPPED_URL="''${RAW_URL:6}"
+    URL=$(printf '%b' "''${STRIPPED_URL//%/\\x}")
+    exec ${config.programs.mpv.finalPackage}/bin/mpv "$URL"
+  '';
+in
+{
   config = lib.mkIf (config.usercfg.wm == "Wayland") {
 
     home.packages = with pkgs; [
@@ -14,17 +27,23 @@
       glib
     ];
 
+
+    xdg.desktopEntries."mpv-handler" = {
+      name = "MPV Scheme Handler";
+      exec = "${mpvHandler}/bin/mpv-handler %u";
+      terminal = false;
+      mimeType = [ "x-scheme-handler/mpv" ];
+    };
+
     xdg.mimeApps = {
       enable = true;
       defaultApplications = {
-        "x-scheme-handler/discord-409416265891971072" =
+        # --- System & Directories ---
-          [ "discord-409416265891971072.desktop" ];
+        "inode/directory" = [ "thunar.desktop" ];
-        "x-scheme-handler/discord-402572971681644545" =
+        "x-scheme-handler/file" = [ "thunar.desktop" ];
-          [ "discord-402572971681644545.desktop" ];
+
-        "x-scheme-handler/discord-696343075731144724" =
+        # --- Web & Browsing ---
-          [ "discord-696343075731144724.desktop" ];
+        "x-scheme-handler/unknown" = [ "firefox.desktop" ];
-        "x-scheme-handler/tg" = [ "org.telegram.desktop.desktop" ];
-        "x-scheme-handler/tonsite" = [ "org.telegram.desktop.desktop" ];
         "x-scheme-handler/http" = [ "firefox.desktop" ];
         "x-scheme-handler/https" = [ "firefox.desktop" ];
         "x-scheme-handler/chrome" = [ "firefox.desktop" ];
@@ -36,16 +55,77 @@
         "application/x-extension-xhtml" = [ "firefox.desktop" ];
         "application/x-extension-xht" = [ "firefox.desktop" ];
 
+        # --- Chat & Social Protocol Schemes ---
+        "x-scheme-handler/tg" = [ "org.telegram.desktop.desktop" ];
+        "x-scheme-handler/tonsite" = [ "org.telegram.desktop.desktop" ];
+        "x-scheme-handler/discord-409416265891971072" = [ "discord-409416265891971072.desktop" ];
+        "x-scheme-handler/discord-402572971681644545" = [ "discord-402572971681644545.desktop" ];
+        "x-scheme-handler/discord-696343075731144724" = [ "discord-696343075731144724.desktop" ];
+
+        # --- Documents & Source Code (VSCodium) ---
         "application/pdf" = [ "org.pwmt.zathura-pdf-mupdf.desktop" ];
         "text/plain" = [ "vscodium.desktop" ];
+        "text/markdown" = [ "vscodium.desktop" ];
+        "text/xml" = [ "vscodium.desktop" ];
+        "text/csv" = [ "vscodium.desktop" ];
+        "text/css" = [ "vscodium.desktop" ];
+        "application/xml" = [ "vscodium.desktop" ];
+        "application/json" = [ "vscodium.desktop" ];
+        "application/toml" = [ "vscodium.desktop" ];
+        "application/yaml" = [ "vscodium.desktop" ];
+        "application/javascript" = [ "vscodium.desktop" ];
+        "application/x-shellscript" = [ "vscodium.desktop" ];
 
+        # --- Video & Audio (MPV) ---
+        "x-scheme-handler/mpv" = [ "mpv-handler.desktop" ];
         "video/mp4" = [ "mpv.desktop" ];
+        "video/mkv" = [ "mpv.desktop" ];
+        "video/webm" = [ "mpv.desktop" ];
+        "video/x-matroska" = [ "mpv.desktop" ];
+        "video/quicktime" = [ "mpv.desktop" ];
+        "video/x-msvideo" = [ "mpv.desktop" ];
+        "video/x-flv" = [ "mpv.desktop" ];
+        "video/3gpp" = [ "mpv.desktop" ];
+        "audio/mp3" = [ "mpv.desktop" ];
+        "audio/mpeg" = [ "mpv.desktop" ];
+        "audio/ogg" = [ "mpv.desktop" ];
+        "audio/wav" = [ "mpv.desktop" ];
+        "audio/x-wav" = [ "mpv.desktop" ];
+        "audio/flac" = [ "mpv.desktop" ];
+        "audio/x-flac" = [ "mpv.desktop" ];
+        "audio/mp4" = [ "mpv.desktop" ];
+        "audio/aac" = [ "mpv.desktop" ];
+        "audio/x-matroska-audio" = [ "mpv.desktop" ];
+        "audio/x-mpegurl" = [ "mpv.desktop" ];
+        "audio/mpegurl" = [ "mpv.desktop" ];
 
+        # --- Images (IMV) ---
         "image/png" = [ "imv-dir.desktop" ];
         "image/jpg" = [ "imv-dir.desktop" ];
+        "image/jpeg" = [ "imv-dir.desktop" ];
+        "image/webp" = [ "imv-dir.desktop" ];
+        "image/gif" = [ "imv-dir.desktop" ];
+        "image/svg+xml" = [ "imv-dir.desktop" ];
+        "image/x-canon-cr2" = [ "imv-dir.desktop" ];
+        "image/bmp" = [ "imv-dir.desktop" ];
+        "image/tiff" = [ "imv-dir.desktop" ];
+        "image/heic" = [ "imv-dir.desktop" ];
+        "image/avif" = [ "imv-dir.desktop" ];
+
+        # --- Archives (Engrampa) ---
+        "application/zip" = [ "engrampa.desktop" ];
+        "application/x-tar" = [ "engrampa.desktop" ];
+        "application/x-gzip" = [ "engrampa.desktop" ];
+        "application/x-bzip2" = [ "engrampa.desktop" ];
+        "application/x-7z-compressed" = [ "engrampa.desktop" ];
+        "application/x-rar" = [ "engrampa.desktop" ];
       };
+
       associations = {
-        removed = { "application/pdf" = [ "krita_pdf.desktop" ]; };
+        removed = {
+          "application/pdf" = [ "krita_pdf.desktop" ];
+          "application/zip" = [ "org.prismlauncher.PrismLauncher.desktop" ];
+        };
       };
     };
   };

modules/home/wayland/hyprland/config.nix

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

modules/home/xorg/bspwm/config.nix

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

modules/nixos/system/default.nix

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

modules/nixos/system/docs/default.nix

@@ -0,0 +1,14 @@
+{ 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 @@
-{ pkgs, ... }: {
+{ config, lib, pkgs, ... }: {
 
-  fonts = {
+  fonts = lib.mkIf (config.syscfg.make.gui || config.syscfg.make.serverExtras) {
     enableDefaultPackages = false;
     fontDir.enable = true;
 

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

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

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

@@ -1,6 +1,9 @@
-{ pkgs, ... }: {
+{ config, lib, 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 = true; # User Mounted FS
+  services.gvfs.enable = config.syscfg.make.gui; # User Mounted FS
 
-  environment.systemPackages = with pkgs; [ nfs-utils ];
+  environment.systemPackages = lib.optionals hasNfsFileSystems [ pkgs.nfs-utils ];
 }

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

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

modules/nixos/system/nix/default.nix

@@ -1,14 +1,10 @@
-{ inputs, pkgs, ... }: {
+{ config, inputs, lib, 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 pkgs; };
+  nixpkgs.overlays = import ../../../../overlays { inherit inputs; };
   nix = {
     package = pkgs.nixVersions.stable;
     extraOptions = ''
@@ -37,7 +33,9 @@
       ];
     };
   };
-  programs.nix-ld = {
+  programs.nix-ld = lib.mkIf (
+    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,10 +1,12 @@
-{ pkgs, ... }: {
+{ config, lib, pkgs, ... }: {
-  security.polkit.enable = true;
+  config = lib.mkIf config.syscfg.make.gui {
-  security.pam.services.hyprlock = { #swaylock
+    security.polkit.enable = true;
-    text = ''
+    security.pam.services.hyprlock = { #swaylock
-      auth include login
+      text = ''
-    '';
+        auth include login
-  };
+      '';
+    };
 
-  environment.systemPackages = with pkgs; [ polkit_gnome ];
+    environment.systemPackages = [ pkgs.polkit_gnome ];
+  };
 }

modules/nixos/tools/debug/default.nix

@@ -3,6 +3,7 @@
   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,4 +1,5 @@
-{ pkgs, ... }: {
+{ config, lib, pkgs, ... }: {
   imports = [ ./debug ./develop ./telegraf ];
 
+  environment.systemPackages = lib.optionals config.syscfg.make.gui [ pkgs.engrampa ];
 }

modules/server/containers/apps/miniflux.nix

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

modules/server/containers/apps/trmnl.nix

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

modules/server/containers/builder.nix

@@ -37,7 +37,9 @@ 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";
@@ -61,7 +63,7 @@ let
     };
     in lib.recursiveUpdate base overrides;
   vmBuilder = { name, vm }: ((import "${pkgs.path}/nixos/lib/eval-config.nix" {
-      system = "x86_64-linux";
+      system = pkgs.stdenv.hostPlatform.system;
       modules = [ vm.cfg
         ({ config, lib, modulesPath, ... }: {
         imports = [

modules/server/containers/default.nix

@@ -16,7 +16,9 @@ let
   basePathConfigs =
     lib.mapAttrsToList (_: cfg: cfg) (lib.filterAttrs (name: _: name != "config" && name != "data") serverCfg.path);
   runtimePathConfigs = concatRuntimeLists "paths";
-  allSetupConfigs = map (app: ({ name = app.name; envFile = ""; } // app.runtime.setup)) appsList;
+  allSetupConfigs = builtins.filter
+    (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:
@@ -88,7 +90,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 ];
@@ -96,7 +98,8 @@ 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,7 +3,9 @@ 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";
@@ -13,4 +15,5 @@ in{
       mode = "0444";
       sopsFile = ./server.yaml;
     }));
+  };
 }

modules/shared/sops/default.nix

@@ -1,6 +1,8 @@
 { config, lib, pkgs, ... }:
 let
   isCI = builtins.elem config.syscfg.hostname [ "ci" "sandbox" ];
+  defaultUser = config.users.users.${config.syscfg.defaultUser} or { };
+  defaultGroup = if pkgs.stdenv.isDarwin then "staff" else "users";
   keyFilePath = (if isCI then
     "/var/lib/sops-nix/mock-key.txt"
   else
@@ -8,7 +10,7 @@ let
   sopsFilePath = (if isCI then ./mock.yaml else ./common.yaml);
 in {
   environment.systemPackages = with pkgs; [ sops ];
-  environment.sessionVariables.SOPS_AGE_KEY_FILE = keyFilePath;
+  environment.variables.SOPS_AGE_KEY_FILE = keyFilePath;
 
   sops.defaultSopsFile = sopsFilePath;
   sops.age.keyFile = keyFilePath;
@@ -19,8 +21,8 @@ in {
   {
     "${config.syscfg.hostname}_ssh_priv" = {
       mode = "0400";
-      owner = config.users.users.${config.syscfg.defaultUser}.name;
+      owner = defaultUser.name or config.syscfg.defaultUser;
-      group = config.users.users.${config.syscfg.defaultUser}.group;
+      group = defaultUser.group or defaultGroup;
     };
   }
   (lib.mkIf config.syscfg.net.wlp.enable {

modules/shared/syscfg/default.nix

@@ -1,11 +1,15 @@
-{ inputs, lib, ... }:
+{ lib, ... }:
 let
   systemsDir = ../../../systems;
-  systemNames = lib.attrNames (lib.filterAttrs 
+  isIgnoredSystemDir = name: lib.hasPrefix "_" name || lib.hasPrefix "." name;
-    (name: type: type == "directory" && builtins.pathExists (systemsDir + "/${name}/cfg.nix")) 
+  systemNames = lib.attrNames (
-    (builtins.readDir systemsDir));
+    lib.filterAttrs
-
+      (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 = {
@@ -14,6 +18,11 @@ in with lib; {
       type = types.enum [ "nixos" "macos" "home" ];
       default = "nixos";
     };
+    system = mkOption {
+      type = types.enum [ "x86_64-linux" "aarch64-linux" "x86_64-darwin" "aarch64-darwin" ];
+      default = "x86_64-linux";
+      description = "Nix platform used to evaluate this host.";
+    };
     defaultUser = mkOption { type = types.str; };
     make = import ./make.nix {inherit lib;};
     net = import ./net.nix {inherit lib;};

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.path; default = null; };
+        cert = mkOption { type = types.nullOr types.path; default = null; };
     };
-}
+}

modules/shared/syscfg/make.nix

@@ -2,8 +2,9 @@
 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; };
     develop = mkOption { type = types.bool; default = false; };
-}
+}

overlays/default.nix

@@ -1,15 +1,14 @@
-{ inputs, pkgs, ... }:
+{ inputs, ... }:
 [
   (final: prev: {
     #openttd-jgrpp = import ./openttd-jgrpp { inherit final prev; };
     #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;
-      stdenv.hostPlatform.system = final.stdenv.hostPlatform.system;
       config.allowUnfree = true;
     };
   })

packages/default.nix

@@ -1,15 +1,8 @@
-{ pkgs, ... }: {
+{ pkgs, ... }:
+{
   amdgpu_top = pkgs.callPackage ./amdgpu_top { };
   simc = pkgs.qt6.callPackage ./simc { };
   repalette = pkgs.callPackage ./repalette { };
 
   vosk = pkgs.callPackage ./vosk { };
-
-  pythonPackages = {
-
-  };
-
-  nodePackages = {
-
-  };
 }

shells/default.nix

@@ -1,13 +1,9 @@
-{ inputs, ... }:
+{ inputs, mkPkgs, systems, ... }:
-let
+inputs.nixpkgs.lib.genAttrs systems (
-  forEachSystem =
+  system:
-    inputs.nixpkgs.lib.genAttrs [ "aarch64-linux" "x86_64-linux" ];
+  let pkgs = mkPkgs system;
-in forEachSystem (system:
-  let
-    overlays = import ../overlays { inherit inputs pkgs; };
-    overrides = { custom = import ../packages { inherit pkgs; }; };
-    pkgs = import inputs.nixpkgs { inherit system overlays; } // overrides;
   in {
     default = import ./devsh { inherit pkgs; };
     devsh = import ./devsh { inherit pkgs; };
-  })
+  }
+)

systems/asgard/cfg.nix

@@ -3,5 +3,6 @@
     hostname = "asgard";
     defaultUser = "sora";
     type = "macos";
+    system = "x86_64-darwin";
   };
 }

systems/asgard/default.nix

@@ -12,8 +12,7 @@
   };
 
   fonts = {
-    fontDir.enable = true;
+    packages = with pkgs; [ ibm-plex openmoji-color material-design-icons ];
-    fonts = with pkgs; [ ibm-plex openmoji-color material-design-icons ];
   };
 
   environment = {
@@ -33,8 +32,6 @@
 
   programs = { zsh.enable = true; };
 
-  services = { nix-daemon.enable = true; };
-
   homebrew = {
     enable = true;
     onActivation = {
@@ -54,7 +51,11 @@
     '';
     gc = {
       automatic = true;
-      dates = "weekly";
+      interval = {
+        Weekday = 0;
+        Hour = 3;
+        Minute = 0;
+      };
       options = "--delete-older-than 7d";
     };
     settings = {
@@ -67,6 +68,7 @@
   };
 
   system = {
+    primaryUser = "sora";
     defaults = {
       NSGlobalDomain = {
         KeyRepeat = 1;

systems/gateway/default.nix

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

systems/gateway/hardware.nix

@@ -5,10 +5,12 @@
   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,6 +32,7 @@
         # ===== BASE =====
         traefik.subdomain = "traefik";
         traefik.extra={provider="infomaniak";};
+        robotstxt.extra = {};
         umami.subdomain = "umami";
         authentik.subdomain = "sso";
         searxng.subdomain = "searx";
@@ -42,14 +43,19 @@
         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 =====
@@ -58,9 +64,6 @@
         influx.subdomain = "metrum";
 
         freshrss.subdomain = "rss";
-        suwayomi.subdomain = "manga";
-        calibre.subdomain = "books";
-        selfmark = { subdomain = "arr"; subpath = "selfmark"; };
 
         favicon.extra = {
           mappings = {