migrated channel 24.05 to unstable

modules/apps/gaming.nix

@@ -27,10 +27,9 @@
       gamemode # optimizes linux to have better gaming performance
       heroic # install epic games
       protonup-qt # update proton-ge
-      # minecraft # minecraft official launcher
       ns-usbloader # load games into my switch
-      grapejuice # roblox manager
       (callPackage ../../pkgs/polymc/default.nix { }) # minecraft launcher
+      # minecraft # minecraft official launcher
 
       # emulators
       rpcs3 # ps3

modules/dev/python.nix

@@ -11,7 +11,7 @@
     environment.variables.PYTHONSTARTUP = "\${XDG_CONFIG_HOME}/python/pythonrc";
     users.users.jawz.packages = with pkgs; [
       pipenv # python development workflow for humans
-      nodePackages.pyright # LSP
+      pyright # LSP
       (python3.withPackages (
         ps: with ps; [
           black # Python code formatter

modules/servers/mealie.nix

@@ -4,8 +4,6 @@ let
   setup = import ./setup.nix { inherit lib config; };
 in
 {
-  disabledModules = [ "services/web-apps/mealie.nix" ];
-  imports = [ ../../pkgs/mealie-service.nix ];
   options.my.servers.mealie = setup.mkOptions "mealie" "mealie" 9925;
   config = {
     networking.firewall.allowedTCPPorts = lib.mkIf (!cfg.isLocal) [ cfg.port ];

modules/servers/nextcloud.nix

@@ -43,7 +43,7 @@ in
         mediainfo
         nodejs
         perl
-        (python3.withPackages (ps: with ps; [ tensorflow ]))
+        (python311.withPackages (ps: with ps; [ tensorflow ]))
         (perlPackages.buildPerlPackage rec {
           pname = "Image-ExifTool";
           version = "12.70";
@@ -84,7 +84,6 @@ in
           adminpassFile = config.sops.secrets.nextcloud-adminpass.path;
           dbtype = "pgsql";
           dbhost = config.my.postgresSocket;
-          dbtableprefix = "oc_";
           dbname = "nextcloud";
         };
         phpOptions = {
@@ -134,7 +133,10 @@ in
             "OC\\Preview\\Movie"
           ];
         };
-        # phpExtraExtensions = all: [ all.pdlib all.bz2 ];
+        phpExtraExtensions = all: [
+          all.pdlib
+          all.bz2
+        ];
       };
       nginx.virtualHosts = {
         "${config.services.nextcloud.hostName}" = lib.mkIf cfg.enableProxy {

modules/servers/shiori.nix

@@ -4,8 +4,6 @@ let
   setup = import ./setup.nix { inherit lib config; };
 in
 {
-  disabledModules = [ "services/web-apps/shiori.nix" ];
-  imports = [ ../../pkgs/shiori-service.nix ];
   options.my.servers.shiori = setup.mkOptions "shiori" "bookmarks" 4368;
   config = lib.mkIf (config.my.servers.shiori.enable && config.my.servers.postgres.enable) {
     networking.firewall.allowedTCPPorts = lib.mkIf (!cfg.isLocal) [ cfg.port ];

modules/services/nvidia.nix

@@ -10,10 +10,9 @@
     boot.kernelParams = lib.mkIf (config.networking.hostName == "workstation") [ "nvidia-drm.fbdev=1" ];
     services.xserver.videoDrivers = [ "nvidia" ];
     hardware = {
-      opengl = {
+      graphics = {
         enable = true;
-        driSupport = true;
-        driSupport32Bit = true;
+        enable32Bit = true;
         extraPackages = with pkgs; [
           nvidia-vaapi-driver
           vaapiVdpau

modules/services/printing.nix

@@ -13,7 +13,7 @@ in
 {
   options.my.services.printing.enable = lib.mkEnableOption "enable";
   config = lib.mkIf config.my.services.printing.enable {
-    users.users.jawz.packages = [ pkgs.gnome.simple-scan ];
+    users.users.jawz.packages = [ pkgs.simple-scan ];
     services.printing = {
       enable = true;
       drivers = printingDrivers;

modules/services/sound.nix

@@ -10,7 +10,6 @@
   config = lib.mkIf config.my.services.sound.enable {
     hardware.pulseaudio.enable = false;
     security.rtkit.enable = true; # make pipewire realtime-capable
-    sound.enable = false;
     services.pipewire = {
       enable = true;
       alsa.enable = true;