Fix sonarr not building due to dotnet 6.0 EOL

Use audio enhancement from nixos-hardware for f13
iynaix · Dec 4, 2024 · e7e35d7 · e7e35d7
1 parent b2a4592
commit e7e35d7
Show file tree

Hide file tree

Showing 9 changed files with 71 additions and 86 deletions.
diff --git a/flake.lock b/flake.lock
diff --git a/flake.nix b/flake.nix
@@ -3,7 +3,7 @@
 
   inputs = {
     nixpkgs.url = "github:nixos/nixpkgs/nixos-unstable";
-    nixpkgs-stable.url = "github:nixos/nixpkgs/nixos-24.05";
+    nixpkgs-stable.url = "github:nixos/nixpkgs/nixos-24.11";
 
     nixos-hardware.url = "github:NixOS/nixos-hardware";
 
@@ -71,6 +71,14 @@
       pkgs = import inputs.nixpkgs {
         inherit system;
         config.allowUnfree = true;
+        # FIXME: sonarr doesn't build because dotnet 6.0 is EOL
+        # https://github.com/NixOS/nixpkgs/issues/360592
+        config.permittedInsecurePackages = [
+          "aspnetcore-runtime-6.0.36"
+          "aspnetcore-runtime-wrapped-6.0.36"
+          "dotnet-sdk-6.0.428"
+          "dotnet-sdk-wrapped-6.0.428"
+        ];
       };
       lib = import ./lib.nix {
         inherit (nixpkgs) lib;

diff --git a/home-manager/default.nix b/home-manager/default.nix
@@ -96,7 +96,7 @@
         noto-fonts
         noto-fonts-cjk-sans
         noto-fonts-emoji
-        (nerdfonts.override { fonts = [ "JetBrainsMono" ]; })
+        nerd-fonts.jetbrains-mono
       ];
 
       persist = {

diff --git a/home-manager/hyprland/screenshot.nix b/home-manager/hyprland/screenshot.nix
@@ -8,8 +8,6 @@
 }:
 let
   focal = inputs.focal.packages.${pkgs.system}.default.override {
-    # TODO: remove when wf-recorder is fixed upstream
-    inherit (pkgs) wf-recorder;
     hyprland = config.wayland.windowManager.hyprland.package;
     rofi-wayland = config.programs.rofi.package;
     ocr = true;

diff --git a/hosts/framework/default.nix b/hosts/framework/default.nix
@@ -5,6 +5,8 @@ _: {
 
   networking.hostId = "abb4d116"; # required for zfs
 
+  hardware.framework.laptop13.audioEnhancement.enable = true;
+
   # touchpad support
   services.libinput.enable = true;
 

diff --git a/hosts/framework/home.nix b/hosts/framework/home.nix
@@ -45,18 +45,4 @@
       "${lib.getExe pkgs.brightnessctl} s 20%"
     ];
   };
-
-  # improve framework speaker audio quality
-  # https://reddit.com/r/framework/comments/18cngrn/
-  services.easyeffects = {
-    enable = true;
-    preset = "kieran_levin";
-  };
-
-  xdg.configFile."easyeffects/output".source = pkgs.fetchFromGitHub {
-    owner = "ceiphr";
-    repo = "ee-framework-presets";
-    rev = "27885fe00c97da7c441358c7ece7846722fd12fa";
-    hash = "sha256-z2WmozMDMUkiAd+BEc/5+DHgFXDbw3FdsvBwgIj0JmI=";
-  };
 }
diff --git a/overlays/default.nix b/overlays/default.nix
@@ -98,15 +98,6 @@ in
 
       # nsig keeps breaking, so use updated version from github
       yt-dlp = prev.yt-dlp.overrideAttrs sources.yt-dlp;
-
-      # FIXME: allow rclip to use later deps
-      rclip = prev.rclip.overridePythonAttrs {
-        pythonRelaxDeps = [
-          "pillow"
-          "torch"
-          "torchvision"
-        ];
-      };
     })
   ];
 }
diff --git a/overlays/generated.json b/overlays/generated.json
@@ -21,7 +21,7 @@
     },
     "swww": {
         "cargoLocks": null,
-        "date": "2024-10-31",
+        "date": "2024-11-30",
         "extract": null,
         "name": "swww",
         "passthru": null,
@@ -33,11 +33,11 @@
             "name": null,
             "owner": "LGFae",
             "repo": "swww",
-            "rev": "0db3f4eb192f1c9bf914efcc1d2aba809da5d78a",
-            "sha256": "sha256-+8YUJsNzvgAeZYLfbHYfYlad/iS+6Eec/LWzL1ZIGfY=",
+            "rev": "1bd7166f0e06bbb4f1c175b35bfef582b4e639ac",
+            "sha256": "sha256-yp7P0gQ0EThnOL2Fy87S6IsKdyrUSA/oMVk3BvNrJKE=",
             "type": "github"
         },
