Compare commits

...

5 commits

Author SHA1 Message Date
Natsu Kagami 43dfa8b845
Seems like kak-tree-sitter has overwritten the tag 2025-02-21 02:43:28 +01:00
Natsu Kagami c2a0236c41
Update osu 2025-02-21 02:43:13 +01:00
Natsu Kagami a1cc06cfea
Update youmubot 2025-02-21 02:43:06 +01:00
Natsu Kagami 5aba8092bd
Update nixpkgs 2025-02-20 20:08:28 +01:00
Natsu Kagami dd75a5b5ee
phanpy: update 2025-02-15 18:52:19 +01:00
4 changed files with 36 additions and 37 deletions

View file

@ -211,11 +211,11 @@
"nixpkgs": "nixpkgs_7"
},
"locked": {
"lastModified": 1731494335,
"narHash": "sha256-G1G2WRGgIOFNmlJglfqEupSg0VWHgODbBJzp5xo+cYY=",
"lastModified": 1739632357,
"narHash": "sha256-aqLiDoLaqYdZIEgR7NGavo4KPbOYOhU7vuCDXe1uL5Y=",
"ref": "dtth-fork",
"rev": "c414bb78f27b20df4463c36a5851c94cfe9c79b0",
"revCount": 3367,
"rev": "30979814a9dbbf590d4d954e559811e6a7504459",
"revCount": 3476,
"type": "git",
"url": "ssh://gitea@git.dtth.ch/nki-dtth/phanpy"
},
@ -721,11 +721,11 @@
]
},
"locked": {
"lastModified": 1738448366,
"narHash": "sha256-4ATtQqBlgsGqkHTemta0ydY6f7JBRXz4Hf574NHQpkg=",
"lastModified": 1739571712,
"narHash": "sha256-0UdSDV/TBY+GuxXLbrLq3l2Fq02ciyKCIMy4qmnfJXQ=",
"owner": "nix-community",
"repo": "home-manager",
"rev": "18fa9f323d8adbb0b7b8b98a8488db308210ed93",
"rev": "6d3163aea47fdb1fe19744e91306a2ea4f602292",
"type": "github"
},
"original": {
@ -1073,11 +1073,11 @@
},
"nixpkgs-unstable": {
"locked": {
"lastModified": 1738452225,
"narHash": "sha256-Qmwx3FXM0x0pdjibwTk/uRbayqDrs3EwmRJe7tQWu48=",
"lastModified": 1739451785,
"narHash": "sha256-3ebRdThRic9bHMuNi2IAA/ek9b32bsy8F5R4SvGTIog=",
"owner": "nixos",
"repo": "nixpkgs",
"rev": "6c4e0724e0a785a20679b1bca3a46bfce60f05b6",
"rev": "1128e89fd5e11bb25aedbfc287733c6502202ea9",
"type": "github"
},
"original": {
@ -1676,16 +1676,15 @@
"rust-overlay": "rust-overlay_4"
},
"locked": {
"lastModified": 1737051126,
"narHash": "sha256-RXdUcprutFE53CwSyimRsiodETsCz6nrarJlh1aMD/M=",
"lastModified": 1740088478,
"narHash": "sha256-olqbNvJ5Uk1LseAC1zYDSL0BPLhPxkQG8EhO/3zhKRw=",
"owner": "natsukagami",
"repo": "youmubot",
"rev": "2f49f09a279f9cc20e2ea1dc312e213442cc7bf3",
"rev": "a35563801dbf74c6f221aac3e70146572e3fe14e",
"type": "github"
},
"original": {
"owner": "natsukagami",
"ref": "osu-commands",
"repo": "youmubot",
"type": "github"
}

View file

@ -37,7 +37,7 @@
# ---
# Imported apps
youmubot.url = "github:natsukagami/youmubot/osu-commands";
youmubot.url = "github:natsukagami/youmubot";
# swayfx = {
# url = github:WillPower3309/swayfx;
# inputs.nixpkgs.follows = "nixpkgs";

View file

@ -1,28 +1,28 @@
{ pkgs, lib, ... }:
let
osu-pkg = pkgs.unstable.osu-lazer-bin;
# osu-pkg = with pkgs; with lib;
# appimageTools.wrapType2 rec {
# pname = "osu-lazer-bin";
# version = "2025.101.0";
# src = fetchurl {
# url = "https://github.com/ppy/osu/releases/download/${version}/osu.AppImage";
# hash = "sha256-GsnTxVpNk2RXHLET6Ugv0/ZOlq8RUkw2ZXqRjkU+dzw=";
# };
# extraPkgs = pkgs: with pkgs; [ icu ];
# osu-pkg = pkgs.unstable.osu-lazer-bin;
osu-pkg = with pkgs; with lib;
appimageTools.wrapType2 rec {
pname = "osu-lazer-bin";
version = "2025.221.0";
src = fetchurl {
url = "https://github.com/ppy/osu/releases/download/${version}/osu.AppImage";
hash = "sha256-V6JJShVGE4GXGI8FvDhyWuHUnlI+p3JLW/NN+u+Vikc=";
};
extraPkgs = pkgs: with pkgs; [ icu ];
# extraInstallCommands =
# let contents = appimageTools.extract { inherit pname version src; };
# in
# ''
# mv -v $out/bin/${pname} $out/bin/osu\!
# install -m 444 -D ${contents}/osu\!.desktop -t $out/share/applications
# for i in 16 32 48 64 96 128 256 512 1024; do
# install -D ${contents}/osu.png $out/share/icons/hicolor/''${i}x$i/apps/osu.png
# done
# '';
# };
extraInstallCommands =
let contents = appimageTools.extract { inherit pname version src; };
in
''
mv -v $out/bin/${pname} $out/bin/osu\!
install -m 444 -D ${contents}/osu\!.desktop -t $out/share/applications
for i in 16 32 48 64 96 128 256 512 1024; do
install -D ${contents}/osu.png $out/share/icons/hicolor/''${i}x$i/apps/osu.png
done
'';
};
in
{
home.packages = [ osu-pkg ];

View file

@ -11,7 +11,7 @@ let
inherit src;
pname = "kak-tree-sitter";
version = "1.1.2";
cargoHash = "sha256-OQPUWqJAts8DbFNSsC/CmMCbuZ9TVxRTR05O7oiodKI=";
cargoHash = "sha256-ruHklps7NZzsI1ub1trRKyufrP9tufWWrQ+urvEsIdA=";
cargoBuildOptions = [ "--package" "kak-tree-sitter" "--package" "ktsctl" ];
nativeBuildInputs = [ clang git ];