Compare commits

...

3 commits

Author SHA1 Message Date
Vinzenz Schroeter 12a1359d31 nix flake update 2025-06-28 09:47:59 +02:00
Vinzenz Schroeter 316e88afd3 get most extensions from open-vsx 2025-06-28 09:46:50 +02:00
Vinzenz Schroeter be565adff6 add nix-vscode-extensions, deduplicate inputs 2025-06-28 09:46:08 +02:00
4 changed files with 108 additions and 59 deletions

View file

@ -40,11 +40,11 @@
] ]
}, },
"locked": { "locked": {
"lastModified": 1749154018, "lastModified": 1750792728,
"narHash": "sha256-gjN3j7joRvT3a8Zgcylnd4NFsnXeDBumqiu4HmY1RIg=", "narHash": "sha256-Lh3dopA8DdY+ZoaAJPrtkZOZaFEJGSYjOdAYYgOPgE4=",
"owner": "nix-community", "owner": "nix-community",
"repo": "home-manager", "repo": "home-manager",
"rev": "7aae0ee71a17b19708b93b3ed448a1a0952bf111", "rev": "366f00797b1efb70f2882d3da485e3c10fd3d557",
"type": "github" "type": "github"
}, },
"original": { "original": {
@ -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": 1751073903,
"narHash": "sha256-JcSmySCB3pOtzeWMaEksZgaiNedEDIC6qyBezkK+92Q=", "narHash": "sha256-6pUwEiEJw8PGqUn2+Mf0IEJN4M0FMoXCM4sNa2EZuKk=",
"owner": "sodiboo", "owner": "sodiboo",
"repo": "niri-flake", "repo": "niri-flake",
"rev": "32d49ef427be377c82d32ce74ff3082c2c992199", "rev": "3667e998b5ad7a1ec56207f79c9629a919eafd43",
"type": "github" "type": "github"
}, },
"original": { "original": {
@ -139,16 +141,16 @@
"niri-stable": { "niri-stable": {
"flake": false, "flake": false,
"locked": { "locked": {
"lastModified": 1740117926, "lastModified": 1748151941,
"narHash": "sha256-mTTHA0RAaQcdYe+9A3Jx77cmmyLFHmRoZdd8RpWa+m8=", "narHash": "sha256-z4viQZLgC2bIJ3VrzQnR+q2F3gAOEQpU1H5xHtX/2fs=",
"owner": "YaLTeR", "owner": "YaLTeR",
"repo": "niri", "repo": "niri",
"rev": "b94a5db8790339cf9134873d8b490be69e02ac71", "rev": "8ba57fcf25d2fc9565131684a839d58703f1dae7",
"type": "github" "type": "github"
}, },
"original": { "original": {
"owner": "YaLTeR", "owner": "YaLTeR",
"ref": "v25.02", "ref": "v25.05.1",
"repo": "niri", "repo": "niri",
"type": "github" "type": "github"
} }
@ -156,11 +158,11 @@
"niri-unstable": { "niri-unstable": {
"flake": false, "flake": false,
"locked": { "locked": {
"lastModified": 1749112952, "lastModified": 1750791124,
"narHash": "sha256-ajI1cXa2AgdZSELvlVaQZd0XMi4eM8H3Ys0Ek8a/roI=", "narHash": "sha256-F5iVU/hjoSHSSe0gllxm0PcAaseEtGNanYK5Ha3k2Tg=",
"owner": "YaLTeR", "owner": "YaLTeR",
"repo": "niri", "repo": "niri",
"rev": "242ebf294514cc22f4f9d83c0566c8ffe1cb8d8a", "rev": "37458d94b288945f6cfbd3c5c233f634d59f246c",
"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": 1751076164,
"narHash": "sha256-oRam5PS1vcrr5UPgALW0eo1m/5/pls27Z/pabHNy2Ms=", "narHash": "sha256-to92MoMF7QC2K2gdpkYoN/Y9wuF6Q/qlvNyHca6uPjQ=",
"owner": "numtide", "owner": "nix-community",
"repo": "nix-filter", "repo": "nix-vscode-extensions",
"rev": "f7653272fd234696ae94229839a99b73c9ab7de0", "rev": "7f443f5e4125f9aad3885542c04653f29b15b92a",
"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": 1750969886,
"narHash": "sha256-DJcgJMekoxVesl9kKjfLPix2Nbr42i7cpEHJiTnBUwU=", "narHash": "sha256-zW/OFnotiz/ndPFdebpo3X0CrbVNf22n4DjN2vxlb58=",
"owner": "NixOS", "owner": "NixOS",
"repo": "nixpkgs", "repo": "nixpkgs",
"rev": "4792576cb003c994bd7cc1edada3129def20b27d", "rev": "a676066377a2fe7457369dd37c31fd2263b662f4",
"type": "github" "type": "github"
}, },
"original": { "original": {
@ -217,11 +227,11 @@
}, },
"nixpkgs-unstable": { "nixpkgs-unstable": {
"locked": { "locked": {
"lastModified": 1749174413, "lastModified": 1750994206,
"narHash": "sha256-urN9UMK5cd1dzhR+Lx0xHeTgBp2MatA5+6g9JaxjuQs=", "narHash": "sha256-3u6rEbIX9CN/5A5/mc3u0wIO1geZ0EhjvPBXmRDHqWM=",
"owner": "NixOS", "owner": "NixOS",
"repo": "nixpkgs", "repo": "nixpkgs",
"rev": "6ad174a6dc07c7742fc64005265addf87ad08615", "rev": "80d50fc87924c2a0d346372d242c27973cf8cdbf",
"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"
] ]
@ -310,16 +327,16 @@
"xwayland-satellite-stable": { "xwayland-satellite-stable": {
"flake": false, "flake": false,
"locked": { "locked": {
"lastModified": 1739246919, "lastModified": 1748488455,
"narHash": "sha256-/hBM43/Gd0/tW+egrhlWgOIISeJxEs2uAOIYVpfDKeU=", "narHash": "sha256-IiLr1alzKFIy5tGGpDlabQbe6LV1c9ABvkH6T5WmyRI=",
"owner": "Supreeeme", "owner": "Supreeeme",
"repo": "xwayland-satellite", "repo": "xwayland-satellite",
"rev": "44590a416d4a3e8220e19e29e0b6efe64a80315d", "rev": "3ba30b149f9eb2bbf42cf4758d2158ca8cceef73",
"type": "github" "type": "github"
}, },
"original": { "original": {
"owner": "Supreeeme", "owner": "Supreeeme",
"ref": "v0.5.1", "ref": "v0.6",
"repo": "xwayland-satellite", "repo": "xwayland-satellite",
"type": "github" "type": "github"
} }
@ -327,11 +344,11 @@
"xwayland-satellite-unstable": { "xwayland-satellite-unstable": {
"flake": false, "flake": false,
"locked": { "locked": {
"lastModified": 1748488455, "lastModified": 1750821680,
"narHash": "sha256-IiLr1alzKFIy5tGGpDlabQbe6LV1c9ABvkH6T5WmyRI=", "narHash": "sha256-Bu5unTxnqok2RoU5P394Gh0vRaoyI/5xlOOJDF6akrc=",
"owner": "Supreeeme", "owner": "Supreeeme",
"repo": "xwayland-satellite", "repo": "xwayland-satellite",
"rev": "3ba30b149f9eb2bbf42cf4758d2158ca8cceef73", "rev": "2e7c318ac2bbf699b6ab92ef91e661e16415dfac",
"type": "github" "type": "github"
}, },
"original": { "original": {

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
]; ];
} }
]); ]);

View file

@ -47,6 +47,8 @@
"jetbrains-toolbox" "jetbrains-toolbox"
"anydesk" "anydesk"
"vscode-extension-ms-dotnettools-csharp"
]; ];
}; };
} }

