From 35cfa1a174ba9793c50d6e4a4964c3b2964d0438 Mon Sep 17 00:00:00 2001 From: buffet Date: Wed, 26 Jun 2024 10:17:39 +0200 Subject: [PATCH 1/3] feat: install libclang --- users/buffet/default.nix | 3 ++- 1 file changed, 2 insertions(+), 1 deletion(-) diff --git a/users/buffet/default.nix b/users/buffet/default.nix index 0b6b1b3..1dff4c4 100644 --- a/users/buffet/default.nix +++ b/users/buffet/default.nix @@ -57,7 +57,6 @@ du-dust element-desktop-wayland fd - libllvm fx gdb github-cli @@ -67,6 +66,8 @@ hyperfine jq kcachegrind + libclang + libllvm linuxPackages.perf man-pages man-pages-posix From 34de1d3bb7296a56da2d7db627987138dc3c8901 Mon Sep 17 00:00:00 2001 From: buffet Date: Wed, 26 Jun 2024 12:37:32 +0200 Subject: [PATCH 2/3] fix: use proper lix module, remove electron based apps --- flake.lock | 38 +++++++++++++++----------------------- flake.nix | 8 +------- users/buffet/default.nix | 2 -- 3 files changed, 16 insertions(+), 32 deletions(-) diff --git a/flake.lock b/flake.lock index eabbf09..5799bbc 100644 --- a/flake.lock +++ b/flake.lock @@ -165,18 +165,15 @@ "lix": { "flake": false, "locked": { - "lastModified": 1714955862, - "narHash": "sha256-REWlo2RYHfJkxnmZTEJu3Cd/2VM+wjjpPy7Xi4BdDTQ=", - "ref": "refs/tags/2.90-beta.1", - "rev": "b6799ab0374a8e1907a48915d3187e07da41d88c", - "revCount": 15501, - "type": "git", - "url": "https://git@git.lix.systems/lix-project/lix" + "lastModified": 1718419213, + "narHash": "sha256-WY7BGnu5PnbK4O8cKKv9kvxwzZIGbIQUQLGPHFXitI0=", + "rev": "253546d5fbf8a5aa60ac8164c1b4f5794dc4e9d1", + "type": "tarball", + "url": "https://git.lix.systems/api/v1/repos/lix-project/lix/archive/253546d5fbf8a5aa60ac8164c1b4f5794dc4e9d1.tar.gz" }, "original": { - "ref": "refs/tags/2.90-beta.1", - "type": "git", - "url": "https://git@git.lix.systems/lix-project/lix" + "type": "tarball", + "url": "https://git.lix.systems/lix-project/lix/archive/2.90.0-rc1.tar.gz" } }, "lix-module": { @@ -185,25 +182,21 @@ "flake-utils" ], "flakey-profile": "flakey-profile", - "lix": [ - "lix" - ], + "lix": "lix", "nixpkgs": [ "nixpkgs" ] }, "locked": { - "lastModified": 1718778751, - "narHash": "sha256-DdcMvX9r29uHMlz7P1Shgs5xZw9WkZ4ObMGYzwROAiw=", - "ref": "refs/heads/main", - "rev": "909e593ae9f5fe338ab19b4ed9d52bb0ea09bad8", - "revCount": 90, - "type": "git", - "url": "https://git.lix.systems/lix-project/nixos-module" + "lastModified": 1718778548, + "narHash": "sha256-64lB/NO6AQ6z6EDCemPSYZWX/Qc6Rt04cPia5T5v01g=", + "rev": "29ed1bb67751e5b107d08df35d18dda6d45324e9", + "type": "tarball", + "url": "https://git.lix.systems/api/v1/repos/lix-project/nixos-module/archive/29ed1bb67751e5b107d08df35d18dda6d45324e9.tar.gz" }, "original": { - "type": "git", - "url": "https://git.lix.systems/lix-project/nixos-module" + "type": "tarball", + "url": "https://git.lix.systems/lix-project/nixos-module/archive/2.90.0-rc1.tar.gz" } }, "nix-index-database": { @@ -319,7 +312,6 @@ "disko": "disko", "flake-utils": "flake-utils", "home-manager": "home-manager", - "lix": "lix", "lix-module": "lix-module", "nix-index-database": "nix-index-database", "nixos-hardware": "nixos-hardware", diff --git a/flake.nix b/flake.nix index 369e71c..e8cb716 100644 --- a/flake.nix +++ b/flake.nix @@ -41,16 +41,10 @@ inputs.nixpkgs.follows = "nixpkgs"; }; - lix = { - url = "git+https://git@git.lix.systems/lix-project/lix?ref=refs/tags/2.90-beta.1"; - flake = false; - }; - lix-module = { - url = "git+https://git.lix.systems/lix-project/nixos-module"; + url = "https://git.lix.systems/lix-project/nixos-module/archive/2.90.0-rc1.tar.gz"; inputs = { flake-utils.follows = "flake-utils"; - lix.follows = "lix"; nixpkgs.follows = "nixpkgs"; }; }; diff --git a/users/buffet/default.nix b/users/buffet/default.nix index 1dff4c4..8a5362b 100644 --- a/users/buffet/default.nix +++ b/users/buffet/default.nix @@ -49,13 +49,11 @@ unstable.cargo-nextest unstable.cargo-watch unstable.clippy - unstable.logseq unstable.rustfmt alejandra clang du-dust - element-desktop-wayland fd fx gdb From 5d17ee23ccfd393175ddcf7df9b1889049b371cc Mon Sep 17 00:00:00 2001 From: buffet Date: Wed, 26 Jun 2024 12:40:00 +0200 Subject: [PATCH 3/3] fix: use devShells.default instead of deprecated devShell --- flake.nix | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/flake.nix b/flake.nix index e8cb716..5620e9d 100644 --- a/flake.nix +++ b/flake.nix @@ -110,7 +110,7 @@ }; }; - devShell = nixpkgs.legacyPackages.${system}.mkShell { + devShells.default = nixpkgs.legacyPackages.${system}.mkShell { inherit (self.checks.${system}.pre-commit-check) shellHook; buildInputs = self.checks.${system}.pre-commit-check.enabledPackages; };