From 68bfe174b9d442c3d31cec0b9e6a8e30b49d25fe Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Jalil=20David=20Salam=C3=A9=20Messina?= Date: Sat, 8 Jun 2024 22:49:32 +0200 Subject: [PATCH 1/4] [fix] flake.nix: track upstream stylix [stylix/#244][1] has been merged so I can finally stop using my fork (also I deleted that branch so it broke :p). [1]: --- flake.lock | 12 ++++++------ flake.nix | 2 +- 2 files changed, 7 insertions(+), 7 deletions(-) diff --git a/flake.lock b/flake.lock index 2c02604..c24cf11 100644 --- a/flake.lock +++ b/flake.lock @@ -507,16 +507,16 @@ ] }, "locked": { - "lastModified": 1717250350, - "narHash": "sha256-l7y55WbUrj4NVCzgo3GLmM1Z2HC2uLb8dLUt7FxfI5g=", - "owner": "jalil-salame", + "lastModified": 1718122552, + "narHash": "sha256-A+dBkSwp8ssHKV/WyXb9uqIYrHBqHvtSedU24Lq9lqw=", + "owner": "danth", "repo": "stylix", - "rev": "03a8c7744903f29f017fabeda833834bd873f956", + "rev": "e59d2c1725b237c362e4a62f5722f5b268d566c7", "type": "github" }, "original": { - "owner": "jalil-salame", - "ref": "enable-option", + "owner": "danth", + "ref": "release-24.05", "repo": "stylix", "type": "github" } diff --git a/flake.nix b/flake.nix index 6769b60..85d47f6 100644 --- a/flake.nix +++ b/flake.nix @@ -36,7 +36,7 @@ nixos-hardware.url = "github:NixOS/nixos-hardware"; # FIXME: pin to 24.05 when avalialble stylix = { - url = "github:jalil-salame/stylix/enable-option"; + url = "github:danth/stylix/release-24.05"; inputs = { nixpkgs.follows = "nixpkgs"; home-manager.follows = "home-manager"; -- 2.47.0 From dcd30e116b83e5db83e45f55426e7c1a69c3994e Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Jalil=20David=20Salam=C3=A9=20Messina?= Date: Fri, 14 Jun 2024 23:26:09 +0200 Subject: [PATCH 2/4] [fix] flake.nix: minor input adjustments --- flake.nix | 3 +-- 1 file changed, 1 insertion(+), 2 deletions(-) diff --git a/flake.nix b/flake.nix index 85d47f6..d4fbb21 100644 --- a/flake.nix +++ b/flake.nix @@ -78,7 +78,6 @@ jpassmenu, audiomenu, nixvim, - lix, lix-module, ... }: let @@ -213,7 +212,7 @@ (import ./system {inherit stylix;}) home-manager.nixosModules.home-manager ] - ++ nixpkgs.lib.optional (lix != null && lix-module != null) lix-module.nixosModules.default; + ++ nixpkgs.lib.optional (lix-module != null) lix-module.nixosModules.default; home-manager = { useGlobalPkgs = true; useUserPackages = true; -- 2.47.0 From f30f93283eb15d6e3e57a41421f8404c2428ba6b Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Jalil=20David=20Salam=C3=A9=20Messina?= Date: Fri, 14 Jun 2024 23:39:15 +0200 Subject: [PATCH 3/4] [chore] flake.lock: Update inputs MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit • Updated input 'lix': 'https://git.lix.systems/api/v1/repos/lix-project/lix/archive/4f94531209510c7d580e525a017ea01f18894ded.tar.gz?narHash=sha256-cxK0tBbUxXtIYKLbjHpH%2BswiIzEoj61c82I/pN/yBoE%3D' (2024-06-07) → 'https://git.lix.systems/api/v1/repos/lix-project/lix/archive/068576042b3b58f8180b24a36c07199a1a3fd380.tar.gz?narHash=sha256-/hsqsiw3p5qMpazedgFFZF2sQghbCJIoef7XCpegTXw%3D' (2024-06-13) • Updated input 'nixos-hardware': 'github:NixOS/nixos-hardware/d6c6cf6f5fead4057d8fb2d5f30aa8ac1727f177' (2024-06-05) → 'github:NixOS/nixos-hardware/ae5c8dcc4d0182d07d75df2dc97112de822cb9d6' (2024-06-14) • Updated input 'nixpkgs': 'github:NixOS/nixpkgs/0b8e7a1ae5a94da2e1ee3f3030a32020f6254105' (2024-06-05) → 'github:NixOS/nixpkgs/cc54fb41d13736e92229c21627ea4f22199fee6b' (2024-06-12) • Updated input 'nixvim': 'github:nix-community/nixvim/36f2e51b28ee3389a67ed5e9ed5c4bd388b06918' (2024-06-06) → 'github:nix-community/nixvim/7a2a25af02be25987aa43cd681312f4b5ba12317' (2024-06-14) • Updated input 'nixvim/treefmt-nix': 'github:numtide/treefmt-nix/3eb96ca1ae9edf792a8e0963cc92fddfa5a87706' (2024-06-01) → 'github:numtide/treefmt-nix/1cb529bffa880746a1d0ec4e0f5076876af931f1' (2024-06-11) • Updated input 'unstable': 'github:NixOS/nixpkgs/e8057b67ebf307f01bdcc8fba94d94f75039d1f6' (2024-06-05) → 'github:NixOS/nixpkgs/e9ee548d90ff586a6471b4ae80ae9cfcbceb3420' (2024-06-13) --- flake.lock | 38 +++++++++++++++++++------------------- 1 file changed, 19 insertions(+), 19 deletions(-) diff --git a/flake.lock b/flake.lock index c24cf11..01f0ba9 100644 --- a/flake.lock +++ b/flake.lock @@ -371,11 +371,11 @@ "lix": { "flake": false, "locked": { - "lastModified": 1717732411, - "narHash": "sha256-cxK0tBbUxXtIYKLbjHpH+swiIzEoj61c82I/pN/yBoE=", - "rev": "4f94531209510c7d580e525a017ea01f18894ded", + "lastModified": 1718316862, + "narHash": "sha256-/hsqsiw3p5qMpazedgFFZF2sQghbCJIoef7XCpegTXw=", + "rev": "068576042b3b58f8180b24a36c07199a1a3fd380", "type": "tarball", - "url": "https://git.lix.systems/api/v1/repos/lix-project/lix/archive/4f94531209510c7d580e525a017ea01f18894ded.tar.gz" + "url": "https://git.lix.systems/api/v1/repos/lix-project/lix/archive/068576042b3b58f8180b24a36c07199a1a3fd380.tar.gz" }, "original": { "type": "tarball", @@ -409,11 +409,11 @@ }, "nixos-hardware": { "locked": { - "lastModified": 1717574423, - "narHash": "sha256-cz3P5MZffAHwL2IQaNzsqUBsJS+u0J/AAwArHMAcCa0=", + "lastModified": 1718349360, + "narHash": "sha256-SuPne4BMqh9/IkKIAG47Cu5qfmntAaqlHdX1yuFoDO0=", "owner": "NixOS", "repo": "nixos-hardware", - "rev": "d6c6cf6f5fead4057d8fb2d5f30aa8ac1727f177", + "rev": "ae5c8dcc4d0182d07d75df2dc97112de822cb9d6", "type": "github" }, "original": { @@ -424,11 +424,11 @@ }, "nixpkgs": { "locked": { - "lastModified": 1717555607, - "narHash": "sha256-WZ1s48OODmRJ3DHC+I/DtM3tDRuRJlNqMvxvAPTD7ec=", + "lastModified": 1718208800, + "narHash": "sha256-US1tAChvPxT52RV8GksWZS415tTS7PV42KTc2PNDBmc=", "owner": "NixOS", "repo": "nixpkgs", - "rev": "0b8e7a1ae5a94da2e1ee3f3030a32020f6254105", + "rev": "cc54fb41d13736e92229c21627ea4f22199fee6b", "type": "github" }, "original": { @@ -458,11 +458,11 @@ "treefmt-nix": "treefmt-nix" }, "locked": { - "lastModified": 1717681257, - "narHash": "sha256-0PhFvfc4wDjba1cus2ALsfn0wVizeKkcuF+aqvDJivg=", + "lastModified": 1718376125, + "narHash": "sha256-NIJZxmY2CWsqJK/9BQCRSHfcCY9K6thjq/1XtJobxmU=", "owner": "nix-community", "repo": "nixvim", - "rev": "36f2e51b28ee3389a67ed5e9ed5c4bd388b06918", + "rev": "7a2a25af02be25987aa43cd681312f4b5ba12317", "type": "github" }, "original": { @@ -544,11 +544,11 @@ ] }, "locked": { - "lastModified": 1717278143, - "narHash": "sha256-u10aDdYrpiGOLoxzY/mJ9llST9yO8Q7K/UlROoNxzDw=", + "lastModified": 1718139168, + "narHash": "sha256-1TZQcdETNdJMcfwwoshVeCjwWfrPtkSQ8y8wFX3it7k=", "owner": "numtide", "repo": "treefmt-nix", - "rev": "3eb96ca1ae9edf792a8e0963cc92fddfa5a87706", + "rev": "1cb529bffa880746a1d0ec4e0f5076876af931f1", "type": "github" }, "original": { @@ -559,11 +559,11 @@ }, "unstable": { "locked": { - "lastModified": 1717602782, - "narHash": "sha256-pL9jeus5QpX5R+9rsp3hhZ+uplVHscNJh8n8VpqscM0=", + "lastModified": 1718318537, + "narHash": "sha256-4Zu0RYRcAY/VWuu6awwq4opuiD//ahpc2aFHg2CWqFY=", "owner": "NixOS", "repo": "nixpkgs", - "rev": "e8057b67ebf307f01bdcc8fba94d94f75039d1f6", + "rev": "e9ee548d90ff586a6471b4ae80ae9cfcbceb3420", "type": "github" }, "original": { -- 2.47.0 From 63f529704d10c256fa0a59dcef18a934392acf9c Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Jalil=20David=20Salam=C3=A9=20Messina?= Date: Fri, 14 Jun 2024 23:46:38 +0200 Subject: [PATCH 4/4] [fix] nixvim: rollback to nixpkgs-stable See [nixvim/#1699][1] for context. [1]: --- flake.lock | 2 +- flake.nix | 4 +++- nvim/plugins.nix | 4 ++-- 3 files changed, 6 insertions(+), 4 deletions(-) diff --git a/flake.lock b/flake.lock index 01f0ba9..124c48f 100644 --- a/flake.lock +++ b/flake.lock @@ -453,7 +453,7 @@ ], "nix-darwin": [], "nixpkgs": [ - "unstable" + "nixpkgs" ], "treefmt-nix": "treefmt-nix" }, diff --git a/flake.nix b/flake.nix index d4fbb21..96a26cc 100644 --- a/flake.nix +++ b/flake.nix @@ -45,7 +45,9 @@ nixvim = { url = "github:nix-community/nixvim"; inputs = { - nixpkgs.follows = "unstable"; + # Disable until fixed upstream: https://github.com/nix-community/nixvim/issues/1699 + # nixpkgs.follows = "unstable"; + nixpkgs.follows = "nixpkgs"; devshell.follows = "devshell"; nix-darwin.follows = ""; # disable MacOS stuff home-manager.follows = "home-manager"; diff --git a/nvim/plugins.nix b/nvim/plugins.nix index 1732580..056af9a 100644 --- a/nvim/plugins.nix +++ b/nvim/plugins.nix @@ -134,13 +134,13 @@ enable = true; servers = { bashls.enable = true; - # clangd.enable = true; + # clangd.enable = true; # Adds ~2GiB html.enable = true; jsonls.enable = true; nil-ls.enable = true; ruff-lsp.enable = true; taplo.enable = true; - texlab.enable = true; + # texlab.enable = true; # Not writing TeX rn typos-lsp.enable = true; typst-lsp.enable = true; }; -- 2.47.0