diff --git a/flake.lock b/flake.lock index f4724d7..9525d73 100644 --- a/flake.lock +++ b/flake.lock @@ -70,7 +70,9 @@ }, "lix-module": { "inputs": { - "flake-utils": "flake-utils", + "flake-utils": [ + "flake-utils" + ], "flakey-profile": "flakey-profile", "lix": "lix", "nixpkgs": [ @@ -123,11 +125,11 @@ "xwayland-satellite-unstable": "xwayland-satellite-unstable" }, "locked": { - "lastModified": 1749144707, - "narHash": "sha256-JcSmySCB3pOtzeWMaEksZgaiNedEDIC6qyBezkK+92Q=", + "lastModified": 1749890123, + "narHash": "sha256-pRkyWFytGAMaHlrOJIYYEur8NRDe0kTfMIhRdTeasRQ=", "owner": "sodiboo", "repo": "niri-flake", - "rev": "32d49ef427be377c82d32ce74ff3082c2c992199", + "rev": "8f39eb82488525728eda222b34e79b1ecf6d3f96", "type": "github" }, "original": { @@ -156,11 +158,11 @@ "niri-unstable": { "flake": false, "locked": { - "lastModified": 1749112952, - "narHash": "sha256-ajI1cXa2AgdZSELvlVaQZd0XMi4eM8H3Ys0Ek8a/roI=", + "lastModified": 1749797708, + "narHash": "sha256-P5x0U6AW5Zn20bARv4D83d8XlNaWK1st9QwBfSe+Vfg=", "owner": "YaLTeR", "repo": "niri", - "rev": "242ebf294514cc22f4f9d83c0566c8ffe1cb8d8a", + "rev": "f3f6e79eeca8924ff9cfea4b30006e5b782bc93e", "type": "github" }, "original": { @@ -184,28 +186,36 @@ "type": "github" } }, - "nix-filter_2": { + "nix-vscode-extensions": { + "inputs": { + "flake-utils": [ + "flake-utils" + ], + "nixpkgs": [ + "nixpkgs" + ] + }, "locked": { - "lastModified": 1731533336, - "narHash": "sha256-oRam5PS1vcrr5UPgALW0eo1m/5/pls27Z/pabHNy2Ms=", - "owner": "numtide", - "repo": "nix-filter", - "rev": "f7653272fd234696ae94229839a99b73c9ab7de0", + "lastModified": 1749953646, + "narHash": "sha256-NwuPVQfAbrq46nAtjz9MIQ3XLK6f9OLzgY8hJlQKS/8=", + "owner": "nix-community", + "repo": "nix-vscode-extensions", + "rev": "459503794a816b2d9038fc0c9181805acf45bafb", "type": "github" }, "original": { - "owner": "numtide", - "repo": "nix-filter", + "owner": "nix-community", + "repo": "nix-vscode-extensions", "type": "github" } }, "nixpkgs": { "locked": { - "lastModified": 1749086602, - "narHash": "sha256-DJcgJMekoxVesl9kKjfLPix2Nbr42i7cpEHJiTnBUwU=", + "lastModified": 1749727998, + "narHash": "sha256-mHv/yeUbmL91/TvV95p+mBVahm9mdQMJoqaTVTALaFw=", "owner": "NixOS", "repo": "nixpkgs", - "rev": "4792576cb003c994bd7cc1edada3129def20b27d", + "rev": "fd487183437963a59ba763c0cc4f27e3447dd6dd", "type": "github" }, "original": { @@ -217,11 +227,11 @@ }, "nixpkgs-unstable": { "locked": { - "lastModified": 1749174413, - "narHash": "sha256-urN9UMK5cd1dzhR+Lx0xHeTgBp2MatA5+6g9JaxjuQs=", + "lastModified": 1749871736, + "narHash": "sha256-K9yBph93OLTNw02Q6e9CYFGrUhvEXnh45vrZqIRWfvQ=", "owner": "NixOS", "repo": "nixpkgs", - "rev": "6ad174a6dc07c7742fc64005265addf87ad08615", + "rev": "6afe187897bef7933475e6af374c893f4c84a293", "type": "github" }, "original": { @@ -233,10 +243,13 @@ }, "root": { "inputs": { + "flake-utils": "flake-utils", "home-manager": "home-manager", "lix-module": "lix-module", "naersk": "naersk", "niri": "niri", + "nix-filter": "nix-filter", + "nix-vscode-extensions": "nix-vscode-extensions", "nixpkgs": "nixpkgs", "nixpkgs-unstable": "nixpkgs-unstable", "servicepoint-cli": "servicepoint-cli", @@ -249,7 +262,9 @@ "naersk": [ "naersk" ], - "nix-filter": "nix-filter", + "nix-filter": [ + "nix-filter" + ], "nixpkgs": [ "nixpkgs" ] @@ -273,7 +288,9 @@ "naersk": [ "naersk" ], - "nix-filter": "nix-filter_2", + "nix-filter": [ + "nix-filter" + ], "nixpkgs": [ "nixpkgs" ] @@ -327,11 +344,11 @@ "xwayland-satellite-unstable": { "flake": false, "locked": { - "lastModified": 1748488455, - "narHash": "sha256-IiLr1alzKFIy5tGGpDlabQbe6LV1c9ABvkH6T5WmyRI=", + "lastModified": 1749315541, + "narHash": "sha256-bEik1BfVOFnWvtOrcOHluos/edJ8f+G2y1QySbt/0Ak=", "owner": "Supreeeme", "repo": "xwayland-satellite", - "rev": "3ba30b149f9eb2bbf42cf4758d2158ca8cceef73", + "rev": "da2ecb5be816de35e2efe23a408a1c49fe8b11ba", "type": "github" }, "original": { diff --git a/flake.nix b/flake.nix index bafecdc..1791bbb 100644 --- a/flake.nix +++ b/flake.nix @@ -11,7 +11,10 @@ lix-module = { url = "https://git.lix.systems/lix-project/nixos-module/archive/2.93.0.tar.gz"; - inputs.nixpkgs.follows = "nixpkgs"; + inputs = { + nixpkgs.follows = "nixpkgs"; + flake-utils.follows = "flake-utils"; + }; }; niri = { @@ -32,15 +35,33 @@ servicepoint-cli = { url = "git+https://git.berlin.ccc.de/servicepoint/servicepoint-cli.git"; - inputs.nixpkgs.follows = "nixpkgs"; - inputs.naersk.follows = "naersk"; + inputs = { + nixpkgs.follows = "nixpkgs"; + naersk.follows = "naersk"; + nix-filter.follows = "nix-filter"; + }; }; servicepoint-simulator = { url = "git+https://git.berlin.ccc.de/servicepoint/servicepoint-simulator.git"; - inputs.nixpkgs.follows = "nixpkgs"; - inputs.naersk.follows = "naersk"; + inputs = { + nixpkgs.follows = "nixpkgs"; + naersk.follows = "naersk"; + nix-filter.follows = "nix-filter"; + }; }; + + nix-vscode-extensions = { + url = "github:nix-community/nix-vscode-extensions"; + inputs = { + nixpkgs.follows = "nixpkgs"; + flake-utils.follows = "flake-utils"; + }; + }; + + # this is used to pin transitive dependencies to the same version + flake-utils.url = "github:numtide/flake-utils"; + nix-filter.url = "github:numtide/nix-filter"; }; outputs = @@ -55,6 +76,8 @@ servicepoint-cli, servicepoint-simulator, naersk, + nix-vscode-extensions, + ... }: let devices = { @@ -113,6 +136,7 @@ nixpkgs.overlays = [ niri.overlays.niri overlays.servicepoint-packages + nix-vscode-extensions.overlays.default ]; } ]);