From 465a89fef949ee6ea43ca31297655ee9238ad6cc Mon Sep 17 00:00:00 2001 From: Natsu Kagami Date: Mon, 3 Feb 2025 14:53:12 +0100 Subject: [PATCH] Flake update --- flake.lock | 88 ++++++++++++++-------------------------------------- flake.nix | 18 +++++------ home/osu.nix | 42 ++++++++++++------------- 3 files changed, 53 insertions(+), 95 deletions(-) diff --git a/flake.lock b/flake.lock index f51006d..d989f8a 100644 --- a/flake.lock +++ b/flake.lock @@ -724,11 +724,11 @@ ] }, "locked": { - "lastModified": 1736785676, - "narHash": "sha256-TY0jUwR3EW0fnS0X5wXMAVy6h4Z7Y6a3m+Yq++C9AyE=", + "lastModified": 1738448366, + "narHash": "sha256-4ATtQqBlgsGqkHTemta0ydY6f7JBRXz4Hf574NHQpkg=", "owner": "nix-community", "repo": "home-manager", - "rev": "fc52a210b60f2f52c74eac41a8647c1573d2071d", + "rev": "18fa9f323d8adbb0b7b8b98a8488db308210ed93", "type": "github" }, "original": { @@ -800,15 +800,15 @@ "lix": { "flake": false, "locked": { - "lastModified": 1729298361, - "narHash": "sha256-hiGtfzxFkDc9TSYsb96Whg0vnqBVV7CUxyscZNhed0U=", - "rev": "ad9d06f7838a25beec425ff406fe68721fef73be", + "lastModified": 1737234286, + "narHash": "sha256-CCKIAE84dzkrnlxJCKFyffAxP3yfsOAbdvydUGqq24g=", + "rev": "2837da71ec1588c1187d2e554719b15904a46c8b", "type": "tarball", - "url": "https://git.lix.systems/api/v1/repos/lix-project/lix/archive/ad9d06f7838a25beec425ff406fe68721fef73be.tar.gz?rev=ad9d06f7838a25beec425ff406fe68721fef73be" + "url": "https://git.lix.systems/api/v1/repos/lix-project/lix/archive/2837da71ec1588c1187d2e554719b15904a46c8b.tar.gz?rev=2837da71ec1588c1187d2e554719b15904a46c8b" }, "original": { "type": "tarball", - "url": "https://git.lix.systems/lix-project/lix/archive/2.91.1.tar.gz" + "url": "https://git.lix.systems/lix-project/lix/archive/2.92.0.tar.gz" } }, "lix-module": { @@ -821,15 +821,15 @@ ] }, "locked": { - "lastModified": 1729360442, - "narHash": "sha256-6U0CyPycIBc04hbYy2hBINnVso58n/ZyywY2BD3hu+s=", - "rev": "9098ac95768f7006d7e070b88bae76939f6034e6", + "lastModified": 1737237494, + "narHash": "sha256-YMLrcBpf0TR5r/eaqm8lxzFPap2TxCor0ZGcK3a7+b8=", + "rev": "b90bf629bbd835e61f1317b99e12f8c831017006", "type": "tarball", - "url": "https://git.lix.systems/api/v1/repos/lix-project/nixos-module/archive/9098ac95768f7006d7e070b88bae76939f6034e6.tar.gz?rev=9098ac95768f7006d7e070b88bae76939f6034e6" + "url": "https://git.lix.systems/api/v1/repos/lix-project/nixos-module/archive/b90bf629bbd835e61f1317b99e12f8c831017006.tar.gz?rev=b90bf629bbd835e61f1317b99e12f8c831017006" }, "original": { "type": "tarball", - "url": "https://git.lix.systems/lix-project/nixos-module/archive/2.91.1-1.tar.gz" + "url": "https://git.lix.systems/lix-project/nixos-module/archive/2.92.0.tar.gz" } }, "mpd-mpris": { @@ -1077,11 +1077,11 @@ }, "nixpkgs-unstable": { "locked": { - "lastModified": 1736755442, - "narHash": "sha256-a3MMEY7i/wdF0gb7WFNTn6onzaiMOvwj7OerRVenA8o=", + "lastModified": 1738452225, + "narHash": "sha256-Qmwx3FXM0x0pdjibwTk/uRbayqDrs3EwmRJe7tQWu48=", "owner": "nixos", "repo": "nixpkgs", - "rev": "ef56e777fedaa4da8c66a150081523c5de1e0171", + "rev": "6c4e0724e0a785a20679b1bca3a46bfce60f05b6", "type": "github" }, "original": { @@ -1125,11 +1125,11 @@ }, "nixpkgs_12": { "locked": { - "lastModified": 1734424634, - "narHash": "sha256-cHar1vqHOOyC7f1+tVycPoWTfKIaqkoe1Q6TnKzuti4=", + "lastModified": 1738410390, + "narHash": "sha256-xvTo0Aw0+veek7hvEVLzErmJyQkEcRk6PSR4zsRQFEc=", "owner": "nixos", "repo": "nixpkgs", - "rev": "d3c42f187194c26d9f0309a8ecc469d6c878ce33", + "rev": "3a228057f5b619feb3186e986dbe76278d707b6e", "type": "github" }, "original": { @@ -1683,17 +1683,14 @@ }, "zen-browser": { "inputs": { - "nixpkgs": "nixpkgs_12", - "zen-browser-aarch64": "zen-browser-aarch64", - "zen-browser-generic": "zen-browser-generic", - "zen-browser-specific": "zen-browser-specific" + "nixpkgs": "nixpkgs_12" }, "locked": { - "lastModified": 1734667644, - "narHash": "sha256-vluyzRt6RikEn78Yk0t7Qd96iZZfyRBt4+ESI0mtlhk=", + "lastModified": 1738469108, + "narHash": "sha256-AS4akOUGZP2ELHQKj1IiXuuzU9bpK20ks4dGaCrwOEk=", "owner": "youwen5", "repo": "zen-browser-flake", - "rev": "8c8af380bf45b42ae14b2f6d5252be3627332f23", + "rev": "f95fa7b1560b0f2ed8989e6f12f2c7e7e7ee9433", "type": "github" }, "original": { @@ -1701,45 +1698,6 @@ "repo": "zen-browser-flake", "type": "github" } - }, - "zen-browser-aarch64": { - "flake": false, - "locked": { - "lastModified": 1734641206, - "narHash": "sha256-F5FwGqAgL4kfEy5rNWvofRQl8SH0udQvEIMhysRMDgs=", - "type": "tarball", - "url": "https://github.com/zen-browser/desktop/releases/download/1.0.2-b.3/zen.linux-aarch64.tar.bz2" - }, - "original": { - "type": "tarball", - "url": "https://github.com/zen-browser/desktop/releases/download/1.0.2-b.3/zen.linux-aarch64.tar.bz2" - } - }, - "zen-browser-generic": { - "flake": false, - "locked": { - "lastModified": 1734646830, - "narHash": "sha256-slIWuEWSV9PK1JTr6UKKC+VP4oLNaczwkxkYiqcjZM8=", - "type": "tarball", - "url": "https://github.com/zen-browser/desktop/releases/download/1.0.2-b.3/zen.linux-generic.tar.bz2" - }, - "original": { - "type": "tarball", - "url": "https://github.com/zen-browser/desktop/releases/download/1.0.2-b.3/zen.linux-generic.tar.bz2" - } - }, - "zen-browser-specific": { - "flake": false, - "locked": { - "lastModified": 1734645803, - "narHash": "sha256-zAo93sHeB8cTW2JBAqxx0wo3CANcxCgjEcTQgbDeWT4=", - "type": "tarball", - "url": "https://github.com/zen-browser/desktop/releases/download/1.0.2-b.3/zen.linux-specific.tar.bz2" - }, - "original": { - "type": "tarball", - "url": "https://github.com/zen-browser/desktop/releases/download/1.0.2-b.3/zen.linux-specific.tar.bz2" - } } }, "root": "root", diff --git a/flake.nix b/flake.nix index babfc3d..95db841 100644 --- a/flake.nix +++ b/flake.nix @@ -18,20 +18,20 @@ # --- Secure boot lanzaboote = { - url = github:nix-community/lanzaboote/v0.4.1; + url = "github:nix-community/lanzaboote/v0.4.1"; inputs.nixpkgs.follows = "nixpkgs"; }; # --- Build tools - flake-utils.url = github:numtide/flake-utils; - crane.url = github:ipetkov/crane; + flake-utils.url = "github:numtide/flake-utils"; + crane.url = "github:ipetkov/crane"; rust-overlay = { url = "github:oxalica/rust-overlay"; inputs.nixpkgs.follows = "nixpkgs"; }; - arion.url = github:hercules-ci/arion; + arion.url = "github:hercules-ci/arion"; lix-module = { - url = "https://git.lix.systems/lix-project/nixos-module/archive/2.91.1-1.tar.gz"; + url = "https://git.lix.systems/lix-project/nixos-module/archive/2.92.0.tar.gz"; inputs.nixpkgs.follows = "nixpkgs"; }; @@ -43,21 +43,21 @@ # inputs.nixpkgs.follows = "nixpkgs"; # }; mpd-mpris = { - url = github:natsukagami/mpd-mpris; + url = "github:natsukagami/mpd-mpris"; inputs.nixpkgs.follows = "nixpkgs"; }; dtth-phanpy.url = "git+ssh://gitea@git.dtth.ch/nki-dtth/phanpy?ref=dtth-fork"; conduit.url = "gitlab:famedly/conduit/v0.9.0"; - nix-gaming.url = github:fufexan/nix-gaming; + nix-gaming.url = "github:fufexan/nix-gaming"; zen-browser.url = "github:youwen5/zen-browser-flake"; niri.url = "github:sodiboo/niri-flake"; # --- Sources - kakoune.url = github:mawww/kakoune; + kakoune.url = "github:mawww/kakoune"; kakoune.flake = false; kak-lsp.url = "github:kakoune-lsp/kakoune-lsp/v18.1.1"; kak-lsp.flake = false; - nixos-m1.url = github:tpwrules/nixos-apple-silicon; + nixos-m1.url = "github:tpwrules/nixos-apple-silicon"; nixos-m1.inputs.nixpkgs.follows = "nixpkgs"; # --- diff --git a/home/osu.nix b/home/osu.nix index 07f4cf1..e64424a 100644 --- a/home/osu.nix +++ b/home/osu.nix @@ -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.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 ]; - 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 ];