nki/nix-home
1
0
Fork 0
Code Issues Pull requests 2 Packages Projects Releases Wiki Activity

Compare commits

base: nki:43dfa8b845ec05383bc6abd677edf37f3dda74ea
Branches Tags
nki:master
nki:kakoune-package
nki:niri
nki:move-s3
nki:build-farm
nki:remove-macbook
nki:24.05
nki:peertube
nki:invi
nki:local-net
nki:test
..
compare: nki:d425bde1a1e217efa5e5394fb46aca5ff756f64a
Branches Tags
nki:kakoune-package
nki:master
nki:niri
nki:move-s3
nki:build-farm
nki:remove-macbook
nki:24.05
nki:peertube
nki:invi
nki:local-net
nki:test

No commits in common. "43dfa8b845ec05383bc6abd677edf37f3dda74ea" and "d425bde1a1e217efa5e5394fb46aca5ff756f64a" have entirely different histories.
43dfa8b845 ... d425bde1a1

4 changed files with 37 additions and 36 deletions
Show stats Expand all files Collapse all files

27
flake.lock
View file

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

2
flake.nix
View file

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

42
home/osu.nix
View file

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

2
packages/common/kak-tree-sitter/default.nix
View file

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