diff --git a/flake.lock b/flake.lock index 250d6e3..ff52892 100644 --- a/flake.lock +++ b/flake.lock @@ -122,6 +122,27 @@ "type": "github" } }, + "nix-packages": { + "inputs": { + "nixpkgs": [ + "nixpkgs" + ] + }, + "locked": { + "lastModified": 1721941415, + "narHash": "sha256-cwXnE1iElys54c0Kwv1ue1EKX1eoJECQlkEYnaNTJlg=", + "ref": "master", + "rev": "08c9b0d19c4d5f63e5169169a106a476899ccf27", + "revCount": 8, + "type": "git", + "url": "https://git.t-juice.club/torjus/nix-packages" + }, + "original": { + "ref": "master", + "type": "git", + "url": "https://git.t-juice.club/torjus/nix-packages" + } + }, "nixpkgs": { "locked": { "lastModified": 1721743106, @@ -216,6 +237,7 @@ "ghettoptt": "ghettoptt", "home-manager": "home-manager", "huecli": "huecli", + "nix-packages": "nix-packages", "nixpkgs": "nixpkgs", "nixpkgs-stable": "nixpkgs-stable", "sops-nix": "sops-nix" diff --git a/flake.nix b/flake.nix index 2bf01ca..baa9ef1 100644 --- a/flake.nix +++ b/flake.nix @@ -18,6 +18,10 @@ url = "git+https://git.t-juice.club/torjus/huecli?ref=master"; inputs.nixpkgs.follows = "nixpkgs"; }; + nix-packages = { + url = "git+https://git.t-juice.club/torjus/nix-packages?ref=master"; + inputs.nixpkgs.follows = "nixpkgs"; + }; }; outputs = @@ -28,6 +32,7 @@ sops-nix, ghettoptt, huecli, + nix-packages, ... }@inputs: let @@ -95,6 +100,7 @@ overlay-stable ghettoptt.overlays.default huecli.overlays.default + nix-packages.overlays.default ]; } ) diff --git a/home/hyprland/hyprland_gunter.nix b/home/hyprland/hyprland_gunter.nix index 6133b5b..2f38301 100644 --- a/home/hyprland/hyprland_gunter.nix +++ b/home/hyprland/hyprland_gunter.nix @@ -134,7 +134,10 @@ "special:special, on-created-empty:kitty, rounding:true, decorate:false, border:false" ]; - bindm = [ "$mainMod,mouse:272,movewindow" ]; + bindm = [ + "$mainMod,mouse:272,movewindow" + "$shiftMainMod,mouse:272,resizewindow" + ]; bindr = [ # mumble ptt release diff --git a/home/packages/default.nix b/home/packages/default.nix index b0e291d..7aa1b8e 100644 --- a/home/packages/default.nix +++ b/home/packages/default.nix @@ -1,8 +1,6 @@ { pkgs, osConfig, ... }: let withCuda = if (osConfig.system.name == "gunter") then true else false; - pob = pkgs.qt6Packages.callPackage ../../packages/pob.nix { }; - awakened-poe-trade = pkgs.callPackage ../../packages/awakened-poe-trade.nix { }; in { home.packages = with pkgs; [ @@ -105,7 +103,8 @@ in # PrismLauncher (prismlauncher.override { withWaylandGLFW = true; }) - pob + # From nix-packages flake + path-of-building-beta awakened-poe-trade ]; } diff --git a/packages/awakened-poe-trade.nix b/packages/awakened-poe-trade.nix deleted file mode 100644 index f4bedbd..0000000 --- a/packages/awakened-poe-trade.nix +++ /dev/null @@ -1,138 +0,0 @@ -{ - stdenv, - lib, - fetchFromGitHub, - fetchYarnDeps, - yarn, - yarnConfigHook, - yarnBuildHook, - makeWrapper, - libGL, - nodejs, - electron, - xorg, - wayland, - libglvnd, - npmHooks, -}: -let - pkgVersion = "3.24.10004"; - - pkgSrc = fetchFromGitHub { - owner = "SnosMe"; - repo = "awakened-poe-trade"; - rev = "v${pkgVersion}"; - hash = "sha256-khIJIOT5Us792YThruNZfnpfBrcPS/vjoAdLI6V4Nwo="; - }; - - yarnCacheRenderer = fetchYarnDeps { - yarnLock = pkgSrc + "/renderer/yarn.lock"; - hash = "sha256-hOfE8XCu1Y4yZzOKHhaNkqKxJ6gxZS5SLRlBxvq3LwY="; - }; - - yarnCacheMain = fetchYarnDeps { - yarnLock = pkgSrc + "/main/yarn.lock"; - hash = "sha256-VLDsqCKrNF7Smywg3yRrjgMG0lmZt8uzeTHKr5n2JMw="; - }; - - renderer = stdenv.mkDerivation (finalAttrs: { - pname = "awakened-poe-trade-renderer"; - version = "${pkgVersion}"; - src = pkgSrc; - sourceRoot = "${finalAttrs.src.name}/renderer"; - - yarnOfflineCache = yarnCacheRenderer; - - buildPhase = '' - yarn make-index-files - runHook yarnBuildHook - ''; - - installPhase = '' - mkdir -p $out - cp -r dist $out; - ''; - - nativeBuildInputs = [ - yarnConfigHook - yarnBuildHook - nodejs - ]; - }); -in -stdenv.mkDerivation (finalAttrs: { - pname = "awakened-poe-trade"; - version = "${pkgVersion}"; - src = pkgSrc; - sourceRoot = "${finalAttrs.src.name}/main"; - - yarnOfflineCache = yarnCacheMain; - - patchPhase = '' - find . - substituteInPlace electron-builder.yml \ - --replace-fail "../renderer/dist" "${renderer}/dist" \ - --replace-fail "AppImage" "dir" - cat electron-builder.yml - find "${renderer}" - ''; - - env = { - ELECTRON_SKIP_BINARY_DOWNLOAD = 1; - ELECTRON_OVERRIDE_DIST_PATH = "${electron}"; - }; - - nativeBuildInputs = [ - yarnConfigHook - yarnBuildHook - yarn - nodejs - electron - makeWrapper - renderer - ]; - - # yarnBuildScript = "electron-builder"; - # yarnBuildFlags = [ - # "--dir" - # "-c.electronDist=${electron}/libexec/electron" - # "-c.electronVersion=${electron.version}" - # ]; - buildPhase = '' - runHook yarnBuildHook - yarn run electron-builder --dir -c.electronDist=${electron}/libexec/electron -c.electronVersion=${electron.version} - find dist - ''; - - installPhase = '' - runHook preInstall - mkdir -p "$out/share/lib/awakened-poe-trade" - cp -r ./dist/*-unpacked/{locales,resources{,.pak}} "$out/share/lib/awakened-poe-trade" - cp -r "${renderer}/dist/data" "$out/share/lib/awakened-poe-trade/resources/data" - echo "${renderer}" - - makeWrapper '${electron}/bin/electron' "$out/bin/awakened-poe-trade" \ - --set LD_LIBRARY_PATH "${ - lib.makeLibraryPath [ - libGL - xorg.libXtst - xorg.libXt - wayland - libglvnd - ] - }" \ - --add-flags "$out/share/lib/awakened-poe-trade/resources/app.asar" \ - --add-flags "\''${NIXOS_OZONE_WL:+\''${WAYLAND_DISPLAY:+--ozone-platform-hint=auto --enable-features=WaylandWindowDecorations}}" \ - --inherit-argv0 - runHook postInstall - ''; - - buildInputs = [ electron ]; - - meta = { - description = "Path of Exile trading app for price checking"; - homepage = "https://github.com/SnosMe/awakened-poe-trade"; - license = lib.licenses.mit; - mainProgram = "pobfrontend"; - }; -}) diff --git a/packages/pob.nix b/packages/pob.nix deleted file mode 100644 index dcdf48f..0000000 --- a/packages/pob.nix +++ /dev/null @@ -1,94 +0,0 @@ -{ - stdenv, - lib, - fetchFromGitHub, - unzip, - meson, - ninja, - pkg-config, - qtbase, - qttools, - wrapQtAppsHook, - luajit, -}: -let - data = stdenv.mkDerivation (finalAttrs: { - pname = "path-of-building-data"; - version = "2.43.0-beta"; - - src = fetchFromGitHub { - owner = "PathOfBuildingCommunity"; - repo = "PathOfBuilding"; - rev = "9481c10746f58e73f72572363ae6891129a95200"; - hash = "sha256-TMJp/+DCHIXNtt96291c3Nf19QaGhnhCmx73mcMk9jM="; - }; - - nativeBuildInputs = [ unzip ]; - - buildCommand = '' - # I have absolutely no idea how this file is generated - # and I don't think I want to know. The Flatpak also does this. - unzip -j -d $out $src/runtime-win32.zip lua/sha1.lua - - # Install the actual data - cp -r $src/src $src/runtime/lua/*.lua $src/manifest.xml $out - - # Pretend this is an official build so we don't get the ugly "dev mode" warning - substituteInPlace $out/manifest.xml --replace ' $out/src/UpdateCheck.lua - ''; - }); -in -stdenv.mkDerivation { - pname = "path-of-building"; - version = "${data.version}-unstable-2023-04-09"; - - src = fetchFromGitHub { - owner = "ernstp"; - repo = "pobfrontend"; - rev = "9faa19aa362f975737169824c1578d5011487c18"; - hash = "sha256-zhw2PZ6ZNMgZ2hG+a6AcYBkeg7kbBHNc2eSt4if17Wk="; - }; - - nativeBuildInputs = [ - meson - ninja - pkg-config - qttools - wrapQtAppsHook - ]; - buildInputs = [ - qtbase - luajit - luajit.pkgs.lua-curl - ]; - - installPhase = '' - runHook preInstall - install -Dm555 pobfrontend $out/bin/pobfrontend - runHook postInstall - ''; - - preFixup = '' - qtWrapperArgs+=( - --set LUA_PATH "$LUA_PATH" - --set LUA_CPATH "$LUA_CPATH" - --chdir "${data}" - ) - ''; - - passthru.data = data; - - meta = { - description = "Offline build planner for Path of Exile"; - homepage = "https://pathofbuilding.community/"; - license = lib.licenses.mit; - maintainers = [ lib.maintainers.k900 ]; - mainProgram = "pobfrontend"; - broken = stdenv.isDarwin; # doesn't find uic6 for some reason - }; -}