Compare commits

...

3 commits

Author SHA1 Message Date
Vinzenz Schroeter f71f9f50fb update zerforschen.plus 2025-05-28 01:11:44 +02:00
Vinzenz Schroeter 63ba09cb0d fix intellij file system watcher 2025-05-18 11:03:34 +02:00
Vinzenz Schroeter b6ad841847 configure vscode nix formatting 2025-05-18 11:03:25 +02:00
4 changed files with 123 additions and 103 deletions

View file

@ -347,11 +347,11 @@
] ]
}, },
"locked": { "locked": {
"lastModified": 1745527190, "lastModified": 1748387402,
"narHash": "sha256-5Dve5nrUc1TJkWbZ0iKs4VK3GFSXn8SmdT05MsvFblQ=", "narHash": "sha256-5hae2UmVd42S/U6vp0+JQmjkgJrdKkp4vKM9+oEoQDQ=",
"ref": "refs/heads/main", "ref": "refs/heads/main",
"rev": "7411c96c0610c5d71235f84e80e58512a69a1a46", "rev": "fe4068c9ec1a8f4184d632d47916580edc2f9c17",
"revCount": 13, "revCount": 15,
"type": "git", "type": "git",
"url": "https://git.berlin.ccc.de/vinzenz/zerforschen.plus" "url": "https://git.berlin.ccc.de/vinzenz/zerforschen.plus"
}, },

View file

@ -1,57 +1,65 @@
{ pkgs, ... }: { pkgs, lib, ... }:
{ {
config.programs.vscode = { config = {
enable = true; home.sessionVariables.NIXOS_OZONE_WL = "1";
package = pkgs.vscodium; programs.vscode = {
enableUpdateCheck = false; enable = true;
extensions = with pkgs.vscode-extensions; [ package = pkgs.vscodium;
bbenoist.nix enableUpdateCheck = false;
ms-python.python extensions = with pkgs.vscode-extensions; [
kamadorueda.alejandra jnoortheen.nix-ide
editorconfig.editorconfig ms-python.python
yzhang.markdown-all-in-one editorconfig.editorconfig
redhat.vscode-yaml yzhang.markdown-all-in-one
pkief.material-icon-theme redhat.vscode-yaml
rust-lang.rust-analyzer pkief.material-icon-theme
tamasfe.even-better-toml rust-lang.rust-analyzer
llvm-vs-code-extensions.vscode-clangd tamasfe.even-better-toml
mkhl.direnv llvm-vs-code-extensions.vscode-clangd
vadimcn.vscode-lldb mkhl.direnv
ms-dotnettools.csharp vadimcn.vscode-lldb
ms-vscode-remote.remote-ssh ms-dotnettools.csharp
]; ms-vscode-remote.remote-ssh
userSettings = { ];
"files.autoSave" = "afterDelay"; userSettings = {
"files.autoSaveWhenNoErrors" = true; "files.autoSave" = "afterDelay";
"files.autoSaveWorkspaceFilesOnly" = true; "files.autoSaveWhenNoErrors" = true;
"files.autoSaveWorkspaceFilesOnly" = true;
"editor.fontFamily" = "'Fira Code', 'Droid Sans Mono', 'monospace', monospace"; "editor.fontFamily" = "'Fira Code', 'Droid Sans Mono', 'monospace', monospace";
"editor.fontLigatures" = true; "editor.fontLigatures" = true;
"editor.formatOnSave" = true; "editor.formatOnSave" = true;
"editor.formatOnSaveMode" = "modificationsIfAvailable"; "editor.formatOnSaveMode" = "modificationsIfAvailable";
"editor.minimap.autohide" = true; "editor.minimap.autohide" = true;
"workbench.startupEditor" = "readme"; "workbench.startupEditor" = "readme";
"workbench.enableExperiments" = false; "workbench.enableExperiments" = false;
"workbench.iconTheme" = "material-icon-theme"; "workbench.iconTheme" = "material-icon-theme";
"update.mode" = "none"; "update.mode" = "none";
"extensions.autoUpdate" = false; "extensions.autoUpdate" = false;
"extensions.autoCheckUpdates" = false; "extensions.autoCheckUpdates" = false;
"telemetry.telemetryLevel" = "off"; "telemetry.telemetryLevel" = "off";
"redhat.telemetry.enabled" = false; "redhat.telemetry.enabled" = false;
"git.autofetch" = true; "git.autofetch" = true;
"diffEditor.diffAlgorithm" = "advanced"; "diffEditor.diffAlgorithm" = "advanced";
"explorer.excludeGitIgnore" = true; "explorer.excludeGitIgnore" = true;
"markdown.extension.tableFormatter.normalizeIndentation" = true; "markdown.extension.tableFormatter.normalizeIndentation" = true;
"markdown.extension.toc.orderedList" = false; "markdown.extension.toc.orderedList" = false;
"rust-analyzer.checkOnSave.command" = "clippy"; "rust-analyzer.checkOnSave.command" = "clippy";
"\[makefile\]" = { "nix.formatterPath" = "${lib.getBin pkgs.nixfmt-rfc-style}/bin/nixfmt";
"editor.insertSpaces" = false;
"editor.detectIndentation" = false; "\[makefile\]" = {
"editor.insertSpaces" = false;
"editor.detectIndentation" = false;
};
"\[nix\]" = {
"editor.formatOnSave" = false;
};
}; };
}; };
}; };

View file

@ -56,8 +56,11 @@
servicepoint-simulator servicepoint-simulator
]; ];
home.file."policy.json" = { home.file = {
target = ".config/containers/policy.json"; "policy.json" = {
text = builtins.readFile ./.config/containers/policy.json; target = ".config/containers/policy.json";
text = builtins.readFile ./.config/containers/policy.json;
};
"idea.properties".text = "idea.filewatcher.executable.path = ${pkgs.fsnotifier}/bin/fsnotifier";
}; };
} }

