vinzenz/nixos-configuration
0
1
Fork 0
Code Issues Pull requests Actions Packages Projects Releases Wiki Activity

add nix-vscode-extensions, deduplicate inputs

Browse source
This commit is contained in:
Vinzenz Schroeter 2025-06-28 09:46:08 +02:00
parent 0261c84d62
commit be565adff6
2 changed files with 72 additions and 31 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

69
flake.lock
View file

@ -70,7 +70,9 @@
}, },
"lix-module": { "lix-module": {
"inputs": { "inputs": {
"flake-utils": "flake-utils", "flake-utils": [
"flake-utils"
],
"flakey-profile": "flakey-profile", "flakey-profile": "flakey-profile",
"lix": "lix", "lix": "lix",
"nixpkgs": [ "nixpkgs": [
@ -123,11 +125,11 @@
"xwayland-satellite-unstable": "xwayland-satellite-unstable" "xwayland-satellite-unstable": "xwayland-satellite-unstable"
}, },
"locked": { "locked": {
"lastModified": 1749144707, "lastModified": 1749890123,
"narHash": "sha256-JcSmySCB3pOtzeWMaEksZgaiNedEDIC6qyBezkK+92Q=", "narHash": "sha256-pRkyWFytGAMaHlrOJIYYEur8NRDe0kTfMIhRdTeasRQ=",
"owner": "sodiboo", "owner": "sodiboo",
"repo": "niri-flake", "repo": "niri-flake",
"rev": "32d49ef427be377c82d32ce74ff3082c2c992199", "rev": "8f39eb82488525728eda222b34e79b1ecf6d3f96",
"type": "github" "type": "github"
}, },
"original": { "original": {
@ -156,11 +158,11 @@
"niri-unstable": { "niri-unstable": {
"flake": false, "flake": false,
"locked": { "locked": {
"lastModified": 1749112952, "lastModified": 1749797708,
"narHash": "sha256-ajI1cXa2AgdZSELvlVaQZd0XMi4eM8H3Ys0Ek8a/roI=", "narHash": "sha256-P5x0U6AW5Zn20bARv4D83d8XlNaWK1st9QwBfSe+Vfg=",
"owner": "YaLTeR", "owner": "YaLTeR",
"repo": "niri", "repo": "niri",
"rev": "242ebf294514cc22f4f9d83c0566c8ffe1cb8d8a", "rev": "f3f6e79eeca8924ff9cfea4b30006e5b782bc93e",
"type": "github" "type": "github"
}, },
"original": { "original": {
@ -184,28 +186,36 @@
"type": "github" "type": "github"
} }
}, },
"nix-filter_2": { "nix-vscode-extensions": {
"inputs": {
"flake-utils": [
"flake-utils"
],
"nixpkgs": [
"nixpkgs"
]
},
"locked": { "locked": {
"lastModified": 1731533336, "lastModified": 1749953646,
"narHash": "sha256-oRam5PS1vcrr5UPgALW0eo1m/5/pls27Z/pabHNy2Ms=", "narHash": "sha256-NwuPVQfAbrq46nAtjz9MIQ3XLK6f9OLzgY8hJlQKS/8=",
"owner": "numtide", "owner": "nix-community",
"repo": "nix-filter", "repo": "nix-vscode-extensions",
"rev": "f7653272fd234696ae94229839a99b73c9ab7de0", "rev": "459503794a816b2d9038fc0c9181805acf45bafb",
"type": "github" "type": "github"
}, },
"original": { "original": {
"owner": "numtide", "owner": "nix-community",
"repo": "nix-filter", "repo": "nix-vscode-extensions",
"type": "github" "type": "github"
} }
}, },
"nixpkgs": { "nixpkgs": {
"locked": { "locked": {
"lastModified": 1749086602, "lastModified": 1749727998,
"narHash": "sha256-DJcgJMekoxVesl9kKjfLPix2Nbr42i7cpEHJiTnBUwU=", "narHash": "sha256-mHv/yeUbmL91/TvV95p+mBVahm9mdQMJoqaTVTALaFw=",
"owner": "NixOS", "owner": "NixOS",
"repo": "nixpkgs", "repo": "nixpkgs",
"rev": "4792576cb003c994bd7cc1edada3129def20b27d", "rev": "fd487183437963a59ba763c0cc4f27e3447dd6dd",
"type": "github" "type": "github"
}, },
"original": { "original": {
@ -217,11 +227,11 @@
}, },
"nixpkgs-unstable": { "nixpkgs-unstable": {
"locked": { "locked": {
"lastModified": 1749174413, "lastModified": 1749871736,
"narHash": "sha256-urN9UMK5cd1dzhR+Lx0xHeTgBp2MatA5+6g9JaxjuQs=", "narHash": "sha256-K9yBph93OLTNw02Q6e9CYFGrUhvEXnh45vrZqIRWfvQ=",
"owner": "NixOS", "owner": "NixOS",
"repo": "nixpkgs", "repo": "nixpkgs",
"rev": "6ad174a6dc07c7742fc64005265addf87ad08615", "rev": "6afe187897bef7933475e6af374c893f4c84a293",
"type": "github" "type": "github"
}, },
"original": { "original": {
@ -233,10 +243,13 @@
}, },
"root": { "root": {
"inputs": { "inputs": {
"flake-utils": "flake-utils",
"home-manager": "home-manager", "home-manager": "home-manager",
"lix-module": "lix-module", "lix-module": "lix-module",
"naersk": "naersk", "naersk": "naersk",
"niri": "niri", "niri": "niri",
"nix-filter": "nix-filter",
"nix-vscode-extensions": "nix-vscode-extensions",
"nixpkgs": "nixpkgs", "nixpkgs": "nixpkgs",
"nixpkgs-unstable": "nixpkgs-unstable", "nixpkgs-unstable": "nixpkgs-unstable",
"servicepoint-cli": "servicepoint-cli", "servicepoint-cli": "servicepoint-cli",
@ -249,7 +262,9 @@
"naersk": [ "naersk": [
"naersk" "naersk"
], ],
"nix-filter": "nix-filter", "nix-filter": [
"nix-filter"
],
"nixpkgs": [ "nixpkgs": [
"nixpkgs" "nixpkgs"
] ]
@ -273,7 +288,9 @@
"naersk": [ "naersk": [
"naersk" "naersk"
], ],
"nix-filter": "nix-filter_2", "nix-filter": [
"nix-filter"
],
"nixpkgs": [ "nixpkgs": [
"nixpkgs" "nixpkgs"
] ]
@ -327,11 +344,11 @@
"xwayland-satellite-unstable": { "xwayland-satellite-unstable": {
"flake": false, "flake": false,
"locked": { "locked": {
"lastModified": 1748488455, "lastModified": 1749315541,
"narHash": "sha256-IiLr1alzKFIy5tGGpDlabQbe6LV1c9ABvkH6T5WmyRI=", "narHash": "sha256-bEik1BfVOFnWvtOrcOHluos/edJ8f+G2y1QySbt/0Ak=",
"owner": "Supreeeme", "owner": "Supreeeme",
"repo": "xwayland-satellite", "repo": "xwayland-satellite",
"rev": "3ba30b149f9eb2bbf42cf4758d2158ca8cceef73", "rev": "da2ecb5be816de35e2efe23a408a1c49fe8b11ba",
"type": "github" "type": "github"
}, },
"original": { "original": {

34
flake.nix
View file

@ -11,7 +11,10 @@
lix-module = { lix-module = {
url = "https://git.lix.systems/lix-project/nixos-module/archive/2.93.0.tar.gz"; 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 = { niri = {
@ -32,15 +35,33 @@
servicepoint-cli = { servicepoint-cli = {
url = "git+https://git.berlin.ccc.de/servicepoint/servicepoint-cli.git"; url = "git+https://git.berlin.ccc.de/servicepoint/servicepoint-cli.git";
inputs.nixpkgs.follows = "nixpkgs"; inputs = {
inputs.naersk.follows = "naersk"; nixpkgs.follows = "nixpkgs";
naersk.follows = "naersk";
nix-filter.follows = "nix-filter";
};
}; };
servicepoint-simulator = { servicepoint-simulator = {
url = "git+https://git.berlin.ccc.de/servicepoint/servicepoint-simulator.git"; url = "git+https://git.berlin.ccc.de/servicepoint/servicepoint-simulator.git";
inputs.nixpkgs.follows = "nixpkgs"; inputs = {
inputs.naersk.follows = "naersk"; 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 = outputs =
@ -55,6 +76,8 @@
servicepoint-cli, servicepoint-cli,
servicepoint-simulator, servicepoint-simulator,
naersk, naersk,
nix-vscode-extensions,
...
}: }:
let let
devices = { devices = {
@ -113,6 +136,7 @@
nixpkgs.overlays = [ nixpkgs.overlays = [
niri.overlays.niri niri.overlays.niri
overlays.servicepoint-packages overlays.servicepoint-packages
nix-vscode-extensions.overlays.default
]; ];
} }
]); ]);