deprekated/dotfiles
1
0
Fork 0
Code Issues Pull requests Projects Releases Packages Wiki Activity Actions

Compare commits

base: deprekated:447d718ac79b6249ddbcab9d78174d5543916b8d
Branches Tags
deprekated:main
..
compare: deprekated:b0aa81270d0c0ba87adfa4ec3735b151053d0b1d
Branches Tags
deprekated:main

No commits in common. "447d718ac79b6249ddbcab9d78174d5543916b8d" and "b0aa81270d0c0ba87adfa4ec3735b151053d0b1d" have entirely different histories.
447d718ac7 ... b0aa81270d

12 changed files with 100 additions and 272 deletions
Show stats Expand all files Collapse all files

110
flake.lock generated
View file

@ -8,11 +8,11 @@
"systems": "systems" "systems": "systems"
}, },
"locked": { "locked": {
"lastModified": 1750173260, "lastModified": 1747575206,
"narHash": "sha256-9P1FziAwl5+3edkfFcr5HeGtQUtrSdk/MksX39GieoA=", "narHash": "sha256-NwmAFuDUO/PFcgaGGr4j3ozG9Pe5hZ/ogitWhY+D81k=",
"owner": "ryantm", "owner": "ryantm",
"repo": "agenix", "repo": "agenix",
"rev": "531beac616433bac6f9e2a19feb8e99a22a66baf", "rev": "4835b1dc898959d8547a871ef484930675cb47f1",
"type": "github" "type": "github"
}, },
"original": { "original": {
@ -163,11 +163,11 @@
] ]
}, },
"locked": { "locked": {
"lastModified": 1750618568, "lastModified": 1749873626,
"narHash": "sha256-w9EG5FOXrjXGfbqCcQg9x1lMnTwzNDW5BMXp8ddy15E=", "narHash": "sha256-1Mc/D/1RwwmDKY59f4IpDBgcQttxffm+4o0m67lQ8hc=",
"owner": "lnl7", "owner": "lnl7",
"repo": "nix-darwin", "repo": "nix-darwin",
"rev": "1dd19f19e4b53a1fd2e8e738a08dd5fe635ec7e5", "rev": "2f140d6ac8840c6089163fb43ba95220c230f22b",
"type": "github" "type": "github"
}, },
"original": { "original": {
@ -464,11 +464,11 @@
] ]
}, },
"locked": { "locked": {
"lastModified": 1751146119, "lastModified": 1749944797,
"narHash": "sha256-gvjG95TCnUVJkvQvLMlnC4NqiqFyBdJk3o8/RwuHeaU=", "narHash": "sha256-1l6ZW+2+LDQhYgE4fo2KsM2Ms3lY3ZXv0n6uKka2yMk=",
"owner": "nix-community", "owner": "nix-community",
"repo": "home-manager", "repo": "home-manager",
"rev": "76d0c31fce2aa0c71409de953e2f9113acd5b656", "rev": "c5f345153397f62170c18ded1ae1f0875201d49a",
"type": "github" "type": "github"
}, },
"original": { "original": {
@ -509,11 +509,11 @@
"pre-commit-hooks": "pre-commit-hooks" "pre-commit-hooks": "pre-commit-hooks"
}, },
"locked": { "locked": {
"lastModified": 1751156047, "lastModified": 1749838547,
"narHash": "sha256-cjBo82cbIyYtwj0b6bjmUsS5Plqko8W50TTAz7awvqs=", "narHash": "sha256-4qJy0n+6P13/XAHPlcjcWK6MDNYd38PkFdI8iCiJYYo=",
"ref": "refs/heads/main", "ref": "refs/heads/main",
"rev": "e1ccbe9abd5042e5622379bcae35a81bfd242330", "rev": "1e34c3747779a82d59ef27b351d4ed02fb372a2a",
"revCount": 18098, "revCount": 18027,
"type": "git", "type": "git",
"url": "https://git@git.lix.systems/lix-project/lix" "url": "https://git@git.lix.systems/lix-project/lix"
}, },
@ -543,11 +543,11 @@
"nixpkgs": "nixpkgs_5" "nixpkgs": "nixpkgs_5"
}, },
"locked": { "locked": {
"lastModified": 1751141511, "lastModified": 1749796250,
"narHash": "sha256-89z1bdfGxY5sqMyvqNCgqiChfkcHlYZUuAkDjY0JVgw=", "narHash": "sha256-oxvVAFUO9husnRk6XZcLFLjLWL9z0pW25Fk6kVKwt1c=",
"owner": "oxalica", "owner": "oxalica",
"repo": "nil", "repo": "nil",
"rev": "704192a3aa4653efecd7aa45147e1a32abcb4b97", "rev": "9e4cccb088440c20703d62db9de8d5ae06d4a449",
"type": "github" "type": "github"
}, },
"original": { "original": {
@ -566,11 +566,11 @@
"xwayland-satellite-unstable": "xwayland-satellite-unstable" "xwayland-satellite-unstable": "xwayland-satellite-unstable"
}, },
"locked": { "locked": {
"lastModified": 1751179061, "lastModified": 1749890123,
"narHash": "sha256-E3SA2IZf72CR3wklJM+cF1ZOVjy6r8ZqbsOPXodNjWo=", "narHash": "sha256-pRkyWFytGAMaHlrOJIYYEur8NRDe0kTfMIhRdTeasRQ=",
"owner": "sodiboo", "owner": "sodiboo",
"repo": "niri-flake", "repo": "niri-flake",
"rev": "cc5722e779f3b32bdd918e473777c39da67ab1b6", "rev": "8f39eb82488525728eda222b34e79b1ecf6d3f96",
"type": "github" "type": "github"
}, },
"original": { "original": {
@ -582,16 +582,16 @@
"niri-stable": { "niri-stable": {
"flake": false, "flake": false,
"locked": { "locked": {
"lastModified": 1748151941, "lastModified": 1740117926,
"narHash": "sha256-z4viQZLgC2bIJ3VrzQnR+q2F3gAOEQpU1H5xHtX/2fs=", "narHash": "sha256-mTTHA0RAaQcdYe+9A3Jx77cmmyLFHmRoZdd8RpWa+m8=",
"owner": "YaLTeR", "owner": "YaLTeR",
"repo": "niri", "repo": "niri",
"rev": "8ba57fcf25d2fc9565131684a839d58703f1dae7", "rev": "b94a5db8790339cf9134873d8b490be69e02ac71",
"type": "github" "type": "github"
}, },
"original": { "original": {
"owner": "YaLTeR", "owner": "YaLTeR",
"ref": "v25.05.1", "ref": "v25.02",
"repo": "niri", "repo": "niri",
"type": "github" "type": "github"
} }
@ -599,11 +599,11 @@
"niri-unstable": { "niri-unstable": {
"flake": false, "flake": false,
"locked": { "locked": {
"lastModified": 1750791124, "lastModified": 1749797708,
"narHash": "sha256-F5iVU/hjoSHSSe0gllxm0PcAaseEtGNanYK5Ha3k2Tg=", "narHash": "sha256-P5x0U6AW5Zn20bARv4D83d8XlNaWK1st9QwBfSe+Vfg=",
"owner": "YaLTeR", "owner": "YaLTeR",
"repo": "niri", "repo": "niri",
"rev": "37458d94b288945f6cfbd3c5c233f634d59f246c", "rev": "f3f6e79eeca8924ff9cfea4b30006e5b782bc93e",
"type": "github" "type": "github"
}, },
"original": { "original": {
@ -695,11 +695,11 @@
}, },
"nix-hardware": { "nix-hardware": {
"locked": { "locked": {
"lastModified": 1750837715, "lastModified": 1749832440,
"narHash": "sha256-2m1ceZjbmgrJCZ2PuQZaK4in3gcg3o6rZ7WK6dr5vAA=", "narHash": "sha256-lfxhuxAaHlYFGr8yOrAXZqdMt8PrFLzjVqH9v3lQaoY=",
"owner": "nixos", "owner": "nixos",
"repo": "nixos-hardware", "repo": "nixos-hardware",
"rev": "98236410ea0fe204d0447149537a924fb71a6d4f", "rev": "db030f62a449568345372bd62ed8c5be4824fa49",
"type": "github" "type": "github"
}, },
"original": { "original": {
@ -782,11 +782,11 @@
}, },
"nixos-hardware": { "nixos-hardware": {
"locked": { "locked": {
"lastModified": 1750837715, "lastModified": 1749832440,
"narHash": "sha256-2m1ceZjbmgrJCZ2PuQZaK4in3gcg3o6rZ7WK6dr5vAA=", "narHash": "sha256-lfxhuxAaHlYFGr8yOrAXZqdMt8PrFLzjVqH9v3lQaoY=",
"owner": "NixOS", "owner": "NixOS",
"repo": "nixos-hardware", "repo": "nixos-hardware",
"rev": "98236410ea0fe204d0447149537a924fb71a6d4f", "rev": "db030f62a449568345372bd62ed8c5be4824fa49",
"type": "github" "type": "github"
}, },
"original": { "original": {
@ -876,11 +876,11 @@
}, },
"nixpkgs-stable_2": { "nixpkgs-stable_2": {
"locked": { "locked": {
"lastModified": 1750969886, "lastModified": 1749727998,
"narHash": "sha256-zW/OFnotiz/ndPFdebpo3X0CrbVNf22n4DjN2vxlb58=", "narHash": "sha256-mHv/yeUbmL91/TvV95p+mBVahm9mdQMJoqaTVTALaFw=",
"owner": "NixOS", "owner": "NixOS",
"repo": "nixpkgs", "repo": "nixpkgs",
"rev": "a676066377a2fe7457369dd37c31fd2263b662f4", "rev": "fd487183437963a59ba763c0cc4f27e3447dd6dd",
"type": "github" "type": "github"
}, },
"original": { "original": {
@ -955,11 +955,11 @@
}, },
"nixpkgs_6": { "nixpkgs_6": {
"locked": { "locked": {
"lastModified": 1751011381, "lastModified": 1749794982,
"narHash": "sha256-krGXKxvkBhnrSC/kGBmg5MyupUUT5R6IBCLEzx9jhMM=", "narHash": "sha256-Kh9K4taXbVuaLC0IL+9HcfvxsSUx8dPB5s5weJcc9pc=",
"owner": "NixOS", "owner": "NixOS",
"repo": "nixpkgs", "repo": "nixpkgs",
"rev": "30e2e2857ba47844aa71991daa6ed1fc678bcbb7", "rev": "ee930f9755f58096ac6e8ca94a1887e0534e2d81",
"type": "github" "type": "github"
}, },
"original": { "original": {
@ -971,11 +971,11 @@
}, },
"nixpkgs_7": { "nixpkgs_7": {
"locked": { "locked": {
"lastModified": 1751011381, "lastModified": 1749794982,
"narHash": "sha256-krGXKxvkBhnrSC/kGBmg5MyupUUT5R6IBCLEzx9jhMM=", "narHash": "sha256-Kh9K4taXbVuaLC0IL+9HcfvxsSUx8dPB5s5weJcc9pc=",
"owner": "NixOS", "owner": "NixOS",
"repo": "nixpkgs", "repo": "nixpkgs",
"rev": "30e2e2857ba47844aa71991daa6ed1fc678bcbb7", "rev": "ee930f9755f58096ac6e8ca94a1887e0534e2d81",
"type": "github" "type": "github"
}, },
"original": { "original": {
@ -1002,10 +1002,10 @@
}, },
"nixpkgs_9": { "nixpkgs_9": {
"locked": { "locked": {
"lastModified": 1749794982, "lastModified": 1749285348,
"narHash": "sha256-Kh9K4taXbVuaLC0IL+9HcfvxsSUx8dPB5s5weJcc9pc=", "narHash": "sha256-frdhQvPbmDYaScPFiCnfdh3B/Vh81Uuoo0w5TkWmmjU=",
"path": "/nix/store/xnr2xjs0clkhlhqfc3vqcmhnnwdk3c5p-source", "path": "/nix/store/syvnmj3hhckkbncm94kfkbl76qsdqqj3-source",
"rev": "ee930f9755f58096ac6e8ca94a1887e0534e2d81", "rev": "3e3afe5174c561dee0df6f2c2b2236990146329f",
"type": "path" "type": "path"
}, },
"original": { "original": {
@ -1190,11 +1190,11 @@
"tinted-zed": "tinted-zed" "tinted-zed": "tinted-zed"
}, },
"locked": { "locked": {
"lastModified": 1751145558, "lastModified": 1749905587,
"narHash": "sha256-OPlbpH64jzIspYqvJB96tnN9V9HBlAxROS5ijQwtN70=", "narHash": "sha256-sZpQM+InPCYwJQiTxs/PCCupwbYNaSCFi2Hvpl1/pOo=",
"owner": "danth", "owner": "danth",
"repo": "stylix", "repo": "stylix",
"rev": "3a09d3f5cb940fa4142a2f3415b508a8be92b721", "rev": "77a8b26520f48305f3b1bacffaa8740dde8afa2a",
"type": "github" "type": "github"
}, },
"original": { "original": {
@ -1424,16 +1424,16 @@
"xwayland-satellite-stable": { "xwayland-satellite-stable": {
"flake": false, "flake": false,
"locked": { "locked": {
"lastModified": 1748488455, "lastModified": 1739246919,
"narHash": "sha256-IiLr1alzKFIy5tGGpDlabQbe6LV1c9ABvkH6T5WmyRI=", "narHash": "sha256-/hBM43/Gd0/tW+egrhlWgOIISeJxEs2uAOIYVpfDKeU=",
"owner": "Supreeeme", "owner": "Supreeeme",
"repo": "xwayland-satellite", "repo": "xwayland-satellite",
"rev": "3ba30b149f9eb2bbf42cf4758d2158ca8cceef73", "rev": "44590a416d4a3e8220e19e29e0b6efe64a80315d",
"type": "github" "type": "github"
}, },
"original": { "original": {
"owner": "Supreeeme", "owner": "Supreeeme",
"ref": "v0.6", "ref": "v0.5.1",
"repo": "xwayland-satellite", "repo": "xwayland-satellite",
"type": "github" "type": "github"
} }
@ -1441,11 +1441,11 @@
"xwayland-satellite-unstable": { "xwayland-satellite-unstable": {
"flake": false, "flake": false,
"locked": { "locked": {
"lastModified": 1751176151, "lastModified": 1749315541,
"narHash": "sha256-7bK5eoK0ySlct/cbehTrkGcTcSMOLXSnh+RJiswVzEU=", "narHash": "sha256-bEik1BfVOFnWvtOrcOHluos/edJ8f+G2y1QySbt/0Ak=",
"owner": "Supreeeme", "owner": "Supreeeme",
"repo": "xwayland-satellite", "repo": "xwayland-satellite",
"rev": "91d463851e24c190cc912471861b5414ac8fe65c", "rev": "da2ecb5be816de35e2efe23a408a1c49fe8b11ba",
"type": "github" "type": "github"
}, },
"original": { "original": {

2
flake.nix
View file

@ -196,6 +196,8 @@
# Modules for offline linux machines. # Modules for offline linux machines.
linuxOfflineModuleSet = [ linuxOfflineModuleSet = [
./nixos/packages/offline.nix ./nixos/packages/offline.nix
./nixos/configs/waydroid.nix
]; ];
# Helper functions for creating modules in the defintions below. # Helper functions for creating modules in the defintions below.

19
nixos/hosts/hinata.nix
View file

@ -23,9 +23,7 @@ let
sha256 = "sha256-gr3UvFB6D04he/9zawvQIuwfv0B7fEZb6BGiNAbLids="; sha256 = "sha256-gr3UvFB6D04he/9zawvQIuwfv0B7fEZb6BGiNAbLids=";
}; };
nativeBuildInputs = nativeBuildInputs = prev.nativeBuildInputs ++ (with pkgs; [
prev.nativeBuildInputs
++ (with pkgs; [
opencv opencv
cmake cmake
doctest doctest
@ -34,6 +32,15 @@ let
installCheckPhase = ""; installCheckPhase = "";
}).overrideAttrs (prev: rec {
version = "1.94.4";
src = pkgs.fetchFromGitLab {
domain = "gitlab.freedesktop.org";
owner = "libfprint";
repo = "fprintd";
rev = "refs/tags/v${version}";
hash = "sha256-B2g2d29jSER30OUqCkdk3+Hv5T3DA4SUKoyiqHb8FeU=";
};
}); });
in in
@ -80,11 +87,9 @@ in
# Fingerprint reader support. # Fingerprint reader support.
services.fprintd = { services.fprintd = {
enable = true; enable = true;
package = package = (pkgs.fprintd.override {
(pkgs.fprintd.override {
libfprint = libfprint-gpd; libfprint = libfprint-gpd;
}).overrideAttrs }).overrideAttrs (prev: rec {
(prev: rec {
version = "1.94.4"; version = "1.94.4";
src = pkgs.fetchFromGitLab { src = pkgs.fetchFromGitLab {
domain = "gitlab.freedesktop.org"; domain = "gitlab.freedesktop.org";

70
nixos/hosts/trailblazer/default.nix
View file

@ -34,7 +34,8 @@ let
openrgb -d "Corsair Lighting Node Pro" -m direct -z 1 -s 100 -b 100 -c $1 openrgb -d "Corsair Lighting Node Pro" -m direct -z 1 -s 100 -b 100 -c $1
''; '';
mqttServer = "192.168.50.124"; #mqttServer = "fuuka"
mqttServer = "mitsuru";
commandScript = pkgs.writeScriptBin "trailblazer-command-daemon" '' commandScript = pkgs.writeScriptBin "trailblazer-command-daemon" ''
#!${pkgs.xonsh}/bin/xonsh #!${pkgs.xonsh}/bin/xonsh
@ -64,16 +65,6 @@ let
print("[I] Everything should be... well, not-shiny, captain!") print("[I] Everything should be... well, not-shiny, captain!")
elif verb == "power/suspend":
print("[I] Got a 'sleep' request. Dozing.")
${pkgs.mosquitto}/bin/mosquitto_pub -h ${mqttServer} -t trailblazer/power/status -m sleep
systemctl suspend
elif verb == "power/off":
print("[I] Got a 'power off' request. Will I dream?")
${pkgs.mosquitto}/bin/mosquitto_pub -h ${mqttServer} -t trailblazer/power/status -m off
systemctl suspend
elif verb == "monitors/off": elif verb == "monitors/off":
print("[I] Got a 'monitors off' request. Adding DPMS nulls.") print("[I] Got a 'monitors off' request. Adding DPMS nulls.")
@ -146,8 +137,7 @@ let
print("[I] Trailblazer status service started. Updating every 10s.") print("[I] Trailblazer status service started. Updating every 10s.")
while True: while True:
sleep 10 sleep 10
${pkgs.mosquitto}/bin/mosquitto_pub -h ${mqttServer} -t trailblazer/monitors/status -m $(cat /sys/class/drm/card1-HDMI-A-1/dpms) mosquitto_pub -h mitsuru -t trailblazer/monitors/status -m $(cat /sys/class/drm/card1-HDMI-A-1/dpms)
${pkgs.mosquitto}/bin/mosquitto_pub -h ${mqttServer} -t trailblazer/power/status -m on
''; '';
in in
{ {
@ -187,7 +177,7 @@ in
boot.kernelParams = [ boot.kernelParams = [
"iommu=on" "iommu=on"
"amd_iommu=on" "amd_iommu=on"
"xhci_hcd.quirks=270336" # fix random wakeups, maybe? #"pcie_acs_override=downstream,multifunction"
]; ];
# Enable fingerprint reader. # Enable fingerprint reader.
@ -256,8 +246,6 @@ in
virtualisation.docker.enable = true; virtualisation.docker.enable = true;
users.users.deprekated.extraGroups = [ "docker" ]; users.users.deprekated.extraGroups = [ "docker" ];
# Fix XHCI suprious wakeups.
# #
# Trailblazer remote service (allows trailblazer things to be controlled via Home Assistant. # Trailblazer remote service (allows trailblazer things to be controlled via Home Assistant.
# #
@ -270,7 +258,6 @@ in
after = [ "network-online.target" ]; after = [ "network-online.target" ];
script = "${commandScript}/bin/trailblazer-command-daemon"; script = "${commandScript}/bin/trailblazer-command-daemon";
serviceConfig.Restart = "always";
}; };
systemd.services.trailblazer-status = { systemd.services.trailblazer-status = {
description = "trailblazer status service"; description = "trailblazer status service";
@ -281,57 +268,8 @@ in
after = [ "network-online.target" ]; after = [ "network-online.target" ];
script = "${statusScript}/bin/trailblazer-status-daemon"; script = "${statusScript}/bin/trailblazer-status-daemon";
serviceConfig.Restart = "always";
}; };
systemd.services.suspend_notify = {
description = "trailblazer sleep notifier";
# Start once we're online.
wantedBy = [ "suspend.target" ];
wants = [ "network-online.target" ];
after = [ "network-online.target" ];
before = [ "suspend.target" ];
script = "${pkgs.mosquitto}/bin/mosquitto_pub -h ${mqttServer} -t trailblazer/power/status -m sleep";
};
systemd.services.resume_notify = {
description = "trailblazer wake notifier";
# Start once we're online.
wantedBy = [ "suspend.target" ];
wants = [ "network-online.target" ];
after = [ "network-online.target" "suspend.target" ];
script = "${pkgs.mosquitto}/bin/mosquitto_pub -h ${mqttServer} -t trailblazer/power/status -m on";
};
systemd.services.poweroff_notify = {
description = "trailblazer shutdown notifier";
# Start once we're online.
wantedBy = [ "shutdown.target" ];
wants = [ "network-online.target" ];
after = [ "network-online.target" ];
before = [ "shutdown.target" ];
script = "${pkgs.mosquitto}/bin/mosquitto_pub -h ${mqttServer} -t trailblazer/power/status -m shutdown";
};
systemd.services.poweron_notify = {
description = "trailblazer wake notifier";
# Start once we're online.
wantedBy = [ "suspend.target" ];
wants = [ "network-online.target" ];
after = [ "network-online.target" ];
script = "${pkgs.mosquitto}/bin/mosquitto_pub -h ${mqttServer} -t trailblazer/power/status -m on";
};
# #
# Let trailblazer share its GPS with the house devices. # Let trailblazer share its GPS with the house devices.
# #

6
nixos/packages/default.pkgs.nix
View file

@ -56,7 +56,6 @@ with pkgs;
# Utils. # Utils.
_1password-cli _1password-cli
age age
age-plugin-yubikey
agenix.agenix agenix.agenix
atool atool
bat bat
@ -145,11 +144,6 @@ with pkgs;
# Office. # Office.
sc-im sc-im
# Lab tools.
deprekages.rfe-fwupgrade
deprekages.rfe-touch
deprekages.rfe-signal
# For editors. # For editors.
fish fish
lazygit lazygit

2
nixos/packages/offline.pkgs.nix
View file

@ -33,7 +33,6 @@ with pkgs;
python3 python3
cfr cfr
procyon procyon
mono
# Build systems. # Build systems.
cmake cmake
@ -86,6 +85,7 @@ with pkgs;
if pkgs.stdenv.isDarwin then if pkgs.stdenv.isDarwin then
[ [
] ]
else else
[ ] [ ]

12
packages/binary-ninja.nix
View file

@ -20,8 +20,7 @@
wayland, wayland,
python3, python3,
svd2py, svd2py,
qt6, qt6
libxml2
}: }:
let let
desktopFile = writeText "binary-ninja.desktop" '' desktopFile = writeText "binary-ninja.desktop" ''
@ -48,14 +47,11 @@ let
pname = "binary-ninja"; pname = "binary-ninja";
version = "4.0.5902"; version = "4.0.5902";
nativeBuildInputs = [ buildInputs = [
autoPatchelfHook autoPatchelfHook
qt6.wrapQtAppsHook qt6.wrapQtAppsHook
makeWrapper makeWrapper
unzip unzip
];
buildInputs = [
libGL libGL
stdenv.cc.cc.lib stdenv.cc.cc.lib
glib glib
@ -72,15 +68,13 @@ let
qt6.qtdeclarative qt6.qtdeclarative
wayland wayland
binja-python binja-python
libxml2
dbus dbus
]; ];
autoPatchelfIgnoreMissingDeps = [ "libxml2.so.2" ];
propogatedBuildInputs = (additional-python-packages python3.pkgs); propogatedBuildInputs = (additional-python-packages python3.pkgs);
# Use our local zip directly. # Use our local zip directly.
dontBuild = true;
src = if stdenv.isAarch64 then src = if stdenv.isAarch64 then
../proprietary/binja/binaryninja_personal_linux_aarch64.zip ../proprietary/binja/binaryninja_personal_linux_aarch64.zip
else else

19
packages/default.nix
View file

@ -5,7 +5,7 @@
flake-utils, flake-utils,
deprekages, deprekages,
nixpkgs, nixpkgs,
esp-dev, esp-dev
}: }:
flake-utils.lib.eachDefaultSystem ( flake-utils.lib.eachDefaultSystem (
@ -72,11 +72,6 @@ flake-utils.lib.eachDefaultSystem (
vja = callPackage ./vja.nix { }; vja = callPackage ./vja.nix { };
gimgtools = callPackage ./gimgtools.nix { }; gimgtools = callPackage ./gimgtools.nix { };
# rf explorer
rfe-fwupdate = callPackage ./rfe-fwupdate.nix { };
rfe-touch = callPackage ./rfe-touch.nix { };
rfe-signal = callPackage ./rfe-signal.nix { };
# libraries # libraries
libnfc-nci = callPackage ./libnfc-nci { }; libnfc-nci = callPackage ./libnfc-nci { };
ws-server = callPackage ./ws-server { }; ws-server = callPackage ./ws-server { };
@ -125,12 +120,12 @@ flake-utils.lib.eachDefaultSystem (
esp-env = esp-dev.${system}.esp-idf-full; esp-env = esp-dev.${system}.esp-idf-full;
# xonsh and xontribs # xonsh and xontribs
xontrib-whole-word-jumping = callPackage ./xontrib-whole-word-jumping.nix { }; xontrib-whole-word-jumping = callPackage ./xontrib-whole-word-jumping.nix {};
xontrib-term-integrations = callPackage ./xontrib-term-integrations.nix { }; xontrib-term-integrations = callPackage ./xontrib-term-integrations.nix {};
xontrib-prompt-starship = callPackage ./xontrib-prompt-starship.nix { }; xontrib-prompt-starship = callPackage ./xontrib-prompt-starship.nix {};
xontrib-prompt-bar = callPackage ./xontrib-prompt-bar.nix { }; xontrib-prompt-bar = callPackage ./xontrib-prompt-bar.nix {};
xontrib-termcolors = callPackage ./xontrib-termcolors.nix { }; xontrib-termcolors = callPackage ./xontrib-termcolors.nix {};
xontrib-sh = callPackage ./xontrib-sh.nix { }; xontrib-sh = callPackage ./xontrib-sh.nix {};
xonsh-with-xontribs = pkgs.xonsh.override { xonsh-with-xontribs = pkgs.xonsh.override {
extraPackages = pythonPackages: [ extraPackages = pythonPackages: [

28
packages/rfe-fwupdate.nix
View file

@ -1,28 +0,0 @@
{
stdenv,
fetchzip,
mono,
}:
stdenv.mkDerivation (finalAttrs: {
pname = "rfe-fwuploader";
version = "latest";
src = fetchzip {
url = "https://j3.rf-explorer.com/download/sw/fw/RFExplorer_UploaderLinux.zip";
hash = "sha256-eHDMQvL0L4JmEc+q4qeKV2i1EMXdE3G1JX2Jhuctg6o=";
stripRoot = false;
};
buildInputs = [ mono ];
installPhase = ''
mkdir -p "$out/bin"
cp $src/RFEUploaderLinux.exe $out/bin/.rfe-fwupdate-mono
echo "#/usr/bin/env sh"
echo "${mono}/bin/mono $out/bin/.rfe-fwupdate-mono" >> $out/bin/rfe-fwupdate
chmod +x $out/bin/rfe-fwupdate
'';
})

36
packages/rfe-signal.nix
View file

@ -1,36 +0,0 @@
{
lib,
stdenv,
fetchzip,
mono,
gtk2,
}:
stdenv.mkDerivation (finalAttrs: {
pname = "rfe-signal";
version = "2_5_2105_2";
src = fetchzip {
url = "https://j3.rf-explorer.com/download/sw/linux/RFExplorerGeneratorLinux_v${finalAttrs.version}.zip";
hash = "sha256-bvTH3EzFvizPrb5fv8LzIin45KkmASMRh/rk0BP+yIg=";
stripRoot = false;
};
buildInputs = [
mono
gtk2
];
installPhase = ''
mkdir -p "$out/bin"
cp $src/RFExplorerGeneratorLinux_v${finalAttrs.version}.exe $out/bin/.rfe-touch-mono
OUTFILE="$out/bin/${finalAttrs.pname}"
echo "#/usr/bin/env sh" > $OUTFILE
echo "env LD_LIBRARY_PATH=\"${lib.makeLibraryPath finalAttrs.buildInputs}\" ${mono}/bin/mono $out/bin/.rfe-touch-mono" >> $OUTFILE
chmod +x $OUTFILE
'';
})

36
packages/rfe-touch.nix
View file

@ -1,36 +0,0 @@
{
lib,
stdenv,
fetchzip,
mono,
gtk2,
}:
stdenv.mkDerivation (finalAttrs: {
pname = "rfe-touch";
version = "2.7.2206.7";
src = fetchzip {
url = "https://j3.rf-explorer.com/download/sw/linux/RFETouchLinux_${finalAttrs.version}.zip";
hash = "sha256-0/O12nlmAsN4tly574ZNtFSMvhghR/VMU2h6SwzXS/k=";
stripRoot = false;
};
buildInputs = [
mono
gtk2
];
installPhase = ''
mkdir -p "$out/bin"
cp $src/RFETouchLinux_${finalAttrs.version}.exe $out/bin/.rfe-touch-mono
OUTFILE="$out/bin/${finalAttrs.pname}"
echo "#/usr/bin/env sh" > $OUTFILE
echo "env LD_LIBRARY_PATH=\"${lib.makeLibraryPath finalAttrs.buildInputs}\" ${mono}/bin/mono $out/bin/.rfe-touch-mono" >> $OUTFILE
chmod +x $OUTFILE
'';
})

2
wezterm/wezterm.lua
View file

@ -117,7 +117,7 @@ end)
-- Possibly replace with a per-platform equivalent?' -- Possibly replace with a per-platform equivalent?'
--if (hostname == "hinata") then --if (hostname == "hinata") then
if wezterm.target_triple == "x86_64-unknown-linux-gnu" then if wezterm.target_triple == "x86_64-unknown-linux-gnu" then
config["default_prog"] = { "/run/current-system/sw/bin/zellij" } config["default_prog"] = { "/run/current-system/sw/bin/zellij", "-l", "welcome" }
end end
return config return config