From d40140f37f0b2e50bb26bdd14d3e2b30d45be228 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Jakub=20Krop=C3=A1=C4=8Dek?= Date: Fri, 27 Jun 2025 15:36:15 +0200 Subject: [PATCH] add my warpssh --- flake.lock | 24 ++++++++++---------- flake.nix | 1 + homeManagerModules/packages/development.nix | 1 + overlays/default.nix | 1 + packages/warpssh/default.nix | 25 +++++++++++++++++++++ scripts/build_packages.py | 2 +- 6 files changed, 41 insertions(+), 13 deletions(-) create mode 100644 packages/warpssh/default.nix diff --git a/flake.lock b/flake.lock index 4c36ff2..2d22835 100644 --- a/flake.lock +++ b/flake.lock @@ -32,11 +32,11 @@ ] }, "locked": { - "lastModified": 1750040002, - "narHash": "sha256-KrC9iOVYIn6ukpVlHbqSA4hYCZ6oDyJKrcLqv4c5v84=", + "lastModified": 1750903843, + "narHash": "sha256-Ng9+f0H5/dW+mq/XOKvB9uwvGbsuiiO6HrPdAcVglCs=", "owner": "nix-community", "repo": "disko", - "rev": "7f1857b31522062a6a00f88cbccf86b43acceed1", + "rev": "83c4da299c1d7d300f8c6fd3a72ac46cb0d59aae", "type": "github" }, "original": { @@ -52,11 +52,11 @@ ] }, "locked": { - "lastModified": 1750304462, - "narHash": "sha256-Mj5t4yX05/rXnRqJkpoLZTWqgStB88Mr/fegTRqyiWc=", + "lastModified": 1750973805, + "narHash": "sha256-BZXgag7I0rnL/HMHAsBz3tQrfKAibpY2vovexl2lS+Y=", "owner": "nix-community", "repo": "home-manager", - "rev": "863842639722dd12ae9e37ca83bcb61a63b36f6c", + "rev": "080e8b48b0318b38143d5865de9334f46d51fce3", "type": "github" }, "original": { @@ -103,11 +103,11 @@ }, "nixos-hardware": { "locked": { - "lastModified": 1750431636, - "narHash": "sha256-vnzzBDbCGvInmfn2ijC4HsIY/3W1CWbwS/YQoFgdgPg=", + "lastModified": 1750837715, + "narHash": "sha256-2m1ceZjbmgrJCZ2PuQZaK4in3gcg3o6rZ7WK6dr5vAA=", "owner": "NixOS", "repo": "nixos-hardware", - "rev": "1552a9f4513f3f0ceedcf90320e48d3d47165712", + "rev": "98236410ea0fe204d0447149537a924fb71a6d4f", "type": "github" }, "original": { @@ -119,11 +119,11 @@ }, "nixpkgs": { "locked": { - "lastModified": 1750365781, - "narHash": "sha256-XE/lFNhz5lsriMm/yjXkvSZz5DfvKJLUjsS6pP8EC50=", + "lastModified": 1750776420, + "narHash": "sha256-/CG+w0o0oJ5itVklOoLbdn2dGB0wbZVOoDm4np6w09A=", "owner": "NixOS", "repo": "nixpkgs", - "rev": "08f22084e6085d19bcfb4be30d1ca76ecb96fe54", + "rev": "30a61f056ac492e3b7cdcb69c1e6abdcf00e39cf", "type": "github" }, "original": { diff --git a/flake.nix b/flake.nix index 0540075..e2c534a 100644 --- a/flake.nix +++ b/flake.nix @@ -81,6 +81,7 @@ { uv-bin = pkgs.callPackage ./packages/uv { }; lanshare = pkgs.callPackage ./packages/lanshare { }; + warpssh = pkgs.callPackage ./packages/warpssh { }; }; formatter.x86_64-linux = nixpkgs.legacyPackages.x86_64-linux.nixfmt-rfc-style; hydraJobs = { diff --git a/homeManagerModules/packages/development.nix b/homeManagerModules/packages/development.nix index 0737f2c..e05101e 100644 --- a/homeManagerModules/packages/development.nix +++ b/homeManagerModules/packages/development.nix @@ -32,6 +32,7 @@ in kropcloud-utils rpi-imager wireguard-tools + warpssh ]; programs.go = { enable = true; diff --git a/overlays/default.nix b/overlays/default.nix index 56d11ff..e0b9cc4 100644 --- a/overlays/default.nix +++ b/overlays/default.nix @@ -7,6 +7,7 @@ in (final: prev: { uv-bin = self.packages.x86_64-linux.uv-bin; lanshare = self.packages.x86_64-linux.lanshare; + warpssh = self.packages.x86_64-linux.warpssh; kropcloud-utils = inputs.kropcloud-utils.packages.x86_64-linux.default; gamescope = prev.gamescope.overrideAttrs (oldAttrs: { patches = (oldAttrs.patches or [ ]) ++ [ diff --git a/packages/warpssh/default.nix b/packages/warpssh/default.nix new file mode 100644 index 0000000..3f129ec --- /dev/null +++ b/packages/warpssh/default.nix @@ -0,0 +1,25 @@ +{ + stdenv, + buildGoModule, + fetchgit, + lib, +}: +buildGoModule rec { + pname = "warpssh"; + version = "1.0"; + + src = fetchgit { + url = "https://git.kropcloud.net/JustScreaMy/warpssh.git"; + rev = "refs/tags/${version}"; + hash = "sha256-oMtUQYYqJ+/ezNrFVhNL8LBcqf0P9w8Dq1Gt28sgxLI="; + }; + + ldflags = [ "-s -w" ]; + + vendorHash = "sha256-NFe8i8S2yVl7I/mwgghvsFIHHEyaIo4B8SkKChJu6nI="; + + meta = { + description = "Fuzzyfind your warpgate servers!"; + homepage = "https://git.kropcloud.net/JustScreaMy/warpssh"; + }; +} diff --git a/scripts/build_packages.py b/scripts/build_packages.py index ab4a422..5bed301 100755 --- a/scripts/build_packages.py +++ b/scripts/build_packages.py @@ -1,4 +1,4 @@ -#!/usr/bin/env python3.12 +#!/usr/bin/env python3.13 import json import shutil