refactor stuff

modules/collections/laptop.nix

@@ -41,7 +41,7 @@
     };
   };
 
-  nixpkgs.config.permittedInsecurePackages = [ "electron-28.3.3" ];
+  nixpkgs.config.permittedInsecurePackages = [ "electron-27.3.11" "electron-28.3.3" ];
   programs.firejail.wrappedBinaries = with pkgs;
     let inherit (config.custom.misc.firejail) mk;
     in lib.mkMerge [

modules/collections/server.nix

@@ -1,58 +0,0 @@
-{pkgs, ...}:
-{
-  imports = [
-    ### Services ###
-    ../services/adguard.nix
-    ../services/github-runner.nix
-    ../services/gitolite.nix
-    # wait for https://github.com/NixOS/nixpkgs/pull/300228
-    ../services/grafana.nix
-    #../services/nextcloud.nix
-    #../services/samba.nix
-    ../services/ssh.nix
-    ../services/step-ca.nix
-    ../services/syncthing.nix
-    #../services/syncthing.nix
-    ../services/wireguard.nix
-    ### Other Modules ###
-    #../games/palworld.nix
-    ../backup.nix
-    ../cron.nix
-    ../fail2ban.nix
-    ../firewall.nix
-    ../git.nix
-    ../hdd-spindown.nix
-    ../fail2ban.nix
-    ../logging.nix
-    ../motd.nix
-  ];
-
-  custom = {
-    cli-tools.enable = true;
-    tmpfs.enable = true;
-    static-ip = {
-      enable = true;
-      interface = "enp0s31f6";
-      ip = "192.168.0.6";
-      dns = "127.0.0.1";
-    };
-    nix = {
-      settings.enable = true;
-    };
-    services = {
-      acme.enable = true;
-      nginx.enable = true;
-      kavita = {
-        enable = true;
-        dir = "/mnt/1tbssd/kavita";
-      };
-    };
-    misc = {
-      docker.enable = true;
-    };
-    hardware = {
-      firmware.enable = true;
-      ssd.enable = true;
-    };
-  };
-}

modules/firewall.nix

@@ -1,9 +0,0 @@
-{ config, pkgs, lib, inputs, vars, ... }:
-let
-  allowedUDPPortRanges = vars.udpRanges;
-in
-{
-  networking.firewall.enable = true;
-  networking.firewall.allowedUDPPorts = [ 5000 ];
-  networking.firewall.allowedUDPPortRanges = allowedUDPPortRanges;
-}

modules/hardware/nvidia.nix

@@ -1,17 +1,26 @@
-{ lib, config, pkgs, ... }:
-with lib;
+{ lib, config, pkgs, inputs, pkgsVersion, ... }:
 let cfg = config.custom.hardware.nvidia;
 in {
   options.custom.hardware.nvidia = {
-    enable = mkEnableOption "Enables nvidia gpus";
+    enable = lib.mkEnableOption "Enables nvidia gpus";
   };
 
-  config = mkIf cfg.enable {
-    # Enable OpenGL
-    hardware.graphics = {
-      enable = true;
-      enable32Bit = true;
-    };
+  config = let
+    # the option was renamed in unstable
+    nvidiaOption =
+      if (pkgsVersion == inputs.nixpkgs-unstable) then {
+        hardware.graphics = {
+          enable = true;
+          enable32Bit = true;
+        };
+      } else {
+        hardware.opengl = {
+          enable = true;
+          driSupport = true;
+          driSupport32Bit = true;
+        };
+      };
+  in lib.mkIf cfg.enable nvidiaOption // {
     boot.kernelParams = [ "nvidia-drm.fbdev=1" ];
     services.xserver.videoDrivers = [ "nvidia" ];
     hardware.nvidia = {