-        "version": "0db3f4eb192f1c9bf914efcc1d2aba809da5d78a"
+        "version": "1bd7166f0e06bbb4f1c175b35bfef582b4e639ac"
     },
     "wallust": {
         "cargoLocks": null,
@@ -60,7 +60,7 @@
     },
     "yazi-plugins": {
         "cargoLocks": null,
-        "date": "2024-11-28",
+        "date": "2024-12-03",
         "extract": null,
         "name": "yazi-plugins",
         "passthru": null,
@@ -72,11 +72,11 @@
             "name": null,
             "owner": "yazi-rs",
             "repo": "plugins",
-            "rev": "2491a93e2ce425768fe58559106544932b14c64a",
-            "sha256": "sha256-geg0UjwzXALZl+XYGFzwSx4hcNwXCZykvfUV0/U8QwE=",
+            "rev": "40eafa3e4c7383db865ac1d61bbc0fa22be0ef01",
+            "sha256": "sha256-Ey3lDmhFLpp/sD3sC/kNgsN7JZz+i2dU+bvqKODOxzo=",
             "type": "github"
         },
-        "version": "2491a93e2ce425768fe58559106544932b14c64a"
+        "version": "40eafa3e4c7383db865ac1d61bbc0fa22be0ef01"
     },
     "yazi-time-travel": {
         "cargoLocks": null,
@@ -112,10 +112,10 @@
             "name": null,
             "owner": "yt-dlp",
             "repo": "yt-dlp",
-            "rev": "2024.11.18",
-            "sha256": "sha256-TpQry/qUxqAvj4gQJecGSAlw850WxjK1KU43JpecPAU=",
+            "rev": "2024.12.03",
+            "sha256": "sha256-0Ko3CNc0R3BPMvRGUGuLbid+nHKw+14y0l4wDpfPp6E=",
             "type": "github"
         },
-        "version": "2024.11.18"
+        "version": "2024.12.03"
     }
 }
diff --git a/overlays/generated.nix b/overlays/generated.nix
@@ -14,15 +14,15 @@
   };
   swww = {
     pname = "swww";
-    version = "0db3f4eb192f1c9bf914efcc1d2aba809da5d78a";
+    version = "1bd7166f0e06bbb4f1c175b35bfef582b4e639ac";
     src = fetchFromGitHub {
       owner = "LGFae";
       repo = "swww";
-      rev = "0db3f4eb192f1c9bf914efcc1d2aba809da5d78a";
+      rev = "1bd7166f0e06bbb4f1c175b35bfef582b4e639ac";
       fetchSubmodules = false;
-      sha256 = "sha256-+8YUJsNzvgAeZYLfbHYfYlad/iS+6Eec/LWzL1ZIGfY=";
+      sha256 = "sha256-yp7P0gQ0EThnOL2Fy87S6IsKdyrUSA/oMVk3BvNrJKE=";
     };
-    date = "2024-10-31";
+    date = "2024-11-30";
   };
   wallust = {
     pname = "wallust";
@@ -39,15 +39,15 @@
   };
   yazi-plugins = {
     pname = "yazi-plugins";
-    version = "2491a93e2ce425768fe58559106544932b14c64a";
+    version = "40eafa3e4c7383db865ac1d61bbc0fa22be0ef01";
     src = fetchFromGitHub {
       owner = "yazi-rs";
       repo = "plugins";
-      rev = "2491a93e2ce425768fe58559106544932b14c64a";
+      rev = "40eafa3e4c7383db865ac1d61bbc0fa22be0ef01";
       fetchSubmodules = false;
-      sha256 = "sha256-geg0UjwzXALZl+XYGFzwSx4hcNwXCZykvfUV0/U8QwE=";
+      sha256 = "sha256-Ey3lDmhFLpp/sD3sC/kNgsN7JZz+i2dU+bvqKODOxzo=";
     };
-    date = "2024-11-28";
+    date = "2024-12-03";
   };
   yazi-time-travel = {
     pname = "yazi-time-travel";
@@ -63,13 +63,13 @@
   };
   yt-dlp = {
     pname = "yt-dlp";
-    version = "2024.11.18";
+    version = "2024.12.03";
     src = fetchFromGitHub {
       owner = "yt-dlp";
       repo = "yt-dlp";
-      rev = "2024.11.18";
+      rev = "2024.12.03";
       fetchSubmodules = false;
-      sha256 = "sha256-TpQry/qUxqAvj4gQJecGSAlw850WxjK1KU43JpecPAU=";
+      sha256 = "sha256-0Ko3CNc0R3BPMvRGUGuLbid+nHKw+14y0l4wDpfPp6E=";
     };
   };
 }