Partial upgrade to 24.11

Signed-off-by: Mel <einebeere@gmail.com>

7 files changed, 30 insertions, 91 deletions

diff --git a/configs/alacritty.toml b/configs/alacritty.toml
index 9c67e4f..4e4d130 100644
--- a/configs/alacritty.toml
+++ b/configs/alacritty.toml
@@ -1,4 +1,4 @@
-[shell]
+[terminal.shell]
 
 program = "/run/current-system/sw/bin/tmux"
 args = [ "new-session", "-A", "-D", "-s", "mains" ]
diff --git a/flake.lock b/flake.lock
index f6a00ec..7b2c17d 100644
--- a/flake.lock
+++ b/flake.lock
@@ -49,11 +49,11 @@
     },
     "flake-compat": {
       "locked": {
-        "lastModified": 1696426674,
-        "narHash": "sha256-kvjfFW7WAETZlt09AgDn1MrtKzP7t90Vf7vypd3OL1U=",
+        "lastModified": 1732722421,
+        "narHash": "sha256-HRJ/18p+WoXpWJkcdsk9St5ZiukCqSDgbOGFa8Okehg=",
         "owner": "edolstra",
         "repo": "flake-compat",
-        "rev": "0f9255e01c2351cc7d116c072cb317785dd33b33",
+        "rev": "9ed2ac151eada2306ca8c418ebd97807bb08f6ac",
         "type": "github"
       },
       "original": {
@@ -69,43 +69,43 @@
         ]
       },
       "locked": {
-        "lastModified": 1726989464,
-        "narHash": "sha256-Vl+WVTJwutXkimwGprnEtXc/s/s8sMuXzqXaspIGlwM=",
+        "lastModified": 1733050161,
+        "narHash": "sha256-lYnT+EYE47f5yY3KS/Kd4pJ6CO9fhCqumkYYkQ3TK20=",
         "owner": "nix-community",
         "repo": "home-manager",
-        "rev": "2f23fa308a7c067e52dfcc30a0758f47043ec176",
+        "rev": "62d536255879be574ebfe9b87c4ac194febf47c5",
         "type": "github"
       },
       "original": {
         "owner": "nix-community",
-        "ref": "release-24.05",
+        "ref": "release-24.11",
         "repo": "home-manager",
         "type": "github"
       }
     },
     "nixpkgs": {
       "locked": {
-        "lastModified": 1731652201,
-        "narHash": "sha256-XUO0JKP1hlww0d7mm3kpmIr4hhtR4zicg5Wwes9cPMg=",
+        "lastModified": 1732981179,
+        "narHash": "sha256-F7thesZPvAMSwjRu0K8uFshTk3ZZSNAsXTIFvXBT+34=",
         "owner": "NixOS",
         "repo": "nixpkgs",
-        "rev": "c21b77913ea840f8bcf9adf4c41cecc2abffd38d",
+        "rev": "62c435d93bf046a5396f3016472e8f7c8e2aed65",
         "type": "github"
       },
       "original": {
         "owner": "NixOS",
-        "ref": "nixos-24.05",
+        "ref": "nixos-24.11",
         "repo": "nixpkgs",
         "type": "github"
       }
     },
     "nixpkgs-unstable": {
       "locked": {
-        "lastModified": 1731676054,
-        "narHash": "sha256-OZiZ3m8SCMfh3B6bfGC/Bm4x3qc1m2SVEAlkV6iY7Yg=",
+        "lastModified": 1732837521,
+        "narHash": "sha256-jNRNr49UiuIwaarqijgdTR2qLPifxsVhlJrKzQ8XUIE=",
         "owner": "NixOS",
         "repo": "nixpkgs",
-        "rev": "5e4fbfb6b3de1aa2872b76d49fafc942626e2add",
+        "rev": "970e93b9f82e2a0f3675757eb0bfc73297cc6370",
         "type": "github"
       },
       "original": {
diff --git a/flake.nix b/flake.nix
index 8cef25b..ff0f11f 100644
--- a/flake.nix
+++ b/flake.nix
@@ -1,11 +1,11 @@
 {
   inputs = {
-    nixpkgs.url = "github:NixOS/nixpkgs/nixos-24.05";
+    nixpkgs.url = "github:NixOS/nixpkgs/nixos-24.11";
 
     nixpkgs-unstable.url = "github:NixOS/nixpkgs/nixos-unstable";
 
     home-manager = {
-      url = "github:nix-community/home-manager/release-24.05";
+      url = "github:nix-community/home-manager/release-24.11";
       inputs.nixpkgs.follows = "nixpkgs";
     };
 
diff --git a/machines/bismuth/devices.nix b/machines/bismuth/devices.nix
index 711b237..9bec0c5 100644
--- a/machines/bismuth/devices.nix
+++ b/machines/bismuth/devices.nix
@@ -24,10 +24,8 @@
 
   # internet
   networking.networkmanager.enable = true;
-  
-  # sound 
-  sound.enable = true;
-  hardware.pulseaudio.enable = false;
+
+  # sound
   security.rtkit.enable = true;
   services.pipewire = {
     enable = true;
diff --git a/modules/common.nix b/modules/common.nix
index fdef280..c696bc7 100644
--- a/modules/common.nix
+++ b/modules/common.nix
@@ -66,12 +66,12 @@
     inetutils arp-scan pciutils lshw lsof inxi iw pmutils acpi acpid
     sysprof wireshark hardinfo remmina
     vlc celluloid foliate calibre
-    yt-dlp ffmpeg_7-full handbrake subtitlecomposer mpv helvum
-    gimp krita aseprite mypaint rnote
-    blender inkscape obs-studio darktable
+    yt-dlp ffmpeg_7-full handbrake mpv helvum
+    gimp krita aseprite rnote
+    blender inkscape obs-studio darktable davinci-resolve
     renderdoc
-    audacity musescore reaper bitwig-studio
-    lagrange senpai signal-desktop
+    audacity musescore muse-sounds-manager reaper bitwig-studio
+    lagrange senpai signal-desktop alpaca
     qemu_full virtiofsd
 
     openvpn openvpn3 update-resolv-conf
@@ -95,8 +95,6 @@
     borgbackup pika-backup
 
     prismlauncher xonotic
-  ]) ++ (with unstablePkgs; [
-    davinci-resolve muse-sounds-manager alpaca
   ]) ++ (with auxiliaryPkgs; [
     ghidra ngfx retroarch
   ]);
diff --git a/modules/gnome.nix b/modules/gnome.nix
index 7fde00d..39495fa 100644
--- a/modules/gnome.nix
+++ b/modules/gnome.nix
@@ -43,22 +43,4 @@
       gtk-application-prefer-dark-theme = 1
     '';
   };
-
-  # enable triple buffering which makes mutter supposedly feel smoother
-  nixpkgs.overlays = [
-    # GNOME 46: triple-buffering-v4-46
-    (final: prev: {
-      gnome = prev.gnome.overrideScope (gnomeFinal: gnomePrev: {
-        mutter = gnomePrev.mutter.overrideAttrs (old: {
-          src = pkgs.fetchFromGitLab  {
-            domain = "gitlab.gnome.org";
-            owner = "vanvugt";
-            repo = "mutter";
-            rev = "triple-buffering-v4-46";
-            hash = "sha256-C2VfW3ThPEZ37YkX7ejlyumLnWa9oij333d5c4yfZxc=";
-          };
-        });
-      });
-    })
-  ];
 }
diff --git a/modules/nvidia.nix b/modules/nvidia.nix
index efb38a3..c12bfdc 100644
--- a/modules/nvidia.nix
+++ b/modules/nvidia.nix
@@ -1,63 +1,24 @@
-{ config, lib, pkgs, fetchpatch, ... }:
+{ config, lib, pkgs, ... }:
 
-let
-  # Fixes framebuffer with linux 6.11
-  fbdev_linux_611_patch = fetchpatch {
-    url = "https://patch-diff.githubusercontent.com/raw/NVIDIA/open-gpu-kernel-modules/pull/692.patch";
-    hash = "sha256-OYw8TsHDpBE5DBzdZCBT45+AiznzO9SfECz5/uXN5Uc=";
-  };
-in
 {
-  # Enable OpenGL
-  hardware.opengl = {
+  hardware.graphics = {
     enable = true;
-    driSupport = true;
-    driSupport32Bit = true;
+    enable32Bit = true;
   };
 
-  # Load nvidia driver for Xorg and Wayland
   services.xserver.videoDrivers = ["nvidia"];
 
   hardware.nvidia = {
-
-    # Modesetting is required.
     modesetting.enable = true;
-
-    # Nvidia power management. Experimental, and can cause sleep/suspend to fail.
     powerManagement.enable = true;
-    # Fine-grained power management. Turns off GPU when not in use.
-    # Experimental and only works on modern Nvidia GPUs (Turing or newer).
     powerManagement.finegrained = false;
 
-    # Use the NVidia open source kernel module (not to be confused with the
-    # independent third-party "nouveau" open source driver).
-    # Support is limited to the Turing and later architectures. Full list of 
-    # supported GPUs is at: 
-    # https://github.com/NVIDIA/open-gpu-kernel-modules#compatible-gpus 
-    # Only available from driver 515.43.04+
-    # Currently alpha-quality/buggy, so false is currently the recommended setting.
-    # open = false;
-
-    # Enable the Nvidia settings menu,
-	# accessible via `nvidia-settings`.
     # note: fails to build after 560
     nvidiaSettings = false;
 
-    # Optionally, you may need to select the appropriate driver version for your specific GPU.
-    # package = config.boot.kernelPackages.nvidiaPackages.beta;
-    
-    # note: this is enabled by default for nvidia 555 so maybe it should be true?
-    # very crashy :(
-    open = false;   
+    # sadly still very crashy :(
+    open = false;
 
-    package = config.boot.kernelPackages.nvidiaPackages.mkDriver {
-      version = "560.35.03";
-      sha256_64bit = "sha256-8pMskvrdQ8WyNBvkU/xPc/CtcYXCa7ekP73oGuKfH+M=";
-      sha256_aarch64 = "sha256-s8ZAVKvRNXpjxRYqM3E5oss5FdqW+tv1qQC2pDjfG+s=";
-      openSha256 = "sha256-/32Zf0dKrofTmPZ3Ratw4vDM7B+OgpC4p7s+RHUjCrg=";
-      settingsSha256 = "sha256-kQsvDgnxis9ANFmwIwB7HX5MkIAcpEEAHc8IBOLdXvk=";
-      persistencedSha256 = "sha256-E2J2wYYyRu7Kc3MMZz/8ZIemcZg68rkzvqEwFAL3fFs=";
-      #patchesOpen = [ fbdev_linux_611_patch ];
-    }; 
+    package = config.boot.kernelPackages.nvidiaPackages.beta;
   };
 }