Merge branch 'main' into renovate/renovate-renovate-37.x

nixos/common/desktop/home.nix

@@ -15,6 +15,7 @@ in
     cinny-desktop
     element-desktop-wayland
     fusee-launcher
+    fractal-next
     gcc
     gimp
     helix
@@ -32,8 +33,8 @@ in
     nixpkgs-review
     plex-media-player
     plexamp
+    spotify
     qmk
-    rustup
     solo2-cli
     tex
     unzip
@@ -45,6 +46,7 @@ in
   programs = {
     v.vscode.enable = true;
     v.nvim.enable = true;
+    v.rust.enable = true;
 
     riff = {
       enable = true;

nixos/common/hm-modules/default.nix

@@ -1,3 +1,3 @@
 { ... }: {
-  imports = [ ./catppuccin.nix ./nvim.nix ./riff.nix ./vscode.nix ./git.nix ];
+  imports = [ ./catppuccin.nix ./nvim.nix ./riff.nix ./vscode.nix ./git.nix ./rust.nix ];
 }

nixos/common/hm-modules/rust.nix

@@ -0,0 +1,21 @@
+{ pkgs, lib, config, ... }:
+with lib;
+let cfg = config.programs.v.rust;
+in {
+  options.programs.v.rust = { enable = mkEnableOption "rust"; };
+  config = mkIf cfg.enable {
+    home.packages = with pkgs; [ rustup ];
+
+    home.file = {
+      ".cargo/config.toml".text = ''
+        [registries.crates-io]
+        protocol = "sparse"
+
+        [build]
+        rustc-wrapper = "${pkgs.sccache}/bin/sccache"
+      '';
+    };
+
+    home.sessionPath = [ "$HOME/.cargo/bin" ];
+  };
+}

nixos/hosts/olympus/dhcp/configuration.nix

@@ -34,11 +34,11 @@ in
 
   networking.firewall.allowedUDPPorts = [ 67 ];
 
-  services.prometheus.exporters.kea = {
-    enable = true;
-    openFirewall = true;
-    controlSocketPaths = [ "/run/kea/kea-dhcp4.socket" ];
-  };
+  # services.prometheus.exporters.kea = {
+  #   enable = true;
+  #   openFirewall = true;
+  #   controlSocketPaths = [ "/run/kea/kea-dhcp4.socket" ];
+  # };
 
   services.kea.dhcp4 = {
     enable = true;
@@ -50,10 +50,11 @@ in
 
       interfaces-config.interfaces = [ "eth0" ];
 
-      control-socket = {
-        socket-type = "unix";
-        socket-name = "/run/kea/kea-dhcp4.socket";
-      };
+      # control-socket = {
+      #   socket-type = "unix";
+      #   socket-name = "/run/kea/kea-dhcp4.socket";
+      # };
+      # failed to initialize Kea server: configuration error using file '/etc/kea/dhcp4-server.conf': cannot create socket lockfile, /run/kea/kea-dhcp4.socket.lock, : No such file or directory
 
       lease-database = {
         name = "/var/lib/kea/dhcp4.leases";

nixos/hosts/olympus/eevee/configuration.nix

@@ -40,22 +40,6 @@
 
   environment.sessionVariables.NIXOS_OZONE_WL = "1";
 
-
-  # services.kubo = {
-  #   enable = true;
-  #   enableGC = true;
-  #   # autoMount = true;
-  #   settings = {
-  #     Addresses.API = "/ip4/127.0.0.1/tcp/2324";
-  #     Routing = {
-  #       AcceleratedDHTClient = true;
-  #     };
-  #     Experimental = {
-  #       FilestoreEnabled = true;
-  #     };
-  #   };
-  # };
-
   home-manager = {
     users.victor = import ./home;
   };

nixos/hosts/olympus/eevee/hardware.nix

@@ -2,13 +2,14 @@
   hardware = {
     enableAllFirmware = true;
     nvidia = {
-      package = config.boot.kernelPackages.nvidiaPackages.stable;
+      # package = config.boot.kernelPackages.nvidiaPackages.stable;
 
       # Open drivers cause gdm to crash
       # open = true;
 
       # nvidia-drm.modeset=1
       modesetting.enable = true;
+      powerManagement.enable = false;
     };
 
     # Hardware acceleration
@@ -17,6 +18,7 @@
 
       # Vulkan
       driSupport = true;
+      driSupport32Bit = true;
     };
 
     logitech.wireless = {