Compare commits

..

No commits in common. "f71f9f50fb2d7f6411475b3eafad3786fc4851ce" and "889bff482c77b4f0ec2da8d9723c3aa83a8bf9b4" have entirely different histories.

4 changed files with 103 additions and 123 deletions

View file

@ -347,11 +347,11 @@
] ]
}, },
"locked": { "locked": {
"lastModified": 1748387402, "lastModified": 1745527190,
"narHash": "sha256-5hae2UmVd42S/U6vp0+JQmjkgJrdKkp4vKM9+oEoQDQ=", "narHash": "sha256-5Dve5nrUc1TJkWbZ0iKs4VK3GFSXn8SmdT05MsvFblQ=",
"ref": "refs/heads/main", "ref": "refs/heads/main",
"rev": "fe4068c9ec1a8f4184d632d47916580edc2f9c17", "rev": "7411c96c0610c5d71235f84e80e58512a69a1a46",
"revCount": 15, "revCount": 13,
"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,65 +1,57 @@
{ pkgs, lib, ... }: { pkgs, ... }:
{ {
config = { config.programs.vscode = {
home.sessionVariables.NIXOS_OZONE_WL = "1"; enable = true;
programs.vscode = { package = pkgs.vscodium;
enable = true; enableUpdateCheck = false;
package = pkgs.vscodium; extensions = with pkgs.vscode-extensions; [
enableUpdateCheck = false; bbenoist.nix
extensions = with pkgs.vscode-extensions; [ ms-python.python
jnoortheen.nix-ide kamadorueda.alejandra
ms-python.python editorconfig.editorconfig
editorconfig.editorconfig yzhang.markdown-all-in-one
yzhang.markdown-all-in-one redhat.vscode-yaml
redhat.vscode-yaml pkief.material-icon-theme
pkief.material-icon-theme rust-lang.rust-analyzer
rust-lang.rust-analyzer tamasfe.even-better-toml
tamasfe.even-better-toml llvm-vs-code-extensions.vscode-clangd
llvm-vs-code-extensions.vscode-clangd mkhl.direnv
mkhl.direnv vadimcn.vscode-lldb
vadimcn.vscode-lldb ms-dotnettools.csharp
ms-dotnettools.csharp ms-vscode-remote.remote-ssh
ms-vscode-remote.remote-ssh ];
]; userSettings = {
userSettings = { "files.autoSave" = "afterDelay";
"files.autoSave" = "afterDelay"; "files.autoSaveWhenNoErrors" = true;
"files.autoSaveWhenNoErrors" = true; "files.autoSaveWorkspaceFilesOnly" = 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";
"nix.formatterPath" = "${lib.getBin pkgs.nixfmt-rfc-style}/bin/nixfmt"; "\[makefile\]" = {
"editor.insertSpaces" = false;
"\[makefile\]" = { "editor.detectIndentation" = false;
"editor.insertSpaces" = false;
"editor.detectIndentation" = false;
};
"\[nix\]" = {
"editor.formatOnSave" = false;
};
}; };
}; };
}; };

View file

@ -56,11 +56,8 @@
servicepoint-simulator servicepoint-simulator
]; ];
home.file = { home.file."policy.json" = {
"policy.json" = { target = ".config/containers/policy.json";
target = ".config/containers/policy.json"; text = builtins.readFile ./.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,69 +1,60 @@
{ pkgs, lib, ... }: { pkgs, lib, ... }:
{ {
config = { config.programs.vscode = {
home.sessionVariables.NIXOS_OZONE_WL = "1"; enable = true;
programs.vscode = { package = pkgs.vscodium;
enable = true; enableUpdateCheck = false;
package = pkgs.vscodium; extensions = with pkgs.vscode-extensions; [
enableUpdateCheck = false; bbenoist.nix
extensions = with pkgs.vscode-extensions; [ ms-python.python
jnoortheen.nix-ide kamadorueda.alejandra
ms-python.python editorconfig.editorconfig
editorconfig.editorconfig yzhang.markdown-all-in-one
yzhang.markdown-all-in-one redhat.vscode-yaml
redhat.vscode-yaml pkief.material-icon-theme
pkief.material-icon-theme rust-lang.rust-analyzer
rust-lang.rust-analyzer tamasfe.even-better-toml
tamasfe.even-better-toml llvm-vs-code-extensions.vscode-clangd
llvm-vs-code-extensions.vscode-clangd mkhl.direnv
mkhl.direnv vadimcn.vscode-lldb
vadimcn.vscode-lldb ms-dotnettools.csharp
ms-dotnettools.csharp ms-vscode-remote.remote-ssh
ms-vscode-remote.remote-ssh RoweWilsonFrederiskHolme.wikitext
RoweWilsonFrederiskHolme.wikitext davidanson.vscode-markdownlint
davidanson.vscode-markdownlint ];
]; userSettings = {
userSettings = { "files.autoSave" = "afterDelay";
"files.autoSave" = "afterDelay"; "files.autoSaveWhenNoErrors" = true;
"files.autoSaveWhenNoErrors" = true; "files.autoSaveWorkspaceFilesOnly" = 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";
"rust-analyzer.checkOnSave.command" = "clippy"; "\[makefile\]" = {
"editor.insertSpaces" = false;
"nix.formatterPath" = "${lib.getBin pkgs.nixfmt-rfc-style}/bin/nixfmt"; "editor.detectIndentation" = false;
"\[makefile\]" = {
"editor.insertSpaces" = false;
"editor.detectIndentation" = false;
};
"\[nix\]" = {
"editor.formatOnSave" = false;
};
}; };
}; };
}; };