View file

@ -7,23 +7,27 @@
package = pkgs.vscodium; package = pkgs.vscodium;
profiles.default = { profiles.default = {
enableUpdateCheck = false; enableUpdateCheck = false;
extensions = with pkgs.vscode-extensions; [ extensions =
jnoortheen.nix-ide with pkgs.nix-vscode-extensions.open-vsx;
ms-python.python [
editorconfig.editorconfig jnoortheen.nix-ide
yzhang.markdown-all-in-one ms-python.python
redhat.vscode-yaml editorconfig.editorconfig
pkief.material-icon-theme yzhang.markdown-all-in-one
rust-lang.rust-analyzer redhat.vscode-yaml
tamasfe.even-better-toml pkief.material-icon-theme
llvm-vs-code-extensions.vscode-clangd rust-lang.rust-analyzer
mkhl.direnv tamasfe.even-better-toml
vadimcn.vscode-lldb llvm-vs-code-extensions.vscode-clangd
# ms-dotnettools.csharp mkhl.direnv
# ms-vscode-remote.remote-ssh muhammad-sammy.csharp
RoweWilsonFrederiskHolme.wikitext davidanson.vscode-markdownlint
davidanson.vscode-markdownlint ]
]; ++ (with pkgs.vscode-extensions; [
vadimcn.vscode-lldb
RoweWilsonFrederiskHolme.wikitext
ms-dotnettools.csharp
]);
userSettings = { userSettings = {
"files.autoSave" = "afterDelay"; "files.autoSave" = "afterDelay";
"files.autoSaveWhenNoErrors" = true; "files.autoSaveWhenNoErrors" = true;
@ -66,6 +70,8 @@
}; };
}; };
"dotnetAcquisitionExtension.sharedExistingDotnetPath" = "${lib.getBin pkgs.dotnet-sdk}/bin/dotnet";
"\[makefile\]" = { "\[makefile\]" = {
"editor.insertSpaces" = false; "editor.insertSpaces" = false;
"editor.detectIndentation" = false; "editor.detectIndentation" = false;