Add nix-packages flake

flake.lock

@@ -64,11 +64,11 @@
         ]
       },
       "locked": {
-        "lastModified": 1721534365,
+        "lastModified": 1721852138,
-        "narHash": "sha256-XpZOkaSJKdOsz1wU6JfO59Rx2fqtcarQ0y6ndIOKNpI=",
+        "narHash": "sha256-JH8N5uoqoVA6erV4O40VtKKHsnfmhvMGbxMNDLtim5o=",
         "owner": "nix-community",
         "repo": "home-manager",
-        "rev": "635563f245309ef5320f80c7ebcb89b2398d2949",
+        "rev": "304a011325b7ac7b8c9950333cd215a7aa146b0e",
         "type": "github"
       },
       "original": {
@@ -122,13 +122,34 @@
         "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": 1721379653,
+        "lastModified": 1721743106,
-        "narHash": "sha256-8MUgifkJ7lkZs3u99UDZMB4kbOxvMEXQZ31FO3SopZ0=",
+        "narHash": "sha256-adRZhFpBTnHiK3XIELA3IBaApz70HwCYfv7xNrHjebA=",
         "owner": "nixos",
         "repo": "nixpkgs",
-        "rev": "1d9c2c9b3e71b9ee663d11c5d298727dace8d374",
+        "rev": "dc14ed91132ee3a26255d01d8fd0c1f5bff27b2f",
         "type": "github"
       },
       "original": {
@@ -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"
@@ -227,11 +249,11 @@
         "nixpkgs-stable": "nixpkgs-stable_2"
       },
       "locked": {
-        "lastModified": 1721531171,
+        "lastModified": 1721688883,
-        "narHash": "sha256-AsvPw7T0tBLb53xZGcUC3YPqlIpdxoSx56u8vPCr6gU=",
+        "narHash": "sha256-9jsjsRKtJRqNSTXKj9zuDFRf2PGix30nMx9VKyPgD2U=",
         "owner": "Mic92",
         "repo": "sops-nix",
-        "rev": "909e8cfb60d83321d85c8d17209d733658a21c95",
+        "rev": "aff2f88277dabe695de4773682842c34a0b7fd54",
         "type": "github"
       },
       "original": {

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
                 ];
               }
             )

home/editor/neovim/default.nix

@@ -35,6 +35,8 @@
           p.tree-sitter-c
           p.tree-sitter-cmake
           p.tree-sitter-cpp
+          p.tree-sitter-markdown
+          p.tree-sitter-markdown-inline
         ]))
       ];
       extraLuaConfig = ''

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

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; [
@@ -45,7 +43,6 @@ in
     tokei
     unzip
     ventoy
-    zoxide
 
     # Non-CLI stuff
     alacritty
@@ -106,7 +103,8 @@ in
     # PrismLauncher
     (prismlauncher.override { withWaylandGLFW = true; })
 
-    pob
+    # From nix-packages flake
+    path-of-building-beta
     awakened-poe-trade
   ];
 }

home/zsh/default.nix

@@ -10,6 +10,10 @@
       package = pkgs.nix-direnv;
     };
   };
+  programs.zoxide = {
+    enable = true;
+    enableZshIntegration = true;
+  };
   programs.zsh = {
     enable = true;
     autocd = false;
@@ -32,9 +36,6 @@
 
       # Aliases
       alias ls=eza
-
-      # Init zoxide
-      eval "$(zoxide init zsh)"
     '';
     zplug = {
       enable = true;

hosts/gunter/configuration.nix

@@ -72,18 +72,18 @@
     modesetting.enable = true;
     powerManagement.enable = false;
     powerManagement.finegrained = false;
-    open = false;
+    open = true;
-    nvidiaSettings = true;
+    nvidiaSettings = false;
 
-    package = config.boot.kernelPackages.nvidiaPackages.beta;
+    # package = config.boot.kernelPackages.nvidiaPackages.beta;
-    # package = config.boot.kernelPackages.nvidiaPackages.mkDriver {
+    package = config.boot.kernelPackages.nvidiaPackages.mkDriver {
-    #   version = "555.42.02";
+      version = "560.28.03";
-    #   sha256_64bit = "sha256-k7cI3ZDlKp4mT46jMkLaIrc2YUx1lh1wj/J4SVSHWyk=";
+      sha256_64bit = "sha256-martv18vngYBJw1IFUCAaYr+uc65KtlHAMdLMdtQJ+Y=";
-    #   sha256_aarch64 = lib.fakeSha256;
+      sha256_aarch64 = lib.fakeHash;
-    #   openSha256 = "sha256-rtDxQjClJ+gyrCLvdZlT56YyHQ4sbaL+d5tL4L4VfkA=";
+      openSha256 = "sha256-asGpqOpU0tIO9QqceA8XRn5L27OiBFuI9RZ1NjSVwaM=";
-    #   settingsSha256 = "sha256-rtDxQjClJ+gyrCLvdZlT56YyHQ4sbaL+d5tL4L4VfkA=";
+      settingsSha256 = lib.fakeHash;
-    #   persistencedSha256 = lib.fakeSha256;
+      persistencedSha256 = lib.fakeSha256;
-    # };
+    };
   };
 
   # Setup hyprland

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

@@ -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 '<Version' '<Version platform="nixos"'
-      touch $out/installed.cfg
-
-      # Completely stub out the update check
-      chmod +w $out/src/UpdateCheck.lua
-      echo 'return "none"' > $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
-  };
-}