diff --git a/flake.lock b/flake.lock index 2b1d8e0..8aa586b 100644 --- a/flake.lock +++ b/flake.lock @@ -347,11 +347,11 @@ ] }, "locked": { - "lastModified": 1748387402, - "narHash": "sha256-5hae2UmVd42S/U6vp0+JQmjkgJrdKkp4vKM9+oEoQDQ=", + "lastModified": 1745527190, + "narHash": "sha256-5Dve5nrUc1TJkWbZ0iKs4VK3GFSXn8SmdT05MsvFblQ=", "ref": "refs/heads/main", - "rev": "fe4068c9ec1a8f4184d632d47916580edc2f9c17", - "revCount": 15, + "rev": "7411c96c0610c5d71235f84e80e58512a69a1a46", + "revCount": 13, "type": "git", "url": "https://git.berlin.ccc.de/vinzenz/zerforschen.plus" }, diff --git a/home/ronja/vscode.nix b/home/ronja/vscode.nix index 7b37dd6..79ab666 100644 --- a/home/ronja/vscode.nix +++ b/home/ronja/vscode.nix @@ -1,65 +1,57 @@ -{ pkgs, lib, ... }: +{ pkgs, ... }: { - config = { - home.sessionVariables.NIXOS_OZONE_WL = "1"; - programs.vscode = { - enable = true; - package = pkgs.vscodium; - enableUpdateCheck = false; - extensions = with pkgs.vscode-extensions; [ - jnoortheen.nix-ide - ms-python.python - editorconfig.editorconfig - yzhang.markdown-all-in-one - redhat.vscode-yaml - pkief.material-icon-theme - rust-lang.rust-analyzer - tamasfe.even-better-toml - llvm-vs-code-extensions.vscode-clangd - mkhl.direnv - vadimcn.vscode-lldb - ms-dotnettools.csharp - ms-vscode-remote.remote-ssh - ]; - userSettings = { - "files.autoSave" = "afterDelay"; - "files.autoSaveWhenNoErrors" = true; - "files.autoSaveWorkspaceFilesOnly" = true; + config.programs.vscode = { + enable = true; + package = pkgs.vscodium; + enableUpdateCheck = false; + extensions = with pkgs.vscode-extensions; [ + bbenoist.nix + ms-python.python + kamadorueda.alejandra + editorconfig.editorconfig + yzhang.markdown-all-in-one + redhat.vscode-yaml + pkief.material-icon-theme + rust-lang.rust-analyzer + tamasfe.even-better-toml + llvm-vs-code-extensions.vscode-clangd + mkhl.direnv + vadimcn.vscode-lldb + ms-dotnettools.csharp + ms-vscode-remote.remote-ssh + ]; + userSettings = { + "files.autoSave" = "afterDelay"; + "files.autoSaveWhenNoErrors" = true; + "files.autoSaveWorkspaceFilesOnly" = true; - "editor.fontFamily" = "'Fira Code', 'Droid Sans Mono', 'monospace', monospace"; - "editor.fontLigatures" = true; - "editor.formatOnSave" = true; - "editor.formatOnSaveMode" = "modificationsIfAvailable"; - "editor.minimap.autohide" = true; + "editor.fontFamily" = "'Fira Code', 'Droid Sans Mono', 'monospace', monospace"; + "editor.fontLigatures" = true; + "editor.formatOnSave" = true; + "editor.formatOnSaveMode" = "modificationsIfAvailable"; + "editor.minimap.autohide" = true; - "workbench.startupEditor" = "readme"; - "workbench.enableExperiments" = false; - "workbench.iconTheme" = "material-icon-theme"; + "workbench.startupEditor" = "readme"; + "workbench.enableExperiments" = false; + "workbench.iconTheme" = "material-icon-theme"; - "update.mode" = "none"; - "extensions.autoUpdate" = false; - "extensions.autoCheckUpdates" = false; + "update.mode" = "none"; + "extensions.autoUpdate" = false; + "extensions.autoCheckUpdates" = false; - "telemetry.telemetryLevel" = "off"; - "redhat.telemetry.enabled" = false; + "telemetry.telemetryLevel" = "off"; + "redhat.telemetry.enabled" = false; - "git.autofetch" = true; - "diffEditor.diffAlgorithm" = "advanced"; - "explorer.excludeGitIgnore" = true; - "markdown.extension.tableFormatter.normalizeIndentation" = true; - "markdown.extension.toc.orderedList" = false; - "rust-analyzer.checkOnSave.command" = "clippy"; + "git.autofetch" = true; + "diffEditor.diffAlgorithm" = "advanced"; + "explorer.excludeGitIgnore" = true; + "markdown.extension.tableFormatter.normalizeIndentation" = true; + "markdown.extension.toc.orderedList" = false; + "rust-analyzer.checkOnSave.command" = "clippy"; - "nix.formatterPath" = "${lib.getBin pkgs.nixfmt-rfc-style}/bin/nixfmt"; - - "\[makefile\]" = { - "editor.insertSpaces" = false; - "editor.detectIndentation" = false; - }; - - "\[nix\]" = { - "editor.formatOnSave" = false; - }; + "\[makefile\]" = { + "editor.insertSpaces" = false; + "editor.detectIndentation" = false; }; }; }; diff --git a/home/vinzenz/configuration.nix b/home/vinzenz/configuration.nix index 8bcc7be..d2c79a8 100644 --- a/home/vinzenz/configuration.nix +++ b/home/vinzenz/configuration.nix @@ -56,11 +56,8 @@ servicepoint-simulator ]; - home.file = { - "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"; + home.file."policy.json" = { + target = ".config/containers/policy.json"; + text = builtins.readFile ./.config/containers/policy.json; }; } diff --git a/home/vinzenz/vscode.nix b/home/vinzenz/vscode.nix index 15f747e..dca318b 100644 --- a/home/vinzenz/vscode.nix +++ b/home/vinzenz/vscode.nix @@ -1,69 +1,60 @@ { pkgs, lib, ... }: { - config = { - home.sessionVariables.NIXOS_OZONE_WL = "1"; - programs.vscode = { - enable = true; - package = pkgs.vscodium; - enableUpdateCheck = false; - extensions = with pkgs.vscode-extensions; [ - jnoortheen.nix-ide - ms-python.python - editorconfig.editorconfig - yzhang.markdown-all-in-one - redhat.vscode-yaml - pkief.material-icon-theme - rust-lang.rust-analyzer - tamasfe.even-better-toml - llvm-vs-code-extensions.vscode-clangd - mkhl.direnv - vadimcn.vscode-lldb - ms-dotnettools.csharp - ms-vscode-remote.remote-ssh - RoweWilsonFrederiskHolme.wikitext - davidanson.vscode-markdownlint - ]; - userSettings = { - "files.autoSave" = "afterDelay"; - "files.autoSaveWhenNoErrors" = true; - "files.autoSaveWorkspaceFilesOnly" = true; + config.programs.vscode = { + enable = true; + package = pkgs.vscodium; + enableUpdateCheck = false; + extensions = with pkgs.vscode-extensions; [ + bbenoist.nix + ms-python.python + kamadorueda.alejandra + editorconfig.editorconfig + yzhang.markdown-all-in-one + redhat.vscode-yaml + pkief.material-icon-theme + rust-lang.rust-analyzer + tamasfe.even-better-toml + llvm-vs-code-extensions.vscode-clangd + mkhl.direnv + vadimcn.vscode-lldb + ms-dotnettools.csharp + ms-vscode-remote.remote-ssh + RoweWilsonFrederiskHolme.wikitext + davidanson.vscode-markdownlint + ]; + userSettings = { + "files.autoSave" = "afterDelay"; + "files.autoSaveWhenNoErrors" = true; + "files.autoSaveWorkspaceFilesOnly" = true; - "editor.fontFamily" = "'Fira Code', 'Droid Sans Mono', 'monospace', monospace"; - "editor.fontLigatures" = true; - "editor.formatOnSave" = true; - "editor.formatOnSaveMode" = "modificationsIfAvailable"; - "editor.minimap.autohide" = true; + "editor.fontFamily" = "'Fira Code', 'Droid Sans Mono', 'monospace', monospace"; + "editor.fontLigatures" = true; + "editor.formatOnSave" = true; + "editor.formatOnSaveMode" = "modificationsIfAvailable"; + "editor.minimap.autohide" = true; - "workbench.startupEditor" = "readme"; - "workbench.enableExperiments" = false; - "workbench.iconTheme" = "material-icon-theme"; + "workbench.startupEditor" = "readme"; + "workbench.enableExperiments" = false; + "workbench.iconTheme" = "material-icon-theme"; - "update.mode" = "none"; - "extensions.autoUpdate" = false; - "extensions.autoCheckUpdates" = false; + "update.mode" = "none"; + "extensions.autoUpdate" = false; + "extensions.autoCheckUpdates" = false; - "telemetry.telemetryLevel" = "off"; - "redhat.telemetry.enabled" = false; + "telemetry.telemetryLevel" = "off"; + "redhat.telemetry.enabled" = false; - "git.autofetch" = true; - "git.path" = "${lib.getBin pkgs.git}/bin/git"; - "diffEditor.diffAlgorithm" = "advanced"; - "explorer.excludeGitIgnore" = false; - "markdown.extension.tableFormatter.normalizeIndentation" = true; - "markdown.extension.toc.orderedList" = false; + "git.autofetch" = true; + "git.path" = "${lib.getBin pkgs.git}/bin/git"; + "diffEditor.diffAlgorithm" = "advanced"; + "explorer.excludeGitIgnore" = false; + "markdown.extension.tableFormatter.normalizeIndentation" = true; + "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; - "editor.detectIndentation" = false; - }; - - "\[nix\]" = { - "editor.formatOnSave" = false; - }; + "\[makefile\]" = { + "editor.insertSpaces" = false; + "editor.detectIndentation" = false; }; }; };