flake.lock

@@ -64,11 +64,11 @@
         ]
       },
       "locked": {
-        "lastModified": 1721534365,
+        "lastModified": 1721135958,
-        "narHash": "sha256-XpZOkaSJKdOsz1wU6JfO59Rx2fqtcarQ0y6ndIOKNpI=",
+        "narHash": "sha256-H548rpPMsn25LDKn1PCFmPxmWlClJJGnvdzImHkqjuY=",
         "owner": "nix-community",
         "repo": "home-manager",
-        "rev": "635563f245309ef5320f80c7ebcb89b2398d2949",
+        "rev": "afd2021bedff2de92dfce0e257a3d03ae65c603d",
         "type": "github"
       },
       "original": {
@@ -156,11 +156,11 @@
     },
     "nixpkgs-stable_2": {
       "locked": {
-        "lastModified": 1721524707,
+        "lastModified": 1720915306,
-        "narHash": "sha256-5NctRsoE54N86nWd0psae70YSLfrOek3Kv1e8KoXe/0=",
+        "narHash": "sha256-6vuViC56+KSr+945bCV8akHK+7J5k6n/epYg/W3I5eQ=",
         "owner": "NixOS",
         "repo": "nixpkgs",
-        "rev": "556533a23879fc7e5f98dd2e0b31a6911a213171",
+        "rev": "74348da2f3a312ee25cea09b98cdba4cb9fa5d5d",
         "type": "github"
       },
       "original": {
@@ -172,11 +172,11 @@
     },
     "nixpkgs_2": {
       "locked": {
-        "lastModified": 1721466660,
+        "lastModified": 1720781449,
-        "narHash": "sha256-pFSxgSZqZ3h+5Du0KvEL1ccDZBwu4zvOil1zzrPNb3c=",
+        "narHash": "sha256-po3TZO9kcZwzvkyMJKb0WCzzDtiHWD34XeRaX1lWXp0=",
         "owner": "NixOS",
         "repo": "nixpkgs",
-        "rev": "6e14bbce7bea6c4efd7adfa88a40dac750d80100",
+        "rev": "8b5a3d5a1d951344d683b442c0739010b80039db",
         "type": "github"
       },
       "original": {
@@ -227,11 +227,11 @@
         "nixpkgs-stable": "nixpkgs-stable_2"
       },
       "locked": {
-        "lastModified": 1721531171,
+        "lastModified": 1720926522,
-        "narHash": "sha256-AsvPw7T0tBLb53xZGcUC3YPqlIpdxoSx56u8vPCr6gU=",
+        "narHash": "sha256-eTpnrT6yu1vp8C0B5fxHXhgKxHoYMoYTEikQx///jxY=",
         "owner": "Mic92",
         "repo": "sops-nix",
-        "rev": "909e8cfb60d83321d85c8d17209d733658a21c95",
+        "rev": "0703ba03fd9c1665f8ab68cc3487302475164617",
         "type": "github"
       },
       "original": {

home/hyprland/hyprland_gunter.nix

@@ -88,17 +88,14 @@
 
         animations = {
           enabled = true;
-          bezier = [
+          bezier = "myBezier, 0.05, 0.9, 0.1, 1.05";
-            "myBezier, 0.05, 0.9, 0.1, 1.05"
-            "easeInB, 0.6, -0.28, 0.735, 0.045"
-          ];
           animation = [
             "windows, 1, 7, myBezier"
             "windowsOut, 1, 7, default, popin 80%"
             "border, 1, 10, default"
             "borderangle, 1, 8, default"
             "fade, 1, 7, default"
-            "workspaces, 1, 6, easeInB, slidefadevert"
+            "workspaces, 1, 6, default"
             "specialWorkspace, 1, 4, default, fade"
           ];
         };
@@ -121,12 +118,9 @@
         ];
 
         workspace = [
-          "name:T1, monitor:$mon_top, persistent:true, default:true"
+          "name:T, monitor:$mon_top, persistent:true, default:true"
-          "name:T2, monitor:$mon_top, persistent:true, default:true"
+          "name:L, monitor:$mon_left, persistent:true, default:true"
-          "name:L1, monitor:$mon_left, persistent:true, default:true"
+          "name:R, monitor:$mon_right, persistent:true, default:true"
-          "name:L2, monitor:$mon_left, persistent:true, default:true"
-          "name:R1, monitor:$mon_right, persistent:true, default:true"
-          "name:R2, monitor:$mon_right, persistent:true, default:true"
           "name:c1, monitor:$mon_center, persistent:true, default:true"
           "name:c2, monitor:$mon_center, persistent:true, default:true"
           "name:c3, monitor:$mon_center, persistent:true, default:true"
@@ -134,7 +128,7 @@
           "special:special, on-created-empty:kitty, rounding:true, decorate:false, border:false"
         ];
 
-        bindm = [ "$mainMod,mouse:272,movewindow" ];
+        bindm = [ "ALT,mouse:272,movewindow" ];
 
         bindr = [
           # mumble ptt release

home/packages/default.nix

@@ -2,7 +2,6 @@
 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; [
@@ -101,12 +100,13 @@ in
     huecli
 
     # Stuff with overrides
+    # Blender
+    (blender.override { cudaSupport = withCuda; })
     # Btop
     (btop.override { cudaSupport = withCuda; })
     # PrismLauncher
     (prismlauncher.override { withWaylandGLFW = true; })
 
     pob
-    awakened-poe-trade
   ];
 }

packages/awakened-poe-trade.nix

@@ -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";
-  };
-})

packages/pob.nix

@@ -19,8 +19,8 @@ let
     src = fetchFromGitHub {
       owner = "PathOfBuildingCommunity";
       repo = "PathOfBuilding";
-      rev = "9481c10746f58e73f72572363ae6891129a95200";
+      rev = "b28c9cd74b664a9af3fb8d72416afebe140b350a";
-      hash = "sha256-TMJp/+DCHIXNtt96291c3Nf19QaGhnhCmx73mcMk9jM=";
+      hash = "sha256-fxpxuS64MpHJrq1tqrhZFKF0wz7phyijLIHEuxzUfa0=";
     };
 
     nativeBuildInputs = [ unzip ];

scripts/update-pob.sh

@@ -1,6 +1,6 @@
 #!/usr/bin/env bash
 set -eo pipefail
-# set -x
+set -x
 
 # TODO: Update pobfrontend as well?
 
@@ -11,7 +11,7 @@ else
     nurl_output=$(nurl -j https://github.com/PathOfBuildingCommunity/PathOfBuilding "$1" 2>/dev/null)
 fi
 
-hash=$(jq '.args.hash' <<< "$nurl_output" | sed 's/\//\\\//g')
+hash=$(jq '.args.hash' <<< "$nurl_output")
 echo "Updating pob to $rev"
 
 # Find lines to replace

system/podman.nix

@@ -2,11 +2,9 @@
 
 {
   virtualisation = {
-    containers.enable = true;
     podman = {
       enable = true;
       dockerCompat = true;
-      defaultNetwork.settings.dns_enabled = true;
     };
   };
 }