From b66238c0c478e93aab09f51b6e3b02d4347f4a9b Mon Sep 17 00:00:00 2001 From: DACHXY Date: Thu, 20 Feb 2025 00:35:33 +0800 Subject: [PATCH] feat: update flake --- flake.lock | 327 +++++++++++++++++++----------- flake.nix | 17 +- home/user/config.nix | 1 - home/user/hypr/bind.nix | 17 +- home/user/hypr/binde.nix | 16 ++ home/user/hypr/plugin.nix | 27 ++- home/user/hyprland.nix | 6 +- home/user/nvim.nix | 18 +- home/user/programs.nix | 2 +- system/dev/dn-lap/default.nix | 2 + system/dev/dn-pre7780/default.nix | 3 +- 11 files changed, 280 insertions(+), 156 deletions(-) create mode 100644 home/user/hypr/binde.nix diff --git a/flake.lock b/flake.lock index 45b200c..b38ad76 100644 --- a/flake.lock +++ b/flake.lock @@ -8,11 +8,11 @@ "systems": "systems" }, "locked": { - "lastModified": 1736162631, - "narHash": "sha256-i4pwzFbmnBRJyWADux6eOXv30l2SGu4MifeEMWKDqOk=", + "lastModified": 1739004667, + "narHash": "sha256-t/KaeHEgzh225HUdAiHXRsgDeyDrBCMTg0LjR73v3Nw=", "owner": "KZDKM", "repo": "Hyprspace", - "rev": "f430d4bf8afa9397c937d575cb7a9176a76aeace", + "rev": "ac55bbdb6cee760af9315899b5b187a40ce43e46", "type": "github" }, "original": { @@ -41,11 +41,11 @@ ] }, "locked": { - "lastModified": 1736102453, - "narHash": "sha256-5qb4kb7Xbt8jJFL/oDqOor9Z2+E+A+ql3PiyDvsfWZ0=", + "lastModified": 1739103745, + "narHash": "sha256-c53dcRaw0F4Os9WD05HwIRs9kTDZw4Mxe1XK4edEALo=", "owner": "hyprwm", "repo": "aquamarine", - "rev": "4846091641f3be0ad7542086d52769bb7932bde6", + "rev": "a3dda0d10ce9aa1d1dfb7a6c139ea8c2872c74bd", "type": "github" }, "original": { @@ -96,11 +96,11 @@ ] }, "locked": { - "lastModified": 1737508273, - "narHash": "sha256-MkwmVx0kUCEcHBMFlzIjzAJEI87smC47RV8Ro9OG4eE=", + "lastModified": 1739927499, + "narHash": "sha256-Ptt0oVYP89UchdJOzOTQCc9oh5tLreXs+LbiRnpZ33k=", "owner": "nix-community", "repo": "flake-firefox-nightly", - "rev": "2335be5f02e8b3a39d116876d3ac4ccc9de308d6", + "rev": "129eaf0cfac1d1ca018384b93cf55c476aef2078", "type": "github" }, "original": { @@ -127,11 +127,11 @@ "flake-compat_2": { "flake": false, "locked": { - "lastModified": 1696426674, - "narHash": "sha256-kvjfFW7WAETZlt09AgDn1MrtKzP7t90Vf7vypd3OL1U=", + "lastModified": 1733328505, + "narHash": "sha256-NeCCThCEP3eCl2l/+27kNNK7QrwZB1IJCrXfrbv5oqU=", "owner": "edolstra", "repo": "flake-compat", - "rev": "0f9255e01c2351cc7d116c072cb317785dd33b33", + "rev": "ff81ac966bb2cae68946d5ed5fc4994f96d0ffec", "type": "github" }, "original": { @@ -233,11 +233,11 @@ ] }, "locked": { - "lastModified": 1736143030, - "narHash": "sha256-+hu54pAoLDEZT9pjHlqL9DNzWz0NbUn8NEAHP7PQPzU=", + "lastModified": 1738453229, + "narHash": "sha256-7H9XgNiGLKN1G1CgRh0vUL4AheZSYzPm+zmZ7vxbJdo=", "owner": "hercules-ci", "repo": "flake-parts", - "rev": "b905f6fc23a9051a6e1b741e1438dbfc0634c6de", + "rev": "32ea77a06711b758da0ad9bd6a844c5740a87abd", "type": "github" }, "original": { @@ -255,11 +255,11 @@ ] }, "locked": { - "lastModified": 1736143030, - "narHash": "sha256-+hu54pAoLDEZT9pjHlqL9DNzWz0NbUn8NEAHP7PQPzU=", + "lastModified": 1738453229, + "narHash": "sha256-7H9XgNiGLKN1G1CgRh0vUL4AheZSYzPm+zmZ7vxbJdo=", "owner": "hercules-ci", "repo": "flake-parts", - "rev": "b905f6fc23a9051a6e1b741e1438dbfc0634c6de", + "rev": "32ea77a06711b758da0ad9bd6a844c5740a87abd", "type": "github" }, "original": { @@ -290,11 +290,11 @@ "systems": "systems_3" }, "locked": { - "lastModified": 1705309234, - "narHash": "sha256-uNRRNRKmJyCRC/8y1RqBkqWBLM034y4qN7EprSdmgyA=", + "lastModified": 1731533236, + "narHash": "sha256-l0KFg5HjrsfsO/JpG+r7fRrqm12kzFHyUHqHCVpMMbI=", "owner": "numtide", "repo": "flake-utils", - "rev": "1ef2e671c3b0c19053962c07dbda38332dcebf26", + "rev": "11707dc2f618dd54ca8739b309ec4fc024de578b", "type": "github" }, "original": { @@ -308,11 +308,11 @@ "systems": "systems_6" }, "locked": { - "lastModified": 1726560853, - "narHash": "sha256-X6rJYSESBVr3hBoH0WbKE5KvhPU5bloyZ2L4K60/fPQ=", + "lastModified": 1731533236, + "narHash": "sha256-l0KFg5HjrsfsO/JpG+r7fRrqm12kzFHyUHqHCVpMMbI=", "owner": "numtide", "repo": "flake-utils", - "rev": "c1dfcf08411b08f6b8615f7d8971a2bfa81d5e8a", + "rev": "11707dc2f618dd54ca8739b309ec4fc024de578b", "type": "github" }, "original": { @@ -324,16 +324,18 @@ "ghostty": { "inputs": { "flake-compat": "flake-compat_2", + "flake-utils": "flake-utils_2", "nixpkgs-stable": "nixpkgs-stable", "nixpkgs-unstable": "nixpkgs-unstable", - "zig": "zig" + "zig": "zig", + "zig2nix": "zig2nix" }, "locked": { - "lastModified": 1737085478, - "narHash": "sha256-EzdUQf1ljtGIWMmscVzoW3rUxxN3UKyNXOXbzUvz3BQ=", + "lastModified": 1739918167, + "narHash": "sha256-6zdYjNKqMTKfHKlaz0kKqqSmoSCqEjv1vyIygqi3wCo=", "owner": "ghostty-org", "repo": "ghostty", - "rev": "72d085525b22d66468c5969a4d507a0fa68d4a04", + "rev": "38908e01268298ced33b7b6835e49b8c6d437e12", "type": "github" }, "original": { @@ -440,11 +442,11 @@ ] }, "locked": { - "lastModified": 1736917206, - "narHash": "sha256-JTBWmyGf8K1Rwb+gviHIUzRJk/sITtT+72HXFkTZUjo=", + "lastModified": 1739595404, + "narHash": "sha256-0CjCfbq0yHWexOrpO06e2WU1r5JAqR6ffy1zgM3NksI=", "owner": "hercules-ci", "repo": "hercules-ci-effects", - "rev": "afd0a42e8c61ebb56899315ee4084a8b2e4ff425", + "rev": "06519cec8fb32d219006da6eacd255504a9996af", "type": "github" }, "original": { @@ -460,11 +462,11 @@ ] }, "locked": { - "lastModified": 1737075266, - "narHash": "sha256-u1gk5I1an975FOAMMdS6oBKnSIsZza5ZKhaeBZAskVo=", + "lastModified": 1739913864, + "narHash": "sha256-WhzgQjadrwnwPJQLLxZUUEIxojxa7UWDkf7raAkB1Lw=", "owner": "nix-community", "repo": "home-manager", - "rev": "12851ae7467bad8ef422b20806ab4d6d81e12d29", + "rev": "97ac0801d187b2911e8caa45316399de12f6f199", "type": "github" }, "original": { @@ -489,11 +491,11 @@ ] }, "locked": { - "lastModified": 1734906540, - "narHash": "sha256-vQ/L9hZFezC0LquLo4TWXkyniWtYBlFHAKIsDc7PYJE=", + "lastModified": 1738664950, + "narHash": "sha256-xIeGNM+iivwVHkv9tHwOqoUP5dDrtees34bbFKKMZYs=", "owner": "hyprwm", "repo": "hyprcursor", - "rev": "69270ba8f057d55b0e6c2dca0e165d652856e613", + "rev": "7c6d165e1eb9045a996551eb9f121b6d1b30adc3", "type": "github" }, "original": { @@ -518,11 +520,11 @@ ] }, "locked": { - "lastModified": 1736115290, - "narHash": "sha256-Jcn6yAzfUMcxy3tN/iZRbi/QgrYm7XLyVRl9g/nbUl4=", + "lastModified": 1739049071, + "narHash": "sha256-3+7TpXMrbsUXSwgr5VAKAnmkzMb6JO+Rvc9XRb5NMg4=", "owner": "hyprwm", "repo": "hyprgraphics", - "rev": "52202272d89da32a9f866c0d10305a5e3d954c50", + "rev": "175c6b29b6ff82100539e7c4363a35a02c74dd73", "type": "github" }, "original": { @@ -538,11 +540,11 @@ ] }, "locked": { - "lastModified": 1736771168, - "narHash": "sha256-8TaiwQorn5etYxUtyUYPJBkWuzfoULHSwGDEf+cOhh4=", + "lastModified": 1739902080, + "narHash": "sha256-iKpCQqZ679+urn6AoObt9S6Yh7k+5soMzjl6H1ZO0Ng=", "owner": "horriblename", "repo": "hyprgrass", - "rev": "d324904d70e8c9710bcf772227f364262baf3820", + "rev": "3c290c81c89156d82dc2d2912840b3b67addbb90", "type": "github" }, "original": { @@ -567,11 +569,11 @@ "xdph": "xdph" }, "locked": { - "lastModified": 1737038559, - "narHash": "sha256-iSJIeZz2Bto/RiZN1scp4hfvnEAc+IhIRGxD2V3iu+c=", + "lastModified": 1739892000, + "narHash": "sha256-kwS/xplOy9ncwjgTr5q3aOIqt4oioE9/+Hm2tMrsnvs=", "ref": "refs/heads/main", - "rev": "0dc7367a7006cc3cc877d52bf34c4998144bff84", - "revCount": 5674, + "rev": "0137a5f6cdd24d5a10f813572791f1e641221a5b", + "revCount": 5831, "submodules": true, "type": "git", "url": "https://github.com/hyprwm/Hyprland" @@ -599,11 +601,11 @@ ] }, "locked": { - "lastModified": 1736372092, - "narHash": "sha256-+uxeBRTrDZsH6HtVtlMuJLLPJw3usPpG2/pm/L30c3E=", + "lastModified": 1738966025, + "narHash": "sha256-MzgrF0jKlTNnNS33D8PwI5z2MJ1Tzf5MQVf/oms2pdw=", "owner": "hyprwm", "repo": "hyprland-plugins", - "rev": "b4c0fa3ebc6ccd1589dcd17904652223088efede", + "rev": "4f48dbe12f3cbbeb4d31c91c67b21edbc5b4b451", "type": "github" }, "original": { @@ -624,11 +626,11 @@ ] }, "locked": { - "lastModified": 1735774328, - "narHash": "sha256-vIRwLS9w+N99EU1aJ+XNOU6mJTxrUBa31i1r82l0V7s=", + "lastModified": 1738422629, + "narHash": "sha256-5v+bv75wJWvahyM2xcMTSNNxmV8a7hb01Eey5zYnBJw=", "owner": "hyprwm", "repo": "hyprland-protocols", - "rev": "e3b6af97ddcfaafbda8e2828c719a5af84f662cb", + "rev": "755aef8dab49d0fc4663c715fa4ad221b2aedaed", "type": "github" }, "original": { @@ -637,10 +639,49 @@ "type": "github" } }, + "hyprland-qt-support": { + "inputs": { + "hyprlang": [ + "hyprland", + "hyprland-qtutils", + "hyprlang" + ], + "nixpkgs": [ + "hyprland", + "hyprland-qtutils", + "nixpkgs" + ], + "systems": [ + "hyprland", + "hyprland-qtutils", + "systems" + ] + }, + "locked": { + "lastModified": 1737634706, + "narHash": "sha256-nGCibkfsXz7ARx5R+SnisRtMq21IQIhazp6viBU8I/A=", + "owner": "hyprwm", + "repo": "hyprland-qt-support", + "rev": "8810df502cdee755993cb803eba7b23f189db795", + "type": "github" + }, + "original": { + "owner": "hyprwm", + "repo": "hyprland-qt-support", + "type": "github" + } + }, "hyprland-qtutils": { "inputs": { + "hyprland-qt-support": "hyprland-qt-support", + "hyprlang": [ + "hyprland", + "hyprlang" + ], "hyprutils": [ "hyprland", + "hyprland-qtutils", + "hyprlang", "hyprutils" ], "nixpkgs": [ @@ -653,11 +694,11 @@ ] }, "locked": { - "lastModified": 1736114838, - "narHash": "sha256-FxbuGQExtN37ToWYnGmO6weOYN6WPHN/RAqbr7gNPek=", + "lastModified": 1739048983, + "narHash": "sha256-REhTcXq4qs3B3cCDtLlYDz0GZvmsBSh947Ub6pQWGTQ=", "owner": "hyprwm", "repo": "hyprland-qtutils", - "rev": "6997fe382dcf396704227d2b98ffdd5066da6959", + "rev": "3504a293c8f8db4127cb0f7cfc1a318ffb4316f8", "type": "github" }, "original": { @@ -682,11 +723,11 @@ ] }, "locked": { - "lastModified": 1735393019, - "narHash": "sha256-NPpqA8rtmDLsEmZOmz+qR67zsB6Y503Jnv+nSFLKJZ8=", + "lastModified": 1739048914, + "narHash": "sha256-vd5rJBTmp2w7SDgfv23Zcd84ktI5eDA7e5UBzx+pKrU=", "owner": "hyprwm", "repo": "hyprlang", - "rev": "55608efdaa387af7bfdc0eddb404c409958efa43", + "rev": "a7334904d591f38757c46fbe2ab68651877d9099", "type": "github" }, "original": { @@ -708,11 +749,11 @@ "systems": "systems_5" }, "locked": { - "lastModified": 1737823473, - "narHash": "sha256-XhYxMiTEHEJfOv5C2IGby32pg0Qvz+nVynl0IGbjChk=", + "lastModified": 1739837523, + "narHash": "sha256-nep87/xMYhq2W3v9jNHMorM8bKeIXcRhTynTXzDtCkk=", "owner": "raybbian", "repo": "hyprtasking", - "rev": "17940931b59f76ff3b475230648fef261e1e94c8", + "rev": "52e7f425f32a55a10fb5c2f3b4d06ad90565d9d7", "type": "github" }, "original": { @@ -733,11 +774,11 @@ ] }, "locked": { - "lastModified": 1736164519, - "narHash": "sha256-1LimBKvDpBbeX+qW7T240WEyw+DBVpDotZB4JYm8Aps=", + "lastModified": 1739048933, + "narHash": "sha256-ck6MaoYvISBQKqZR+HcxXnx0wOhyCauxfVMaV5zhJxQ=", "owner": "hyprwm", "repo": "hyprutils", - "rev": "3c895da64b0eb19870142196fa48c07090b441c4", + "rev": "e4e018a2ca6f5a9c33511973454199e1c7c85499", "type": "github" }, "original": { @@ -758,11 +799,11 @@ ] }, "locked": { - "lastModified": 1735493474, - "narHash": "sha256-fktzv4NaqKm94VAkAoVqO/nqQlw+X0/tJJNAeCSfzK4=", + "lastModified": 1739049028, + "narHash": "sha256-RleJp7LYbr6s+M1xgbmhtBs+fYa3ZdIiF7+QalJ4D1g=", "owner": "hyprwm", "repo": "hyprwayland-scanner", - "rev": "de913476b59ee88685fdc018e77b8f6637a2ae0b", + "rev": "04146df74a8d5ec0b579657307be01f1e241125f", "type": "github" }, "original": { @@ -803,11 +844,11 @@ "nixpkgs-lib": "nixpkgs-lib" }, "locked": { - "lastModified": 1737288694, - "narHash": "sha256-e9MsdkHidgepQpF0InyRSpeD6YujQcaB0uUzeXVvW+I=", + "lastModified": 1739708078, + "narHash": "sha256-ePo0EHEEKb/853zI4/or8Jea2aYE/dUgO/rUDXSakCA=", "owner": "nix-community", "repo": "lib-aggregate", - "rev": "e07594822638004d96f100febbe947189c42e8a9", + "rev": "af2561272f74dd3d489d62efb98fe5f0b28fdbbe", "type": "github" }, "original": { @@ -843,11 +884,11 @@ "treefmt-nix": "treefmt-nix" }, "locked": { - "lastModified": 1737763478, - "narHash": "sha256-fohNScp0mg8eUugIoqcLhy7tnUJ7CxhcVomizNqj5b8=", + "lastModified": 1739948995, + "narHash": "sha256-kvgcTSfZ8wOBToSkUDUUc9Tcvdj8GJVJEbcYdCYv93U=", "owner": "nix-community", "repo": "neovim-nightly-overlay", - "rev": "8a11d160b76ea8dc76ac3356140010e38fef0ab5", + "rev": "5ba4ec1627a1a98607779d857d5f8782f158b11c", "type": "github" }, "original": { @@ -859,11 +900,11 @@ "neovim-src": { "flake": false, "locked": { - "lastModified": 1737716271, - "narHash": "sha256-7bgefXUOc5AVXSZ4E+0YzJKW4c+tDj1ttmDoZN1BhPs=", + "lastModified": 1739946765, + "narHash": "sha256-q8hkuuK/pzHvoKMHrXvlgqIWdXfv0PMyXzC8Vwh0ZG8=", "owner": "neovim", "repo": "neovim", - "rev": "c6d2cbf8f51abfa0c9d244ef384a15b0b69e16c6", + "rev": "9005134cdc8e578201b90192253171a9bc261752", "type": "github" }, "original": { @@ -879,11 +920,11 @@ ] }, "locked": { - "lastModified": 1736652904, - "narHash": "sha256-8uolHABgroXqzs03QdulHp8H9e5kWQZnnhcda1MKbBM=", + "lastModified": 1739676768, + "narHash": "sha256-U1HQ7nzhJyVVXUgjU028UCkbLQLEIkg42+G7iIiBmlU=", "owner": "nix-community", "repo": "nix-index-database", - "rev": "271e5bd7c57e1f001693799518b10a02d1123b12", + "rev": "ae15068e79e22b76c344f0d7f8aed1bb1c5b0b63", "type": "github" }, "original": { @@ -894,11 +935,11 @@ }, "nixpkgs": { "locked": { - "lastModified": 1736012469, - "narHash": "sha256-/qlNWm/IEVVH7GfgAIyP6EsVZI6zjAx1cV5zNyrs+rI=", + "lastModified": 1739020877, + "narHash": "sha256-mIvECo/NNdJJ/bXjNqIh8yeoSjVLAuDuTUzAo7dzs8Y=", "owner": "NixOS", "repo": "nixpkgs", - "rev": "8f3e1f807051e32d8c95cd12b9b421623850a34d", + "rev": "a79cfe0ebd24952b580b1cf08cd906354996d547", "type": "github" }, "original": { @@ -910,11 +951,11 @@ }, "nixpkgs-lib": { "locked": { - "lastModified": 1737248590, - "narHash": "sha256-6SWtDeYJS3bS7QyJrGKyd6FpROEN0JCMgakSX8yPbyA=", + "lastModified": 1739667890, + "narHash": "sha256-7QtSNdCEbYG1v+ZVrFWhBkhlo2GWehPffWC0BP1VZSo=", "owner": "nix-community", "repo": "nixpkgs.lib", - "rev": "977f49fd8cf854416f82987696784717acd6e817", + "rev": "9b883b6d4d3bd580734ddb4b5bfde8ebffd26559", "type": "github" }, "original": { @@ -925,11 +966,11 @@ }, "nixpkgs-stable": { "locked": { - "lastModified": 1733423277, - "narHash": "sha256-TxabjxEgkNbCGFRHgM/b9yZWlBj60gUOUnRT/wbVQR8=", + "lastModified": 1738255539, + "narHash": "sha256-hP2eOqhIO/OILW+3moNWO4GtdJFYCqAe9yJZgvlCoDQ=", "owner": "nixos", "repo": "nixpkgs", - "rev": "e36963a147267afc055f7cf65225958633e536bf", + "rev": "c3511a3b53b482aa7547c9d1626fd7310c1de1c5", "type": "github" }, "original": { @@ -957,11 +998,11 @@ }, "nixpkgs-unstable": { "locked": { - "lastModified": 1733229606, - "narHash": "sha256-FLYY5M0rpa5C2QAE3CKLYAM6TwbKicdRK6qNrSHlNrE=", + "lastModified": 1738136902, + "narHash": "sha256-pUvLijVGARw4u793APze3j6mU1Zwdtz7hGkGGkD87qw=", "owner": "nixos", "repo": "nixpkgs", - "rev": "566e53c2ad750c84f6d31f9ccb9d00f823165550", + "rev": "9a5db3142ce450045840cc8d832b13b8a2018e0c", "type": "github" }, "original": { @@ -971,13 +1012,29 @@ "type": "github" } }, + "nixpkgs-unstable_2": { + "locked": { + "lastModified": 1739866667, + "narHash": "sha256-EO1ygNKZlsAC9avfcwHkKGMsmipUk1Uc0TbrEZpkn64=", + "owner": "nixos", + "repo": "nixpkgs", + "rev": "73cf49b8ad837ade2de76f87eb53fc85ed5d4680", + "type": "github" + }, + "original": { + "owner": "nixos", + "ref": "nixos-unstable", + "repo": "nixpkgs", + "type": "github" + } + }, "nixpkgs_2": { "locked": { - "lastModified": 1737717945, - "narHash": "sha256-ET91TMkab3PmOZnqiJQYOtSGvSTvGeHoegAv4zcTefM=", + "lastModified": 1739863612, + "narHash": "sha256-UbtgxplOhFcyjBcNbTVO8+HUHAl/WXFDOb6LvqShiZo=", "owner": "NixOS", "repo": "nixpkgs", - "rev": "ecd26a469ac56357fd333946a99086e992452b6a", + "rev": "632f04521e847173c54fa72973ec6c39a371211c", "type": "github" }, "original": { @@ -989,11 +1046,11 @@ }, "nixpkgs_3": { "locked": { - "lastModified": 1736883708, - "narHash": "sha256-uQ+NQ0/xYU0N1CnXsa2zghgNaOPxWpMJXSUJJ9W7140=", + "lastModified": 1739866667, + "narHash": "sha256-EO1ygNKZlsAC9avfcwHkKGMsmipUk1Uc0TbrEZpkn64=", "owner": "nixos", "repo": "nixpkgs", - "rev": "eb62e6aa39ea67e0b8018ba8ea077efe65807dc8", + "rev": "73cf49b8ad837ade2de76f87eb53fc85ed5d4680", "type": "github" }, "original": { @@ -1005,11 +1062,11 @@ }, "nixpkgs_4": { "locked": { - "lastModified": 1729265718, - "narHash": "sha256-4HQI+6LsO3kpWTYuVGIzhJs1cetFcwT7quWCk/6rqeo=", + "lastModified": 1737003892, + "narHash": "sha256-RCzJE9wKByLCXmRBp+z8LK9EgdW+K+W/DXnJS4S/NVo=", "owner": "NixOS", "repo": "nixpkgs", - "rev": "ccc0c2126893dd20963580b6478d1a10a4512185", + "rev": "ae06b9c2d83cb5c8b12d7d0e32692e93d1379713", "type": "github" }, "original": { @@ -1029,11 +1086,11 @@ ] }, "locked": { - "lastModified": 1735882644, - "narHash": "sha256-3FZAG+pGt3OElQjesCAWeMkQ7C/nB1oTHLRQ8ceP110=", + "lastModified": 1737465171, + "narHash": "sha256-R10v2hoJRLq8jcL4syVFag7nIGE7m13qO48wRIukWNg=", "owner": "cachix", "repo": "git-hooks.nix", - "rev": "a5a961387e75ae44cc20f0a57ae463da5e959656", + "rev": "9364dc02281ce2d37a1f55b6e51f7c0f65a75f17", "type": "github" }, "original": { @@ -1083,6 +1140,7 @@ "neovim-nightly-overlay": "neovim-nightly-overlay", "nix-index-database": "nix-index-database", "nixpkgs": "nixpkgs_3", + "nixpkgs-unstable": "nixpkgs-unstable_2", "yazi": "yazi" } }, @@ -1115,11 +1173,11 @@ ] }, "locked": { - "lastModified": 1729391507, - "narHash": "sha256-as0I9xieJUHf7kiK2a9znDsVZQTFWhM1pLivII43Gi0=", + "lastModified": 1737080704, + "narHash": "sha256-n+J2h9GM9ZpFOQUmtZoCr1+DFF/iO5UlmLJeHIxbZGY=", "owner": "oxalica", "repo": "rust-overlay", - "rev": "784981a9feeba406de38c1c9a3decf966d853cca", + "rev": "f9953fe89f8b65401fc4d4a288940bc2cb072949", "type": "github" }, "original": { @@ -1226,11 +1284,11 @@ ] }, "locked": { - "lastModified": 1737483750, - "narHash": "sha256-5An1wq5U8sNycOBBg3nsDDgpwBmR9liOpDGlhliA6Xo=", + "lastModified": 1739829690, + "narHash": "sha256-mL1szCeIsjh6Khn3nH2cYtwO5YXG6gBiTw1A30iGeDU=", "owner": "numtide", "repo": "treefmt-nix", - "rev": "f2cc121df15418d028a59c9737d38e3a90fbaf8f", + "rev": "3d0579f5cc93436052d94b73925b48973a104204", "type": "github" }, "original": { @@ -1267,11 +1325,11 @@ ] }, "locked": { - "lastModified": 1734907020, - "narHash": "sha256-p6HxwpRKVl1KIiY5xrJdjcEeK3pbmc///UOyV6QER+w=", + "lastModified": 1737634991, + "narHash": "sha256-dBAnb7Kbnier30cA7AgxVSxxARmxKZ1vHZT33THSIr8=", "owner": "hyprwm", "repo": "xdg-desktop-portal-hyprland", - "rev": "d7f18dda5e511749fa1511185db3536208fb1a63", + "rev": "e09dfe2726c8008f983e45a0aa1a3b7416aaeb8a", "type": "github" }, "original": { @@ -1287,11 +1345,11 @@ "rust-overlay": "rust-overlay_2" }, "locked": { - "lastModified": 1737047842, - "narHash": "sha256-gVdbw3reThRxfwmx4MQ1gsq5waHthpg4e64crT2YXqg=", + "lastModified": 1739776850, + "narHash": "sha256-XWzxhk0Nrw9cu6E5yjsmhAVfbt9ArVN54zz8qgzBA/I=", "owner": "sxyazi", "repo": "yazi", - "rev": "6c94227d40b150cf5446ee5577bffc805d107e29", + "rev": "1ddbbfea711636dcb997239ea9d2b483cea16f80", "type": "github" }, "original": { @@ -1305,18 +1363,21 @@ "flake-compat": [ "ghostty" ], - "flake-utils": "flake-utils_2", + "flake-utils": [ + "ghostty", + "flake-utils" + ], "nixpkgs": [ "ghostty", "nixpkgs-stable" ] }, "locked": { - "lastModified": 1717848532, - "narHash": "sha256-d+xIUvSTreHl8pAmU1fnmkfDTGQYCn2Rb/zOwByxS2M=", + "lastModified": 1738239110, + "narHash": "sha256-Y5i9mQ++dyIQr+zEPNy+KIbc5wjPmfllBrag3cHZgcE=", "owner": "mitchellh", "repo": "zig-overlay", - "rev": "02fc5cc555fc14fda40c42d7c3250efa43812b43", + "rev": "1a8fb6f3a04724519436355564b95fce5e272504", "type": "github" }, "original": { @@ -1324,6 +1385,32 @@ "repo": "zig-overlay", "type": "github" } + }, + "zig2nix": { + "inputs": { + "flake-utils": [ + "ghostty", + "flake-utils" + ], + "nixpkgs": [ + "ghostty", + "nixpkgs-stable" + ] + }, + "locked": { + "lastModified": 1738263917, + "narHash": "sha256-j/3fwe2pEOquHabP/puljOKwAZFjIE9gXZqA91sC48M=", + "owner": "jcollie", + "repo": "zig2nix", + "rev": "c311d8e77a6ee0d995f40a6e10a89a3a4ab04f9a", + "type": "github" + }, + "original": { + "owner": "jcollie", + "ref": "c311d8e77a6ee0d995f40a6e10a89a3a4ab04f9a", + "repo": "zig2nix", + "type": "github" + } } }, "root": "root", diff --git a/flake.nix b/flake.nix index 2182267..cf95908 100644 --- a/flake.nix +++ b/flake.nix @@ -6,6 +6,10 @@ url = "github:nixos/nixpkgs/nixos-unstable"; }; + nixpkgs-unstable = { + url = "github:nixos/nixpkgs/nixos-unstable"; + }; + firefox = { url = "github:nix-community/flake-firefox-nightly"; inputs.nixpkgs.follows = "nixpkgs"; @@ -60,25 +64,26 @@ outputs = { nixpkgs, + nixpkgs-unstable, nix-index-database, lanzaboote, ... }@inputs: let system = "x86_64-linux"; - pkgs = import nixpkgs { - system = "x86_64-linux"; - config.allowUnfree = true; - }; + # pkgs = import nixpkgs { + # system = "x86_64-linux"; + # config.allowUnfree = true; + # }; nix-version = "25.05"; username = "danny"; git-config = { username = "DACHXY"; email = "danny10132024@gmail.com"; }; + unstable = import nixpkgs-unstable { inherit system; }; in { - nixpkgs.pkgs = pkgs; nixosConfigurations = { dn-pre7780 = nixpkgs.lib.nixosSystem { modules = [ @@ -88,6 +93,7 @@ ]; specialArgs = { inherit + unstable inputs system nix-version @@ -105,6 +111,7 @@ ]; specialArgs = { inherit + unstable inputs system nix-version diff --git a/home/user/config.nix b/home/user/config.nix index 76bbabd..44dbece 100644 --- a/home/user/config.nix +++ b/home/user/config.nix @@ -34,7 +34,6 @@ in source = "${configDir}/ghostty"; }; ".face".source = "${configDir}/.face"; - ".config/fish/functions".source = "${configDir}/fish/functions"; ".config/yazi" = { recursive = true; source = "${configDir}/yazi"; diff --git a/home/user/hypr/bind.nix b/home/user/hypr/bind.nix index b43bf46..96e8033 100644 --- a/home/user/hypr/bind.nix +++ b/home/user/hypr/bind.nix @@ -11,10 +11,6 @@ let # freezeShot = "--freeze"; freezeShot = ""; - - resizeStep = builtins.toString 20; - brightnessStep = builtins.toString 10; - volumeStep = builtins.toString 2; in [ ''${mainMod}, F, exec, ${browser}'' @@ -56,21 +52,12 @@ in ''${mainMod}, mouse_down, workspace, e-1'' ''${mainMod}, mouse_up, workspace, e+1'' - ''${mainMod} CTRL, l, resizeactive, ${resizeStep} 0'' - ''${mainMod} CTRL, h, resizeactive, -${resizeStep} 0'' - ''${mainMod} CTRL, k, resizeactive, 0 -${resizeStep}'' - ''${mainMod} CTRL, j, resizeactive, 0 ${resizeStep}'' - ''${mainMod} SHIFT, l, movewindow, r'' ''${mainMod} SHIFT, h, movewindow, l'' ''${mainMod} SHIFT, k, movewindow, u'' ''${mainMod} SHIFT, j, movewindow, d'' # Media - '',XF86AudioRaiseVolume, exec, wpctl set-mute @DEFAULT_SINK@ 0 && wpctl set-volume @DEFAULT_SINK@ ${volumeStep}%+'' - '',XF86AudioLowerVolume, exec, wpctl set-mute @DEFAULT_SINK@ 0 && wpctl set-volume @DEFAULT_SINK@ ${volumeStep}%-'' - '',XF86MonBrightnessDown, exec, brightnessctl set ${brightnessStep}%-'' - '',XF86MonBrightnessUp, exec, brightnessctl set ${brightnessStep}%+'' '',XF86AudioPrev, exec, playerctl previous'' '',XF86AudioNext, exec, playerctl next'' ''${mainMod} CTRL, COMMA, exec, playerctl previous'' @@ -81,8 +68,8 @@ in # ==== Plugins ==== # # Overview - # ''${mainMod}, o, hyprexpo:expo, toggle'' - # ''${mainMod}, TAB, hyprexpo:expo, toggle'' + ''${mainMod}, o, hyprtasking:toggle, cursor'' + ''${mainMod}, TAB, hyprtasking:toggle, all'' ] ++ ( # workspaces diff --git a/home/user/hypr/binde.nix b/home/user/hypr/binde.nix new file mode 100644 index 0000000..e6b8a1b --- /dev/null +++ b/home/user/hypr/binde.nix @@ -0,0 +1,16 @@ +{ mainMod }: +let + resizeStep = builtins.toString 20; + brightnessStep = builtins.toString 10; + volumeStep = builtins.toString 2; +in +[ + '',XF86AudioRaiseVolume, exec, wpctl set-mute @DEFAULT_SINK@ 0 && wpctl set-volume @DEFAULT_SINK@ ${volumeStep}%+'' + '',XF86AudioLowerVolume, exec, wpctl set-mute @DEFAULT_SINK@ 0 && wpctl set-volume @DEFAULT_SINK@ ${volumeStep}%-'' + '',XF86MonBrightnessDown, exec, brightnessctl set ${brightnessStep}%-'' + '',XF86MonBrightnessUp, exec, brightnessctl set ${brightnessStep}%+'' + ''${mainMod} CTRL, l, resizeactive, ${resizeStep} 0'' + ''${mainMod} CTRL, h, resizeactive, -${resizeStep} 0'' + ''${mainMod} CTRL, k, resizeactive, 0 -${resizeStep}'' + ''${mainMod} CTRL, j, resizeactive, 0 ${resizeStep}'' +] diff --git a/home/user/hypr/plugin.nix b/home/user/hypr/plugin.nix index ac76621..72c3dd5 100644 --- a/home/user/hypr/plugin.nix +++ b/home/user/hypr/plugin.nix @@ -1,13 +1,22 @@ { - hyprexpo = { - columns = 3; - gap_size = 5; - bg_col = "rgb(111111)"; - workspace_method = "center current"; # [center/first] [workspace] e.g. first 1 or center m+1 - enable_gesture = true; # laptop touchpad - gesture_fingers = 3; # 3 or 4 - gesture_distance = 300; # how far is the "max" - gesture_positive = true; # positive = swipe down. Negative = swipe up. + hyprtasking = { + layout = "grid"; + bg_color = "0xffebdbb2"; + + gap_size = 20; + + gestures = { + enabled = true; + open_fingers = 3; + open_distance = 300; + open_positive = true; + }; + + linear = { + height = 400; + scroll_speed = 1.1; + blur = 0; + }; }; hyprwinrap = { diff --git a/home/user/hyprland.nix b/home/user/hyprland.nix index 8ccc03a..e579487 100644 --- a/home/user/hyprland.nix +++ b/home/user/hyprland.nix @@ -30,7 +30,7 @@ let getCurrentSong = pkgs.writeShellScriptBin "getSong" '' song_info=$(playerctl metadata --format '{{title}} 󰎆 {{artist}}') - echo "$song_info" + echo "$song_info" ''; ewwWayland = pkgs.eww.overrideAttrs (oldAttrs: { @@ -65,12 +65,11 @@ in plugins = (with inputs.hyprland-plugins.packages.${system}; [ xtra-dispatchers - hyprexpo hyprwinwrap ]) ++ [ inputs.hyprgrass.packages.${system}.default - # inputs.hyprtasking.packages.${system}.hyprtasking + inputs.hyprtasking.packages.${system}.hyprtasking ]; settings = @@ -80,6 +79,7 @@ in }; bind = import ./hypr/bind.nix { inherit mainMod nvidia-offload-enabled; }; bindm = import ./hypr/bindm.nix { inherit mainMod; }; + binde = import ./hypr/binde.nix { inherit mainMod; }; monitor = import ./hypr/monitor.nix; plugin = plugins; exec-once = ''${startScript}''; diff --git a/home/user/nvim.nix b/home/user/nvim.nix index 3d2d58d..3ec73ac 100644 --- a/home/user/nvim.nix +++ b/home/user/nvim.nix @@ -1,11 +1,25 @@ { lib, pkgs, + unstable, device-name, username, inputs, ... }: +let + lazyVim = ( + unstable.vimPlugins.LazyVim.overrideAttrs (previous: { + version = "2025-02-15"; + src = pkgs.fetchFromGitHub { + owner = "LazyVim"; + repo = "LazyVim"; + rev = "main"; + sha256 = "sha256-dF2clJlNkaGoQ15TaZBswuuUJmSf0OK2vgV4XCsYwv4="; + }; + }) + ); +in { home.packages = with pkgs; [ gh @@ -62,7 +76,8 @@ let plugins = with pkgs.vimPlugins; [ # LazyVim - LazyVim + lazyVim + bufferline-nvim cmp-buffer cmp-nvim-lsp @@ -174,6 +189,7 @@ lazyPath = pkgs.linkFarm "lazy-plugins" (builtins.map mkEntryFromDrv plugins); in + # lua '' require("lazy").setup({ defaults = { diff --git a/home/user/programs.nix b/home/user/programs.nix index 5c8fd2a..2a974c3 100644 --- a/home/user/programs.nix +++ b/home/user/programs.nix @@ -33,7 +33,7 @@ in yazi = { enable = true; package = inputs.yazi.packages.${system}.default; - enableFishIntegration = true; + enableFishIntegration = false; }; obs-studio = { diff --git a/system/dev/dn-lap/default.nix b/system/dev/dn-lap/default.nix index c9088e0..46c374e 100644 --- a/system/dev/dn-lap/default.nix +++ b/system/dev/dn-lap/default.nix @@ -1,5 +1,6 @@ { lib, + unstable, system, inputs, nix-version, @@ -34,6 +35,7 @@ in backupFileExtension = "hm-backup"; extraSpecialArgs = { inherit + unstable inputs system nix-version diff --git a/system/dev/dn-pre7780/default.nix b/system/dev/dn-pre7780/default.nix index 891ffff..319c038 100644 --- a/system/dev/dn-pre7780/default.nix +++ b/system/dev/dn-pre7780/default.nix @@ -1,5 +1,6 @@ { lib, + unstable, inputs, system, nix-version, @@ -53,9 +54,9 @@ in home-manager = { backupFileExtension = "hm-backup"; useUserPackages = true; - useGlobalPkgs = true; extraSpecialArgs = { inherit + unstable inputs system nix-version