View file

@ -1,60 +1,69 @@
{ pkgs, lib, ... }: { pkgs, lib, ... }:
{ {
config.programs.vscode = { config = {
enable = true; home.sessionVariables.NIXOS_OZONE_WL = "1";
package = pkgs.vscodium; programs.vscode = {
enableUpdateCheck = false; enable = true;
extensions = with pkgs.vscode-extensions; [ package = pkgs.vscodium;
bbenoist.nix enableUpdateCheck = false;
ms-python.python extensions = with pkgs.vscode-extensions; [
kamadorueda.alejandra jnoortheen.nix-ide
editorconfig.editorconfig ms-python.python
yzhang.markdown-all-in-one editorconfig.editorconfig
redhat.vscode-yaml yzhang.markdown-all-in-one
pkief.material-icon-theme redhat.vscode-yaml
rust-lang.rust-analyzer pkief.material-icon-theme
tamasfe.even-better-toml rust-lang.rust-analyzer
llvm-vs-code-extensions.vscode-clangd tamasfe.even-better-toml
mkhl.direnv llvm-vs-code-extensions.vscode-clangd
vadimcn.vscode-lldb mkhl.direnv
ms-dotnettools.csharp vadimcn.vscode-lldb
ms-vscode-remote.remote-ssh ms-dotnettools.csharp
RoweWilsonFrederiskHolme.wikitext ms-vscode-remote.remote-ssh
davidanson.vscode-markdownlint RoweWilsonFrederiskHolme.wikitext
]; davidanson.vscode-markdownlint
userSettings = { ];
"files.autoSave" = "afterDelay"; userSettings = {
"files.autoSaveWhenNoErrors" = true; "files.autoSave" = "afterDelay";
"files.autoSaveWorkspaceFilesOnly" = true; "files.autoSaveWhenNoErrors" = true;
"files.autoSaveWorkspaceFilesOnly" = true;
"editor.fontFamily" = "'Fira Code', 'Droid Sans Mono', 'monospace', monospace"; "editor.fontFamily" = "'Fira Code', 'Droid Sans Mono', 'monospace', monospace";
"editor.fontLigatures" = true; "editor.fontLigatures" = true;
"editor.formatOnSave" = true; "editor.formatOnSave" = true;
"editor.formatOnSaveMode" = "modificationsIfAvailable"; "editor.formatOnSaveMode" = "modificationsIfAvailable";
"editor.minimap.autohide" = true; "editor.minimap.autohide" = true;
"workbench.startupEditor" = "readme"; "workbench.startupEditor" = "readme";
"workbench.enableExperiments" = false; "workbench.enableExperiments" = false;
"workbench.iconTheme" = "material-icon-theme"; "workbench.iconTheme" = "material-icon-theme";
"update.mode" = "none"; "update.mode" = "none";
"extensions.autoUpdate" = false; "extensions.autoUpdate" = false;
"extensions.autoCheckUpdates" = false; "extensions.autoCheckUpdates" = false;
"telemetry.telemetryLevel" = "off"; "telemetry.telemetryLevel" = "off";
"redhat.telemetry.enabled" = false; "redhat.telemetry.enabled" = false;
"git.autofetch" = true; "git.autofetch" = true;
"git.path" = "${lib.getBin pkgs.git}/bin/git"; "git.path" = "${lib.getBin pkgs.git}/bin/git";
"diffEditor.diffAlgorithm" = "advanced"; "diffEditor.diffAlgorithm" = "advanced";
"explorer.excludeGitIgnore" = false; "explorer.excludeGitIgnore" = false;
"markdown.extension.tableFormatter.normalizeIndentation" = true; "markdown.extension.tableFormatter.normalizeIndentation" = true;
"markdown.extension.toc.orderedList" = false; "markdown.extension.toc.orderedList" = false;
"rust-analyzer.checkOnSave.command" = "clippy";
"\[makefile\]" = { "rust-analyzer.checkOnSave.command" = "clippy";
"editor.insertSpaces" = false;
"editor.detectIndentation" = false; "nix.formatterPath" = "${lib.getBin pkgs.nixfmt-rfc-style}/bin/nixfmt";
"\[makefile\]" = {
"editor.insertSpaces" = false;
"editor.detectIndentation" = false;
};
"\[nix\]" = {
"editor.formatOnSave" = false;
};
}; };
}; };
}; };