Going back to 24.05

general/user/packages.nix

@@ -1,4 +1,4 @@
-{ pkgs, lib, config, ... }:
+{ pkgs, nixpkgs-unstable, lib, config, ... }:
 
 let
   tex = (pkgs.texlive.combine { inherit (pkgs.texlive)
@@ -63,20 +63,20 @@ in {
     local.quadcastrgb
 
     # Reading
-    calibre
+    # calibre
     papers
 
     # Utilities
     impression
     resources
-    file-roller
+    gnome.file-roller
     baobab
 
     # Proton
     protonmail-bridge-gui
     protonmail-desktop
     protonvpn-gui
-    proton-pass
+    unstable.proton-pass
 
     # Games
     heroic
@@ -84,7 +84,7 @@ in {
     prismlauncher
     vvvvvv
     ryujinx
-    dolphin-emu
+    # dolphin-emu
     parsec-bin
 
     # Nix
@@ -95,12 +95,13 @@ in {
     # Commandline
     starship
     wl-clipboard
+    sl
 
     # System
     gnome-firmware
 
     # Customization
-    gnome-tweaks
+    gnome.gnome-tweaks
     gnome-extension-manager
     adw-gtk3
     paper-icon-theme
@@ -110,7 +111,7 @@ in {
     git
     git-lfs
     vscode
-    zed-editor
+    unstable.zed-editor
     gcc
     rustup
     python3
@@ -125,7 +126,7 @@ in {
     # Containers & VMs
     toolbox
     distrobox
-    gnome-boxes
+    gnome.gnome-boxes
 
     # Office
     libreoffice
@@ -143,7 +144,6 @@ in {
     tex
     pandoc
     typst
-    typst-live
     tinymist
     zotero
  
@@ -205,26 +205,35 @@ in {
     update.auto.enable = true;
   };
 
-  # Version pins
-  nixpkgs.overlays = [ (final: prev: {
-    dolphin-emu = prev.dolphin-emu.overrideAttrs (super: {
-      version = "2407";
-      commit = "b92e354389bb7c0bd114a8631b8af110d3cb3a14";
+  nixpkgs.overlays = [
+    # Version pins
+    (final: prev: {
+      dolphin-emu = prev.dolphin-emu.overrideAttrs (super: {
+        version = "2407";
+        commit = "b92e354389bb7c0bd114a8631b8af110d3cb3a14";
 
-      src = pkgs.fetchFromGitHub {
-        owner = "dolphin-emu";
-        repo = "dolphin";
-        rev = "heads/refs/tags/${final.dolphin-emu.version}";
-        hash = "sha256-8W4KyIj+rhDkWnQogjpzlEJVo3HJenfpWKimSyMGN7c=";
-        fetchSubmodules = true;
+        src = pkgs.fetchFromGitHub {
+          owner = "dolphin-emu";
+          repo = "dolphin";
+          rev = "heads/refs/tags/${final.dolphin-emu.version}";
+          hash = "sha256-8W4KyIj+rhDkWnQogjpzlEJVo3HJenfpWKimSyMGN7c=";
+          fetchSubmodules = true;
+        };
+
+        cmakeFlags = [
+          "-DDISTRIBUTOR=NixOS"
+          "-DDOLPHIN_WC_BRANCH=${final.dolphin-emu.src.rev}"
+          "-DDOLPHIN_WC_DESCRIBE=${final.dolphin-emu.version}"
+          "-DDOLPHIN_WC_REVISION=${final.dolphin-emu.commit}"
+        ];
+      });
+    })
+
+    # Unstable
+    (final: prev: {
+      unstable = import nixpkgs-unstable {
+        system = prev.system;
       };
-
-      cmakeFlags = [
-        "-DDISTRIBUTOR=NixOS"
-        "-DDOLPHIN_WC_BRANCH=${final.dolphin-emu.src.rev}"
-        "-DDOLPHIN_WC_DESCRIBE=${final.dolphin-emu.version}"
-        "-DDOLPHIN_WC_REVISION=${final.dolphin-emu.commit}"
-      ];
-    });
-  }) ];
+    })
+  ];
 }