From c038fa3228f091fc8120916b738cb38bb5bb610f Mon Sep 17 00:00:00 2001 From: Rouven Seifert Date: Sun, 14 May 2023 22:04:06 +0200 Subject: [PATCH] upstreamed my stuff --- flake.lock | 18 +++++----- pkgs/dracula-icon-theme/default.nix | 32 ----------------- pkgs/x32edit/default.nix | 48 -------------------------- users/rouven/modules/packages.nix | 5 +-- users/rouven/modules/theme/default.nix | 2 +- 5 files changed, 13 insertions(+), 92 deletions(-) delete mode 100644 pkgs/dracula-icon-theme/default.nix delete mode 100644 pkgs/x32edit/default.nix diff --git a/flake.lock b/flake.lock index 7af8bdc..5ad6247 100644 --- a/flake.lock +++ b/flake.lock @@ -23,11 +23,11 @@ ] }, "locked": { - "lastModified": 1684058710, - "narHash": "sha256-A0Qix+nPSjxO9kn2iFxciui0UolDancvFSWQGxU453s=", + "lastModified": 1684061181, + "narHash": "sha256-EJpZ+Drpt3aHpowddpsQFBWsqLSJHyP6dnremTVMdWw=", "owner": "nix-community", "repo": "home-manager", - "rev": "db3d440e2664e8aaf67742b6fd545cf148fe5016", + "rev": "e4272987f785a8848205263abb4911b922c21e1b", "type": "github" }, "original": { @@ -44,11 +44,11 @@ "xdph": "xdph" }, "locked": { - "lastModified": 1683977796, - "narHash": "sha256-b1tlmtHcAHSj4ORC/5qVcBoNxU8wJbhhPRd0HhutaCM=", + "lastModified": 1684068895, + "narHash": "sha256-1oSX5LQmSl/lcpPdM+NG2TlLynFmVbubNeIoSF1Mmv0=", "owner": "hyprwm", "repo": "Hyprland", - "rev": "896a78aaa0bb2e4d4f197ed1286c4f030dbaef5f", + "rev": "7c207243e41b5b4f35d790767ad2e21eba1b7a0b", "type": "github" }, "original": { @@ -196,11 +196,11 @@ }, "nixpkgs_2": { "locked": { - "lastModified": 1683408522, - "narHash": "sha256-9kcPh6Uxo17a3kK3XCHhcWiV1Yu1kYj22RHiymUhMkU=", + "lastModified": 1684049129, + "narHash": "sha256-7WB9LpnPNAS8oI7hMoHeKLNhRX7k3CI9uWBRSfmOCCE=", "owner": "nixos", "repo": "nixpkgs", - "rev": "897876e4c484f1e8f92009fd11b7d988a121a4e7", + "rev": "0470f36b02ef01d4f43c641bbf07020bcab71bf1", "type": "github" }, "original": { diff --git a/pkgs/dracula-icon-theme/default.nix b/pkgs/dracula-icon-theme/default.nix deleted file mode 100644 index 41c22e6..0000000 --- a/pkgs/dracula-icon-theme/default.nix +++ /dev/null @@ -1,32 +0,0 @@ -{ lib, stdenv, fetchFromGitHub }: - -let - themeName = "Dracula"; - version = "2021-07-21"; -in -stdenv.mkDerivation { - pname = "dracula-icon-theme"; - inherit version; - - src = fetchFromGitHub { - owner = "m4thewz"; - repo = "dracula-icons"; - rev = "2d3c83caa8664e93d956cfa67a0f21418b5cdad8"; - sha256 = "GY+XxTM22jyNq8kaB81zNfHRhfXujArFcyzDa8kjxCQ="; - }; - - installPhase = '' - runHook preInstall - mkdir -p $out/share/icons/${themeName} - cp -a * $out/share/icons/${themeName}/ - runHook postInstall - ''; - - meta = with lib; { - description = "Dracula Icon theme"; - homepage = "https://github.com/m4thewz/dracula-icons"; - platforms = platforms.all; - license = licenses.gpl3; - maintainers = with maintainers; [ therealr5 ]; - }; -} diff --git a/pkgs/x32edit/default.nix b/pkgs/x32edit/default.nix deleted file mode 100644 index f18b5f4..0000000 --- a/pkgs/x32edit/default.nix +++ /dev/null @@ -1,48 +0,0 @@ -{ stdenv, fetchurl, lib, libX11, libXext, alsa-lib, freetype, curlWithGnuTls, ... }: -stdenv.mkDerivation rec { - pname = "X32-Edit"; - version = "4.3"; - # version = "4.1"; - - src = fetchurl { - url = "https://mediadl.musictribe.com/download/software/behringer/X32/X32-Edit_LINUX_${version}.tar.gz"; - sha256 = "iVBBW6qVtEGlNXqKRZxObB9WfbOEjXMA1Nsp1CTFOH4="; - # sha256 = "YyxrXWRapTj31dEv4pGFt4zZf+kb4TunPigyVh0+XH8="; - }; - - sourceRoot = "."; - dontBuild = true; - dontStrip = true; - - installPhase = '' - mkdir -p $out/bin - cp ${pname} $out/bin - ''; - preFixup = - let - # we prepare our library path in the let clause to avoid it become part of the input of mkDerivation - libPath = lib.makeLibraryPath [ - curlWithGnuTls - # libX11 # libX11.so.6 - # libXext # libXext.so.6 - alsa-lib # libasound.so.2 - freetype # libfreetype.so.6 - stdenv.cc.cc.lib # libstdc++.so.6 - ]; - in - '' - patchelf \ - --set-interpreter "$(cat $NIX_CC/nix-support/dynamic-linker)" \ - --set-rpath "${libPath}" \ - $out/bin/${pname} - ''; - - meta = with lib; { - homepage = "https://www.behringer.com/behringer/product?modelCode=P0ASF"; - description = "Editor for the behringer x32 digital mixer"; - sourceProvenance = with sourceTypes; [ binaryNativeCode ]; - license = licenses.unfree; - platforms = platforms.linux; - maintainers = [ maintainers.magnetophon ]; - }; -} diff --git a/users/rouven/modules/packages.nix b/users/rouven/modules/packages.nix index ce2b1cb..46a28a9 100644 --- a/users/rouven/modules/packages.nix +++ b/users/rouven/modules/packages.nix @@ -22,7 +22,7 @@ # sound pavucontrol - # (pkgs.callPackage ../../../pkgs/x32edit { }) + x32edit # bluetooth blueman @@ -44,11 +44,12 @@ # yubikey and password stuff yubikey-manager yubikey-manager-qt - yubioath-flutter + # yubioath-flutter # broken, TODO fix bitwarden bitwarden-cli # misc + btop neofetch # obligatory virt-manager ventoy diff --git a/users/rouven/modules/theme/default.nix b/users/rouven/modules/theme/default.nix index 479221e..b141853 100644 --- a/users/rouven/modules/theme/default.nix +++ b/users/rouven/modules/theme/default.nix @@ -12,7 +12,7 @@ }; iconTheme = { name = "Dracula"; - package = (pkgs.callPackage ../../../../pkgs/dracula-icon-theme { }); + package = pkgs.dracula-icon-theme; }; }; home.pointerCursor = {