.envrc

@@ -0,0 +1 @@
+eval "$(lorri direnv)"

.gitignore

@@ -1,6 +1,3 @@
 result
 result-*
 
-.direnv
-.envrc
-

flake.nix

@@ -8,40 +8,27 @@
 
   outputs = { self, nixpkgs, flake-utils }:
     let
-      inherit (flake-utils.lib) eachDefaultSystem flattenTree;
-      inherit (nixpkgs.lib.attrsets) filterAttrs mapAttrs;
+      inherit (flake-utils.lib) defaultSystems flattenTree;
+      inherit (nixpkgs.lib.attrsets) filterAttrs genAttrs mapAttrs;
     in
     {
       nixosModules = mapAttrs (_: path: import path) (import ./modules);
-
-      overlays = import ./overlays // {
-        pkgs = final: prev: import ./pkgs/top-level/all-packages.nix { pkgs = prev; };
-      };
-
       overlay = final: prev: {
         xeals = nixpkgs.lib.composeExtensions self.overlays.pkgs;
       };
-    } // eachDefaultSystem (system:
-      let
-        pkgs = nixpkgs.legacyPackages.${system};
-        xPkgs = import ./pkgs/top-level/all-packages.nix { inherit pkgs; };
-        mkApp = opts: { type = "app"; } // opts;
-      in
-      rec {
-        packages = filterAttrs
-          (attr: drv: builtins.elem system (drv.meta.platforms or [ ]))
-          (flattenTree xPkgs);
-
-        apps = flattenTree {
-          alacritty = mkApp { program = "${packages.alacritty-ligatures}/bin/alacritty"; };
-          protonmail-bridge = mkApp { program = "${packages.protonmail-bridge}/bin/protonmail-bridge"; };
-          protonmail-bridge-headless = mkApp { program = "${packages.protonmail-bridge}/bin/protonmail-bridge"; };
-          psst = {
-            cli = mkApp { program = "${packages.psst}/bin/psst-cli"; };
-            gui = mkApp { program = "${packages.psst}/bin/psst-gui"; };
-          };
-          samrewritten = mkApp { program = "${packages.samrewritten}/bin/samrewritten"; };
-          spotify-ripper = mkApp { program = "${packages.spotify-ripper}/bin/spotify-ripper"; };
-        };
-      });
+      overlays = import ./overlays // {
+        pkgs = final: prev: import ./pkgs/top-level/all-packages.nix { pkgs = prev; };
+      };
+      packages = genAttrs defaultSystems
+        (system:
+          let
+            pkgs = nixpkgs.legacyPackages.${system};
+            xPkgs = import ./pkgs/top-level/all-packages.nix { inherit pkgs; };
+          in
+          filterAttrs
+            (attr: drv:
+              builtins.elem system drv.meta.platforms or [ ])
+            xPkgs
+        );
+    };
 }

pkgs/applications/audio/psst/default.nix

@@ -1,71 +0,0 @@
-{ stdenv
-, fetchFromGitHub
-, rustPlatform
-
-, cmake
-, pkg-config
-, openssl
-
-  # GUI
-, withGui ? true
-, copyDesktopItems
-, makeDesktopItem
-, gtk3
-}:
-
-let
-  inherit (stdenv.lib) optional optionals;
-in
-
-assert withGui -> gtk3.meta.available;
-
-rustPlatform.buildRustPackage rec {
-  pname = "psst";
-  version = "20210103.002c2bb";
-  src = fetchFromGitHub {
-    owner = "jpochyla";
-    repo = "psst";
-    rev = "002c2bbd610ab7a49b095cd871c56bfe2c3a9f6b";
-    sha256 = "883ecb0ae2ef5af441dc4fe15ef15a2077f2cef10ab3e96096c38355acdba031";
-    fetchSubmodules = true;
-  };
-  cargoSha256 = "e3f94e41fda9e2bc55b48ee77487d574d35e771fbd13a565432f30cda26654a1";
-
-  nativeBuildInputs = [ pkg-config ]
-    ++ optional withGui copyDesktopItems;
-
-  buildInputs = [ openssl ]
-    ++ optional withGui gtk3;
-
-  cargoBuildFlags = optionals (!withGui) [
-    "--workspace"
-    "--exclude"
-    "psst-gui"
-  ];
-
-  # Unable to exclude targets from the check phase as it doesn't respect
-  # `cargoBuildFlags`; to save from attempting to build the GUI without meaning
-  # to, don't bother checking for CLI-only builds.
-  # https://github.com/NixOS/nixpkgs/blob/77d190f10931c1d06d87bf6d772bf65346c71777/pkgs/build-support/rust/default.nix#L241
-  doCheck = withGui;
-
-  desktopItems = optionals withGui [
-    (makeDesktopItem {
-      name = pname;
-      desktopName = "psst";
-      genericName = "Spotify Player";
-      categories = "AudioVideo;Audio;Network;Player;";
-      comment = "Spotify client with native GUI";
-      exec = "psst-gui";
-      extraEntries = "Keywords=spotify;music;";
-      icon = "spotify";
-      type = "Application";
-    })
-  ];
-
-  meta = with stdenv.lib; {
-    description = "Fast and multi-platform Spotify client with native GUI ";
-    homepage = "https://github.com/jpochyla/psst";
-    license = licenses.mit;
-  };
-}

