Update Valinor and vscodium

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

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";

modules/server/containers/default.nix

@@ -90,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 ];
@@ -98,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/syscfg/make.nix

@@ -2,6 +2,7 @@
 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; };

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 =