Compare commits

..

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

4 changed files with 103 additions and 123 deletions

8
flake.lock generated
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,14 +1,13 @@
{ pkgs, lib, ... }: { pkgs, ... }:
{ {
config = { config.programs.vscode = {
home.sessionVariables.NIXOS_OZONE_WL = "1";
programs.vscode = {
enable = true; enable = true;
package = pkgs.vscodium; package = pkgs.vscodium;
enableUpdateCheck = false; enableUpdateCheck = false;
extensions = with pkgs.vscode-extensions; [ extensions = with pkgs.vscode-extensions; [
jnoortheen.nix-ide bbenoist.nix
ms-python.python ms-python.python
kamadorueda.alejandra
editorconfig.editorconfig editorconfig.editorconfig
yzhang.markdown-all-in-one yzhang.markdown-all-in-one
redhat.vscode-yaml redhat.vscode-yaml
@ -50,17 +49,10 @@
"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\]" = { "\[makefile\]" = {
"editor.insertSpaces" = false; "editor.insertSpaces" = false;
"editor.detectIndentation" = 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,14 +1,13 @@
{ pkgs, lib, ... }: { pkgs, lib, ... }:
{ {
config = { config.programs.vscode = {
home.sessionVariables.NIXOS_OZONE_WL = "1";
programs.vscode = {
enable = true; enable = true;
package = pkgs.vscodium; package = pkgs.vscodium;
enableUpdateCheck = false; enableUpdateCheck = false;
extensions = with pkgs.vscode-extensions; [ extensions = with pkgs.vscode-extensions; [
jnoortheen.nix-ide bbenoist.nix
ms-python.python ms-python.python
kamadorueda.alejandra
editorconfig.editorconfig editorconfig.editorconfig
yzhang.markdown-all-in-one yzhang.markdown-all-in-one
redhat.vscode-yaml redhat.vscode-yaml
@ -51,20 +50,12 @@
"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";
"nix.formatterPath" = "${lib.getBin pkgs.nixfmt-rfc-style}/bin/nixfmt";
"\[makefile\]" = { "\[makefile\]" = {
"editor.insertSpaces" = false; "editor.insertSpaces" = false;
"editor.detectIndentation" = false; "editor.detectIndentation" = false;
}; };
"\[nix\]" = {
"editor.formatOnSave" = false;
};
};
}; };
}; };
} }