pkgs/applications/networking/protonmail-bridge/default.nix

@@ -20,16 +20,16 @@ let
 
     buildGoModule (stdenv.lib.recursiveUpdate args rec {
       inherit pname;
-      version = "1.5.4";
+      version = "1.5.2";
 
       src = fetchFromGitHub {
         owner = "ProtonMail";
         repo = "proton-bridge";
         rev = "br-${version}";
-        sha256 = "1398d13skn6as9carxiws500rp5j9b33r0j2blpxrff856a8v0bp";
+        sha256 = "1mv7fwapcarii43nnsgk7ifqlah07k54zk6vxxxmrp04gy0mzki6";
       };
 
-      vendorSha256 = "1a83kh096pkyklqgdip112fps6ia90vg7zxv0nvivxmdyik2vcvz";
+      vendorSha256 = "01d6by8xj9py72lpfns08zqnsym98v8imb7d6hgmnzp4hfqzbz3c";
 
       nativeBuildInputs = (args.nativeBuildInputs or [ ]) ++ [
         pkg-config

pkgs/development/libraries/libhl/default.nix

@@ -26,10 +26,9 @@ stdenv.mkDerivation rec {
     mkdir -p $out/include $out/lib
   '';
 
-  meta = with stdenv.lib; {
+  meta = {
     homepage = "https://github.com/xant/libhl";
     description = "Simple and fast C library implementing a thread-safe API to manage hash-tables, linked lists, lock-free ring buffers and queues ";
-    license = licenses.lgpl3;
-    platforms = platforms.all;
+    license = stdenv.lib.licenses.lgpl3;
   };
 }

pkgs/shells/zsh/zsh-z/default.nix

@@ -30,6 +30,5 @@ stdenv.mkDerivation {
     description = ''Jump quickly to directories that you have visited "frecently." A native ZSH port of z.sh.'';
     homepage = "https://github.com/agkozak/zsh-z";
     license = stdenv.lib.licenses.mit;
-    platforms = zsh.meta.platforms;
   };
 }

pkgs/tools/misc/samrewritten/default.nix

@@ -13,13 +13,13 @@
 
 stdenv.mkDerivation rec {
   pname = "SamRewritten";
-  version = "2.1";
+  version = "2.0";
 
   src = fetchFromGitHub {
     owner = "PaulCombal";
     repo = pname;
-    rev = "202008";
-    sha256 = "ab7903b997675b0d4d7eede15430fc5ca2736e6c25c7f95a7c97e1ce25582a1c";
+    rev = "202005";
+    sha256 = "0zcb6cmzk4fvbf0rkyyfvlnh9mhi0wz89parprkz6vxrj65ph1f6";
   };
 
   nativeBuildInputs = [ gnumake pkg-config ];
@@ -33,10 +33,21 @@ stdenv.mkDerivation rec {
 
   NIX_CFLAGS_LINK = "-pthread";
 
-  makeFlags = [ "PREFIX=$(out)" ];
+  # FIXME: Use `make install` after the next release
+  # FIXME: Get `substituteInPlace` working
+  installPhase = ''
+    mkdir -p $out/lib/SamRewritten/{bin,glade,assets}
+    mkdir -p $out/share/icons/hicolor/{64x64,256x256}/apps
+    mkdir -p $out/share/applications
+    mkdir -p $out/bin
+    cp bin/launch.sh bin/samrewritten bin/libsteam_api.so $out/lib/SamRewritten/bin/
+    ln -s $out/lib/SamRewritten/bin/launch.sh $out/bin/samrewritten
+    cp glade/main_window.glade $out/lib/SamRewritten/glade/main_window.glade
+    cp assets/icon_64.png $out/share/icons/hicolor/64x64/apps/samrewritten.png
+    cp assets/icon_256.png $out/share/icons/hicolor/256x256/apps/samrewritten.png
+    cp assets/icon_256.png $out/lib/SamRewritten/assets/
 
-  postFixup = ''
-    substituteInPlace $out/share/applications/samrewritten.desktop \
+    substitute package/samrewritten.desktop $out/share/applications/samrewritten.desktop \
       --replace /usr/bin/samrewritten $out/bin/samrewritten
   '';
 
@@ -44,6 +55,5 @@ stdenv.mkDerivation rec {
     description = "Steam Achievement Manager For Linux";
     homepage = "https://github.com/PaulCombal/SamRewritten";
     license = licenses.gpl3;
-    platforms = platforms.linux;
   };
 }

pkgs/top-level/all-packages.nix

@@ -91,8 +91,6 @@ rec {
     patches = (oldAttrs.patches or [ ]) ++ [ ../applications/misc/polybar/9button.patch ];
   });
 
-  psst = pkgs.callPackage ../applications/audio/psst { };
-
   python2Packages =
     let
       fixVersion =