machines: aramis: home: add 'element-desktop'

It's less buggy than the web version...

flake.lock

@@ -23,11 +23,11 @@
     },
     "futils": {
       "locked": {
-        "lastModified": 1652776076,
-        "narHash": "sha256-gzTw/v1vj4dOVbpBSJX4J0DwUR6LIyXo7/SuuTJp1kM=",
+        "lastModified": 1653893745,
+        "narHash": "sha256-0jntwV3Z8//YwuOjzhV2sgJJPt+HY6KhU7VZUL0fKZQ=",
         "owner": "numtide",
         "repo": "flake-utils",
-        "rev": "04c1b180862888302ddfb2e3ad9eaa63afc60cf8",
+        "rev": "1ed9fb1935d260de5fe1c2f7ee0ebaae17ed2fa1",
         "type": "github"
       },
       "original": {
@@ -44,11 +44,11 @@
         ]
       },
       "locked": {
-        "lastModified": 1653153149,
-        "narHash": "sha256-8B/tWWZziFq4DqnAm9uO7M4Z4PNfllYg5+teX1e5yDQ=",
+        "lastModified": 1653943687,
+        "narHash": "sha256-xXW9t24HLf89+n/92kOqRRfOBE3KDna+9rAOefs5WSQ=",
         "owner": "nix-community",
         "repo": "home-manager",
-        "rev": "94780dd888881bf35165dfdd334a57ef6b14ead8",
+        "rev": "8f3e26705178cc8c1d982d37d881fc0d5b5b1837",
         "type": "github"
       },
       "original": {
@@ -60,11 +60,11 @@
     },
     "nixpkgs": {
       "locked": {
-        "lastModified": 1653060744,
-        "narHash": "sha256-kfRusllRumpt33J1hPV+CeCCylCXEU7e0gn2/cIM7cY=",
+        "lastModified": 1653845079,
+        "narHash": "sha256-7ghaQZ+7JXLI9FgNH8+RQHAt3/ubT92j8NtjZleP6t4=",
         "owner": "NixOS",
         "repo": "nixpkgs",
-        "rev": "dfd82985c273aac6eced03625f454b334daae2e8",
+        "rev": "b62ada430501de88dfbb08cea4eb98ead3a5e3e7",
         "type": "github"
       },
       "original": {
@@ -76,11 +76,11 @@
     },
     "nur": {
       "locked": {
-        "lastModified": 1653301395,
-        "narHash": "sha256-T/RZd2MLugtJtZwXOSSwUIQdf2R95j8mj9LxGvKnvnM=",
+        "lastModified": 1653970042,
+        "narHash": "sha256-EcphYipFvqkFV9PrWUUz034G7WQHZwYVwzGiyU5384A=",
         "owner": "nix-community",
         "repo": "NUR",
-        "rev": "2d836739ddb17a69e865c3cc2ca21d3a8bf5db78",
+        "rev": "83f9a7c7287210b20da844b1ccd7c79cb696f51e",
         "type": "github"
       },
       "original": {

flake.nix

@@ -117,6 +117,7 @@
       rec {
         apps = {
           diff-flake = futils.lib.mkApp { drv = packages.diff-flake; };
+          default = apps.diff-flake;
         };
 
         checks = {
@@ -135,8 +136,6 @@
           };
         };
 
-        defaultApp = apps.diff-flake;
-
         devShells = {
           default = pkgs.mkShell {
             name = "NixOS-config";

machines/aramis/home.nix

@@ -13,6 +13,7 @@
     gpg.pinentry = "gtk2";
     # Machine specific packages
     packages.additionalPackages = with pkgs; [
+      element-desktop # Matrix client
       jellyfin-media-player # Wraps the webui and mpv together
       pavucontrol # Audio mixer GUI
       quasselClient # IRC client

overlays/default.nix

@@ -1,5 +1,3 @@
 {
-  sabnzbd-fix-missing-packages = import ./sabnzbd-fix-missing-dependencies;
-
-  transgui-fix-duplicate-status = import ./transgui-fix-duplicate-status;
+  # NOTE: no overlays at the moment
 }

overlays/sabnzbd-fix-missing-dependencies/default.nix

@@ -1,4 +0,0 @@
-final: prev:
-{
-  sabnzbd = final.callPackage ./sabnzbd.nix { };
-}

overlays/sabnzbd-fix-missing-dependencies/sabnzbd.nix

@@ -1,60 +0,0 @@
-{ lib
-, stdenv
-, fetchFromGitHub
-, python3
-, par2cmdline
-, unzip
-, unrar
-, p7zip
-, makeWrapper
-}:
-
-let
-  pythonEnv = python3.withPackages (ps: with ps; [
-    chardet
-    cheetah3
-    cherrypy
-    configobj
-    cryptography
-    feedparser
-    guessit
-    puremagic
-    sabyenc3
-  ]);
-  path = lib.makeBinPath [ par2cmdline unrar unzip p7zip ];
-in
-stdenv.mkDerivation rec {
-  version = "3.4.0";
-  pname = "sabnzbd";
-
-  src = fetchFromGitHub {
-    owner = pname;
-    repo = pname;
-    rev = version;
-    sha256 = "sha256-zax+PuvCmYOlEhRmiCp7UOd9VI0i8dbgTPyTtqLuGUM=";
-  };
-
-  nativeBuildInputs = [ makeWrapper ];
-  buildInputs = [ pythonEnv ];
-
-  installPhase = ''
-    runHook preInstall
-
-    mkdir -p $out
-    cp -R * $out/
-    mkdir $out/bin
-    echo "${pythonEnv}/bin/python $out/SABnzbd.py \$*" > $out/bin/sabnzbd
-    chmod +x $out/bin/sabnzbd
-    wrapProgram $out/bin/sabnzbd --set PATH ${path}
-
-    runHook postInstall
-  '';
-
-  meta = with lib; {
-    description = "Usenet NZB downloader, par2 repairer and auto extracting server";
-    homepage = "https://sabnzbd.org";
-    license = licenses.gpl2Plus;
-    platforms = platforms.linux;
-    maintainers = with lib.maintainers; [ fridh ];
-  };
-}

overlays/transgui-fix-duplicate-status/default.nix

@@ -1,11 +0,0 @@
-final: prev:
-{
-  transgui = prev.transgui.overrideAttrs (oldAttrs: {
-    patches = (oldAttrs.patches or [ ]) ++ [
-      (final.fetchpatch {
-        url = "https://patch-diff.githubusercontent.com/raw/transmission-remote-gui/transgui/pull/1354.patch";
-        sha256 = "sha256-Q4DAduqnTtNI0Zw9NIWpE8L0G8RusvPbZ3iW29k7XXA=";
-      })
-    ];
-  });
-}

pkgs/diff-flake/default.nix

@@ -1,7 +1,7 @@
 { lib, coreutils, git, gnused, makeWrapper, shellcheck, stdenvNoCC }:
 stdenvNoCC.mkDerivation rec {
   pname = "diff-flake";
-  version = "0.1.0";
+  version = "0.2.0";
 
   src = ./diff-flake;
 

pkgs/diff-flake/diff-flake

@@ -28,7 +28,7 @@ add_shell() {
         SYSTEM="$(nix eval --raw --impure --expr 'builtins.currentSystem')"
     fi
     # Use 'inputDerivation' attribute to make sure that it is build-able
-    FLAKE_OUTPUTS+=("devShell.$SYSTEM.inputDerivation")
+    FLAKE_OUTPUTS+=("devShells.$SYSTEM.default.inputDerivation")
 }
 
 add_host() {