diff --git a/flake.lock b/flake.lock index e7fbf20..af49bff 100755 --- a/flake.lock +++ b/flake.lock @@ -20,11 +20,11 @@ ] }, "locked": { - "lastModified": 1737636397, - "narHash": "sha256-F5MbBj3QVorycVSFE9qjuOTLtIQBqt2VWbXa0uwzm98=", + "lastModified": 1739103745, + "narHash": "sha256-c53dcRaw0F4Os9WD05HwIRs9kTDZw4Mxe1XK4edEALo=", "owner": "hyprwm", "repo": "aquamarine", - "rev": "7fe006981fae53e931f513026fc754e322f13145", + "rev": "a3dda0d10ce9aa1d1dfb7a6c139ea8c2872c74bd", "type": "github" }, "original": { @@ -86,16 +86,17 @@ "base16-vim": { "flake": false, "locked": { - "lastModified": 1735953590, - "narHash": "sha256-YbQwaApLFJobn/0lbpMKcJ8N5axKlW2QIGkDS5+xoSU=", + "lastModified": 1732806396, + "narHash": "sha256-e0bpPySdJf0F68Ndanwm+KWHgQiZ0s7liLhvJSWDNsA=", "owner": "tinted-theming", "repo": "base16-vim", - "rev": "c2a1232aa2c0ed27dcbf005779bcfe0e0ab5e85d", + "rev": "577fe8125d74ff456cf942c733a85d769afe58b7", "type": "github" }, "original": { "owner": "tinted-theming", "repo": "base16-vim", + "rev": "577fe8125d74ff456cf942c733a85d769afe58b7", "type": "github" } }, @@ -125,11 +126,11 @@ "nixpkgs": "nixpkgs" }, "locked": { - "lastModified": 1737038063, - "narHash": "sha256-rMEuiK69MDhjz1JgbaeQ9mBDXMJ2/P8vmOYRbFndXsk=", + "lastModified": 1739353546, + "narHash": "sha256-YTqXhBZvCdZLMBupWlCDvRFaTEhaHa2/Xc/p1sUdSZU=", "owner": "nix-community", "repo": "disko", - "rev": "bf0abfde48f469c256f2b0f481c6281ff04a5db2", + "rev": "26ade1005191e0602a78b0f141970648445bafd9", "type": "github" }, "original": { @@ -157,11 +158,11 @@ "flake-compat": { "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": { @@ -216,22 +217,6 @@ "type": "github" } }, - "flake-compat_5": { - "flake": false, - "locked": { - "lastModified": 1733328505, - "narHash": "sha256-NeCCThCEP3eCl2l/+27kNNK7QrwZB1IJCrXfrbv5oqU=", - "owner": "edolstra", - "repo": "flake-compat", - "rev": "ff81ac966bb2cae68946d5ed5fc4994f96d0ffec", - "type": "github" - }, - "original": { - "owner": "edolstra", - "repo": "flake-compat", - "type": "github" - } - }, "flake-parts": { "inputs": { "nixpkgs-lib": [ @@ -240,11 +225,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": { @@ -258,11 +243,11 @@ "systems": "systems" }, "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": { @@ -329,16 +314,18 @@ "ghostty": { "inputs": { "flake-compat": "flake-compat", + "flake-utils": "flake-utils", "nixpkgs-stable": "nixpkgs-stable", "nixpkgs-unstable": "nixpkgs-unstable", - "zig": "zig" + "zig": "zig", + "zig2nix": "zig2nix" }, "locked": { - "lastModified": 1737779447, - "narHash": "sha256-+iVqQXAUJshUYgxOHfke54Ux4f/aggl1yub86KNx2tE=", + "lastModified": 1739480526, + "narHash": "sha256-LnYH//exdKlG3N2FXB1OpceNFf1GuUzsFcrGEyoyGEw=", "owner": "ghostty-org", "repo": "ghostty", - "rev": "71e62f96fa4d286eda835048428d5be96e9f87c1", + "rev": "710ea1c8d9a1005a9f7f03fe98297b13a21b8e44", "type": "github" }, "original": { @@ -489,11 +476,11 @@ ] }, "locked": { - "lastModified": 1737762889, - "narHash": "sha256-5HGG09bh/Yx0JA8wtBMAzt0HMCL1bYZ93x4IqzVExio=", + "lastModified": 1739470101, + "narHash": "sha256-NxNe32VB4XI/xIXrsKmIfrcgtEx5r/5s52pL3CpEcA4=", "owner": "nix-community", "repo": "home-manager", - "rev": "daf04c5950b676f47a794300657f1d3d14c1a120", + "rev": "5031c6d2978109336637977c165f82aa49fa16a7", "type": "github" }, "original": { @@ -510,11 +497,11 @@ ] }, "locked": { - "lastModified": 1737762889, - "narHash": "sha256-5HGG09bh/Yx0JA8wtBMAzt0HMCL1bYZ93x4IqzVExio=", + "lastModified": 1738878603, + "narHash": "sha256-fmhq8B3MvQLawLbMO+LWLcdC2ftLMmwSk+P29icJ3tE=", "owner": "nix-community", "repo": "home-manager", - "rev": "daf04c5950b676f47a794300657f1d3d14c1a120", + "rev": "433799271274c9f2ab520a49527ebfe2992dcfbd", "type": "github" }, "original": { @@ -531,11 +518,11 @@ ] }, "locked": { - "lastModified": 1736785676, - "narHash": "sha256-TY0jUwR3EW0fnS0X5wXMAVy6h4Z7Y6a3m+Yq++C9AyE=", + "lastModified": 1737630279, + "narHash": "sha256-wJQCxyMRc4P26zDrHmZiRD5bbfcJpqPG3e2djdGG3pk=", "owner": "nix-community", "repo": "home-manager", - "rev": "fc52a210b60f2f52c74eac41a8647c1573d2071d", + "rev": "0db5c8bfcce78583ebbde0b2abbc95ad93445f7c", "type": "github" }, "original": { @@ -549,11 +536,11 @@ "nixpkgs": "nixpkgs_2" }, "locked": { - "lastModified": 1737834765, - "narHash": "sha256-xiThQfn7aCcV8+aQ8qdIornefqRATY6/H+3qqyiiUbQ=", + "lastModified": 1739465511, + "narHash": "sha256-kXdVW89VJoG+W6N1u0m8hgK2VIWUAweQVzehRZwdNSo=", "owner": "hyprwm", "repo": "contrib", - "rev": "296740785d25b5fe19cce4978050dc5dc704876a", + "rev": "59178a657b7e09ddf82b9e79681f482b6c2f378b", "type": "github" }, "original": { @@ -578,11 +565,11 @@ ] }, "locked": { - "lastModified": 1737634937, - "narHash": "sha256-Ffw4ujFpi++6pPHe+gCBOfDgAoNlzVPZN6MReC1beu8=", + "lastModified": 1738664950, + "narHash": "sha256-xIeGNM+iivwVHkv9tHwOqoUP5dDrtees34bbFKKMZYs=", "owner": "hyprwm", "repo": "hyprcursor", - "rev": "9c5dd1f7c825ee47f72727ad0a4e16ca46a2688e", + "rev": "7c6d165e1eb9045a996551eb9f121b6d1b30adc3", "type": "github" }, "original": { @@ -607,11 +594,11 @@ ] }, "locked": { - "lastModified": 1737634889, - "narHash": "sha256-9JZE3KxcXOqZH9zs3UeadngDiK/yIACTiAR8HSA/TNI=", + "lastModified": 1739049071, + "narHash": "sha256-3+7TpXMrbsUXSwgr5VAKAnmkzMb6JO+Rvc9XRb5NMg4=", "owner": "hyprwm", "repo": "hyprgraphics", - "rev": "0d77b4895ad5f1bb3b0ee43103a5246c58b65591", + "rev": "175c6b29b6ff82100539e7c4363a35a02c74dd73", "type": "github" }, "original": { @@ -627,8 +614,8 @@ "hyprgraphics": "hyprgraphics", "hyprland-protocols": "hyprland-protocols", "hyprland-qtutils": "hyprland-qtutils", - "hyprlang": "hyprlang_2", - "hyprutils": "hyprutils_2", + "hyprlang": "hyprlang", + "hyprutils": "hyprutils", "hyprwayland-scanner": "hyprwayland-scanner", "nixpkgs": "nixpkgs_3", "pre-commit-hooks": "pre-commit-hooks", @@ -636,11 +623,11 @@ "xdph": "xdph" }, "locked": { - "lastModified": 1737925585, - "narHash": "sha256-Or8v5heNJvsGITHZDeJpXs/yQrFAx/wRhSMCB4iYlRI=", + "lastModified": 1739446679, + "narHash": "sha256-ebMXATT4adwFeMRauZy1eZ10GBDJbGwqpuZYv37xzZ0=", "ref": "refs/heads/main", - "rev": "2f55806d6f11a1e81e3e821cb0327779d5cc50e6", - "revCount": 5741, + "rev": "40adb3dfb4b6f8cf0c5093f095954e3ef162a8eb", + "revCount": 5813, "submodules": true, "type": "git", "url": "https://github.com/hyprwm/Hyprland" @@ -663,11 +650,11 @@ ] }, "locked": { - "lastModified": 1737556638, - "narHash": "sha256-laKgI3mr2qz6tas/q3tuGPxMdsGhBi/w+HO+hO2f1AY=", + "lastModified": 1738422629, + "narHash": "sha256-5v+bv75wJWvahyM2xcMTSNNxmV8a7hb01Eey5zYnBJw=", "owner": "hyprwm", "repo": "hyprland-protocols", - "rev": "4c75dd5c015c8a0e5a34c6d02a018a650f57feb5", + "rev": "755aef8dab49d0fc4663c715fa4ad221b2aedaed", "type": "github" }, "original": { @@ -678,7 +665,11 @@ }, "hyprland-qt-support": { "inputs": { - "hyprlang": "hyprlang", + "hyprlang": [ + "hyprland", + "hyprland-qtutils", + "hyprlang" + ], "nixpkgs": [ "hyprland", "hyprland-qtutils", @@ -707,8 +698,14 @@ "hyprland-qtutils": { "inputs": { "hyprland-qt-support": "hyprland-qt-support", + "hyprlang": [ + "hyprland", + "hyprlang" + ], "hyprutils": [ "hyprland", + "hyprland-qtutils", + "hyprlang", "hyprutils" ], "nixpkgs": [ @@ -721,11 +718,11 @@ ] }, "locked": { - "lastModified": 1737811848, - "narHash": "sha256-WZ7LeiKHk5Y94MU5gHIWn0r8asWxYOvie4LqfCjVIZU=", + "lastModified": 1739048983, + "narHash": "sha256-REhTcXq4qs3B3cCDtLlYDz0GZvmsBSh947Ub6pQWGTQ=", "owner": "hyprwm", "repo": "hyprland-qtutils", - "rev": "9c0831ff98856c0f312fcb8b57553fbe3dd34d5b", + "rev": "3504a293c8f8db4127cb0f7cfc1a318ffb4316f8", "type": "github" }, "original": { @@ -735,36 +732,6 @@ } }, "hyprlang": { - "inputs": { - "hyprutils": "hyprutils", - "nixpkgs": [ - "hyprland", - "hyprland-qtutils", - "hyprland-qt-support", - "nixpkgs" - ], - "systems": [ - "hyprland", - "hyprland-qtutils", - "hyprland-qt-support", - "systems" - ] - }, - "locked": { - "lastModified": 1737634606, - "narHash": "sha256-W7W87Cv6wqZ9PHegI6rH1+ve3zJPiyevMFf0/HwdbCQ=", - "owner": "hyprwm", - "repo": "hyprlang", - "rev": "f41271d35cc0f370d300413d756c2677f386af9d", - "type": "github" - }, - "original": { - "owner": "hyprwm", - "repo": "hyprlang", - "type": "github" - } - }, - "hyprlang_2": { "inputs": { "hyprutils": [ "hyprland", @@ -780,11 +747,11 @@ ] }, "locked": { - "lastModified": 1737634606, - "narHash": "sha256-W7W87Cv6wqZ9PHegI6rH1+ve3zJPiyevMFf0/HwdbCQ=", + "lastModified": 1739048914, + "narHash": "sha256-vd5rJBTmp2w7SDgfv23Zcd84ktI5eDA7e5UBzx+pKrU=", "owner": "hyprwm", "repo": "hyprlang", - "rev": "f41271d35cc0f370d300413d756c2677f386af9d", + "rev": "a7334904d591f38757c46fbe2ab68651877d9099", "type": "github" }, "original": { @@ -795,7 +762,7 @@ }, "hyprpicker": { "inputs": { - "hyprutils": "hyprutils_3", + "hyprutils": "hyprutils_2", "hyprwayland-scanner": "hyprwayland-scanner_2", "nixpkgs": "nixpkgs_4", "systems": "systems_3" @@ -818,25 +785,19 @@ "inputs": { "nixpkgs": [ "hyprland", - "hyprland-qtutils", - "hyprland-qt-support", - "hyprlang", "nixpkgs" ], "systems": [ "hyprland", - "hyprland-qtutils", - "hyprland-qt-support", - "hyprlang", "systems" ] }, "locked": { - "lastModified": 1737632363, - "narHash": "sha256-X9I8POSlHxBVjD0fiX1O2j7U9Zi1+4rIkrsyHP0uHXY=", + "lastModified": 1739048933, + "narHash": "sha256-ck6MaoYvISBQKqZR+HcxXnx0wOhyCauxfVMaV5zhJxQ=", "owner": "hyprwm", "repo": "hyprutils", - "rev": "006620eb29d54ea9086538891404c78563d1bae1", + "rev": "e4e018a2ca6f5a9c33511973454199e1c7c85499", "type": "github" }, "original": { @@ -846,31 +807,6 @@ } }, "hyprutils_2": { - "inputs": { - "nixpkgs": [ - "hyprland", - "nixpkgs" - ], - "systems": [ - "hyprland", - "systems" - ] - }, - "locked": { - "lastModified": 1737725508, - "narHash": "sha256-jGmcPc6y/prg/4A8KGYqJ27nSPaProCMiFadaxNAKvA=", - "owner": "hyprwm", - "repo": "hyprutils", - "rev": "fb0c2d1de3d1ef7396d19c18ac09e12bd956929e", - "type": "github" - }, - "original": { - "owner": "hyprwm", - "repo": "hyprutils", - "type": "github" - } - }, - "hyprutils_3": { "inputs": { "nixpkgs": [ "hyprpicker", @@ -907,11 +843,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": { @@ -988,6 +924,24 @@ "type": "github" } }, + "lash_flake": { + "inputs": { + "nixpkgs": "nixpkgs_5" + }, + "locked": { + "lastModified": 1739483770, + "narHash": "sha256-AGItl4LN8hWqcNmE6d9snIkaV/FZKKD58e2pf7A22UA=", + "owner": "pagedMov", + "repo": "lash", + "rev": "5c038fbb569fdad802f22fa0bd5ca9a839dcaed8", + "type": "github" + }, + "original": { + "owner": "pagedMov", + "repo": "lash", + "type": "github" + } + }, "nix-darwin": { "inputs": { "nixpkgs": [ @@ -996,11 +950,11 @@ ] }, "locked": { - "lastModified": 1737504076, - "narHash": "sha256-/B4XJnzYU/6K1ZZOBIgsa3K4pqDJrnC2579c44c+4rI=", + "lastModified": 1738743987, + "narHash": "sha256-O3bnAfsObto6l2tQOmQlrO6Z2kD6yKwOWfs7pA0CpOc=", "owner": "lnl7", "repo": "nix-darwin", - "rev": "65cc1fa8e36ceff067daf6cfb142331f02f524d3", + "rev": "ae406c04577ff9a64087018c79b4fdc02468c87c", "type": "github" }, "original": { @@ -1011,11 +965,11 @@ }, "nixpkgs": { "locked": { - "lastModified": 1736241350, - "narHash": "sha256-CHd7yhaDigUuJyDeX0SADbTM9FXfiWaeNyY34FL1wQU=", + "lastModified": 1737879851, + "narHash": "sha256-H+FXIKj//kmFHTTW4DFeOjR7F1z2/3eb2iwN6Me4YZk=", "owner": "NixOS", "repo": "nixpkgs", - "rev": "8c9fd3e564728e90829ee7dbac6edc972971cd0f", + "rev": "5d3221fd57cc442a1a522a15eb5f58230f45a304", "type": "github" }, "original": { @@ -1027,11 +981,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": { @@ -1043,11 +997,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": { @@ -1075,11 +1029,11 @@ }, "nixpkgs_3": { "locked": { - "lastModified": 1737632463, - "narHash": "sha256-38J9QfeGSej341ouwzqf77WIHAScihAKCt8PQJ+NH28=", + "lastModified": 1739020877, + "narHash": "sha256-mIvECo/NNdJJ/bXjNqIh8yeoSjVLAuDuTUzAo7dzs8Y=", "owner": "NixOS", "repo": "nixpkgs", - "rev": "0aa475546ed21629c4f5bbf90e38c846a99ec9e9", + "rev": "a79cfe0ebd24952b580b1cf08cd906354996d547", "type": "github" }, "original": { @@ -1106,22 +1060,6 @@ } }, "nixpkgs_5": { - "locked": { - "lastModified": 1737885589, - "narHash": "sha256-Zf0hSrtzaM1DEz8//+Xs51k/wdSajticVrATqDrfQjg=", - "owner": "nixos", - "repo": "nixpkgs", - "rev": "852ff1d9e153d8875a83602e03fdef8a63f0ecf8", - "type": "github" - }, - "original": { - "owner": "nixos", - "ref": "nixos-unstable", - "repo": "nixpkgs", - "type": "github" - } - }, - "nixpkgs_6": { "locked": { "lastModified": 1737746512, "narHash": "sha256-nU6AezEX4EuahTO1YopzueAXfjFfmCHylYEFCagduHU=", @@ -1137,6 +1075,22 @@ "type": "github" } }, + "nixpkgs_6": { + "locked": { + "lastModified": 1739214665, + "narHash": "sha256-26L8VAu3/1YRxS8MHgBOyOM8xALdo6N0I04PgorE7UM=", + "owner": "nixos", + "repo": "nixpkgs", + "rev": "64e75cd44acf21c7933d61d7721e812eac1b5a0a", + "type": "github" + }, + "original": { + "owner": "nixos", + "ref": "nixos-unstable", + "repo": "nixpkgs", + "type": "github" + } + }, "nixpkgs_7": { "locked": { "lastModified": 1736798957, @@ -1168,11 +1122,11 @@ "treefmt-nix": "treefmt-nix" }, "locked": { - "lastModified": 1737914312, - "narHash": "sha256-PBF4R+yQt5Sls7CsA9Miwx28XtOP/yqaqejZ3RKSes0=", + "lastModified": 1739469954, + "narHash": "sha256-faUXxkM3yYm++fpEw02tbAgPJprVB0xOtrU87BEQkuI=", "owner": "nix-community", "repo": "nixvim", - "rev": "8e5422bf3e76f410b97d2da640d0829e87657de9", + "rev": "7f29e4b2ae34c1ba5fe650d74c8f28b0d1fa21ee", "type": "github" }, "original": { @@ -1191,11 +1145,11 @@ ] }, "locked": { - "lastModified": 1737823349, - "narHash": "sha256-LAppb+sftyvJbPdrBG1uN9GYWHz6q7bUpkpDjljcSRo=", + "lastModified": 1738508923, + "narHash": "sha256-4DaDrQDAIxlWhTjH6h/+xfG05jt3qDZrZE/7zDLQaS4=", "owner": "NuschtOS", "repo": "search", - "rev": "f91a0ac0f4ecf0ad1d1d88140f66520dae6ce4bd", + "rev": "86e2038290859006e05ca7201425ea5b5de4aecb", "type": "github" }, "original": { @@ -1204,24 +1158,6 @@ "type": "github" } }, - "ox_flake": { - "inputs": { - "nixpkgs": "nixpkgs_6" - }, - "locked": { - "lastModified": 1737948235, - "narHash": "sha256-U60Ecr2Al4xQB7MFklj/LHkGjsJDK51kLtK926vuKzU=", - "owner": "pagedMov", - "repo": "ox", - "rev": "7e51932dc5e1acc2de9d941b29eb52945afb6dee", - "type": "github" - }, - "original": { - "owner": "pagedMov", - "repo": "ox", - "type": "github" - } - }, "pre-commit-hooks": { "inputs": { "flake-compat": "flake-compat_2", @@ -1254,27 +1190,26 @@ "hyprland": "hyprland", "hyprpicker": "hyprpicker", "impermanence": "impermanence", - "nixpkgs": "nixpkgs_5", + "lash_flake": "lash_flake", + "nixpkgs": "nixpkgs_6", "nixvim": "nixvim", - "ox_flake": "ox_flake", "spicetify-nix": "spicetify-nix", "stylix": "stylix" } }, "spicetify-nix": { "inputs": { - "flake-compat": "flake-compat_4", "nixpkgs": [ "nixpkgs" ], "systems": "systems_5" }, "locked": { - "lastModified": 1737943930, - "narHash": "sha256-Nwl2GgUjMHUK2faHKKwPsvViaKyS02e+MwCXFuC+WsM=", + "lastModified": 1739223162, + "narHash": "sha256-YrbYTM0CkZQG38Ysr2gF4BYdsQDNQtQ4YdQTDgw/zWM=", "owner": "gerg-l", "repo": "spicetify-nix", - "rev": "08b2afcc47281b4f8bacaf4303165be763f1ff51", + "rev": "dea717737d04a2a3e877c082bfd2c7f91c1a33ff", "type": "github" }, "original": { @@ -1290,7 +1225,7 @@ "base16-helix": "base16-helix", "base16-vim": "base16-vim", "firefox-gnome-theme": "firefox-gnome-theme", - "flake-compat": "flake-compat_5", + "flake-compat": "flake-compat_4", "flake-utils": "flake-utils_3", "git-hooks": "git-hooks_2", "gnome-shell": "gnome-shell", @@ -1299,15 +1234,16 @@ "systems": "systems_6", "tinted-foot": "tinted-foot", "tinted-kitty": "tinted-kitty", + "tinted-schemes": "tinted-schemes", "tinted-tmux": "tinted-tmux", "tinted-zed": "tinted-zed" }, "locked": { - "lastModified": 1737930520, - "narHash": "sha256-CAgB9/o54SXzqWwypA+hL2ETxiHW92Y+Ou4fT581jdk=", + "lastModified": 1739375014, + "narHash": "sha256-0fNbvZ1Dod4rDIfwGnC7CzJ3wRFSF1v5AvNCmNkVgXo=", "owner": "danth", "repo": "stylix", - "rev": "6103431cd2f9d4352e5493a4063cf57e307d355c", + "rev": "e86de61bb8f5f2b6459d0be3e3291ad16db4b777", "type": "github" }, "original": { @@ -1440,6 +1376,22 @@ "type": "github" } }, + "tinted-schemes": { + "flake": false, + "locked": { + "lastModified": 1737565458, + "narHash": "sha256-y+9cvOA6BLKT0WfebDsyUpUa/YxKow9hTjBp6HpQv68=", + "owner": "tinted-theming", + "repo": "schemes", + "rev": "ae31625ba47aeaa4bf6a98cf11a8d4886f9463d9", + "type": "github" + }, + "original": { + "owner": "tinted-theming", + "repo": "schemes", + "type": "github" + } + }, "tinted-tmux": { "flake": false, "locked": { @@ -1480,11 +1432,11 @@ ] }, "locked": { - "lastModified": 1737483750, - "narHash": "sha256-5An1wq5U8sNycOBBg3nsDDgpwBmR9liOpDGlhliA6Xo=", + "lastModified": 1738680491, + "narHash": "sha256-8X7tR3kFGkE7WEF5EXVkt4apgaN85oHZdoTGutCFs6I=", "owner": "numtide", "repo": "treefmt-nix", - "rev": "f2cc121df15418d028a59c9737d38e3a90fbaf8f", + "rev": "64dbb922d51a42c0ced6a7668ca008dded61c483", "type": "github" }, "original": { @@ -1539,18 +1491,21 @@ "flake-compat": [ "ghostty" ], - "flake-utils": "flake-utils", + "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": { @@ -1558,6 +1513,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 b0dc715..a4e3f81 100755 --- a/flake.nix +++ b/flake.nix @@ -30,14 +30,14 @@ url = "github:gerg-l/spicetify-nix"; inputs.nixpkgs.follows = "nixpkgs"; }; - ox_flake.url = "github:pagedMov/ox"; + lash_flake.url = "github:pagedMov/lash"; }; - outputs = { self, home-manager, disko, ox_flake, nixpkgs, impermanence, nixvim, stylix, ... }@inputs: + outputs = { self, home-manager, disko, lash_flake, nixpkgs, impermanence, nixvim, stylix, ... }@inputs: let system = "x86_64-linux"; username = "pagedmov"; - ox = ox_flake.packages.${system}.default; + lash = lash_flake.packages.${system}.default; nixpkgsConfig = { allowUnfree = true; }; @@ -143,7 +143,7 @@ nixosConfigurations = { oganesson = nixpkgs.lib.nixosSystem { # Desktop specialArgs = { - inherit self inputs username ox; + inherit self inputs username lash; host = "oganesson"; overlays = [ (import ./overlay/overlay.nix { root = self; }) diff --git a/hosts/desktop/config.nix b/hosts/desktop/config.nix index 66fb2c3..3f99efb 100755 --- a/hosts/desktop/config.nix +++ b/hosts/desktop/config.nix @@ -1,4 +1,4 @@ -{ ox, pkgs, username, ... }: +{ lash, pkgs, username, ... }: { imports = [ ./hardware.nix ]; @@ -28,7 +28,7 @@ environment = { variables = { PATH = "${pkgs.clang-tools}/bin:$PATH"; }; - shells = [ pkgs.myPkgs.ox pkgs.zsh pkgs.bash ]; + shells = [ pkgs.myPkgs.lash pkgs.zsh pkgs.bash ]; }; users = { @@ -38,7 +38,7 @@ ${username} = { isNormalUser = true; initialPassword = "1234"; - shell = pkgs.myPkgs.ox; + shell = pkgs.myPkgs.lash; extraGroups = [ "input" "wheel" "persist" "libvirtd" ]; }; }; diff --git a/modules/home/programs/nixvim/plugins/plugins.nix b/modules/home/programs/nixvim/plugins/plugins.nix index 658ad32..e9c6d0a 100755 --- a/modules/home/programs/nixvim/plugins/plugins.nix +++ b/modules/home/programs/nixvim/plugins/plugins.nix @@ -1,14 +1,6 @@ { programs.nixvim = { plugins = { - dap = { - enable = true; - extensions.dap-ui.enable = true; - }; - dap-lldb = { - enable = true; - autoLoad = true; - }; nix.enable = true; endwise.enable = true; undotree.enable = true; diff --git a/modules/sys/software/gaming/gaming_pkgs.nix b/modules/sys/software/gaming/gaming_pkgs.nix index 1e084fa..c54c69d 100755 --- a/modules/sys/software/gaming/gaming_pkgs.nix +++ b/modules/sys/software/gaming/gaming_pkgs.nix @@ -16,9 +16,9 @@ in { }; config = lib.mkIf config.movOpts.softwareCfg.gamingPkgs.enable { environment.systemPackages = with pkgs; [ - snes9x-gtk - cust-openrct2 - dwarf-fortress-packages.dwarf-fortress-full + #snes9x-gtk + #cust-openrct2 + #dwarf-fortress-packages.dwarf-fortress-full prismlauncher ]; }; diff --git a/modules/sys/software/packages.nix b/modules/sys/software/packages.nix index 7198293..2198e74 100755 --- a/modules/sys/software/packages.nix +++ b/modules/sys/software/packages.nix @@ -14,7 +14,6 @@ fail2ban git gcc - lldb zip unzip hyprland-workspaces @@ -46,6 +45,9 @@ libnotify file libvirt-glib + man-pages + man-pages-posix + most ]; }; } diff --git a/overlay/overlay.nix b/overlay/overlay.nix index ed76378..972cf90 100644 --- a/overlay/overlay.nix +++ b/overlay/overlay.nix @@ -20,7 +20,7 @@ in }); myPkgs = { # Packages that I've made - ox = super.callPackage ./pkgs/ox/package.nix {}; + lash = super.callPackage ./pkgs/lash/package.nix {}; }; myScripts = { # Scripts written using pkgs.writeShellApplication diff --git a/overlay/pkgs/ox/Cargo.lock b/overlay/pkgs/lash/Cargo.lock similarity index 93% rename from overlay/pkgs/ox/Cargo.lock rename to overlay/pkgs/lash/Cargo.lock index 6977ae0..25b8a14 100644 --- a/overlay/pkgs/ox/Cargo.lock +++ b/overlay/pkgs/lash/Cargo.lock @@ -164,6 +164,15 @@ version = "2.8.0" source = "registry+https://github.com/rust-lang/crates.io-index" checksum = "8f68f53c83ab957f72c32642f3868eec03eb974d1fb82e453128456482613d36" +[[package]] +name = "block-buffer" +version = "0.10.4" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "3078c7629b62d3f0439517fa394996acacc5cbc91c5a20d8c658e77abd503a71" +dependencies = [ + "generic-array", +] + [[package]] name = "bstr" version = "1.11.3" @@ -230,9 +239,9 @@ dependencies = [ [[package]] name = "clap" -version = "4.5.27" +version = "4.5.28" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "769b0145982b4b48713e01ec42d61614425f27b7058bda7180a3a41f30104796" +checksum = "3e77c3243bd94243c03672cb5154667347c457ca271254724f9f393aee1c05ff" dependencies = [ "clap_builder", "clap_derive", @@ -252,9 +261,9 @@ dependencies = [ [[package]] name = "clap_derive" -version = "4.5.24" +version = "4.5.28" source = "registry+https://github.com/rust-lang/crates.io-index" -checksum = "54b755194d6389280185988721fffba69495eed5ee9feeee9a599b53db80318c" +checksum = "bf4ced95c6f4a675af3da73304b9ac4ed991640c36374e4b46795c49e17cf1ed" dependencies = [ "heck", "proc-macro2", @@ -310,6 +319,15 @@ version = "0.8.7" source = "registry+https://github.com/rust-lang/crates.io-index" checksum = "773648b94d0e5d620f64f280777445740e61fe701025087ec8b57f45c791888b" +[[package]] +name = "cpufeatures" +version = "0.2.17" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "59ed5838eebb26a2bb2e58f6d5b5316989ae9d08bab10e0e6d103e656d1b0280" +dependencies = [ + "libc", +] + [[package]] name = "crossbeam" version = "0.8.4" @@ -391,6 +409,16 @@ dependencies = [ "winapi", ] +[[package]] +name = "crypto-common" +version = "0.1.6" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "1bfb12502f3fc46cca1bb51ac28df9d618d813cdc3d2f25b9fe775a34af26bb3" +dependencies = [ + "generic-array", + "typenum", +] + [[package]] name = "darling" version = "0.20.10" @@ -476,6 +504,16 @@ dependencies = [ "syn", ] +[[package]] +name = "digest" +version = "0.10.7" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "9ed9a281f7bc9b7576e61468ba615a66a5c8cfdff42420a70aa82701a3b1e292" +dependencies = [ + "block-buffer", + "crypto-common", +] + [[package]] name = "dirs-next" version = "2.0.0" @@ -610,6 +648,16 @@ dependencies = [ "thread_local", ] +[[package]] +name = "generic-array" +version = "0.14.7" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "85649ca51fd72272d7821adaf274ad91c288277713d9c18820d8499a7ff69e9a" +dependencies = [ + "typenum", + "version_check 0.9.5", +] + [[package]] name = "getrandom" version = "0.2.15" @@ -798,6 +846,37 @@ version = "0.2.2" source = "registry+https://github.com/rust-lang/crates.io-index" checksum = "a91d884b6667cd606bb5a69aa0c99ba811a115fc68915e7056ec08a46e93199a" +[[package]] +name = "lash" +version = "0.1.0" +dependencies = [ + "bincode", + "bitflags 2.8.0", + "chrono", + "clap", + "crossterm", + "env_logger", + "glob", + "insta", + "lazy_static", + "libc", + "log 0.4.25", + "logger", + "nix 0.29.0", + "once_cell", + "pest", + "pest_derive", + "rayon", + "regex", + "rustyline", + "serde", + "serde_json", + "signal-hook", + "skim", + "tokio", + "tokio-stream", +] + [[package]] name = "lazy_static" version = "1.5.0" @@ -1000,34 +1079,6 @@ version = "1.20.2" source = "registry+https://github.com/rust-lang/crates.io-index" checksum = "1261fe7e33c73b354eab43b1273a57c8f967d0391e80353e51f764ac02cf6775" -[[package]] -name = "ox" -version = "0.1.0" -dependencies = [ - "bincode", - "bitflags 2.8.0", - "chrono", - "crossterm", - "env_logger", - "glob", - "insta", - "lazy_static", - "libc", - "log 0.4.25", - "logger", - "nix 0.29.0", - "once_cell", - "rayon", - "regex", - "rustyline", - "serde", - "serde_json", - "signal-hook", - "skim", - "tokio", - "tokio-stream", -] - [[package]] name = "parking_lot" version = "0.12.3" @@ -1057,6 +1108,51 @@ version = "1.0.1" source = "registry+https://github.com/rust-lang/crates.io-index" checksum = "31010dd2e1ac33d5b46a5b413495239882813e0369f8ed8a5e266f173602f831" +[[package]] +name = "pest" +version = "2.7.15" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "8b7cafe60d6cf8e62e1b9b2ea516a089c008945bb5a275416789e7db0bc199dc" +dependencies = [ + "memchr", + "thiserror 2.0.11", + "ucd-trie", +] + +[[package]] +name = "pest_derive" +version = "2.7.15" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "816518421cfc6887a0d62bf441b6ffb4536fcc926395a69e1a85852d4363f57e" +dependencies = [ + "pest", + "pest_generator", +] + +[[package]] +name = "pest_generator" +version = "2.7.15" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "7d1396fd3a870fc7838768d171b4616d5c91f6cc25e377b673d714567d99377b" +dependencies = [ + "pest", + "pest_meta", + "proc-macro2", + "quote", + "syn", +] + +[[package]] +name = "pest_meta" +version = "2.7.15" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "e1e58089ea25d717bfd31fb534e4f3afcc2cc569c70de3e239778991ea3b7dea" +dependencies = [ + "once_cell", + "pest", + "sha2", +] + [[package]] name = "phf" version = "0.7.24" @@ -1356,7 +1452,7 @@ checksum = "ba009ff324d1fc1b900bd1fdb31564febe58a8ccc8a6fdbb93b543d33b13ca43" dependencies = [ "getrandom", "libredox", - "thiserror", + "thiserror 1.0.69", ] [[package]] @@ -1497,6 +1593,17 @@ dependencies = [ "serde", ] +[[package]] +name = "sha2" +version = "0.10.8" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "793db75ad2bcafc3ffa7c68b215fee268f537982cd901d132f89c6343f3a3dc8" +dependencies = [ + "cfg-if", + "cpufeatures", + "digest", +] + [[package]] name = "shell-quote" version = "0.7.2" @@ -1636,7 +1743,16 @@ version = "1.0.69" source = "registry+https://github.com/rust-lang/crates.io-index" checksum = "b6aaf5339b578ea85b50e080feb250a3e8ae8cfcdff9a461c9ec2904bc923f52" dependencies = [ - "thiserror-impl", + "thiserror-impl 1.0.69", +] + +[[package]] +name = "thiserror" +version = "2.0.11" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "d452f284b73e6d76dd36758a0c8684b1d5be31f92b89d07fd5822175732206fc" +dependencies = [ + "thiserror-impl 2.0.11", ] [[package]] @@ -1650,6 +1766,17 @@ dependencies = [ "syn", ] +[[package]] +name = "thiserror-impl" +version = "2.0.11" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "26afc1baea8a989337eeb52b6e72a039780ce45c3edfcc9c5b9d112feeb173c2" +dependencies = [ + "proc-macro2", + "quote", + "syn", +] + [[package]] name = "thread_local" version = "1.1.8" @@ -1803,13 +1930,25 @@ dependencies = [ "unsafe-any", ] +[[package]] +name = "typenum" +version = "1.17.0" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "42ff0bf0c66b8238c6f3b578df37d0b7848e55df8577b3f74f92a69acceeb825" + +[[package]] +name = "ucd-trie" +version = "0.1.7" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "2896d95c02a80c6d6a5d6e953d479f5ddf2dfdb6a244441010e373ac0fb88971" + [[package]] name = "unicase" version = "1.4.2" source = "registry+https://github.com/rust-lang/crates.io-index" checksum = "7f4765f83163b74f957c797ad9253caf97f103fb064d3999aea9568d09fc8a33" dependencies = [ - "version_check", + "version_check 0.1.5", ] [[package]] @@ -1883,6 +2022,12 @@ version = "0.1.5" source = "registry+https://github.com/rust-lang/crates.io-index" checksum = "914b1a6776c4c929a602fafd8bc742e06365d4bcbe48c30f9cca5824f70dc9dd" +[[package]] +name = "version_check" +version = "0.9.5" +source = "registry+https://github.com/rust-lang/crates.io-index" +checksum = "0b928f33d975fc6ad9f86c8f283853ad26bdd5b10b7f1542aa2fa15e2289105a" + [[package]] name = "vte" version = "0.13.1" diff --git a/overlay/pkgs/ox/package.nix b/overlay/pkgs/lash/package.nix similarity index 55% rename from overlay/pkgs/ox/package.nix rename to overlay/pkgs/lash/package.nix index 43343ee..8ade5cd 100644 --- a/overlay/pkgs/ox/package.nix +++ b/overlay/pkgs/lash/package.nix @@ -1,14 +1,14 @@ { pkgs ? import {} }: pkgs.rustPlatform.buildRustPackage rec { - pname = "ox"; - version = "v0.3.0-alpha_16aa803"; + pname = "lash"; + version = "v0.5.0_5c038fb"; src = pkgs.fetchFromGitHub { owner = "pagedMov"; - repo = "ox"; - rev = "16aa803faad2db175298f75278947b91b1e91267"; - hash = "sha256-qhH6gPETDIMgRHtWPwmiwalsT1kAqx0ODtlWStVP1d0="; + repo = "lash"; + rev = "5c038fbb569fdad802f22fa0bd5ca9a839dcaed8"; + hash = "sha256-AGItl4LN8hWqcNmE6d9snIkaV/FZKKD58e2pf7A22UA="; }; @@ -17,6 +17,6 @@ pkgs.rustPlatform.buildRustPackage rec { cargoLock.lockFile = ./Cargo.lock; passthru = { - shellPath = "/bin/ox"; + shellPath = "/bin/lash"; }; } diff --git a/overlay/pkgs/lash/update_lash.sh b/overlay/pkgs/lash/update_lash.sh new file mode 100755 index 0000000..fa487ee --- /dev/null +++ b/overlay/pkgs/lash/update_lash.sh @@ -0,0 +1,29 @@ +#!/usr/bin/env bash + +export GIT_SSH_COMMAND="ssh -F /dev/null" + +curl -O https://raw.githubusercontent.com/pagedMov/lash/refs/heads/master/Cargo.lock +NEW_SRC=$(fetchfromgh pagedMov/lash) + +REV_SHORT=$(git ls-remote git@github.com:pagedMov/lash.git HEAD | awk '{print substr($1, 1, 7)}') +CUR_TAG=$(git ls-remote --tags git@github.com:pagedMov/lash.git | tail -n 2 | head -n 1 | cut -f2 | cut -d'/' -f3) +NEW_VER="${CUR_TAG}_$REV_SHORT" + +cat < {} }: + +pkgs.rustPlatform.buildRustPackage rec { + pname = "lash"; + version = "$NEW_VER"; + + $NEW_SRC + + doCheck = false; # TODO: Find a way to make tests work + + cargoLock.lockFile = ./Cargo.lock; + + passthru = { + shellPath = "/bin/lash"; + }; + } +EOF diff --git a/overlay/pkgs/ox/update_ox.sh b/overlay/pkgs/ox/update_ox.sh deleted file mode 100755 index f6feec9..0000000 --- a/overlay/pkgs/ox/update_ox.sh +++ /dev/null @@ -1,27 +0,0 @@ -#!/usr/bin/env bash - -curl -O https://raw.githubusercontent.com/pagedMov/ox/refs/heads/master/Cargo.lock -NEW_SRC=$(fetchfromgh pagedMov/ox) - -REV_SHORT=$(git ls-remote git@github.com:pagedMov/ox.git HEAD | awk '{print substr($1, 1, 7)}') -CUR_TAG=$(git ls-remote --tags git@github.com:pagedMov/ox.git | tail -n 2 | head -n 1 | cut -f2 | cut -d'/' -f3) -NEW_VER="${CUR_TAG}_$REV_SHORT" - -cat < {} }: - -pkgs.rustPlatform.buildRustPackage rec { - pname = "ox"; - version = "$NEW_VER"; - - $NEW_SRC - - doCheck = false; # TODO: Find a way to make tests work - - cargoLock.lockFile = ./Cargo.lock; - - passthru = { - shellPath = "/bin/ox"; - }; - } -EOF