bindings
This commit is contained in:
1 parent
09606a2c11
commit
fd5bb0af6e
13 files changed
+184
-37
No files matched your search
@@ -8,6 +8,7 @@ devenv.local.nix
|
||||
# tmp
|
||||
tmp
|
||||
result.diff
|
||||
.claude-nixos-setup
|
||||
|
||||
# direnv
|
||||
.direnv
|
||||
|
||||
@@ -26,7 +26,6 @@ hl.config({
|
||||
fullscreen_on_one_column = true,
|
||||
focus_fit_method = 0,
|
||||
follow_focus = true,
|
||||
explicit_column_widths = "0.5, 1.0",
|
||||
},
|
||||
|
||||
cursor = {
|
||||
|
||||
@@ -6,7 +6,7 @@ hl.monitor({
|
||||
output = "eDP-1",
|
||||
mode = "2256x1504@60",
|
||||
position = "0x0",
|
||||
scale = 1.57,
|
||||
scale = 1.07,
|
||||
})
|
||||
|
||||
-- Home Office
|
||||
|
||||
@@ -15,7 +15,7 @@ binds {
|
||||
Mod+E { spawn "wofi-emoji"; }
|
||||
Mod+Alt+E { spawn-sh "zeditor ~/.config/niri/shared/binds.kdl"; }
|
||||
Mod+Q { close-window; }
|
||||
Mod+Alt+N hotkey-overlay-title="Workspace: Rename" { spawn "skygqts" "workspace-manager" "toggle"; }
|
||||
Mod+Alt+N hotkey-overlay-title="Workspace: Rename" { spawn "skygqts" "workspace-manager" "rename"; }
|
||||
|
||||
|
||||
// =========================
|
||||
@@ -26,7 +26,7 @@ binds {
|
||||
Mod+Up { focus-workspace-up; }
|
||||
Mod+Right { focus-column-right; }
|
||||
|
||||
Mod+Tab { toggle-overview; }
|
||||
Mod+Tab hotkey-overlay-title="Workspace: Rename" { spawn "skygqts" "workspace-manager" "windows"; }
|
||||
Mod+Shift+Tab { focus-monitor-next; }
|
||||
|
||||
// =========================
|
||||
|
||||
Generated
+26
-26
@@ -41,11 +41,11 @@
|
||||
]
|
||||
},
|
||||
"locked": {
|
||||
"lastModified": 1788444081,
|
||||
"narHash": "sha256-I8i97p9WBQaZQyyBaHFMt8e01VfgfFZSaO+vAUd0u0A=",
|
||||
"lastModified": 1789630322,
|
||||
"narHash": "sha256-jiUl3+k9K+BASO4hvKFhlCMUpHPPoy2q5uZMl3pzOF0=",
|
||||
"owner": "hyprwm",
|
||||
"repo": "aquamarine",
|
||||
"rev": "36b66db4ddd708ad19f5db850af6a478d8a19b2a",
|
||||
"rev": "f31c47a1b9d300847d8fc3108ad959448103dfc1",
|
||||
"type": "github"
|
||||
},
|
||||
"original": {
|
||||
@@ -1039,11 +1039,11 @@
|
||||
"treefmt-nix": "treefmt-nix_2"
|
||||
},
|
||||
"locked": {
|
||||
"lastModified": 1789749213,
|
||||
"narHash": "sha256-bYj5LouChA0lYv8c0L06EmT+nNiOwzhWYSAkROBTxSA=",
|
||||
"lastModified": 1790206168,
|
||||
"narHash": "sha256-KnFEaWAxn9HNC0dfxQe683rAITFpDBf0GR9Mwui/2E0=",
|
||||
"ref": "refs/heads/main",
|
||||
"rev": "c8ff8b1f25345e6437c33a708927e430da37dba3",
|
||||
"revCount": 37,
|
||||
"rev": "d5afd6510f95650bf07cd89b8af77cd75a3114d5",
|
||||
"revCount": 40,
|
||||
"type": "git",
|
||||
"url": "ssh://gitea@minipc1.lab.internal:22/ari/hermenix.git"
|
||||
},
|
||||
@@ -1243,11 +1243,11 @@
|
||||
"xdph": "xdph"
|
||||
},
|
||||
"locked": {
|
||||
"lastModified": 1789046904,
|
||||
"narHash": "sha256-wWPN/kmzwp4kHBtC6JmVUJHg2Np2VtyfS53mFrI90us=",
|
||||
"lastModified": 1790173459,
|
||||
"narHash": "sha256-6/r7tBSiLpohq6hYBLmiuc6KdgTjo6Rers3lE3V3zBM=",
|
||||
"owner": "hyprwm",
|
||||
"repo": "Hyprland",
|
||||
"rev": "f05d73f35795ded80d7e1264a37e41b461625f9f",
|
||||
"rev": "e368c13c27a42a173b9e08fa0bf413f9f7073187",
|
||||
"type": "github"
|
||||
},
|
||||
"original": {
|
||||
@@ -1314,11 +1314,11 @@
|
||||
]
|
||||
},
|
||||
"locked": {
|
||||
"lastModified": 1772460177,
|
||||
"narHash": "sha256-/6G/MsPvtn7bc4Y32pserBT/Z4SUUdBd4XYJpOEKVR4=",
|
||||
"lastModified": 1789475883,
|
||||
"narHash": "sha256-YRFLrPESYitsDYqQKquOFg8OWNI7tHKwPnTrTZWXxWY=",
|
||||
"owner": "hyprwm",
|
||||
"repo": "hyprland-protocols",
|
||||
"rev": "1cb6db5fd6bb8aee419f4457402fa18293ace917",
|
||||
"rev": "cc9a8fd253bdc00f48a967ecf4828211ef08751f",
|
||||
"type": "github"
|
||||
},
|
||||
"original": {
|
||||
@@ -1549,11 +1549,11 @@
|
||||
]
|
||||
},
|
||||
"locked": {
|
||||
"lastModified": 1786903207,
|
||||
"narHash": "sha256-QTwMqLLONRhv9iz6CVeuX6BqQNQCIqI8hL/cPYlR/24=",
|
||||
"lastModified": 1788619883,
|
||||
"narHash": "sha256-dpmeFq5vPvSOsi30ZchOLjltAZEuVBucDvGKs3IZYf4=",
|
||||
"owner": "hyprwm",
|
||||
"repo": "hyprutils",
|
||||
"rev": "6cf50415e06dc6bd9f1252f1b745eac6b4a1cc39",
|
||||
"rev": "a21e87b878e72ee5dfd375899e8b2ad0d0c4c0e1",
|
||||
"type": "github"
|
||||
},
|
||||
"original": {
|
||||
@@ -2182,11 +2182,11 @@
|
||||
},
|
||||
"nixpkgs_9": {
|
||||
"locked": {
|
||||
"lastModified": 1788404924,
|
||||
"narHash": "sha256-lhEhY8X5EgkQ/eg6IFz4cc8jRuSYSvnxx1al7d1dvZ0=",
|
||||
"lastModified": 1789684949,
|
||||
"narHash": "sha256-ZKhUe/2IJUq1JhKxKMu8rbkgSGmPP2ZCqlIPn40aGCM=",
|
||||
"owner": "NixOS",
|
||||
"repo": "nixpkgs",
|
||||
"rev": "0968519e14f7aa7d3e9b389682bd74d2b51c8ce8",
|
||||
"rev": "e554fab72f81915600f3f449b786fd9af40439a5",
|
||||
"type": "github"
|
||||
},
|
||||
"original": {
|
||||
@@ -2311,11 +2311,11 @@
|
||||
]
|
||||
},
|
||||
"locked": {
|
||||
"lastModified": 1788267358,
|
||||
"narHash": "sha256-nt+lUqYVpc9Y6JeMd2WmXzCDojasdadKo0mWcluvY2Y=",
|
||||
"lastModified": 1789514889,
|
||||
"narHash": "sha256-PFD1nxptCXJyJoiYO1gf/5Vv43yqGpHtMC6LUhl9/pQ=",
|
||||
"owner": "cachix",
|
||||
"repo": "git-hooks.nix",
|
||||
"rev": "27555e2624241fb116b49095df4caaee85a25691",
|
||||
"rev": "59f4ca0d063a1a3ec722c88b51a33004862e5379",
|
||||
"type": "github"
|
||||
},
|
||||
"original": {
|
||||
@@ -2471,11 +2471,11 @@
|
||||
]
|
||||
},
|
||||
"locked": {
|
||||
"lastModified": 1790186118,
|
||||
"narHash": "sha256-lN/eoxi6d5CcXpQsd1jFMCQTF0mRCG0TtuQ/VPgCNic=",
|
||||
"lastModified": 1790210299,
|
||||
"narHash": "sha256-r2GXjijMsNZMIX8I7+gIixmIJtQbW6mufy36uvod2lc=",
|
||||
"ref": "refs/heads/main",
|
||||
"rev": "bcf70106e23cbb568a1e77482a40bfa5dcd8879e",
|
||||
"revCount": 24,
|
||||
"rev": "d49ea0d0a6325fd0e8e4957962c7f97c30286cff",
|
||||
"revCount": 27,
|
||||
"type": "git",
|
||||
"url": "ssh://gitea@minipc1.lab.internal:22/ari/skygqts.git"
|
||||
},
|
||||
|
||||
@@ -210,6 +210,7 @@
|
||||
shellHook = ''
|
||||
export PATH=$PATH:$(pwd)/bin
|
||||
export SKYG_LIB="$(pwd)/bin/lib/cmds.nu"
|
||||
export CLAUDE_CONFIG_DIR="$(pwd)/.claude-nixos-setup"
|
||||
${pre-commit-check.shellHook}
|
||||
|
||||
if [ -z "$NU_VERSION" ] && [ -t 0 ] && command -v nu >/dev/null; then
|
||||
@@ -250,6 +251,7 @@
|
||||
skyg-dns-records = dnsRecordsFile;
|
||||
ds4 = my-nixpkgs.legacyPackages.${system}.ds4;
|
||||
buzz-desktop = lib.pkgs.${system}.buzz-desktop;
|
||||
superset-desktop = lib.pkgs.${system}.superset-desktop;
|
||||
colibri = lib.pkgs.${system}.colibri;
|
||||
herdr = herdr.packages.${system}.default;
|
||||
}
|
||||
|
||||
+5
-3
@@ -238,11 +238,13 @@ in
|
||||
claude-desktop
|
||||
unstablePkgs.grok-build
|
||||
unstablePkgs.pi-coding-agent
|
||||
claude-code
|
||||
unstablePkgs.goose-cli
|
||||
unstablePkgs.claude-agent-acp
|
||||
unstablePkgs.claude-code
|
||||
buzz-desktop
|
||||
bubblewrap
|
||||
herdr
|
||||
|
||||
superset-desktop
|
||||
|
||||
# My apps
|
||||
skygqts
|
||||
@@ -294,7 +296,7 @@ in
|
||||
enable = true;
|
||||
host = "0.0.0.0";
|
||||
port = 11434;
|
||||
package = pkgs.ollama-rocm;
|
||||
package = unstablePkgs.ollama-rocm;
|
||||
environmentVariables = {
|
||||
HSA_OVERRIDE_GFX_VERSION = "11.0.2";
|
||||
};
|
||||
|
||||
+9
-2
@@ -170,6 +170,7 @@ in
|
||||
# LLM Stuff
|
||||
unstablePkgs.ollama-rocm
|
||||
unstablePkgs.grok-build
|
||||
unstablePkgs.goose-cli
|
||||
# stable-diffusion-cpp-rocm
|
||||
lmstudio
|
||||
# Hermes gateway - Signal bridge (used to link the device + run the daemon)
|
||||
@@ -220,7 +221,7 @@ in
|
||||
enable = true;
|
||||
host = "0.0.0.0";
|
||||
port = ports.ollama;
|
||||
package = pkgs.ollama-rocm;
|
||||
package = unstablePkgs.ollama-rocm;
|
||||
user = "ollama";
|
||||
home = "/var/lib/ollama";
|
||||
environmentVariables = {
|
||||
@@ -244,7 +245,13 @@ in
|
||||
enable = true;
|
||||
disk.baseDir = "/var/lib/hermes-vm";
|
||||
disk.stateSize = "60G";
|
||||
network.externalInterface = "enp191s0";
|
||||
network = {
|
||||
bridged = false;
|
||||
externalInterface = "enp191s0";
|
||||
lanAddress = "10.0.101.101"; # the guest's fixed LAN IP
|
||||
hostLanAddress = "10.0.10.11"; # this host's current LAN IP (pick up the router reservation)
|
||||
lanGateway = "10.0.0.1";
|
||||
};
|
||||
vcpu = 3;
|
||||
mem = 5000;
|
||||
hermesHome = "/var/lib/hermes/.hermes";
|
||||
|
||||
@@ -22,6 +22,8 @@
|
||||
niri-touchscreen-gestures = final.callPackage ../../pkgs/niri-touchscreen-gestures { };
|
||||
# Buzz Desktop AppImage wrapper, see pkgs/buzz-desktop.
|
||||
buzz-desktop = final.callPackage ../../pkgs/buzz-desktop { };
|
||||
# Superset Desktop AppImage wrapper, see pkgs/superset-desktop.
|
||||
superset-desktop = final.callPackage ../../pkgs/superset-desktop { };
|
||||
|
||||
# Claude Desktop (Linux), see pkgs/claude-desktop.
|
||||
claude-desktop = claude-desktop.packages.${final.stdenv.hostPlatform.system}.default;
|
||||
|
||||
@@ -31,6 +31,7 @@ let
|
||||
colibri = final.callPackage ../pkgs/colibri { };
|
||||
niri-touchscreen-gestures = final.callPackage ../pkgs/niri-touchscreen-gestures { };
|
||||
buzz-desktop = final.callPackage ../pkgs/buzz-desktop { };
|
||||
superset-desktop = final.callPackage ../pkgs/superset-desktop { };
|
||||
})
|
||||
];
|
||||
}
|
||||
|
||||
@@ -11,6 +11,7 @@ Packages here are exposed via an overlay defined in `modules/core/default.nix`.
|
||||
| `colibri/` | colibrì (`JustVugg/colibri`) — GLM-5.2/OLMoE local inference engine, built from source, pinned to a tagged release. Backend-parameterized (`backend = "cpu" \| "rocm"`). Exposed as `pkgs.colibri` (cpu, default), `pkgs.colibri-rocm` (Strix Halo / gfx1151). Installs the `coli` CLI (wrapped with the Python env its converter/bench subcommands need) plus the bundled `colibri`/`olmoe` engine binaries. Model weights are a runtime concern and not packaged. |
|
||||
| `niri-touchscreen-gestures/` | Python daemon that reads multi-touch events from a touchscreen via `evdev`, detects 2/3/4-finger swipes (up/down/left/right), and dispatches configurable `niri msg action` commands. Configured via TOML; exposed as `pkgs.niri-touchscreen-gestures`. |
|
||||
| `buzz-desktop/` | Block Buzz desktop (Type-2 AppImage from `block/buzz`). Wrapped with `appimageTools.wrapType2` plus extra FHS libs (`elfutils`, `zstd`, WebKit/tray, GStreamer good/bad) so it runs on NixOS. Exposed as `pkgs.buzz-desktop` (`buzz-desktop` binary + desktop entry / icons). |
|
||||
| `superset-desktop/` | Superset Desktop (Type-2 AppImage from `superset-sh/superset`). Wrapped with `appimageTools.wrapType2` plus extra FHS libs (`elfutils`, `zstd`, WebKit/tray, GStreamer good/bad) so it runs on NixOS. Exposed as `pkgs.superset-desktop` (`superset-desktop` binary + desktop entry / icons). |
|
||||
|
||||
## Adding a New Package
|
||||
|
||||
|
||||
@@ -23,11 +23,11 @@
|
||||
|
||||
let
|
||||
pname = "buzz-desktop";
|
||||
version = "0.5.23";
|
||||
version = "0.5.24";
|
||||
|
||||
src = fetchurl {
|
||||
url = "https://github.com/block/buzz/releases/download/desktop-v${version}/Buzz_${version}_amd64.AppImage";
|
||||
hash = "sha256-9brR7eui1jQ+QQLpziuu1M2kpt/RarqjMIG/rbxfnU4=";
|
||||
hash = "sha256-cD5s/yEvfqu8ZbPLgWxW1lqoWMQ1o94xVP+7MjrJNws=";
|
||||
};
|
||||
|
||||
extracted = appimageTools.extractType2 {
|
||||
|
||||
@@ -0,0 +1,132 @@
|
||||
{ lib
|
||||
, fetchurl
|
||||
, appimageTools
|
||||
, runCommand
|
||||
}:
|
||||
|
||||
# Superset Desktop — AI-enabled workspace and IDE (superset-sh/superset).
|
||||
#
|
||||
# Upstream ships a Type-2 AppImage. On NixOS we need:
|
||||
# 1. FHS libs missing from appimageTools.defaultFhsEnvArgs (elfutils, zstd, …)
|
||||
# 2. WebKit DMA-BUF disabled — Superset only auto-enables this when it detects a
|
||||
# real AppImage (`APPIMAGE` env). wrapAppImage runs the extracted AppDir.
|
||||
# 3. Explicit GST_PLUGIN_SYSTEM_PATH_1_0 for WebKit media elements.
|
||||
# 4. Drop the upstream AppRun hook that hardcodes `GDK_BACKEND=x11` (breaks
|
||||
# Wayland clipboard under niri).
|
||||
# 5. Drop AppImage-bundled OpenSSL 3.0 — AppRun prepends $APPDIR/usr/lib to
|
||||
# LD_LIBRARY_PATH, so that old libssl shadows nixpkgs OpenSSL 3.2+ and
|
||||
# breaks GStreamer plugins / curl (`OPENSSL_3.2.0' not found`).
|
||||
#
|
||||
# To bump: set `version`, then:
|
||||
# nix hash file --type sha256 --sri <(curl -fsSL \
|
||||
# https://github.com/superset-sh/superset/releases/download/desktop-v${version}/superset-${version}-x86_64.AppImage)
|
||||
|
||||
let
|
||||
pname = "superset-desktop";
|
||||
version = "1.30.2";
|
||||
|
||||
src = fetchurl {
|
||||
url = "https://github.com/superset-sh/superset/releases/download/desktop-v${version}/superset-${version}-x86_64.AppImage";
|
||||
hash = "sha256-OWlTGKNOS4WiTrRow0tFju2Ut8wLK20iQt5fhoh/9gw=";
|
||||
};
|
||||
|
||||
extracted = appimageTools.extractType2 {
|
||||
inherit pname version src;
|
||||
};
|
||||
|
||||
appdir = runCommand "${pname}-appdir" { } ''
|
||||
cp -a ${extracted}/. "$out"
|
||||
chmod -R u+w "$out"
|
||||
|
||||
# Prefer Wayland (clipboard) over hard-coded X11 from linuxdeploy.
|
||||
hook="$out/apprun-hooks/linuxdeploy-plugin-gtk.sh"
|
||||
if [ -f "$hook" ]; then
|
||||
sed -i \
|
||||
-e 's/^export GDK_BACKEND=x11/# export GDK_BACKEND=x11 # nixos: allow Wayland for clipboard/' \
|
||||
"$hook"
|
||||
fi
|
||||
|
||||
# AppRun.wrapped forces LD_LIBRARY_PATH=$APPDIR/usr/lib first. The bundled
|
||||
# libssl/libcrypto are OpenSSL 3.0.x and lack OPENSSL_3.2.0, which nixpkgs
|
||||
# curl / gstreamer plugins need. Remove them so the FHS OpenSSL is used
|
||||
# (libssl.so.3 soname is ABI-compatible for this use).
|
||||
rm -f \
|
||||
"$out/usr/lib"/libssl.so \
|
||||
"$out/usr/lib"/libssl.so.* \
|
||||
"$out/usr/lib"/libcrypto.so \
|
||||
"$out/usr/lib"/libcrypto.so.*
|
||||
'';
|
||||
in
|
||||
appimageTools.wrapAppImage {
|
||||
inherit pname version;
|
||||
src = appdir;
|
||||
|
||||
extraPkgs = pkgs: with pkgs; [
|
||||
elfutils # libelf.so.1
|
||||
zstd # libzstd.so.1
|
||||
openssl # replaces removed AppImage OpenSSL
|
||||
curl
|
||||
webkitgtk_4_1
|
||||
libsoup_3
|
||||
libayatana-appindicator
|
||||
# WebKit media: appsink/appsrc (base), autoaudiosink (good)
|
||||
gst_all_1.gstreamer
|
||||
gst_all_1.gst-plugins-base
|
||||
gst_all_1.gst-plugins-good
|
||||
gst_all_1.gst-plugins-bad
|
||||
gst_all_1.gst-plugins-ugly
|
||||
gst_all_1.gst-libav
|
||||
# Clipboard / desktop integration
|
||||
wl-clipboard
|
||||
xdg-utils
|
||||
];
|
||||
|
||||
profile = ''
|
||||
# WebKit blank-window workaround (Superset sets this itself only for real AppImages).
|
||||
export WEBKIT_DISABLE_DMABUF_RENDERER=1
|
||||
export WEBKIT_DISABLE_COMPOSITING_MODE=1
|
||||
|
||||
# Do not force X11 — Wayland clipboard with niri.
|
||||
unset GDK_BACKEND
|
||||
export GTK_USE_PORTAL=1
|
||||
|
||||
# GStreamer plugins from the FHS root (after AppDir OpenSSL removal they
|
||||
# can load nixpkgs plugins that need OpenSSL 3.2+).
|
||||
export GST_PLUGIN_SYSTEM_PATH_1_0="/usr/lib/gstreamer-1.0''${GST_PLUGIN_SYSTEM_PATH_1_0:+:$GST_PLUGIN_SYSTEM_PATH_1_0}"
|
||||
export GST_PLUGIN_PATH="/usr/lib/gstreamer-1.0''${GST_PLUGIN_PATH:+:$GST_PLUGIN_PATH}"
|
||||
'';
|
||||
|
||||
extraInstallCommands = ''
|
||||
# Desktop entry is at AppDir root (not in usr/share/applications/).
|
||||
install -Dm444 ${appdir}/superset.desktop \
|
||||
$out/share/applications/superset-desktop.desktop
|
||||
substituteInPlace $out/share/applications/superset-desktop.desktop \
|
||||
--replace-fail 'Exec=superset' 'Exec=${pname}' \
|
||||
--replace-fail 'Icon=superset' 'Icon=${pname}'
|
||||
|
||||
# Icons in usr/share/icons/hicolor/*/apps/
|
||||
for size in 16x16 32x32 48x48 64x64 128x128 256x256 512x512 1024x1024; do
|
||||
icon=${appdir}/usr/share/icons/hicolor/$size/apps/superset.png
|
||||
if [ -f "$icon" ]; then
|
||||
install -Dm644 "$icon" \
|
||||
$out/share/icons/hicolor/$size/apps/${pname}.png
|
||||
fi
|
||||
done
|
||||
# Also handle the root-level symlink as fallback
|
||||
if [ ! -e $out/share/icons/hicolor/128x128/apps/${pname}.png ] \
|
||||
&& [ -f ${appdir}/superset.png ]; then
|
||||
install -Dm644 ${appdir}/superset.png \
|
||||
$out/share/icons/hicolor/128x128/apps/${pname}.png
|
||||
fi
|
||||
'';
|
||||
|
||||
meta = {
|
||||
description = "Superset Desktop — AI-enabled workspace and IDE";
|
||||
homepage = "https://github.com/superset-sh/superset";
|
||||
changelog = "https://github.com/superset-sh/superset/releases/tag/desktop-v${version}";
|
||||
license = lib.licenses.asl20;
|
||||
sourceProvenance = [ lib.sourceTypes.binaryNativeCode ];
|
||||
platforms = [ "x86_64-linux" ];
|
||||
mainProgram = "superset-desktop";
|
||||
};
|
||||
}
|
||||
Reference in new issue
Block a user