jalil/configuration.nix
1
1
Fork 0
Code Issues 1 Pull requests Projects Activity Actions

Update lockfile and fix silicon issues #56

Merged
jalil merged 2 commits from update-fix-silicon into main 2024-08-16 22:27:28 +02:00
Conversation 0 Commits 2 Files changed 3 +14 -12
3 changed files with 14 additions and 12 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

20
flake.lock
View file

@ -320,7 +320,7 @@
"narHash": "sha256-Rosl9iA9MybF5Bud4BTAQ9adbY81aGmPfV8dDBGl34s=", "narHash": "sha256-Rosl9iA9MybF5Bud4BTAQ9adbY81aGmPfV8dDBGl34s=",
"rev": "bcaeb6388b8916ac6d1736e3aa2b13313e6a6bd2", "rev": "bcaeb6388b8916ac6d1736e3aa2b13313e6a6bd2",
"type": "tarball", "type": "tarball",
"url": "https://git.lix.systems/api/v1/repos/lix-project/lix/archive/bcaeb6388b8916ac6d1736e3aa2b13313e6a6bd2.tar.gz" "url": "https://git.lix.systems/api/v1/repos/lix-project/lix/archive/bcaeb6388b8916ac6d1736e3aa2b13313e6a6bd2.tar.gz?rev=bcaeb6388b8916ac6d1736e3aa2b13313e6a6bd2"
}, },
"original": { "original": {
"type": "tarball", "type": "tarball",
@ -350,11 +350,11 @@
}, },
"nixpkgs": { "nixpkgs": {
"locked": { "locked": {
"lastModified": 1723556749, "lastModified": 1723688146,
"narHash": "sha256-+CHVZnTnIYRLYsARInHYoWkujzcRkLY/gXm3s5bE52o=", "narHash": "sha256-sqLwJcHYeWLOeP/XoLwAtYjr01TISlkOfz+NG82pbdg=",
"owner": "NixOS", "owner": "NixOS",
"repo": "nixpkgs", "repo": "nixpkgs",
"rev": "4a92571f9207810b559c9eac203d1f4d79830073", "rev": "c3d4ac725177c030b1e289015989da2ad9d56af0",
"type": "github" "type": "github"
}, },
"original": { "original": {
@ -383,11 +383,11 @@
"treefmt-nix": "treefmt-nix" "treefmt-nix": "treefmt-nix"
}, },
"locked": { "locked": {
"lastModified": 1723481641, "lastModified": 1723816538,
"narHash": "sha256-9djT72/Ab2E3SpUbB3l0WmqZQ5mj05+LIVoorcjCWgE=", "narHash": "sha256-h37ltjdifkd7iLtMtBXSBBeYSTuBEKMW6ClFoC7nReQ=",
"owner": "nix-community", "owner": "nix-community",
"repo": "nixvim", "repo": "nixvim",
"rev": "dbf6f7bc997dc3a9ab1f014ea075600357226950", "rev": "00f32f0430f82c74919c72af84bc95bf5ae434e4",
"type": "github" "type": "github"
}, },
"original": { "original": {
@ -502,11 +502,11 @@
}, },
"unstable": { "unstable": {
"locked": { "locked": {
"lastModified": 1723599198, "lastModified": 1723764322,
"narHash": "sha256-kFB8EB7ne/ujWIa7pY6UmcwbGfwUCL6NTGJrglWva40=", "narHash": "sha256-1V4C7f7sUjslxreqbpvBzitl9I2nY7nOrR17DjnatcU=",
"owner": "NixOS", "owner": "NixOS",
"repo": "nixpkgs", "repo": "nixpkgs",
"rev": "5a1fae64da2be3d09a8f289c6257146997827d1d", "rev": "03bd12dcf88b6aabc047fbf909bda4c7e344416c",
"type": "github" "type": "github"
}, },
"original": { "original": {

3
flake.nix
View file

@ -129,6 +129,7 @@
{ {
# Get unstable packages # Get unstable packages
unstable = unstablePkgs; unstable = unstablePkgs;
# Update vim plugins with the versions from unstable # Update vim plugins with the versions from unstable
vimPlugins = prev.vimPlugins // unstablePkgs.vimPlugins; vimPlugins = prev.vimPlugins // unstablePkgs.vimPlugins;
# Get specific packages from unstable # Get specific packages from unstable
@ -228,7 +229,7 @@
devShells = forEachSupportedSystem ( devShells = forEachSupportedSystem (
{ pkgs, system }: { pkgs, system }:
{ {
default = pkgs.mkShell { default = pkgs.mkShellNoCC {
buildInputs = [ buildInputs = [
pkgs.just pkgs.just
self.packages.${system}.nvim self.packages.${system}.nvim

3
nvim/standalone.nix
View file

@ -53,7 +53,8 @@
]; ];
# Formatting & linters # Formatting & linters
extraPackages = [ extraPackages = [
pkgs.unstable.silicon # Rust 1.80.0 broke it, waiting for https://github.com/Aloxaf/silicon/pull/254 to be accepted
pkgs.silicon
pkgs.unstable.alejandra pkgs.unstable.alejandra
pkgs.unstable.luajitPackages.jsregexp pkgs.unstable.luajitPackages.jsregexp
pkgs.unstable.statix pkgs.unstable.statix