diff --git a/.envrc b/.envrc index 29e16c1..d5eacd8 100644 --- a/.envrc +++ b/.envrc @@ -1,3 +1,5 @@ watch_file ./flake.lock **/*.nix -use flake +if has nix; then + use flake +fi diff --git a/_sources/generated.json b/_sources/generated.json index 47a8d47..5fdaabf 100644 --- a/_sources/generated.json +++ b/_sources/generated.json @@ -22,7 +22,7 @@ }, "TrackersListCollection": { "cargoLocks": null, - "date": "2025-10-17", + "date": "2025-10-20", "extract": null, "name": "TrackersListCollection", "passthru": null, @@ -34,14 +34,14 @@ "name": null, "owner": "XIU2", "repo": "TrackersListCollection", - "rev": "d03b757d8e1bec4718c2a5afa96149ada983fe61", - "sha256": "sha256-xS/u7ySlK7Znr+Gtj6rOf6OKKTLTCIhkTfcKOg/7DZg=", + "rev": "98a1b6882702723217dc1d089872179fd63609a5", + "sha256": "sha256-Bs7/VYu8JTWcPNG2MgUd13qeA51kq35LVCSFlu95IaY=", "sparseCheckout": [ "all.txt" ], "type": "github" }, - "version": "d03b757d8e1bec4718c2a5afa96149ada983fe61" + "version": "98a1b6882702723217dc1d089872179fd63609a5" }, "cliphist": { "cargoLocks": null, @@ -188,7 +188,7 @@ }, "spotx": { "cargoLocks": null, - "date": "2025-10-08", + "date": "2025-10-17", "extract": null, "name": "spotx", "passthru": null, @@ -200,12 +200,12 @@ "name": null, "owner": "SpotX-Official", "repo": "SpotX-Bash", - "rev": "12cfe5dcec1d82cb613d8aa8dd60f4cd181dfb06", - "sha256": "sha256-GPy9/fJhcx1XPS6WRt4yVQQrEt/YQCh2cDzQxb1nvfg=", + "rev": "49d01737d175fd2d8b7dc415498bee4099ffae22", + "sha256": "sha256-OTWfBCIJXLd+Jlnkx45CSO/Zpvc4QHtvb+ROpDgaJLw=", "sparseCheckout": [], "type": "github" }, - "version": "12cfe5dcec1d82cb613d8aa8dd60f4cd181dfb06" + "version": "49d01737d175fd2d8b7dc415498bee4099ffae22" }, "tree-sitter-idris": { "cargoLocks": null, diff --git a/_sources/generated.nix b/_sources/generated.nix index fac263c..3aa5f55 100644 --- a/_sources/generated.nix +++ b/_sources/generated.nix @@ -15,18 +15,18 @@ }; TrackersListCollection = { pname = "TrackersListCollection"; - version = "d03b757d8e1bec4718c2a5afa96149ada983fe61"; + version = "98a1b6882702723217dc1d089872179fd63609a5"; src = fetchFromGitHub { owner = "XIU2"; repo = "TrackersListCollection"; - rev = "d03b757d8e1bec4718c2a5afa96149ada983fe61"; + rev = "98a1b6882702723217dc1d089872179fd63609a5"; fetchSubmodules = false; deepClone = false; leaveDotGit = false; sparseCheckout = [ "all.txt" ]; - sha256 = "sha256-xS/u7ySlK7Znr+Gtj6rOf6OKKTLTCIhkTfcKOg/7DZg="; + sha256 = "sha256-Bs7/VYu8JTWcPNG2MgUd13qeA51kq35LVCSFlu95IaY="; }; - date = "2025-10-17"; + date = "2025-10-20"; }; cliphist = { pname = "cliphist"; @@ -119,15 +119,15 @@ }; spotx = { pname = "spotx"; - version = "12cfe5dcec1d82cb613d8aa8dd60f4cd181dfb06"; + version = "49d01737d175fd2d8b7dc415498bee4099ffae22"; src = fetchFromGitHub { owner = "SpotX-Official"; repo = "SpotX-Bash"; - rev = "12cfe5dcec1d82cb613d8aa8dd60f4cd181dfb06"; + rev = "49d01737d175fd2d8b7dc415498bee4099ffae22"; fetchSubmodules = false; - sha256 = "sha256-GPy9/fJhcx1XPS6WRt4yVQQrEt/YQCh2cDzQxb1nvfg="; + sha256 = "sha256-OTWfBCIJXLd+Jlnkx45CSO/Zpvc4QHtvb+ROpDgaJLw="; }; - date = "2025-10-08"; + date = "2025-10-17"; }; tree-sitter-idris = { pname = "tree-sitter-idris"; diff --git a/flake.lock b/flake.lock index 4070bf6..11bc930 100644 --- a/flake.lock +++ b/flake.lock @@ -78,11 +78,11 @@ "systems": "systems" }, "locked": { - "lastModified": 1760316624, - "narHash": "sha256-Dcu83UalaiHxevevfqWAnmTcLA4LQwpQyH4FjGuiIO4=", + "lastModified": 1760925526, + "narHash": "sha256-gymGcDqUpPlbaPPvzxZrM2KTF0kPLodCHepSFtvxdEg=", "owner": "HeitorAugustoLN", "repo": "betterfox-nix", - "rev": "15d8c5b5fdec16d7ea55fbf5e06cff684db594cb", + "rev": "05a3837b57f2d306cf43d4e901918f2d9187cfb2", "type": "github" }, "original": { @@ -100,11 +100,11 @@ "rust-overlay": "rust-overlay" }, "locked": { - "lastModified": 1760671358, - "narHash": "sha256-ZtxBpRjyXw8zTWhkZqIYHiuQ7fjhrdr4/ewTEQnRUDk=", + "lastModified": 1760747305, + "narHash": "sha256-SsuuyaFp4TbJ+ofti9EXot9gIOk4vZqccat/zERVQN4=", "owner": "chaotic-cx", "repo": "nyx", - "rev": "75ddacb4739e65ba177b6d353ca7ea3213e76d94", + "rev": "9838e14b30857ac0a50dbe98a5ba2233d6ccb2de", "type": "github" }, "original": { @@ -182,11 +182,11 @@ ] }, "locked": { - "lastModified": 1758287904, - "narHash": "sha256-IGmaEf3Do8o5Cwp1kXBN1wQmZwQN3NLfq5t4nHtVtcU=", + "lastModified": 1760701190, + "narHash": "sha256-y7UhnWlER8r776JsySqsbTUh2Txf7K30smfHlqdaIQw=", "owner": "nix-community", "repo": "disko", - "rev": "67ff9807dd148e704baadbd4fd783b54282ca627", + "rev": "3a9450b26e69dcb6f8de6e2b07b3fc1c288d85f5", "type": "github" }, "original": { @@ -217,11 +217,11 @@ "nixpkgs-stable": "nixpkgs-stable" }, "locked": { - "lastModified": 1760666828, - "narHash": "sha256-wQ43JXlK0rd9D1IjqfpzIJZwqj7YtRt/WvWSKebXQS8=", + "lastModified": 1760951609, + "narHash": "sha256-rWkUWKWcLin0+dKvinWC1IZVxJnIvXV3q/wlmmKkzo4=", "owner": "nix-community", "repo": "emacs-overlay", - "rev": "97346a378089a06acf6431304ee14a665a26a984", + "rev": "41bee8f6a80b36b0348a8e750e5db88fea528171", "type": "github" }, "original": { @@ -240,11 +240,11 @@ ] }, "locked": { - "lastModified": 1760581365, - "narHash": "sha256-t36CNJKRYq+gz4xWVnpixlN/TFl0A6WQKS0jF4Yu3Fk=", + "lastModified": 1760948693, + "narHash": "sha256-6Yg+MuZjxpoHZkVyoDv+izjB2wFMG22wA7yNXaGLv1I=", "owner": "nix-community", "repo": "emacs-overlay", - "rev": "8a2d9777416087fd7ec2072d15e9830c75a7983d", + "rev": "264e26504e789be07637ca74d1370fcd1cb0b716", "type": "github" }, "original": { @@ -341,11 +341,11 @@ ] }, "locked": { - "lastModified": 1759362264, - "narHash": "sha256-wfG0S7pltlYyZTM+qqlhJ7GMw2fTF4mLKCIVhLii/4M=", + "lastModified": 1760813311, + "narHash": "sha256-lbHQ7FXGzt6/IygWvJ1lCq+Txcut3xYYd6VIpF1ojkg=", "owner": "hercules-ci", "repo": "flake-parts", - "rev": "758cf7296bee11f1706a574c77d072b8a7baa881", + "rev": "4e627ac2e1b8f1de7f5090064242de9a259dbbc8", "type": "github" }, "original": { @@ -359,11 +359,11 @@ "nixpkgs-lib": "nixpkgs-lib" }, "locked": { - "lastModified": 1759362264, - "narHash": "sha256-wfG0S7pltlYyZTM+qqlhJ7GMw2fTF4mLKCIVhLii/4M=", + "lastModified": 1760948891, + "narHash": "sha256-TmWcdiUUaWk8J4lpjzu4gCGxWY6/Ok7mOK4fIFfBuU4=", "owner": "hercules-ci", "repo": "flake-parts", - "rev": "758cf7296bee11f1706a574c77d072b8a7baa881", + "rev": "864599284fc7c0ba6357ed89ed5e2cd5040f0c04", "type": "github" }, "original": { @@ -401,11 +401,11 @@ ] }, "locked": { - "lastModified": 1759362264, - "narHash": "sha256-wfG0S7pltlYyZTM+qqlhJ7GMw2fTF4mLKCIVhLii/4M=", + "lastModified": 1760813311, + "narHash": "sha256-lbHQ7FXGzt6/IygWvJ1lCq+Txcut3xYYd6VIpF1ojkg=", "owner": "hercules-ci", "repo": "flake-parts", - "rev": "758cf7296bee11f1706a574c77d072b8a7baa881", + "rev": "4e627ac2e1b8f1de7f5090064242de9a259dbbc8", "type": "github" }, "original": { @@ -419,11 +419,11 @@ "nixpkgs-lib": "nixpkgs-lib_2" }, "locked": { - "lastModified": 1759362264, - "narHash": "sha256-wfG0S7pltlYyZTM+qqlhJ7GMw2fTF4mLKCIVhLii/4M=", + "lastModified": 1760813311, + "narHash": "sha256-lbHQ7FXGzt6/IygWvJ1lCq+Txcut3xYYd6VIpF1ojkg=", "owner": "hercules-ci", "repo": "flake-parts", - "rev": "758cf7296bee11f1706a574c77d072b8a7baa881", + "rev": "4e627ac2e1b8f1de7f5090064242de9a259dbbc8", "type": "github" }, "original": { @@ -524,6 +524,24 @@ "type": "github" } }, + "flake-utils_3": { + "inputs": { + "systems": "systems_5" + }, + "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" + } + }, "flakey-profile": { "locked": { "lastModified": 1712898590, @@ -565,11 +583,11 @@ ] }, "locked": { - "lastModified": 1760657536, - "narHash": "sha256-t1AJErf/qMMvrPuYhUftotACvsShESjQvoFxMFLEZbk=", + "lastModified": 1760663237, + "narHash": "sha256-BflA6U4AM1bzuRMR8QqzPXqh8sWVCNDzOdsxXEguJIc=", "owner": "cachix", "repo": "git-hooks.nix", - "rev": "59cc72533edf0788599ea312198eeeca2c48e931", + "rev": "ca5b894d3e3e151ffc1db040b6ce4dcc75d31c37", "type": "github" }, "original": { @@ -647,11 +665,11 @@ "rust-overlay": "rust-overlay_2" }, "locked": { - "lastModified": 1760540014, - "narHash": "sha256-aRHbYRS0xekHabEMer6YsHsYHbEFZpMXgUP0Q6GEGSU=", + "lastModified": 1760832569, + "narHash": "sha256-wg925OdUZdhjJub5XfpBTWQ3EOJYH7JnaBWHfh849J4=", "owner": "helix-editor", "repo": "helix", - "rev": "f6f8634eb07f35f02bd2881666925a90513f6f3b", + "rev": "97aee4950fd9a08a78415cd8992354ae5cf3aaf0", "type": "github" }, "original": { @@ -694,11 +712,11 @@ ] }, "locked": { - "lastModified": 1760500983, - "narHash": "sha256-zfY4F4CpeUjTGgecIJZ+M7vFpwLc0Gm9epM/iMQd4w8=", + "lastModified": 1760662441, + "narHash": "sha256-mlDqR1Ntgs9uYYEAUR1IhamKBO0lxoNS4zGLzEZaY0A=", "owner": "nix-community", "repo": "home-manager", - "rev": "c53e65ec92f38d30e3c14f8d628ab55d462947aa", + "rev": "722792af097dff5790f1a66d271a47759f477755", "type": "github" }, "original": { @@ -714,11 +732,11 @@ ] }, "locked": { - "lastModified": 1760662441, - "narHash": "sha256-mlDqR1Ntgs9uYYEAUR1IhamKBO0lxoNS4zGLzEZaY0A=", + "lastModified": 1760929667, + "narHash": "sha256-nZh6uvc71nVNaf/y+wesnjwsmJ6IZZUnP2EzpZe48To=", "owner": "nix-community", "repo": "home-manager", - "rev": "722792af097dff5790f1a66d271a47759f477755", + "rev": "189c21cf879669008ccf06e78a553f17e88d8ef0", "type": "github" }, "original": { @@ -866,11 +884,11 @@ "treefmt-nix": "treefmt-nix" }, "locked": { - "lastModified": 1760659500, - "narHash": "sha256-oBVyFuQfDBZ0HHYWKv7SUc3RECrKIJj++hAQedfHpjk=", + "lastModified": 1760918504, + "narHash": "sha256-y4My1QhxERZ90sreOqeqxz6jt3x4SdkgQboaoZ7biBs=", "owner": "nix-community", "repo": "neovim-nightly-overlay", - "rev": "c9c781b2434050fe75aaa69a0664362fa4c721e9", + "rev": "db23b8034bc0ad8272999f866d54023799a59073", "type": "github" }, "original": { @@ -882,11 +900,11 @@ "neovim-src": { "flake": false, "locked": { - "lastModified": 1760632793, - "narHash": "sha256-qkxukXjPMsel0cSNMlJhP9IWFMd3jICGHQDQQ8NLdb0=", + "lastModified": 1760810839, + "narHash": "sha256-VYkZdjjMOYsugoSydDDWE/1l79swm4zc4NJl1Z0brjA=", "owner": "neovim", "repo": "neovim", - "rev": "371ad48135edc0584ea38272251167f23a998f09", + "rev": "be73c35943f85e7835c3a0fc89bddaeba944db29", "type": "github" }, "original": { @@ -907,11 +925,11 @@ "xwayland-satellite-unstable": "xwayland-satellite-unstable" }, "locked": { - "lastModified": 1760575912, - "narHash": "sha256-8VNgyBHMJ2paTzWX5EAemGBNB0pCiA6NKJFPZHuzjhY=", + "lastModified": 1760950171, + "narHash": "sha256-E2ySTu/oK7cYBdAI3tlGP9zVjF4mZgWJ1OZInBCMb00=", "owner": "sodiboo", "repo": "niri-flake", - "rev": "55d6c441e21c9cd8396d4db03c696c1259d0f62e", + "rev": "f851a923137c0a54719412146fd63d24b3214e60", "type": "github" }, "original": { @@ -940,11 +958,11 @@ "niri-unstable": { "flake": false, "locked": { - "lastModified": 1760524031, - "narHash": "sha256-hcyRViwdsrNUjHTcY0VGygcAawcyU4zYEq7ZZObFwkw=", + "lastModified": 1760940149, + "narHash": "sha256-KbM47vD6E0cx+v4jYQZ8mD5N186AKm2CQlyh34TW58U=", "owner": "YaLTeR", "repo": "niri", - "rev": "2776005c5fc4fbb85636672213b8b84a319dfb01", + "rev": "b3245b81a6ed8edfaf5388a74d2e0a23c24941e5", "type": "github" }, "original": { @@ -963,11 +981,11 @@ "systems": "systems_3" }, "locked": { - "lastModified": 1760604246, - "narHash": "sha256-aot40sBFmWm4gL/DQq2zMXXIhyrPbpEy8emAHOV/3I4=", + "lastModified": 1760949743, + "narHash": "sha256-qp64mFniGiY9MEIySL74+OondOYnUqytlFxe8xGBzzs=", "owner": "marienz", "repo": "nix-doom-emacs-unstraightened", - "rev": "d2ee02fda03a552f0faf2bea043f110bab07e9d5", + "rev": "257eddec1ad9b6e3ece37d02c51a3a7a3e74452b", "type": "github" }, "original": { @@ -982,11 +1000,11 @@ "nixpkgs": "nixpkgs_5" }, "locked": { - "lastModified": 1760579393, - "narHash": "sha256-YuXbuaJ/2EZ1FePhz1eTyo/b+kpiEmw4lj6wX0u0Q/0=", + "lastModified": 1760942919, + "narHash": "sha256-/CoMM0vhhihs5/9QLXgL/kkyALBa9XyVTSkN9Htxtjc=", "owner": "fufexan", "repo": "nix-gaming", - "rev": "7d002241668a738df3973a6c07ef5d79e5508b24", + "rev": "6fa7d37d878cceeaa3c88e2606dbadf15c8022ad", "type": "github" }, "original": { @@ -1018,6 +1036,30 @@ "type": "github" } }, + "nix4nvchad": { + "inputs": { + "flake-utils": "flake-utils_2", + "nixpkgs": [ + "nixpkgs" + ], + "nvchad-starter": [ + "nvchad-starter" + ] + }, + "locked": { + "lastModified": 1759653262, + "narHash": "sha256-uTiQXY/ZlplEq1j2jH0k6oDzldid0xHgnLsLQyRRbvk=", + "owner": "nix-community", + "repo": "nix4nvchad", + "rev": "9d91858966b5d4e87ee52e16993988dfea9b0f94", + "type": "github" + }, + "original": { + "owner": "nix-community", + "repo": "nix4nvchad", + "type": "github" + } + }, "nixos-hardware": { "locked": { "lastModified": 1760106635, @@ -1036,11 +1078,11 @@ }, "nixpkgs": { "locked": { - "lastModified": 1760524057, - "narHash": "sha256-EVAqOteLBFmd7pKkb0+FIUyzTF61VKi7YmvP1tw4nEw=", - "owner": "NixOS", + "lastModified": 1760703608, + "narHash": "sha256-MMIIShabm9KnYTmm0WbJ2h+jxI86gfE7NcByVOaBNNU=", + "owner": "PedroHLC", "repo": "nixpkgs", - "rev": "544961dfcce86422ba200ed9a0b00dd4b1486ec5", + "rev": "95d8e5f411dc2fcc7f73a72766aaabfab1a1c456", "type": "github" }, "original": { @@ -1082,11 +1124,11 @@ }, "nixpkgs-stable": { "locked": { - "lastModified": 1760423683, - "narHash": "sha256-Tb+NYuJhWZieDZUxN6PgglB16yuqBYQeMJyYBGCXlt8=", + "lastModified": 1760862643, + "narHash": "sha256-PXwG0TM7Ek87DNx4LbGWuD93PbFeKAJs4FfALtp7Wo0=", "owner": "NixOS", "repo": "nixpkgs", - "rev": "a493e93b4a259cd9fea8073f89a7ed9b1c5a1da2", + "rev": "33c6dca0c0cb31d6addcd34e90a63ad61826b28c", "type": "github" }, "original": { @@ -1114,11 +1156,11 @@ }, "nixpkgs-stable_3": { "locked": { - "lastModified": 1760423683, - "narHash": "sha256-Tb+NYuJhWZieDZUxN6PgglB16yuqBYQeMJyYBGCXlt8=", + "lastModified": 1760862643, + "narHash": "sha256-PXwG0TM7Ek87DNx4LbGWuD93PbFeKAJs4FfALtp7Wo0=", "owner": "NixOS", "repo": "nixpkgs", - "rev": "a493e93b4a259cd9fea8073f89a7ed9b1c5a1da2", + "rev": "33c6dca0c0cb31d6addcd34e90a63ad61826b28c", "type": "github" }, "original": { @@ -1130,11 +1172,11 @@ }, "nixpkgs_2": { "locked": { - "lastModified": 1760524057, - "narHash": "sha256-EVAqOteLBFmd7pKkb0+FIUyzTF61VKi7YmvP1tw4nEw=", + "lastModified": 1760878510, + "narHash": "sha256-K5Osef2qexezUfs0alLvZ7nQFTGS9DL2oTVsIXsqLgs=", "owner": "NixOS", "repo": "nixpkgs", - "rev": "544961dfcce86422ba200ed9a0b00dd4b1486ec5", + "rev": "5e2a59a5b1a82f89f2c7e598302a9cacebb72a67", "type": "github" }, "original": { @@ -1161,6 +1203,22 @@ } }, "nixpkgs_4": { + "locked": { + "lastModified": 1760872779, + "narHash": "sha256-c5C907Raf9eY8f1NUXYeju9aUDlm227s/V0OptEbypA=", + "owner": "NixOS", + "repo": "nixpkgs", + "rev": "63bdb5d90fa2fa11c42f9716ad1e23565613b07c", + "type": "github" + }, + "original": { + "owner": "NixOS", + "ref": "nixpkgs-unstable", + "repo": "nixpkgs", + "type": "github" + } + }, + "nixpkgs_5": { "locked": { "lastModified": 1760596604, "narHash": "sha256-J/i5K6AAz/y5dBePHQOuzC7MbhyTOKsd/GLezSbEFiM=", @@ -1176,29 +1234,13 @@ "type": "github" } }, - "nixpkgs_5": { - "locked": { - "lastModified": 1760103332, - "narHash": "sha256-BMsGVfKl4Q80Pr9T1AkCRljO1bpwCmY8rTBVj8XGuhA=", - "owner": "NixOS", - "repo": "nixpkgs", - "rev": "870493f9a8cb0b074ae5b411b2f232015db19a65", - "type": "github" - }, - "original": { - "owner": "NixOS", - "ref": "nixpkgs-unstable", - "repo": "nixpkgs", - "type": "github" - } - }, "nixpkgs_6": { "locked": { - "lastModified": 1760524057, - "narHash": "sha256-EVAqOteLBFmd7pKkb0+FIUyzTF61VKi7YmvP1tw4nEw=", + "lastModified": 1760878510, + "narHash": "sha256-K5Osef2qexezUfs0alLvZ7nQFTGS9DL2oTVsIXsqLgs=", "owner": "NixOS", "repo": "nixpkgs", - "rev": "544961dfcce86422ba200ed9a0b00dd4b1486ec5", + "rev": "5e2a59a5b1a82f89f2c7e598302a9cacebb72a67", "type": "github" }, "original": { @@ -1226,11 +1268,11 @@ }, "nixpkgs_8": { "locked": { - "lastModified": 1760524057, - "narHash": "sha256-EVAqOteLBFmd7pKkb0+FIUyzTF61VKi7YmvP1tw4nEw=", + "lastModified": 1760878510, + "narHash": "sha256-K5Osef2qexezUfs0alLvZ7nQFTGS9DL2oTVsIXsqLgs=", "owner": "nixos", "repo": "nixpkgs", - "rev": "544961dfcce86422ba200ed9a0b00dd4b1486ec5", + "rev": "5e2a59a5b1a82f89f2c7e598302a9cacebb72a67", "type": "github" }, "original": { @@ -1242,11 +1284,11 @@ }, "nixpkgs_9": { "locked": { - "lastModified": 1754340878, - "narHash": "sha256-lgmUyVQL9tSnvvIvBp7x1euhkkCho7n3TMzgjdvgPoU=", + "lastModified": 1760596604, + "narHash": "sha256-J/i5K6AAz/y5dBePHQOuzC7MbhyTOKsd/GLezSbEFiM=", "owner": "nixos", "repo": "nixpkgs", - "rev": "cab778239e705082fe97bb4990e0d24c50924c04", + "rev": "3cbe716e2346710d6e1f7c559363d14e11c32a43", "type": "github" }, "original": { @@ -1261,14 +1303,14 @@ "flake-parts": "flake-parts_6", "nixpkgs": "nixpkgs_7", "nuschtosSearch": "nuschtosSearch", - "systems": "systems_5" + "systems": "systems_6" }, "locked": { - "lastModified": 1760616351, - "narHash": "sha256-z6+MKQBXfeZTdUK+PXbmBydaUuJK+k3iFnTanRvdkXg=", + "lastModified": 1760906375, + "narHash": "sha256-inbXtSqhaDOxvosjvt8hP/Az/wWwRCxjipH4x5DSD6A=", "owner": "nix-community", "repo": "nixvim", - "rev": "5275e258bf89e4947409ba36e362031ca491c67c", + "rev": "5c1be58f6d938ff93516d00cc3d2c0def4d80198", "type": "github" }, "original": { @@ -1283,11 +1325,11 @@ "nixpkgs": "nixpkgs_8" }, "locked": { - "lastModified": 1760673183, - "narHash": "sha256-t7elGksfKv2G/nZT2RcjWcCiaFtFB9cYkOEYqOLKL5o=", + "lastModified": 1760953705, + "narHash": "sha256-uo4U/eLQZ1SeCGnXO6oSf8GSzubxk8t9+bWomEAip14=", "owner": "nix-community", "repo": "NUR", - "rev": "e0de649c6a7e0cfd5a651a5590d744b3ece20839", + "rev": "d12d37fa661e688c7bdeee91abfcbfcddd018422", "type": "github" }, "original": { @@ -1323,7 +1365,7 @@ }, "nuschtosSearch": { "inputs": { - "flake-utils": "flake-utils_2", + "flake-utils": "flake-utils_3", "ixx": "ixx", "nixpkgs": [ "nixvim", @@ -1344,6 +1386,19 @@ "type": "github" } }, + "nvchad-starter": { + "flake": false, + "locked": { + "lastModified": 1, + "narHash": "sha256-F3ysDLjeyNGHcZYOQHbw8kjBqf3L+ESrZs9XMRefOJQ=", + "path": "./nvchad", + "type": "path" + }, + "original": { + "path": "./nvchad", + "type": "path" + } + }, "pre-commit-hooks-nix": { "inputs": { "flake-compat": [ @@ -1389,10 +1444,12 @@ "niri-flake": "niri-flake", "nix-doom": "nix-doom", "nix-gaming": "nix-gaming", + "nix4nvchad": "nix4nvchad", "nixos-hardware": "nixos-hardware", "nixpkgs": "nixpkgs_6", "nixvim": "nixvim", "nur": "nur", + "nvchad-starter": "nvchad-starter", "sops-nix": "sops-nix", "spacemacs": "spacemacs", "stylix": "stylix", @@ -1407,11 +1464,11 @@ ] }, "locked": { - "lastModified": 1760495781, - "narHash": "sha256-3OGPAQNJswy6L4VJyX3U9/z7fwgPFvK6zQtB2NHBV0Y=", + "lastModified": 1760668505, + "narHash": "sha256-Ed0cGwPZtLRiSvMx4KgPx8bhLYzn5jiJ7s5o5vj4oG0=", "owner": "oxalica", "repo": "rust-overlay", - "rev": "11e0852a2aa3a65955db5824262d76933750e299", + "rev": "18234d2c11b10eaec9ccc3a1089a5ea872ec8858", "type": "github" }, "original": { @@ -1469,11 +1526,11 @@ ] }, "locked": { - "lastModified": 1760393368, - "narHash": "sha256-8mN3kqyqa2PKY0wwZ2UmMEYMcxvNTwLaOrrDsw6Qi4E=", + "lastModified": 1760845571, + "narHash": "sha256-PwGzU3EOU65Ef1VvuNnVLie+l+P0g/fzf/PGUG82KbM=", "owner": "Mic92", "repo": "sops-nix", - "rev": "ab8d56e85b8be14cff9d93735951e30c3e86a437", + "rev": "9c9a9798be331ed3f4b2902933d7677d0659ee61", "type": "github" }, "original": { @@ -1485,11 +1542,11 @@ "spacemacs": { "flake": false, "locked": { - "lastModified": 1760626893, - "narHash": "sha256-ZnzzyRybBqclopdjP4Ha40TeC2z8WWSA+CgO87BFH4Q=", + "lastModified": 1760813744, + "narHash": "sha256-NzHS3u++7pXh63T7BqPaHZM51X/3h1ZN2iRPT3P1cSY=", "owner": "syl20bnr", "repo": "spacemacs", - "rev": "5a95f23ea3eb429810b96962e56e73c57cba12df", + "rev": "610d900767b35228b5a2eb79f2a8de9596a5a264", "type": "github" }, "original": { @@ -1513,7 +1570,7 @@ "nixpkgs" ], "nur": "nur_2", - "systems": "systems_6", + "systems": "systems_7", "tinted-foot": "tinted-foot", "tinted-kitty": "tinted-kitty", "tinted-schemes": "tinted-schemes", @@ -1624,6 +1681,21 @@ "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": { @@ -1713,11 +1785,11 @@ ] }, "locked": { - "lastModified": 1760120816, - "narHash": "sha256-gq9rdocpmRZCwLS5vsHozwB6b5nrOBDNc2kkEaTXHfg=", + "lastModified": 1760889407, + "narHash": "sha256-ppIp04fmz+BaTpJs1nIOmPADg02asfQFrFbhb3SmxsE=", "owner": "numtide", "repo": "treefmt-nix", - "rev": "761ae7aff00907b607125b2f57338b74177697ed", + "rev": "3f258dead9fed51f53862366d3a6bc1b622ee7cb", "type": "github" }, "original": { @@ -1731,11 +1803,11 @@ "nixpkgs": "nixpkgs_9" }, "locked": { - "lastModified": 1760120816, - "narHash": "sha256-gq9rdocpmRZCwLS5vsHozwB6b5nrOBDNc2kkEaTXHfg=", + "lastModified": 1760945191, + "narHash": "sha256-ZRVs8UqikBa4Ki3X4KCnMBtBW0ux1DaT35tgsnB1jM4=", "owner": "numtide", "repo": "treefmt-nix", - "rev": "761ae7aff00907b607125b2f57338b74177697ed", + "rev": "f56b1934f5f8fcab8deb5d38d42fd692632b47c2", "type": "github" }, "original": { diff --git a/flake.nix b/flake.nix index e451eec..c33a7b1 100644 --- a/flake.nix +++ b/flake.nix @@ -194,6 +194,19 @@ owner = "nix-community"; repo = "neovim-nightly-overlay"; }; + nvchad-starter = { + url = "path:./nvchad"; + flake = false; + }; + nix4nvchad = { + type = "github"; + owner = "nix-community"; + repo = "nix4nvchad"; + inputs = { + nixpkgs.follows = "nixpkgs"; + nvchad-starter.follows = "nvchad-starter"; + }; + }; lanzaboote = { type = "github"; diff --git a/flake/home.nix b/flake/home.nix index 9b8ae22..639acb5 100644 --- a/flake/home.nix +++ b/flake/home.nix @@ -37,7 +37,7 @@ let { "${unixName}@${hostName}" = home-manager.lib.homeManagerConfiguration { pkgs = import nixpkgs { - inherit system; + localSystem = { inherit system; }; }; modules = [ (rootPath + "/home/${unixName}/configurations/${hostName}") diff --git a/flake/perSystem.nix b/flake/perSystem.nix index 4a316d0..ec63063 100644 --- a/flake/perSystem.nix +++ b/flake/perSystem.nix @@ -21,7 +21,7 @@ in { _module.args.pkgs = import nixpkgs { - inherit system; + localSystem = { inherit system; }; config = { allowUnfree = true; }; @@ -36,6 +36,7 @@ typos-lsp just nvfetcher + nixfmt-rfc-style ]; }; legacyPackages = diff --git a/home/david/configurations/Tytonidae/default.nix b/home/david/configurations/Tytonidae/default.nix index 2e0dd36..e7de391 100644 --- a/home/david/configurations/Tytonidae/default.nix +++ b/home/david/configurations/Tytonidae/default.nix @@ -57,6 +57,7 @@ firefox.enable = true; openssh.enable = true; helix.enable = true; + nvchad.enable = true; # spacemacs.enable = true; }; }; diff --git a/home/david/modules/programs/ghostty.nix b/home/david/modules/programs/ghostty.nix index 10976b0..1ac54ad 100644 --- a/home/david/modules/programs/ghostty.nix +++ b/home/david/modules/programs/ghostty.nix @@ -20,25 +20,6 @@ enable = true; package = pkgs.ghostty; settings = { - # font-family = "FiraCode Nerd Font"; - # font-feature = [ - # "calt=1" - # "clig=1" - # "liga=1" - # "cv01" - # "cv02" - # "cv06" - # "zero" - # "onum" - # "cv17" - # "ss05" - # "ss03" - # "cv16" - # "cv31" - # "cv29" - # "cv30" - # ]; - # font-family = "Maple Mono NF CN"; font-feature = [ "calt" @@ -47,7 +28,7 @@ "ss08" ]; font-size = lib.mkForce 17; - # theme = "ayu"; + theme = lib.mkForce "Atom One Dark"; background-opacity = lib.mkForce 0.8; confirm-close-surface = "false"; }; diff --git a/home/david/modules/programs/helix.nix b/home/david/modules/programs/helix.nix index 41149af..94af43e 100644 --- a/home/david/modules/programs/helix.nix +++ b/home/david/modules/programs/helix.nix @@ -16,7 +16,7 @@ in config = lib.mkIf cfg.enable { stylix.targets.helix.enable = false; programs.helix.settings = { - theme = "gruvbox_dark_hard"; + theme = "papercolor-light"; }; youthlic.programs.helix = { enable = true; diff --git a/home/david/modules/programs/niri/config.nix b/home/david/modules/programs/niri/config.nix index 7d15c39..95d6730 100644 --- a/home/david/modules/programs/niri/config.nix +++ b/home/david/modules/programs/niri/config.nix @@ -404,6 +404,12 @@ in (flag "fullscreen-window") ] ) + (node "Mod+Ctrl+M" + [ { repeat = false; } ] + [ + (flag "maximize-window-to-edges") + ] + ) (plain "Mod+Z" [ (flag "center-column") ]) diff --git a/home/david/modules/programs/nvchad.nix b/home/david/modules/programs/nvchad.nix new file mode 100644 index 0000000..3328c65 --- /dev/null +++ b/home/david/modules/programs/nvchad.nix @@ -0,0 +1,26 @@ +{ + config, + lib, + pkgs, + ... +}: +let + cfg = config.david.programs.nvchad; +in +{ + options = { + david.programs.nvchad = { + enable = lib.mkEnableOption "nvchad"; + }; + }; + config = lib.mkIf cfg.enable { + programs.nvchad = { + enable = true; + extraPackages = with pkgs; [ + editor-runtime + ]; + neovim = pkgs.neovim-nightly; + backup = true; + }; + }; +} diff --git a/home/david/modules/programs/spacemacs/default.nix b/home/david/modules/programs/spacemacs/default.nix index ddd3635..88f4696 100644 --- a/home/david/modules/programs/spacemacs/default.nix +++ b/home/david/modules/programs/spacemacs/default.nix @@ -10,7 +10,7 @@ let inherit (pkgs) system; cfg = config.david.programs.spacemacs; pkgs' = import nixpkgs { - inherit system; + localSystem = { inherit system; }; overlays = [ emacs-overlay.overlays.default ]; }; in diff --git a/home/david/modules/programs/zed.nix b/home/david/modules/programs/zed.nix index f3cd7d5..b0c5160 100644 --- a/home/david/modules/programs/zed.nix +++ b/home/david/modules/programs/zed.nix @@ -18,6 +18,7 @@ in programs.zed-editor = { enable = true; extensions = [ + "catppuccin" "asciidoc" "basher" "cargo-tom" @@ -52,6 +53,8 @@ in "ruff" "just" "just-ls" + "jj-lsp" + "org" ]; extraPackages = with pkgs; [ editor-runtime @@ -116,11 +119,8 @@ in "ss08" = true; }; ui_font_family = "Source Han Sans"; - theme = "Gruvbox Dark Hard"; - vim_mode = true; - vim = { - # default_mode = "helix_normal"; - }; + theme = "Catppuccin Latte"; + helix_mode = true; }; }; }; diff --git a/home/modules/default.nix b/home/modules/default.nix index cf2a7ed..4585136 100644 --- a/home/modules/default.nix +++ b/home/modules/default.nix @@ -8,6 +8,7 @@ (with inputs; [ sops-nix.homeManagerModules.sops betterfox-nix.homeModules.betterfox + nix4nvchad.homeManagerModule ]) ++ lib.youthlic.loadImports ./.; diff --git a/nixos/configurations/Tytonidae/default.nix b/nixos/configurations/Tytonidae/default.nix index f91368a..c81056c 100644 --- a/nixos/configurations/Tytonidae/default.nix +++ b/nixos/configurations/Tytonidae/default.nix @@ -91,7 +91,7 @@ waypipe wineWow64Packages.waylandFull iperf3 - nixvim + neovim-nightly doom-emacs neovide osu-lazer-bin # typochecker: disable-line diff --git a/nixos/configurations/Tytonidae/stylix.nix b/nixos/configurations/Tytonidae/stylix.nix index 0a0383d..7afd390 100644 --- a/nixos/configurations/Tytonidae/stylix.nix +++ b/nixos/configurations/Tytonidae/stylix.nix @@ -8,7 +8,7 @@ enable = true; image = rootPath + "/assets/wallpaper/01.png"; polarity = "dark"; - base16Scheme = "${pkgs.base16-schemes}/share/themes/gruvbox-dark-hard.yaml"; + base16Scheme = "${pkgs.base16-schemes}/share/themes/everforest-dark-hard.yaml"; cursor = { package = pkgs.rose-pine-cursor; name = "BreezeX-RosePineDawn-Linux"; diff --git a/nixos/modules/gui/niri.nix b/nixos/modules/gui/niri.nix index 94f04c2..de14798 100644 --- a/nixos/modules/gui/niri.nix +++ b/nixos/modules/gui/niri.nix @@ -101,6 +101,7 @@ in command = "${lib.getExe pkgs.tuigreet} --time --user-menu -r"; }; }; + useTextGreeter = true; }; }; programs = { diff --git a/nvchad/init.lua b/nvchad/init.lua new file mode 100644 index 0000000..e861b68 --- /dev/null +++ b/nvchad/init.lua @@ -0,0 +1,37 @@ +vim.g.base46_cache = vim.fn.stdpath "data" .. "/base46/" +vim.g.mapleader = " " + +-- bootstrap lazy and all plugins +local lazypath = vim.fn.stdpath "data" .. "/lazy/lazy.nvim" + +if not vim.uv.fs_stat(lazypath) then + local repo = "https://github.com/folke/lazy.nvim.git" + vim.fn.system { "git", "clone", "--filter=blob:none", repo, "--branch=stable", lazypath } +end + +vim.opt.rtp:prepend(lazypath) + +local lazy_config = require "configs.lazy" + +-- load plugins +require("lazy").setup({ + { + "NvChad/NvChad", + lazy = false, + branch = "v2.5", + import = "nvchad.plugins", + }, + + { import = "plugins" }, +}, lazy_config) + +-- load theme +dofile(vim.g.base46_cache .. "defaults") +dofile(vim.g.base46_cache .. "statusline") + +require "options" +require "autocmds" + +vim.schedule(function() + require "mappings" +end) diff --git a/nvchad/lua/autocmds.lua b/nvchad/lua/autocmds.lua new file mode 100644 index 0000000..d2db0bb --- /dev/null +++ b/nvchad/lua/autocmds.lua @@ -0,0 +1 @@ +require "nvchad.autocmds" diff --git a/nvchad/lua/chadrc.lua b/nvchad/lua/chadrc.lua new file mode 100644 index 0000000..bd014be --- /dev/null +++ b/nvchad/lua/chadrc.lua @@ -0,0 +1,31 @@ +-- This file needs to have same structure as nvconfig.lua +-- https://github.com/NvChad/ui/blob/v3.0/lua/nvconfig.lua +-- Please read that file to know all available options :( @type ChadrcConfig +local M = {} + +M.base46 = { + theme = "solarized_light", + + -- hl_override = { + -- Comment = { italic = true }, + -- ["@comment"] = { italic = true }, + -- }, +} + +M.nvdash = { load_on_startup = true } +M.ui = { + cmp = { + style = "atom_colored", + }, + tabufline = { + -- lazyload = true, + enabled = false, + }, + statusline = { + enabled = true, + separator_style = "arrow", + theme = "default", + }, +} + +return M diff --git a/nvchad/lua/configs/conform.lua b/nvchad/lua/configs/conform.lua new file mode 100644 index 0000000..dd5af91 --- /dev/null +++ b/nvchad/lua/configs/conform.lua @@ -0,0 +1,18 @@ +local options = { + formatters_by_ft = { + lua = { "stylua" }, + -- css = { "prettier" }, + -- html = { "prettier" }, + nix = { + "nixfmt", + lsp_format = "fallback", + }, + }, + format_on_save = { + -- These options will be passed to conform.format() + timeout_ms = 500, + lsp_fallback = true, + }, +} + +return options diff --git a/nvchad/lua/configs/idris2.lua b/nvchad/lua/configs/idris2.lua new file mode 100644 index 0000000..8504e40 --- /dev/null +++ b/nvchad/lua/configs/idris2.lua @@ -0,0 +1,8 @@ +local options = {} + +options = { + default_regexp_syntax = true, + use_default_semantic_hl_groups = true +} + +return options diff --git a/nvchad/lua/configs/lazy.lua b/nvchad/lua/configs/lazy.lua new file mode 100644 index 0000000..e3b15c2 --- /dev/null +++ b/nvchad/lua/configs/lazy.lua @@ -0,0 +1,45 @@ +return { + defaults = { lazy = true }, + install = { colorscheme = { "nvchad" } }, + ui = { + icons = { + ft = "", + lazy = "󰂠 ", + loaded = "", + not_loaded = "", + }, + }, + performance = { + rtp = { + disabled_plugins = { + "2html_plugin", + "tohtml", + "getscript", + "getscriptPlugin", + "gzip", + "logipat", + "netrw", + "netrwPlugin", + "netrwSettings", + "netrwFileHandlers", + "matchit", + "tar", + "tarPlugin", + "rrhelper", + "spellfile_plugin", + "vimball", + "vimballPlugin", + "zip", + "zipPlugin", + "tutor", + "rplugin", + "syntax", + "synmenu", + "optwin", + "compiler", + "bugreport", + "ftplugin", + }, + }, + }, +} diff --git a/nvchad/lua/configs/lspconfig.lua b/nvchad/lua/configs/lspconfig.lua new file mode 100644 index 0000000..5d5b69d --- /dev/null +++ b/nvchad/lua/configs/lspconfig.lua @@ -0,0 +1,16 @@ +require("nvchad.configs.lspconfig").defaults() + +local servers = { + "rust_analyzer", + "nixd", + "nil_ls", + "lua_ls", + "jsonls", + "taplo" +} +vim.lsp.enable(servers, true) + +local lua_ls_libraries = vim.deepcopy(vim.lsp.config.lua_ls.settings.Lua.workspace.library) +table.insert(lua_ls_libraries, + #lua_ls_libraries, vim.fn.stdpath "data" .. "/lazy/NvChad/lua/nvchad") +vim.lsp.config.lua_ls.settings.Lua.workspace.library = lua_ls_libraries diff --git a/nvchad/lua/mappings.lua b/nvchad/lua/mappings.lua new file mode 100644 index 0000000..689ea47 --- /dev/null +++ b/nvchad/lua/mappings.lua @@ -0,0 +1,29 @@ +require "nvchad.mappings" + +local map = vim.keymap.set + +map("n", "", ":", { desc = "CMD enter command mode" }) +map("n", "ti", function() + local is_enabled = vim.lsp.inlay_hint.is_enabled() + if is_enabled then + vim.lsp.inlay_hint.enable(false) + else + vim.lsp.inlay_hint.enable(true) + end +end, { desc = "Toggle lsp inlay hint" }) + +map({ "n", "v" }, "j", "gj") +map({ "n", "v" }, "k", "gk") +map({ "n", "v" }, "gj", "j") +map({ "n", "v" }, "gk", "k") +map({ "n", "v" }, "", "Telescope help_tags", { desc = "telescope help page" }) +map("i", "", "", { desc = "backspace" }) +map({ "n", "v" }, "tm", function() + local image_api = require("image") + local is_enabled = image_api.is_enabled() + if is_enabled then + image_api.disable() + else + image_api.enable() + end +end, { desc = "Toggle image.nvim" }) diff --git a/nvchad/lua/options.lua b/nvchad/lua/options.lua new file mode 100644 index 0000000..e99d7d3 --- /dev/null +++ b/nvchad/lua/options.lua @@ -0,0 +1,102 @@ +require "nvchad.options" + +local o = vim.o +local opt = vim.opt + +o.autoindent = true +o.autoread = true +opt.backspace = { + "indent", + "eol", + "start", +} +o.backup = false + +opt.breakindent = true +opt.breakindentopt = { "sbr" } +o.showbreak = "↪" + +o.cdhome = true +o.cmdheight = 1 +opt.completeopt = { + "fuzzy", + "menuone", + "noselect", + "popup", +} +opt.concealcursor = { ["v"] = true } +o.confirm = true +o.cursorline = true +opt.cursorlineopt = { "number", "screenline" } +opt.diffopt = { + "algorithm:minimal", + "closeoff", + "context:20", + "followwrap", + "internal", + "linematch:40", +} +o.errorbells = true +o.expandtab = true +o.exrc = true +o.foldcolumn = "auto" +o.fsync = true +o.gdefault = false +opt.helplang = { + "zh", + "en", +} +o.history = 10000 +o.hlsearch = true + +o.ignorecase = true +o.smartcase = true + +o.inccommand = "split" +o.list = true +opt.listchars = { + tab = "--→", + trail = "·", + multispace = " ", + nbsp = "⍽", + space = "·", +} +o.magic = true +o.more = true +o.mouse = "a" + +o.number = true +o.numberwidth = 4 +o.relativenumber = true + +o.scrollback = 100000 +o.scrolloff = 5 +o.shiftround = true +o.shiftwidth = 2 +o.showmode = false +o.signcolumn = "yes" +o.smoothscroll = true +o.splitbelow = true +o.splitright = true +o.startofline = true +o.swapfile = false +opt.tabclose = { + "uselast", +} +o.tabstop = 2 +o.termguicolors = true +o.undofile = true +o.undolevels = 100000 +opt.virtualedit = { + "block", + "onemore", +} +opt.whichwrap = { b = true, s = true, ["<"] = true, [">"] = true } +o.wildmenu = true +opt.wildmode = { "full" } +opt.wildoptions = { + "fuzzy", + "pum", +} +o.winborder = "solid" +o.wrap = true diff --git a/nvchad/lua/plugins/init.lua b/nvchad/lua/plugins/init.lua new file mode 100644 index 0000000..60c51b2 --- /dev/null +++ b/nvchad/lua/plugins/init.lua @@ -0,0 +1,56 @@ +return { + { + "stevearc/conform.nvim", + event = "BufWritePre", -- uncomment for format on save + opts = require "configs.conform", + }, + { + "neovim/nvim-lspconfig", + config = function() + require "configs.lspconfig" + end, + }, + { import = "nvchad.blink.lazyspec" }, + { + "nvim-treesitter/nvim-treesitter", + opts = { + ensure_installed = { + "markdown", + "typst", + "lua", + "toml", + "yaml", + "json", + "rust" + }, + }, + }, + { + "idris-community/idris2-nvim", + dependencies = { + "neovim/nvim-lspconfig", + "MunifTanjim/nui.nvim" + }, + main = "idris2", + opts = require("configs.idris2"), + ft = { "idris2", "ipkg", "lidris2" } + }, + { + "3rd/image.nvim", + opts = { + processor = "magick_cli", + integrations = { + markdown = { + only_render_image_at_cursor = true, + only_render_image_at_cursor_mode = "popup", + }, + } + }, + ft = { "markdown", "typst" } + }, + { + "mrcjkb/rustaceanvim", + version = "^6", + lazy = false, + }, +} diff --git a/overlays/modifications/default.nix b/overlays/modifications/default.nix index ac8320f..30190d7 100644 --- a/overlays/modifications/default.nix +++ b/overlays/modifications/default.nix @@ -16,6 +16,7 @@ in ./zulip.nix ./spotifyd.nix ./nautilus.nix + ./neovim-nightly.nix # Nur ./nur.nix diff --git a/overlays/modifications/neovim-nightly.nix b/overlays/modifications/neovim-nightly.nix new file mode 100644 index 0000000..20f7496 --- /dev/null +++ b/overlays/modifications/neovim-nightly.nix @@ -0,0 +1,8 @@ +{ inputs, ... }: +_final: prev: +let + inherit (prev.stdenv.hostPlatform) system; +in +{ + neovim-nightly = inputs.neovim-nightly.packages.${system}.neovim; +} diff --git a/pkgs/doom-emacs/config/config.el b/pkgs/doom-emacs/config/config.el index 2c85921..76e61b1 100644 --- a/pkgs/doom-emacs/config/config.el +++ b/pkgs/doom-emacs/config/config.el @@ -12,7 +12,7 @@ (setq doom-font (font-spec :family "Maple Mono NF CN" :size 20)) -(setq doom-theme 'doom-gruvbox) +(setq doom-theme 'doom-one-light) ;;; Fix failure to locate 'Symbols Nerd Font Mono' font (setq nerd-icons-font-family "Maple Mono NF CN") @@ -42,26 +42,6 @@ (append exec-path my/emacs-deps-exec-path)))) -(advice-add #'telega-chatbuf-attach-clipboard - :override #'(lambda (doc-p) - (interactive "P") - (let* ((selection-coding-system 'no-conversion) ;for rawdata - (temporary-file-directory telega-temp-dir) - (tmpfile (telega-temp-name "clipboard" ".png")) - (coding-system-for-write 'binary)) - (if (eq system-type 'darwin) - (progn - ;; NOTE: On MacOS, try extracting clipboard using pngpaste - (unless (executable-find "pngpaste") - (error "Please install pngpaste to paste images")) - (unless (= 0 (telega-screenshot-with-pngpaste tmpfile)) - (error "No image in CLIPBOARD"))) - (let ((image-data (or (gui-get-selection 'CLIPBOARD 'image/png) - (gui-get-selection 'CLIPBOARD 'image/jpeg) - (error "No image in CLIPBOARD")))) - (write-region image-data nil tmpfile nil 'quiet))) - (telega-chatbuf-attach-media tmpfile (when doc-p 'preview))))) - (defun +telega-save-file-to-clipboard (msg) "Save file at point to clipboard. NOTE: wayland only." @@ -70,19 +50,19 @@ NOTE: wayland only." (unless file (user-error "No file associated with message")) (telega-file--download file - :priority 32 - :update-callback - (lambda (dfile) - (telega-msg-redisplay msg) - (message "Wait for downloading to finish…") - (when (telega-file--downloaded-p dfile) - (let* ((fpath (telega--tl-get dfile :local :path))) - (shell-command (format "wl-copy < \"%s\"" fpath)) - (message (format "File saved to clipboard: %s" fpath)))))))) + :priority 32 + :update-callback + (lambda (dfile) + (telega-msg-redisplay msg) + (message "Wait for downloading to finish…") + (when (telega-file--downloaded-p dfile) + (let* ((fpath (telega--tl-get dfile :local :path))) + (shell-command (format "wl-copy < \"%s\"" fpath)) + (message (format "File saved to clipboard: %s" fpath)))))))) (map! :map global-map "C-c n" - #'helm-nixos-options) + #'company-nixos-options) (with-eval-after-load 'evil (scroll-on-jump-advice-add evil-redo) diff --git a/pkgs/doom-emacs/package.nix b/pkgs/doom-emacs/package.nix index 788533b..160d96c 100644 --- a/pkgs/doom-emacs/package.nix +++ b/pkgs/doom-emacs/package.nix @@ -8,7 +8,7 @@ let inherit (inputs) nixpkgs emacs-overlay nix-doom; pkgs = import nixpkgs { - inherit system; + localSystem = { inherit system; }; overlays = [ emacs-overlay.overlays.default nix-doom.overlays.default diff --git a/pkgs/editor-runtime.nix b/pkgs/editor-runtime.nix index 6de275a..1a582e4 100644 --- a/pkgs/editor-runtime.nix +++ b/pkgs/editor-runtime.nix @@ -1,5 +1,5 @@ { - symlinkJoin, + buildEnv, nixfmt-rfc-style, idris2Packages, lua-language-server, @@ -37,8 +37,9 @@ jdt-language-server, zls, ty, + imagemagick, }: -symlinkJoin { +buildEnv { name = "editor-runtime"; paths = [ nixfmt-rfc-style @@ -78,6 +79,7 @@ symlinkJoin { jdt-language-server zls ty + imagemagick ]; postBuild = ''''; } diff --git a/templates/cxx/flake.lock b/templates/cxx/flake.lock deleted file mode 100644 index 5011e13..0000000 --- a/templates/cxx/flake.lock +++ /dev/null @@ -1,61 +0,0 @@ -{ - "nodes": { - "flake-utils": { - "inputs": { - "systems": "systems" - }, - "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" - } - }, - "nixpkgs": { - "locked": { - "lastModified": 1746300365, - "narHash": "sha256-thYTdWqCRipwPRxWiTiH1vusLuAy0okjOyzRx4hLWh4=", - "owner": "NixOS", - "repo": "nixpkgs", - "rev": "f21e4546e3ede7ae34d12a84602a22246b31f7e0", - "type": "github" - }, - "original": { - "owner": "NixOS", - "ref": "nixpkgs-unstable", - "repo": "nixpkgs", - "type": "github" - } - }, - "root": { - "inputs": { - "flake-utils": "flake-utils", - "nixpkgs": "nixpkgs" - } - }, - "systems": { - "locked": { - "lastModified": 1681028828, - "narHash": "sha256-Vy1rq5AaRuLzOxct8nz4T6wlgyUR7zLU309k9mBC768=", - "owner": "nix-systems", - "repo": "default", - "rev": "da67096a3b9bf56a91d16901293e51ba5b49a27e", - "type": "github" - }, - "original": { - "owner": "nix-systems", - "repo": "default", - "type": "github" - } - } - }, - "root": "root", - "version": 7 -} diff --git a/templates/cxx/flake.nix b/templates/cxx/flake.nix index fc6b487..a06d90a 100644 --- a/templates/cxx/flake.nix +++ b/templates/cxx/flake.nix @@ -15,7 +15,7 @@ system: let pkgs = import nixpkgs { - inherit system; + localSystem = { inherit system; }; }; in { diff --git a/templates/cxxWithXmake/.clang-format b/templates/cxxWithXmake/.clang-format deleted file mode 100644 index 06e3c51..0000000 --- a/templates/cxxWithXmake/.clang-format +++ /dev/null @@ -1,4 +0,0 @@ ---- -Language: Cpp -BasedOnStyle: Google -... diff --git a/templates/cxxWithXmake/.clang-tidy b/templates/cxxWithXmake/.clang-tidy deleted file mode 100755 index fbc2618..0000000 --- a/templates/cxxWithXmake/.clang-tidy +++ /dev/null @@ -1,3 +0,0 @@ ---- -Checks: "clang-diagnostic-*,clang-analyzer-*,modernize-*,performance-*,cppcoreguidelines-*" -... diff --git a/templates/cxxWithXmake/.clangd b/templates/cxxWithXmake/.clangd deleted file mode 100644 index 8793993..0000000 --- a/templates/cxxWithXmake/.clangd +++ /dev/null @@ -1,9 +0,0 @@ -InlayHints: - Enabled: - true - ParameterNames: - true - DuducedTypes: - true - Designators: - true diff --git a/templates/cxxWithXmake/.envrc b/templates/cxxWithXmake/.envrc deleted file mode 100644 index c1d8584..0000000 --- a/templates/cxxWithXmake/.envrc +++ /dev/null @@ -1,2 +0,0 @@ - -use flake diff --git a/templates/cxxWithXmake/.gitignore b/templates/cxxWithXmake/.gitignore deleted file mode 100644 index 63347cd..0000000 --- a/templates/cxxWithXmake/.gitignore +++ /dev/null @@ -1,147 +0,0 @@ -.cache -compile_commands.json - -###---------------### -### GitHub: C++ ### -###---------------### - -# Prerequisites -*.d - -# Compiled Object files -*.slo -*.lo -*.o -*.obj - -# Precompiled Headers -*.gch -*.pch - -# Compiled Dynamic libraries -*.so -*.dylib -*.dll - -# Fortran module files -*.mod -*.smod - -# Compiled Static libraries -*.lai -*.la -*.a -*.lib - -# Executables -*.exe -*.out -*.app - -###---------------### -### GitHub: Nix ### -###---------------### - -# Ignore build outputs from performing a nix-build or `nix build` command -result -result-* - -# Ignore automatically generated direnv output -.direnv - -###-----------------### -### TopTal: xmake ### -###-----------------### - -# Created by https://www.toptal.com/developers/gitignore/api/xmake -# Edit at https://www.toptal.com/developers/gitignore?templates=xmake - -### xmake ### -# Xmake cache -.xmake/ -build/ - -# End of https://www.toptal.com/developers/gitignore/api/xmake - -###----------------------------### -### GitHub Global: JetBrains ### -###----------------------------### - -# Covers JetBrains IDEs: IntelliJ, GoLand, RubyMine, PhpStorm, AppCode, PyCharm, CLion, Android Studio, WebStorm and Rider -# Reference: https://intellij-support.jetbrains.com/hc/en-us/articles/206544839 - -# User-specific stuff -.idea/**/workspace.xml -.idea/**/tasks.xml -.idea/**/usage.statistics.xml -.idea/**/dictionaries -.idea/**/shelf - -# AWS User-specific -.idea/**/aws.xml - -# Generated files -.idea/**/contentModel.xml - -# Sensitive or high-churn files -.idea/**/dataSources/ -.idea/**/dataSources.ids -.idea/**/dataSources.local.xml -.idea/**/sqlDataSources.xml -.idea/**/dynamic.xml -.idea/**/uiDesigner.xml -.idea/**/dbnavigator.xml - -# Gradle -.idea/**/gradle.xml -.idea/**/libraries - -# Gradle and Maven with auto-import -# When using Gradle or Maven with auto-import, you should exclude module files, -# since they will be recreated, and may cause churn. Uncomment if using -# auto-import. -# .idea/artifacts -# .idea/compiler.xml -# .idea/jarRepositories.xml -# .idea/modules.xml -# .idea/*.iml -# .idea/modules -# *.iml -# *.ipr - -# CMake -cmake-build-*/ - -# Mongo Explorer plugin -.idea/**/mongoSettings.xml - -# File-based project format -*.iws - -# IntelliJ -out/ - -# mpeltonen/sbt-idea plugin -.idea_modules/ - -# JIRA plugin -atlassian-ide-plugin.xml - -# Cursive Clojure plugin -.idea/replstate.xml - -# SonarLint plugin -.idea/sonarlint/ -.idea/sonarlint.xml # see https://community.sonarsource.com/t/is-the-file-idea-idea-idea-sonarlint-xml-intended-to-be-under-source-control/121119 - -# Crashlytics plugin (for Android Studio and IntelliJ) -com_crashlytics_export_strings.xml -crashlytics.properties -crashlytics-build.properties -fabric.properties - -# Editor-based Rest Client -.idea/httpRequests - -# Android studio 3.1+ serialized cache file -.idea/caches/build_file_checksums.ser diff --git a/templates/cxxWithXmake/LICENSE-GPL-3.0-or-later b/templates/cxxWithXmake/LICENSE-GPL-3.0-or-later deleted file mode 100644 index f288702..0000000 --- a/templates/cxxWithXmake/LICENSE-GPL-3.0-or-later +++ /dev/null @@ -1,674 +0,0 @@ - GNU GENERAL PUBLIC LICENSE - Version 3, 29 June 2007 - - Copyright (C) 2007 Free Software Foundation, Inc. - Everyone is permitted to copy and distribute verbatim copies - of this license document, but changing it is not allowed. - - Preamble - - The GNU General Public License is a free, copyleft license for -software and other kinds of works. - - The licenses for most software and other practical works are designed -to take away your freedom to share and change the works. By contrast, -the GNU General Public License is intended to guarantee your freedom to -share and change all versions of a program--to make sure it remains free -software for all its users. We, the Free Software Foundation, use the -GNU General Public License for most of our software; it applies also to -any other work released this way by its authors. You can apply it to -your programs, too. - - When we speak of free software, we are referring to freedom, not -price. Our General Public Licenses are designed to make sure that you -have the freedom to distribute copies of free software (and charge for -them if you wish), that you receive source code or can get it if you -want it, that you can change the software or use pieces of it in new -free programs, and that you know you can do these things. - - To protect your rights, we need to prevent others from denying you -these rights or asking you to surrender the rights. Therefore, you have -certain responsibilities if you distribute copies of the software, or if -you modify it: responsibilities to respect the freedom of others. - - For example, if you distribute copies of such a program, whether -gratis or for a fee, you must pass on to the recipients the same -freedoms that you received. You must make sure that they, too, receive -or can get the source code. And you must show them these terms so they -know their rights. - - Developers that use the GNU GPL protect your rights with two steps: -(1) assert copyright on the software, and (2) offer you this License -giving you legal permission to copy, distribute and/or modify it. - - For the developers' and authors' protection, the GPL clearly explains -that there is no warranty for this free software. For both users' and -authors' sake, the GPL requires that modified versions be marked as -changed, so that their problems will not be attributed erroneously to -authors of previous versions. - - Some devices are designed to deny users access to install or run -modified versions of the software inside them, although the manufacturer -can do so. This is fundamentally incompatible with the aim of -protecting users' freedom to change the software. The systematic -pattern of such abuse occurs in the area of products for individuals to -use, which is precisely where it is most unacceptable. Therefore, we -have designed this version of the GPL to prohibit the practice for those -products. If such problems arise substantially in other domains, we -stand ready to extend this provision to those domains in future versions -of the GPL, as needed to protect the freedom of users. - - Finally, every program is threatened constantly by software patents. -States should not allow patents to restrict development and use of -software on general-purpose computers, but in those that do, we wish to -avoid the special danger that patents applied to a free program could -make it effectively proprietary. To prevent this, the GPL assures that -patents cannot be used to render the program non-free. - - The precise terms and conditions for copying, distribution and -modification follow. - - TERMS AND CONDITIONS - - 0. Definitions. - - "This License" refers to version 3 of the GNU General Public License. - - "Copyright" also means copyright-like laws that apply to other kinds of -works, such as semiconductor masks. - - "The Program" refers to any copyrightable work licensed under this -License. Each licensee is addressed as "you". "Licensees" and -"recipients" may be individuals or organizations. - - To "modify" a work means to copy from or adapt all or part of the work -in a fashion requiring copyright permission, other than the making of an -exact copy. The resulting work is called a "modified version" of the -earlier work or a work "based on" the earlier work. - - A "covered work" means either the unmodified Program or a work based -on the Program. - - To "propagate" a work means to do anything with it that, without -permission, would make you directly or secondarily liable for -infringement under applicable copyright law, except executing it on a -computer or modifying a private copy. Propagation includes copying, -distribution (with or without modification), making available to the -public, and in some countries other activities as well. - - To "convey" a work means any kind of propagation that enables other -parties to make or receive copies. Mere interaction with a user through -a computer network, with no transfer of a copy, is not conveying. - - An interactive user interface displays "Appropriate Legal Notices" -to the extent that it includes a convenient and prominently visible -feature that (1) displays an appropriate copyright notice, and (2) -tells the user that there is no warranty for the work (except to the -extent that warranties are provided), that licensees may convey the -work under this License, and how to view a copy of this License. If -the interface presents a list of user commands or options, such as a -menu, a prominent item in the list meets this criterion. - - 1. Source Code. - - The "source code" for a work means the preferred form of the work -for making modifications to it. "Object code" means any non-source -form of a work. - - A "Standard Interface" means an interface that either is an official -standard defined by a recognized standards body, or, in the case of -interfaces specified for a particular programming language, one that -is widely used among developers working in that language. - - The "System Libraries" of an executable work include anything, other -than the work as a whole, that (a) is included in the normal form of -packaging a Major Component, but which is not part of that Major -Component, and (b) serves only to enable use of the work with that -Major Component, or to implement a Standard Interface for which an -implementation is available to the public in source code form. A -"Major Component", in this context, means a major essential component -(kernel, window system, and so on) of the specific operating system -(if any) on which the executable work runs, or a compiler used to -produce the work, or an object code interpreter used to run it. - - The "Corresponding Source" for a work in object code form means all -the source code needed to generate, install, and (for an executable -work) run the object code and to modify the work, including scripts to -control those activities. However, it does not include the work's -System Libraries, or general-purpose tools or generally available free -programs which are used unmodified in performing those activities but -which are not part of the work. For example, Corresponding Source -includes interface definition files associated with source files for -the work, and the source code for shared libraries and dynamically -linked subprograms that the work is specifically designed to require, -such as by intimate data communication or control flow between those -subprograms and other parts of the work. - - The Corresponding Source need not include anything that users -can regenerate automatically from other parts of the Corresponding -Source. - - The Corresponding Source for a work in source code form is that -same work. - - 2. Basic Permissions. - - All rights granted under this License are granted for the term of -copyright on the Program, and are irrevocable provided the stated -conditions are met. This License explicitly affirms your unlimited -permission to run the unmodified Program. The output from running a -covered work is covered by this License only if the output, given its -content, constitutes a covered work. This License acknowledges your -rights of fair use or other equivalent, as provided by copyright law. - - You may make, run and propagate covered works that you do not -convey, without conditions so long as your license otherwise remains -in force. You may convey covered works to others for the sole purpose -of having them make modifications exclusively for you, or provide you -with facilities for running those works, provided that you comply with -the terms of this License in conveying all material for which you do -not control copyright. Those thus making or running the covered works -for you must do so exclusively on your behalf, under your direction -and control, on terms that prohibit them from making any copies of -your copyrighted material outside their relationship with you. - - Conveying under any other circumstances is permitted solely under -the conditions stated below. Sublicensing is not allowed; section 10 -makes it unnecessary. - - 3. Protecting Users' Legal Rights From Anti-Circumvention Law. - - No covered work shall be deemed part of an effective technological -measure under any applicable law fulfilling obligations under article -11 of the WIPO copyright treaty adopted on 20 December 1996, or -similar laws prohibiting or restricting circumvention of such -measures. - - When you convey a covered work, you waive any legal power to forbid -circumvention of technological measures to the extent such circumvention -is effected by exercising rights under this License with respect to -the covered work, and you disclaim any intention to limit operation or -modification of the work as a means of enforcing, against the work's -users, your or third parties' legal rights to forbid circumvention of -technological measures. - - 4. Conveying Verbatim Copies. - - You may convey verbatim copies of the Program's source code as you -receive it, in any medium, provided that you conspicuously and -appropriately publish on each copy an appropriate copyright notice; -keep intact all notices stating that this License and any -non-permissive terms added in accord with section 7 apply to the code; -keep intact all notices of the absence of any warranty; and give all -recipients a copy of this License along with the Program. - - You may charge any price or no price for each copy that you convey, -and you may offer support or warranty protection for a fee. - - 5. Conveying Modified Source Versions. - - You may convey a work based on the Program, or the modifications to -produce it from the Program, in the form of source code under the -terms of section 4, provided that you also meet all of these conditions: - - a) The work must carry prominent notices stating that you modified - it, and giving a relevant date. - - b) The work must carry prominent notices stating that it is - released under this License and any conditions added under section - 7. This requirement modifies the requirement in section 4 to - "keep intact all notices". - - c) You must license the entire work, as a whole, under this - License to anyone who comes into possession of a copy. This - License will therefore apply, along with any applicable section 7 - additional terms, to the whole of the work, and all its parts, - regardless of how they are packaged. This License gives no - permission to license the work in any other way, but it does not - invalidate such permission if you have separately received it. - - d) If the work has interactive user interfaces, each must display - Appropriate Legal Notices; however, if the Program has interactive - interfaces that do not display Appropriate Legal Notices, your - work need not make them do so. - - A compilation of a covered work with other separate and independent -works, which are not by their nature extensions of the covered work, -and which are not combined with it such as to form a larger program, -in or on a volume of a storage or distribution medium, is called an -"aggregate" if the compilation and its resulting copyright are not -used to limit the access or legal rights of the compilation's users -beyond what the individual works permit. Inclusion of a covered work -in an aggregate does not cause this License to apply to the other -parts of the aggregate. - - 6. Conveying Non-Source Forms. - - You may convey a covered work in object code form under the terms -of sections 4 and 5, provided that you also convey the -machine-readable Corresponding Source under the terms of this License, -in one of these ways: - - a) Convey the object code in, or embodied in, a physical product - (including a physical distribution medium), accompanied by the - Corresponding Source fixed on a durable physical medium - customarily used for software interchange. - - b) Convey the object code in, or embodied in, a physical product - (including a physical distribution medium), accompanied by a - written offer, valid for at least three years and valid for as - long as you offer spare parts or customer support for that product - model, to give anyone who possesses the object code either (1) a - copy of the Corresponding Source for all the software in the - product that is covered by this License, on a durable physical - medium customarily used for software interchange, for a price no - more than your reasonable cost of physically performing this - conveying of source, or (2) access to copy the - Corresponding Source from a network server at no charge. - - c) Convey individual copies of the object code with a copy of the - written offer to provide the Corresponding Source. This - alternative is allowed only occasionally and noncommercially, and - only if you received the object code with such an offer, in accord - with subsection 6b. - - d) Convey the object code by offering access from a designated - place (gratis or for a charge), and offer equivalent access to the - Corresponding Source in the same way through the same place at no - further charge. You need not require recipients to copy the - Corresponding Source along with the object code. If the place to - copy the object code is a network server, the Corresponding Source - may be on a different server (operated by you or a third party) - that supports equivalent copying facilities, provided you maintain - clear directions next to the object code saying where to find the - Corresponding Source. Regardless of what server hosts the - Corresponding Source, you remain obligated to ensure that it is - available for as long as needed to satisfy these requirements. - - e) Convey the object code using peer-to-peer transmission, provided - you inform other peers where the object code and Corresponding - Source of the work are being offered to the general public at no - charge under subsection 6d. - - A separable portion of the object code, whose source code is excluded -from the Corresponding Source as a System Library, need not be -included in conveying the object code work. - - A "User Product" is either (1) a "consumer product", which means any -tangible personal property which is normally used for personal, family, -or household purposes, or (2) anything designed or sold for incorporation -into a dwelling. In determining whether a product is a consumer product, -doubtful cases shall be resolved in favor of coverage. For a particular -product received by a particular user, "normally used" refers to a -typical or common use of that class of product, regardless of the status -of the particular user or of the way in which the particular user -actually uses, or expects or is expected to use, the product. A product -is a consumer product regardless of whether the product has substantial -commercial, industrial or non-consumer uses, unless such uses represent -the only significant mode of use of the product. - - "Installation Information" for a User Product means any methods, -procedures, authorization keys, or other information required to install -and execute modified versions of a covered work in that User Product from -a modified version of its Corresponding Source. The information must -suffice to ensure that the continued functioning of the modified object -code is in no case prevented or interfered with solely because -modification has been made. - - If you convey an object code work under this section in, or with, or -specifically for use in, a User Product, and the conveying occurs as -part of a transaction in which the right of possession and use of the -User Product is transferred to the recipient in perpetuity or for a -fixed term (regardless of how the transaction is characterized), the -Corresponding Source conveyed under this section must be accompanied -by the Installation Information. But this requirement does not apply -if neither you nor any third party retains the ability to install -modified object code on the User Product (for example, the work has -been installed in ROM). - - The requirement to provide Installation Information does not include a -requirement to continue to provide support service, warranty, or updates -for a work that has been modified or installed by the recipient, or for -the User Product in which it has been modified or installed. Access to a -network may be denied when the modification itself materially and -adversely affects the operation of the network or violates the rules and -protocols for communication across the network. - - Corresponding Source conveyed, and Installation Information provided, -in accord with this section must be in a format that is publicly -documented (and with an implementation available to the public in -source code form), and must require no special password or key for -unpacking, reading or copying. - - 7. Additional Terms. - - "Additional permissions" are terms that supplement the terms of this -License by making exceptions from one or more of its conditions. -Additional permissions that are applicable to the entire Program shall -be treated as though they were included in this License, to the extent -that they are valid under applicable law. If additional permissions -apply only to part of the Program, that part may be used separately -under those permissions, but the entire Program remains governed by -this License without regard to the additional permissions. - - When you convey a copy of a covered work, you may at your option -remove any additional permissions from that copy, or from any part of -it. (Additional permissions may be written to require their own -removal in certain cases when you modify the work.) You may place -additional permissions on material, added by you to a covered work, -for which you have or can give appropriate copyright permission. - - Notwithstanding any other provision of this License, for material you -add to a covered work, you may (if authorized by the copyright holders of -that material) supplement the terms of this License with terms: - - a) Disclaiming warranty or limiting liability differently from the - terms of sections 15 and 16 of this License; or - - b) Requiring preservation of specified reasonable legal notices or - author attributions in that material or in the Appropriate Legal - Notices displayed by works containing it; or - - c) Prohibiting misrepresentation of the origin of that material, or - requiring that modified versions of such material be marked in - reasonable ways as different from the original version; or - - d) Limiting the use for publicity purposes of names of licensors or - authors of the material; or - - e) Declining to grant rights under trademark law for use of some - trade names, trademarks, or service marks; or - - f) Requiring indemnification of licensors and authors of that - material by anyone who conveys the material (or modified versions of - it) with contractual assumptions of liability to the recipient, for - any liability that these contractual assumptions directly impose on - those licensors and authors. - - All other non-permissive additional terms are considered "further -restrictions" within the meaning of section 10. If the Program as you -received it, or any part of it, contains a notice stating that it is -governed by this License along with a term that is a further -restriction, you may remove that term. If a license document contains -a further restriction but permits relicensing or conveying under this -License, you may add to a covered work material governed by the terms -of that license document, provided that the further restriction does -not survive such relicensing or conveying. - - If you add terms to a covered work in accord with this section, you -must place, in the relevant source files, a statement of the -additional terms that apply to those files, or a notice indicating -where to find the applicable terms. - - Additional terms, permissive or non-permissive, may be stated in the -form of a separately written license, or stated as exceptions; -the above requirements apply either way. - - 8. Termination. - - You may not propagate or modify a covered work except as expressly -provided under this License. Any attempt otherwise to propagate or -modify it is void, and will automatically terminate your rights under -this License (including any patent licenses granted under the third -paragraph of section 11). - - However, if you cease all violation of this License, then your -license from a particular copyright holder is reinstated (a) -provisionally, unless and until the copyright holder explicitly and -finally terminates your license, and (b) permanently, if the copyright -holder fails to notify you of the violation by some reasonable means -prior to 60 days after the cessation. - - Moreover, your license from a particular copyright holder is -reinstated permanently if the copyright holder notifies you of the -violation by some reasonable means, this is the first time you have -received notice of violation of this License (for any work) from that -copyright holder, and you cure the violation prior to 30 days after -your receipt of the notice. - - Termination of your rights under this section does not terminate the -licenses of parties who have received copies or rights from you under -this License. If your rights have been terminated and not permanently -reinstated, you do not qualify to receive new licenses for the same -material under section 10. - - 9. Acceptance Not Required for Having Copies. - - You are not required to accept this License in order to receive or -run a copy of the Program. Ancillary propagation of a covered work -occurring solely as a consequence of using peer-to-peer transmission -to receive a copy likewise does not require acceptance. However, -nothing other than this License grants you permission to propagate or -modify any covered work. These actions infringe copyright if you do -not accept this License. Therefore, by modifying or propagating a -covered work, you indicate your acceptance of this License to do so. - - 10. Automatic Licensing of Downstream Recipients. - - Each time you convey a covered work, the recipient automatically -receives a license from the original licensors, to run, modify and -propagate that work, subject to this License. You are not responsible -for enforcing compliance by third parties with this License. - - An "entity transaction" is a transaction transferring control of an -organization, or substantially all assets of one, or subdividing an -organization, or merging organizations. If propagation of a covered -work results from an entity transaction, each party to that -transaction who receives a copy of the work also receives whatever -licenses to the work the party's predecessor in interest had or could -give under the previous paragraph, plus a right to possession of the -Corresponding Source of the work from the predecessor in interest, if -the predecessor has it or can get it with reasonable efforts. - - You may not impose any further restrictions on the exercise of the -rights granted or affirmed under this License. For example, you may -not impose a license fee, royalty, or other charge for exercise of -rights granted under this License, and you may not initiate litigation -(including a cross-claim or counterclaim in a lawsuit) alleging that -any patent claim is infringed by making, using, selling, offering for -sale, or importing the Program or any portion of it. - - 11. Patents. - - A "contributor" is a copyright holder who authorizes use under this -License of the Program or a work on which the Program is based. The -work thus licensed is called the contributor's "contributor version". - - A contributor's "essential patent claims" are all patent claims -owned or controlled by the contributor, whether already acquired or -hereafter acquired, that would be infringed by some manner, permitted -by this License, of making, using, or selling its contributor version, -but do not include claims that would be infringed only as a -consequence of further modification of the contributor version. For -purposes of this definition, "control" includes the right to grant -patent sublicenses in a manner consistent with the requirements of -this License. - - Each contributor grants you a non-exclusive, worldwide, royalty-free -patent license under the contributor's essential patent claims, to -make, use, sell, offer for sale, import and otherwise run, modify and -propagate the contents of its contributor version. - - In the following three paragraphs, a "patent license" is any express -agreement or commitment, however denominated, not to enforce a patent -(such as an express permission to practice a patent or covenant not to -sue for patent infringement). To "grant" such a patent license to a -party means to make such an agreement or commitment not to enforce a -patent against the party. - - If you convey a covered work, knowingly relying on a patent license, -and the Corresponding Source of the work is not available for anyone -to copy, free of charge and under the terms of this License, through a -publicly available network server or other readily accessible means, -then you must either (1) cause the Corresponding Source to be so -available, or (2) arrange to deprive yourself of the benefit of the -patent license for this particular work, or (3) arrange, in a manner -consistent with the requirements of this License, to extend the patent -license to downstream recipients. "Knowingly relying" means you have -actual knowledge that, but for the patent license, your conveying the -covered work in a country, or your recipient's use of the covered work -in a country, would infringe one or more identifiable patents in that -country that you have reason to believe are valid. - - If, pursuant to or in connection with a single transaction or -arrangement, you convey, or propagate by procuring conveyance of, a -covered work, and grant a patent license to some of the parties -receiving the covered work authorizing them to use, propagate, modify -or convey a specific copy of the covered work, then the patent license -you grant is automatically extended to all recipients of the covered -work and works based on it. - - A patent license is "discriminatory" if it does not include within -the scope of its coverage, prohibits the exercise of, or is -conditioned on the non-exercise of one or more of the rights that are -specifically granted under this License. You may not convey a covered -work if you are a party to an arrangement with a third party that is -in the business of distributing software, under which you make payment -to the third party based on the extent of your activity of conveying -the work, and under which the third party grants, to any of the -parties who would receive the covered work from you, a discriminatory -patent license (a) in connection with copies of the covered work -conveyed by you (or copies made from those copies), or (b) primarily -for and in connection with specific products or compilations that -contain the covered work, unless you entered into that arrangement, -or that patent license was granted, prior to 28 March 2007. - - Nothing in this License shall be construed as excluding or limiting -any implied license or other defenses to infringement that may -otherwise be available to you under applicable patent law. - - 12. No Surrender of Others' Freedom. - - If conditions are imposed on you (whether by court order, agreement or -otherwise) that contradict the conditions of this License, they do not -excuse you from the conditions of this License. If you cannot convey a -covered work so as to satisfy simultaneously your obligations under this -License and any other pertinent obligations, then as a consequence you may -not convey it at all. For example, if you agree to terms that obligate you -to collect a royalty for further conveying from those to whom you convey -the Program, the only way you could satisfy both those terms and this -License would be to refrain entirely from conveying the Program. - - 13. Use with the GNU Affero General Public License. - - Notwithstanding any other provision of this License, you have -permission to link or combine any covered work with a work licensed -under version 3 of the GNU Affero General Public License into a single -combined work, and to convey the resulting work. The terms of this -License will continue to apply to the part which is the covered work, -but the special requirements of the GNU Affero General Public License, -section 13, concerning interaction through a network will apply to the -combination as such. - - 14. Revised Versions of this License. - - The Free Software Foundation may publish revised and/or new versions of -the GNU General Public License from time to time. Such new versions will -be similar in spirit to the present version, but may differ in detail to -address new problems or concerns. - - Each version is given a distinguishing version number. If the -Program specifies that a certain numbered version of the GNU General -Public License "or any later version" applies to it, you have the -option of following the terms and conditions either of that numbered -version or of any later version published by the Free Software -Foundation. If the Program does not specify a version number of the -GNU General Public License, you may choose any version ever published -by the Free Software Foundation. - - If the Program specifies that a proxy can decide which future -versions of the GNU General Public License can be used, that proxy's -public statement of acceptance of a version permanently authorizes you -to choose that version for the Program. - - Later license versions may give you additional or different -permissions. However, no additional obligations are imposed on any -author or copyright holder as a result of your choosing to follow a -later version. - - 15. Disclaimer of Warranty. - - THERE IS NO WARRANTY FOR THE PROGRAM, TO THE EXTENT PERMITTED BY -APPLICABLE LAW. EXCEPT WHEN OTHERWISE STATED IN WRITING THE COPYRIGHT -HOLDERS AND/OR OTHER PARTIES PROVIDE THE PROGRAM "AS IS" WITHOUT WARRANTY -OF ANY KIND, EITHER EXPRESSED OR IMPLIED, INCLUDING, BUT NOT LIMITED TO, -THE IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS FOR A PARTICULAR -PURPOSE. THE ENTIRE RISK AS TO THE QUALITY AND PERFORMANCE OF THE PROGRAM -IS WITH YOU. SHOULD THE PROGRAM PROVE DEFECTIVE, YOU ASSUME THE COST OF -ALL NECESSARY SERVICING, REPAIR OR CORRECTION. - - 16. Limitation of Liability. - - IN NO EVENT UNLESS REQUIRED BY APPLICABLE LAW OR AGREED TO IN WRITING -WILL ANY COPYRIGHT HOLDER, OR ANY OTHER PARTY WHO MODIFIES AND/OR CONVEYS -THE PROGRAM AS PERMITTED ABOVE, BE LIABLE TO YOU FOR DAMAGES, INCLUDING ANY -GENERAL, SPECIAL, INCIDENTAL OR CONSEQUENTIAL DAMAGES ARISING OUT OF THE -USE OR INABILITY TO USE THE PROGRAM (INCLUDING BUT NOT LIMITED TO LOSS OF -DATA OR DATA BEING RENDERED INACCURATE OR LOSSES SUSTAINED BY YOU OR THIRD -PARTIES OR A FAILURE OF THE PROGRAM TO OPERATE WITH ANY OTHER PROGRAMS), -EVEN IF SUCH HOLDER OR OTHER PARTY HAS BEEN ADVISED OF THE POSSIBILITY OF -SUCH DAMAGES. - - 17. Interpretation of Sections 15 and 16. - - If the disclaimer of warranty and limitation of liability provided -above cannot be given local legal effect according to their terms, -reviewing courts shall apply local law that most closely approximates -an absolute waiver of all civil liability in connection with the -Program, unless a warranty or assumption of liability accompanies a -copy of the Program in return for a fee. - - END OF TERMS AND CONDITIONS - - How to Apply These Terms to Your New Programs - - If you develop a new program, and you want it to be of the greatest -possible use to the public, the best way to achieve this is to make it -free software which everyone can redistribute and change under these terms. - - To do so, attach the following notices to the program. It is safest -to attach them to the start of each source file to most effectively -state the exclusion of warranty; and each file should have at least -the "copyright" line and a pointer to where the full notice is found. - - - Copyright (C) - - This program is free software: you can redistribute it and/or modify - it under the terms of the GNU General Public License as published by - the Free Software Foundation, either version 3 of the License, or - (at your option) any later version. - - This program is distributed in the hope that it will be useful, - but WITHOUT ANY WARRANTY; without even the implied warranty of - MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the - GNU General Public License for more details. - - You should have received a copy of the GNU General Public License - along with this program. If not, see . - -Also add information on how to contact you by electronic and paper mail. - - If the program does terminal interaction, make it output a short -notice like this when it starts in an interactive mode: - - Copyright (C) - This program comes with ABSOLUTELY NO WARRANTY; for details type `show w'. - This is free software, and you are welcome to redistribute it - under certain conditions; type `show c' for details. - -The hypothetical commands `show w' and `show c' should show the appropriate -parts of the General Public License. Of course, your program's commands -might be different; for a GUI interface, you would use an "about box". - - You should also get your employer (if you work as a programmer) or school, -if any, to sign a "copyright disclaimer" for the program, if necessary. -For more information on this, and how to apply and follow the GNU GPL, see -. - - The GNU General Public License does not permit incorporating your program -into proprietary programs. If your program is a subroutine library, you -may consider it more useful to permit linking proprietary applications with -the library. If this is what you want to do, use the GNU Lesser General -Public License instead of this License. But first, please read -. diff --git a/templates/cxxWithXmake/flake.lock b/templates/cxxWithXmake/flake.lock deleted file mode 100644 index 5011e13..0000000 --- a/templates/cxxWithXmake/flake.lock +++ /dev/null @@ -1,61 +0,0 @@ -{ - "nodes": { - "flake-utils": { - "inputs": { - "systems": "systems" - }, - "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" - } - }, - "nixpkgs": { - "locked": { - "lastModified": 1746300365, - "narHash": "sha256-thYTdWqCRipwPRxWiTiH1vusLuAy0okjOyzRx4hLWh4=", - "owner": "NixOS", - "repo": "nixpkgs", - "rev": "f21e4546e3ede7ae34d12a84602a22246b31f7e0", - "type": "github" - }, - "original": { - "owner": "NixOS", - "ref": "nixpkgs-unstable", - "repo": "nixpkgs", - "type": "github" - } - }, - "root": { - "inputs": { - "flake-utils": "flake-utils", - "nixpkgs": "nixpkgs" - } - }, - "systems": { - "locked": { - "lastModified": 1681028828, - "narHash": "sha256-Vy1rq5AaRuLzOxct8nz4T6wlgyUR7zLU309k9mBC768=", - "owner": "nix-systems", - "repo": "default", - "rev": "da67096a3b9bf56a91d16901293e51ba5b49a27e", - "type": "github" - }, - "original": { - "owner": "nix-systems", - "repo": "default", - "type": "github" - } - } - }, - "root": "root", - "version": 7 -} diff --git a/templates/cxxWithXmake/flake.nix b/templates/cxxWithXmake/flake.nix deleted file mode 100644 index f8d4ff5..0000000 --- a/templates/cxxWithXmake/flake.nix +++ /dev/null @@ -1,61 +0,0 @@ -{ - inputs = { - nixpkgs.url = "github:NixOS/nixpkgs/nixpkgs-unstable"; - flake-utils = { - url = "github:numtide/flake-utils"; - }; - }; - outputs = - { - self, - flake-utils, - nixpkgs, - ... - }: - flake-utils.lib.eachDefaultSystem ( - system: - let - pkgs = import nixpkgs { - inherit system; - }; - in - { - formatter = pkgs.alejandra; - checks = { - inherit (self.packages.${system}) default; - }; - devShells.default = pkgs.mkShell { - inputsFrom = [ ] ++ (builtins.attrValues self.checks.${system}); - packages = with pkgs; [ - clang-tools - ]; - }; - packages = rec { - cxx-demo = pkgs.stdenv.mkDerivation { - pname = "cxx-demo"; - version = "unstable"; - src = ./.; - strictDeps = true; - nativeBuildInputs = with pkgs; [ - xmake - gnumake - ]; - preConfigure = '' - xmake config -m release - xmake project -k xmakefile - ''; - env = { - INSTALLDIR = "${placeholder "out"}"; - NIX_DEBUG = 1; - V = 1; - D = 1; - }; - }; - default = cxx-demo; - }; - } - ); - nixConfig = { - keepOutputs = true; - }; -} diff --git a/templates/cxxWithXmake/src/main.cxx b/templates/cxxWithXmake/src/main.cxx deleted file mode 100644 index 43b359a..0000000 --- a/templates/cxxWithXmake/src/main.cxx +++ /dev/null @@ -1,6 +0,0 @@ -#include - -auto main(int /*argc*/, char** /*argv*/) -> int { - std::println("Hello, {}!", "World"); - return 0; -} diff --git a/templates/cxxWithXmake/xmake.lua b/templates/cxxWithXmake/xmake.lua deleted file mode 100644 index b10030e..0000000 --- a/templates/cxxWithXmake/xmake.lua +++ /dev/null @@ -1,76 +0,0 @@ -add_rules("mode.debug", "mode.release") -set_languages("c++26") -set_warnings("all", "error") - -target("cxx-demo") -set_kind("binary") -add_files("src/*.cxx") - --- --- If you want to known more usage about xmake, please see https://xmake.io --- --- ## FAQ --- --- You can enter the project directory firstly before building project. --- --- $ cd projectdir --- --- 1. How to build project? --- --- $ xmake --- --- 2. How to configure project? --- --- $ xmake f -p [macosx|linux|iphoneos ..] -a [x86_64|i386|arm64 ..] -m [debug|release] --- --- 3. Where is the build output directory? --- --- The default output directory is `./build` and you can configure the output directory. --- --- $ xmake f -o outputdir --- $ xmake --- --- 4. How to run and debug target after building project? --- --- $ xmake run [targetname] --- $ xmake run -d [targetname] --- --- 5. How to install target to the system directory or other output directory? --- --- $ xmake install --- $ xmake install -o installdir --- --- 6. Add some frequently-used compilation flags in xmake.lua --- --- @code --- -- add debug and release modes --- add_rules("mode.debug", "mode.release") --- --- -- add macro definition --- add_defines("NDEBUG", "_GNU_SOURCE=1") --- --- -- set warning all as error --- set_warnings("all", "error") --- --- -- set language: c99, c++11 --- set_languages("c99", "c++11") --- --- -- set optimization: none, faster, fastest, smallest --- set_optimize("fastest") --- --- -- add include search directories --- add_includedirs("/usr/include", "/usr/local/include") --- --- -- add link libraries and search directories --- add_links("tbox") --- add_linkdirs("/usr/local/lib", "/usr/lib") --- --- -- add system link libraries --- add_syslinks("z", "pthread") --- --- -- add compilation and link flags --- add_cxflags("-stdnolib", "-fno-strict-aliasing") --- add_ldflags("-L/usr/local/lib", "-lpthread", {force = true}) --- --- @endcode --- diff --git a/templates/default.nix b/templates/default.nix index c781381..f157840 100644 --- a/templates/default.nix +++ b/templates/default.nix @@ -7,10 +7,6 @@ path = ./cxx; description = "C++ template."; }; - cxxWithXmake = { - path = ./cxxWithXmake; - description = "C++ template built by xmake."; - }; python = { path = ./python; description = "Python template."; diff --git a/templates/python/flake.nix b/templates/python/flake.nix index 56828e2..6eb7348 100644 --- a/templates/python/flake.nix +++ b/templates/python/flake.nix @@ -16,7 +16,7 @@ let inherit (pkgs) lib; pkgs = import nixpkgs { - inherit system; + localSystem = { inherit system; }; config = { cudaSupport = true; allowUnfree = true; diff --git a/templates/rust/flake.nix b/templates/rust/flake.nix index f4c8e45..f5b39d8 100644 --- a/templates/rust/flake.nix +++ b/templates/rust/flake.nix @@ -40,7 +40,7 @@ let inherit (pkgs) lib; pkgs = import nixpkgs { - inherit system; + localSystem = { inherit system; }; overlays = [ (import rust-overlay) (_final: prev: {