diff --git a/.zed/settings.json b/.zed/settings.json index ff63d82..afa9393 100644 --- a/.zed/settings.json +++ b/.zed/settings.json @@ -1,12 +1,12 @@ { - "languages": { - "Nix": { - "formatter": { - "external": { - "command": "alejandra", - "arguments": ["-"] - } - } - } - } + "languages": { + "Nix": { + "formatter": { + "external": { + "command": "alejandra", + "arguments": ["-"] + } + } + } + } } diff --git a/_sources/generated.json b/_sources/generated.json index 0fc8749..4d6d327 100644 --- a/_sources/generated.json +++ b/_sources/generated.json @@ -22,7 +22,7 @@ }, "TrackersListCollection": { "cargoLocks": null, - "date": "2025-12-27", + "date": "2026-01-14", "extract": null, "name": "TrackersListCollection", "passthru": null, @@ -34,14 +34,14 @@ "name": null, "owner": "XIU2", "repo": "TrackersListCollection", - "rev": "78cfe5f48e3cceaa10d5b66ad30b13863d6740b9", - "sha256": "sha256-oJ7gVWcuc1QrK+reTlwnsqWsxcisTGaWKJJAd/FD1rg=", + "rev": "aa13bda89bcd7deb9be26dc11a4cfb49543274b0", + "sha256": "sha256-HWami8LfjIawAJkSAAYgK+ifz9h4HZx8AvOTl4K5HC8=", "sparseCheckout": [ "all.txt" ], "type": "github" }, - "version": "78cfe5f48e3cceaa10d5b66ad30b13863d6740b9" + "version": "aa13bda89bcd7deb9be26dc11a4cfb49543274b0" }, "cliphist": { "cargoLocks": null, @@ -148,7 +148,7 @@ }, "spotx": { "cargoLocks": null, - "date": "2025-12-26", + "date": "2026-01-10", "extract": null, "name": "spotx", "passthru": null, @@ -160,12 +160,12 @@ "name": null, "owner": "SpotX-Official", "repo": "SpotX-Bash", - "rev": "7c016872bf24ee5357f9621f1136955443f0a8a3", - "sha256": "sha256-hCTggx0hm9W9MGQp4MDD8IStfJbmsA0s+SNH0hU24P8=", + "rev": "b70121d23c0ca9ddc13dec4d3addcba2799a1a4b", + "sha256": "sha256-SyrdV5RENFEYQZcd7MTtegvPcuGKzTmWQiwPcbnoWpY=", "sparseCheckout": [], "type": "github" }, - "version": "7c016872bf24ee5357f9621f1136955443f0a8a3" + "version": "b70121d23c0ca9ddc13dec4d3addcba2799a1a4b" }, "tree-sitter-idris": { "cargoLocks": null, @@ -189,51 +189,6 @@ }, "version": "c56a25cf57c68ff929356db25505c1cc4c7820f6" }, - "wallpaper_hieda-no-akyuu-touhou.1920x1080.mp4": { - "cargoLocks": null, - "date": null, - "extract": null, - "name": "wallpaper_hieda-no-akyuu-touhou.1920x1080.mp4", - "passthru": null, - "pinned": false, - "src": { - "name": null, - "sha256": "sha256-NGlCqI92PFnMF/eyoCdWzJ0qDIkVhfkW46SpwV/iask=", - "type": "url", - "url": "http://wallpaper.youthlic.social/hieda-no-akyuu-touhou.1920x1080.mp4" - }, - "version": "346942a88f763c59cc17f7b2a02756cc9d2a0c891585f916e3a4a9c15fe26ac9" - }, - "wallpaper_hollow-knight-quest.3840x2160.mp4": { - "cargoLocks": null, - "date": null, - "extract": null, - "name": "wallpaper_hollow-knight-quest.3840x2160.mp4", - "passthru": null, - "pinned": false, - "src": { - "name": null, - "sha256": "sha256-7LsxB15+OHywOpA1KYorD7zlKdL03JG3vdqgivVwpBs=", - "type": "url", - "url": "http://wallpaper.youthlic.social/hollow-knight-quest.3840x2160.mp4" - }, - "version": "ecbb31075e7e387cb03a9035298a2b0fbce529d2f4dc91b7bddaa08af570a41b" - }, - "wallpaper_outer-wilds.3840x2160.mp4": { - "cargoLocks": null, - "date": null, - "extract": null, - "name": "wallpaper_outer-wilds.3840x2160.mp4", - "passthru": null, - "pinned": false, - "src": { - "name": null, - "sha256": "sha256-GeDMtISD9V80EyAXGOiyukpqzREuGj57ta2RO4fF8hA=", - "type": "url", - "url": "http://wallpaper.youthlic.social/outer-wilds.3840x2160.mp4" - }, - "version": "19e0ccb48483f55f3413201718e8b2ba4a6acd112e1a3e7bb5ad913b87c5f210" - }, "wshowkeys-mao": { "cargoLocks": null, "date": "2025-09-14", diff --git a/_sources/generated.nix b/_sources/generated.nix index 7eb74a4..b63e2a1 100644 --- a/_sources/generated.nix +++ b/_sources/generated.nix @@ -15,18 +15,18 @@ }; TrackersListCollection = { pname = "TrackersListCollection"; - version = "78cfe5f48e3cceaa10d5b66ad30b13863d6740b9"; + version = "aa13bda89bcd7deb9be26dc11a4cfb49543274b0"; src = fetchFromGitHub { owner = "XIU2"; repo = "TrackersListCollection"; - rev = "78cfe5f48e3cceaa10d5b66ad30b13863d6740b9"; + rev = "aa13bda89bcd7deb9be26dc11a4cfb49543274b0"; fetchSubmodules = false; deepClone = false; leaveDotGit = false; sparseCheckout = [ "all.txt" ]; - sha256 = "sha256-oJ7gVWcuc1QrK+reTlwnsqWsxcisTGaWKJJAd/FD1rg="; + sha256 = "sha256-HWami8LfjIawAJkSAAYgK+ifz9h4HZx8AvOTl4K5HC8="; }; - date = "2025-12-27"; + date = "2026-01-14"; }; cliphist = { pname = "cliphist"; @@ -91,15 +91,15 @@ }; spotx = { pname = "spotx"; - version = "7c016872bf24ee5357f9621f1136955443f0a8a3"; + version = "b70121d23c0ca9ddc13dec4d3addcba2799a1a4b"; src = fetchFromGitHub { owner = "SpotX-Official"; repo = "SpotX-Bash"; - rev = "7c016872bf24ee5357f9621f1136955443f0a8a3"; + rev = "b70121d23c0ca9ddc13dec4d3addcba2799a1a4b"; fetchSubmodules = false; - sha256 = "sha256-hCTggx0hm9W9MGQp4MDD8IStfJbmsA0s+SNH0hU24P8="; + sha256 = "sha256-SyrdV5RENFEYQZcd7MTtegvPcuGKzTmWQiwPcbnoWpY="; }; - date = "2025-12-26"; + date = "2026-01-10"; }; tree-sitter-idris = { pname = "tree-sitter-idris"; @@ -116,30 +116,6 @@ name = "idris"; date = "2024-11-05"; }; - "wallpaper_hieda-no-akyuu-touhou.1920x1080.mp4" = { - pname = "wallpaper_hieda-no-akyuu-touhou.1920x1080.mp4"; - version = "346942a88f763c59cc17f7b2a02756cc9d2a0c891585f916e3a4a9c15fe26ac9"; - src = fetchurl { - url = "http://wallpaper.youthlic.social/hieda-no-akyuu-touhou.1920x1080.mp4"; - sha256 = "sha256-NGlCqI92PFnMF/eyoCdWzJ0qDIkVhfkW46SpwV/iask="; - }; - }; - "wallpaper_hollow-knight-quest.3840x2160.mp4" = { - pname = "wallpaper_hollow-knight-quest.3840x2160.mp4"; - version = "ecbb31075e7e387cb03a9035298a2b0fbce529d2f4dc91b7bddaa08af570a41b"; - src = fetchurl { - url = "http://wallpaper.youthlic.social/hollow-knight-quest.3840x2160.mp4"; - sha256 = "sha256-7LsxB15+OHywOpA1KYorD7zlKdL03JG3vdqgivVwpBs="; - }; - }; - "wallpaper_outer-wilds.3840x2160.mp4" = { - pname = "wallpaper_outer-wilds.3840x2160.mp4"; - version = "19e0ccb48483f55f3413201718e8b2ba4a6acd112e1a3e7bb5ad913b87c5f210"; - src = fetchurl { - url = "http://wallpaper.youthlic.social/outer-wilds.3840x2160.mp4"; - sha256 = "sha256-GeDMtISD9V80EyAXGOiyukpqzREuGj57ta2RO4fF8hA="; - }; - }; wshowkeys-mao = { pname = "wshowkeys-mao"; version = "184f55dbc5320c34a56d02353410ad35a0f3e090"; diff --git a/flake.lock b/flake.lock index 6d09dea..b1673c2 100644 --- a/flake.lock +++ b/flake.lock @@ -256,22 +256,6 @@ "type": "github" } }, - "flake-compat_3": { - "flake": false, - "locked": { - "lastModified": 1761588595, - "narHash": "sha256-XKUZz9zewJNUj46b4AJdiRZJAvSZ0Dqj2BNfXvFlJC4=", - "owner": "edolstra", - "repo": "flake-compat", - "rev": "f387cd2afec9419c8ee37694406ca490c3f34ee5", - "type": "github" - }, - "original": { - "owner": "edolstra", - "repo": "flake-compat", - "type": "github" - } - }, "flake-parts": { "inputs": { "nixpkgs-lib": [ @@ -412,25 +396,7 @@ }, "flake-utils_2": { "inputs": { - "systems": "systems_3" - }, - "locked": { - "lastModified": 1731533236, - "narHash": "sha256-l0KFg5HjrsfsO/JpG+r7fRrqm12kzFHyUHqHCVpMMbI=", - "owner": "numtide", - "repo": "flake-utils", - "rev": "11707dc2f618dd54ca8739b309ec4fc024de578b", - "type": "github" - }, - "original": { - "owner": "numtide", - "repo": "flake-utils", - "type": "github" - } - }, - "flake-utils_3": { - "inputs": { - "systems": "systems_5" + "systems": "systems_4" }, "locked": { "lastModified": 1731533236, @@ -477,29 +443,6 @@ "type": "github" } }, - "ghostty": { - "inputs": { - "flake-compat": "flake-compat_2", - "flake-utils": "flake-utils_2", - "home-manager": "home-manager", - "nixpkgs": "nixpkgs_2", - "zig": "zig", - "zon2nix": "zon2nix" - }, - "locked": { - "lastModified": 1767987612, - "narHash": "sha256-tRpbQ5W+Asz9qtBVRRBesRwS4TXBxnjQdlwgfghM8Ik=", - "owner": "ghostty-org", - "repo": "ghostty", - "rev": "ec2912dbafe50cc32b786d2327dcd0213c83ecc6", - "type": "github" - }, - "original": { - "owner": "ghostty-org", - "repo": "ghostty", - "type": "github" - } - }, "gitignore": { "inputs": { "nixpkgs": [ @@ -543,7 +486,7 @@ }, "helix": { "inputs": { - "nixpkgs": "nixpkgs_3", + "nixpkgs": "nixpkgs_2", "rust-overlay": "rust-overlay" }, "locked": { @@ -562,28 +505,6 @@ } }, "home-manager": { - "inputs": { - "nixpkgs": [ - "ghostty", - "nixpkgs" - ] - }, - "locked": { - "lastModified": 1755776884, - "narHash": "sha256-CPM7zm6csUx7vSfKvzMDIjepEJv1u/usmaT7zydzbuI=", - "owner": "nix-community", - "repo": "home-manager", - "rev": "4fb695d10890e9fc6a19deadf85ff79ffb78da86", - "type": "github" - }, - "original": { - "owner": "nix-community", - "ref": "release-25.05", - "repo": "home-manager", - "type": "github" - } - }, - "home-manager_2": { "inputs": { "nixpkgs": [ "nixpkgs" @@ -621,7 +542,7 @@ "lanzaboote": { "inputs": { "crane": "crane", - "nixpkgs": "nixpkgs_4", + "nixpkgs": "nixpkgs_3", "pre-commit": "pre-commit", "rust-overlay": "rust-overlay_2" }, @@ -684,7 +605,7 @@ "inputs": { "flake-parts": "flake-parts_3", "neovim-src": "neovim-src", - "nixpkgs": "nixpkgs_5" + "nixpkgs": "nixpkgs_4" }, "locked": { "lastModified": 1767225850, @@ -781,7 +702,7 @@ "nixpkgs": [ "nixpkgs" ], - "systems": "systems_4" + "systems": "systems_3" }, "locked": { "lastModified": 1767257180, @@ -800,7 +721,7 @@ "nix-gaming": { "inputs": { "flake-parts": "flake-parts_4", - "nixpkgs": "nixpkgs_6" + "nixpkgs": "nixpkgs_5" }, "locked": { "lastModified": 1767060285, @@ -818,7 +739,7 @@ }, "nix4nvchad": { "inputs": { - "flake-utils": "flake-utils_3", + "flake-utils": "flake-utils_2", "nixpkgs": [ "nixpkgs" ], @@ -934,36 +855,7 @@ "type": "github" } }, - "nixpkgs_10": { - "locked": { - "lastModified": 1761236834, - "narHash": "sha256-+pthv6hrL5VLW2UqPdISGuLiUZ6SnAXdd2DdUE+fV2Q=", - "owner": "nixos", - "repo": "nixpkgs", - "rev": "d5faa84122bc0a1fd5d378492efce4e289f8eac1", - "type": "github" - }, - "original": { - "owner": "nixos", - "ref": "nixpkgs-unstable", - "repo": "nixpkgs", - "type": "github" - } - }, "nixpkgs_2": { - "locked": { - "lastModified": 1763191728, - "narHash": "sha256-gI9PpaoX4/f28HkjcTbFVpFhtOxSDtOEdFaHZrdETe0=", - "rev": "1d4c88323ac36805d09657d13a5273aea1b34f0c", - "type": "tarball", - "url": "https://releases.nixos.org/nixpkgs/nixpkgs-25.11pre896415.1d4c88323ac3/nixexprs.tar.xz" - }, - "original": { - "type": "tarball", - "url": "https://channels.nixos.org/nixpkgs-unstable/nixexprs.tar.xz" - } - }, - "nixpkgs_3": { "locked": { "lastModified": 1759381078, "narHash": "sha256-gTrEEp5gEspIcCOx9PD8kMaF1iEmfBcTbO0Jag2QhQs=", @@ -979,7 +871,7 @@ "type": "github" } }, - "nixpkgs_4": { + "nixpkgs_3": { "locked": { "lastModified": 1764950072, "narHash": "sha256-BmPWzogsG2GsXZtlT+MTcAWeDK5hkbGRZTeZNW42fwA=", @@ -995,7 +887,7 @@ "type": "github" } }, - "nixpkgs_5": { + "nixpkgs_4": { "locked": { "lastModified": 1767151656, "narHash": "sha256-ujL2AoYBnJBN262HD95yer7QYUmYp5kFZGYbyCCKxq8=", @@ -1011,7 +903,7 @@ "type": "github" } }, - "nixpkgs_6": { + "nixpkgs_5": { "locked": { "lastModified": 1766840161, "narHash": "sha256-Ss/LHpJJsng8vz1Pe33RSGIWUOcqM1fjrehjUkdrWio=", @@ -1027,7 +919,7 @@ "type": "github" } }, - "nixpkgs_7": { + "nixpkgs_6": { "locked": { "lastModified": 1767116409, "narHash": "sha256-5vKw92l1GyTnjoLzEagJy5V5mDFck72LiQWZSOnSicw=", @@ -1043,7 +935,7 @@ "type": "github" } }, - "nixpkgs_8": { + "nixpkgs_7": { "locked": { "lastModified": 1767026758, "narHash": "sha256-7fsac/f7nh/VaKJ/qm3I338+wAJa/3J57cOGpXi0Sbg=", @@ -1059,7 +951,7 @@ "type": "github" } }, - "nixpkgs_9": { + "nixpkgs_8": { "locked": { "lastModified": 1767116409, "narHash": "sha256-5vKw92l1GyTnjoLzEagJy5V5mDFck72LiQWZSOnSicw=", @@ -1075,11 +967,27 @@ "type": "github" } }, + "nixpkgs_9": { + "locked": { + "lastModified": 1761236834, + "narHash": "sha256-+pthv6hrL5VLW2UqPdISGuLiUZ6SnAXdd2DdUE+fV2Q=", + "owner": "nixos", + "repo": "nixpkgs", + "rev": "d5faa84122bc0a1fd5d378492efce4e289f8eac1", + "type": "github" + }, + "original": { + "owner": "nixos", + "ref": "nixpkgs-unstable", + "repo": "nixpkgs", + "type": "github" + } + }, "nixvim": { "inputs": { "flake-parts": "flake-parts_5", - "nixpkgs": "nixpkgs_8", - "systems": "systems_6" + "nixpkgs": "nixpkgs_7", + "systems": "systems_5" }, "locked": { "lastModified": 1767185101, @@ -1118,7 +1026,7 @@ "nur": { "inputs": { "flake-parts": "flake-parts_6", - "nixpkgs": "nixpkgs_9" + "nixpkgs": "nixpkgs_8" }, "locked": { "lastModified": 1767260184, @@ -1177,7 +1085,7 @@ }, "pre-commit": { "inputs": { - "flake-compat": "flake-compat_3", + "flake-compat": "flake-compat_2", "gitignore": "gitignore", "nixpkgs": [ "lanzaboote", @@ -1206,9 +1114,8 @@ "emacs-overlay": "emacs-overlay", "flake-parts": "flake-parts_2", "flake-utils": "flake-utils", - "ghostty": "ghostty", "helix": "helix", - "home-manager": "home-manager_2", + "home-manager": "home-manager", "lanzaboote": "lanzaboote", "lix-module": "lix-module", "neovim-nightly": "neovim-nightly", @@ -1217,7 +1124,7 @@ "nix-gaming": "nix-gaming", "nix4nvchad": "nix4nvchad", "nixos-hardware": "nixos-hardware", - "nixpkgs": "nixpkgs_7", + "nixpkgs": "nixpkgs_6", "nixvim": "nixvim", "noctalia": "noctalia", "nur": "nur", @@ -1322,7 +1229,7 @@ "nixpkgs" ], "nur": "nur_2", - "systems": "systems_7", + "systems": "systems_6", "tinted-foot": "tinted-foot", "tinted-kitty": "tinted-kitty", "tinted-schemes": "tinted-schemes", @@ -1433,21 +1340,6 @@ "type": "github" } }, - "systems_7": { - "locked": { - "lastModified": 1681028828, - "narHash": "sha256-Vy1rq5AaRuLzOxct8nz4T6wlgyUR7zLU309k9mBC768=", - "owner": "nix-systems", - "repo": "default", - "rev": "da67096a3b9bf56a91d16901293e51ba5b49a27e", - "type": "github" - }, - "original": { - "owner": "nix-systems", - "repo": "default", - "type": "github" - } - }, "tinted-foot": { "flake": false, "locked": { @@ -1531,7 +1423,7 @@ }, "treefmt-nix": { "inputs": { - "nixpkgs": "nixpkgs_10" + "nixpkgs": "nixpkgs_9" }, "locked": { "lastModified": 1767122417, @@ -1602,57 +1494,6 @@ "repo": "zen-browser-flake", "type": "github" } - }, - "zig": { - "inputs": { - "flake-compat": [ - "ghostty", - "flake-compat" - ], - "flake-utils": [ - "ghostty", - "flake-utils" - ], - "nixpkgs": [ - "ghostty", - "nixpkgs" - ] - }, - "locked": { - "lastModified": 1763295135, - "narHash": "sha256-sGv/NHCmEnJivguGwB5w8LRmVqr1P72OjS+NzcJsssE=", - "owner": "mitchellh", - "repo": "zig-overlay", - "rev": "64f8b42cfc615b2cf99144adf2b7728c7847c72a", - "type": "github" - }, - "original": { - "owner": "mitchellh", - "repo": "zig-overlay", - "type": "github" - } - }, - "zon2nix": { - "inputs": { - "nixpkgs": [ - "ghostty", - "nixpkgs" - ] - }, - "locked": { - "lastModified": 1758405547, - "narHash": "sha256-WgaDgvIZMPvlZcZrpPMjkaalTBnGF2lTG+62znXctWM=", - "owner": "jcollie", - "repo": "zon2nix", - "rev": "bf983aa90ff169372b9fa8c02e57ea75e0b42245", - "type": "github" - }, - "original": { - "owner": "jcollie", - "repo": "zon2nix", - "rev": "bf983aa90ff169372b9fa8c02e57ea75e0b42245", - "type": "github" - } } }, "root": "root", diff --git a/flake.nix b/flake.nix index 82fbdd4..f11162e 100644 --- a/flake.nix +++ b/flake.nix @@ -236,11 +236,5 @@ nixpkgs.follows = "nixpkgs"; }; }; - - ghostty = { - type = "github"; - owner = "ghostty-org"; - repo = "ghostty"; - }; }; } diff --git a/home/david/modules/programs/firefox.nix b/home/david/modules/programs/firefox.nix index bb5c6d5..0ee8757 100644 --- a/home/david/modules/programs/firefox.nix +++ b/home/david/modules/programs/firefox.nix @@ -225,7 +225,7 @@ in { "Rust Crates" = { urls = [ { - temaplte = "https://crates.io/search"; + template = "https://crates.io/search"; params = [ { name = "q"; diff --git a/home/david/modules/programs/ghostty.nix b/home/david/modules/programs/ghostty.nix index 4a4583f..81f627f 100644 --- a/home/david/modules/programs/ghostty.nix +++ b/home/david/modules/programs/ghostty.nix @@ -1,8 +1,6 @@ { - pkgs, config, lib, - inputs, ... }: { options = { @@ -16,7 +14,6 @@ programs.ghostty = lib.mkMerge [ { enable = true; - package = inputs.ghostty.packages.${pkgs.stdenv.hostPlatform.system}.default; settings = { # font-family = "Maple Mono NF CN"; font-feature = [ diff --git a/home/david/modules/programs/niri/config.nix b/home/david/modules/programs/niri/config.nix index 42f6cd1..b8dde94 100644 --- a/home/david/modules/programs/niri/config.nix +++ b/home/david/modules/programs/niri/config.nix @@ -514,9 +514,12 @@ # ]) (plain "input" [ (plain "touchpad" [ - (leaf "click-method" ["clickfinger"]) - (flag "dwt") (leaf "scroll-method" ["two-finger"]) + (flag "middle-emulation") + (flag "tap") + (flag "dwt") + (leaf "drag" [true]) + (leaf "click-method" ["clickfinger"]) (leaf "tap-button-map" ["left-right-middle"]) ]) ]) diff --git a/nixos/configurations/Tytonidae/networking.nix b/nixos/configurations/Tytonidae/networking.nix index 3ad400c..673c472 100644 --- a/nixos/configurations/Tytonidae/networking.nix +++ b/nixos/configurations/Tytonidae/networking.nix @@ -31,7 +31,7 @@ # MIIMonitorSec = "1s"; # PrimaryReselectPolicy = "better"; # }; - # }; + # }; # }; networks = { "20-eno2" = { diff --git a/nvfetcher.toml b/nvfetcher.toml index 71d708a..d53afc1 100644 --- a/nvfetcher.toml +++ b/nvfetcher.toml @@ -34,18 +34,6 @@ src.git = "https://github.com/top-mind/OuterWildsTextAdventureWeb.git" fetch.github = "sentriz/cliphist" src.git = "https://github.com/sentriz/cliphist.git" -["wallpaper_hieda-no-akyuu-touhou.1920x1080.mp4"] -fetch.url = "http://wallpaper.youthlic.social/hieda-no-akyuu-touhou.1920x1080.mp4" -src.cmd = "curl -sL http://wallpaper.youthlic.social/hieda-no-akyuu-touhou.1920x1080.mp4 | sha256sum | cut -d ' ' -f 1" - -["wallpaper_outer-wilds.3840x2160.mp4"] -fetch.url = "http://wallpaper.youthlic.social/outer-wilds.3840x2160.mp4" -src.cmd = "curl -sL http://wallpaper.youthlic.social/outer-wilds.3840x2160.mp4 | sha256sum | cut -d ' ' -f 1" - -["wallpaper_hollow-knight-quest.3840x2160.mp4"] -fetch.url = "http://wallpaper.youthlic.social/hollow-knight-quest.3840x2160.mp4" -src.cmd = "curl -sL http://wallpaper.youthlic.social/hollow-knight-quest.3840x2160.mp4 | sha256sum | cut -d ' ' -f 1" - [rime-yuhaostar] fetch.url = "https://github.com/forfudan/yuhao-ime-release/releases/download/$ver/star_xingchen_$ver.zip" src.github = "forfudan/yuhao-ime-release" diff --git a/pkgs/wallpapers.nix b/pkgs/wallpapers.nix index 806cb42..5b93704 100644 --- a/pkgs/wallpapers.nix +++ b/pkgs/wallpapers.nix @@ -1,19 +1,9 @@ { - srcs, runCommandLocal, rootPath, - lib, -}: let - wallpapers = with lib; - pipe srcs [ - (filterAttrs (name: _value: hasPrefix "wallpaper" name)) - (concatMapAttrsStringSep "\n" (name: value: "cp ${value.src} $out/${name}")) - ]; -in - runCommandLocal "wallpapers" {} '' - mkdir -p $out +}: +runCommandLocal "wallpapers" {} '' + mkdir -p $out - ${wallpapers} - - cp ${rootPath + "/assets/wallpaper/01.png"} $out/01.png - '' + cp ${rootPath + "/assets/wallpaper/01.png"} $out/01.png +'' diff --git a/treefmt.nix b/treefmt.nix index a993fc1..0c151ba 100644 --- a/treefmt.nix +++ b/treefmt.nix @@ -46,7 +46,7 @@ config = with lib; pipe ./.typos.toml [ builtins.readFile - builtins.fromTOML + fromTOML ]; in { enable = true;