Compare commits

..

No commits in common. "849034ff415d86d4483603cf40dba669e91fb3db" and "b72c2a344d01c136d3ffffe6010a638f0d4224ce" have entirely different histories.

3 changed files with 27 additions and 40 deletions

View file

@ -4,34 +4,17 @@
pkgs,
...
}:
let
inherit (lib) mkIf;
cfg = config.programs.vscode;
in
{
config = mkIf cfg.enable {
programs.vscode = {
package = pkgs.vscode;
enableUpdateCheck = false;
extensions = with pkgs.vscode-extensions; [
rust-lang.rust-analyzer
ms-vscode-remote.remote-ssh
ms-vscode-remote.remote-ssh-edit
ms-vscode.remote-explorer
tamasfe.even-better-toml
];
userSettings = {
editor.formatOnSave = true;
terminal.integrated.inheritEnv = false;
git.autofetch = true;
remote.SSH = {
connectTimeout = 60;
useLocalServer = true;
remotePlatform = {
"192.168.122.152" = "linux";
};
};
};
lib.mkIf config.programs.vscode.enable {
programs.vscode = {
package = pkgs.vscodium;
enableUpdateCheck = false;
extensions = with pkgs.vscode-extensions; [
rust-lang.rust-analyzer
];
userSettings = {
"editor.formatOnSave" = true;
"update.mode" = "none";
"idf.espIdfPath" = "/home/ny/esp/v5.2.2/esp-idf";
};
};
}

View file

@ -1,9 +1,4 @@
{
lib,
config,
osConfig,
...
}:
{ lib, config, ... }:
let
inherit (lib) mkIf;
in
@ -16,11 +11,21 @@ mkIf config.programs.ssh.enable {
user = "deck";
port = 22;
};
vm = mkIf (osConfig.networking.hostName == "marr") {
hostname = "192.168.122.152";
user = "ny";
port = 22;
};
# dockervm = {
#hostname = "192.168.178.22";
#user = "nydragon";
#port = 22;
#};
# raptus = {
#hostname = "vps.ccnlc.eu";
#user = "ny";
#port = 56528;
#};
#shan = {
#hostname = "192.168.178.27";
#user = "root";
#port = 22;
#};
};
};
}

View file

@ -44,7 +44,6 @@
"truenas"
"fritz"
"dav"
"ntfy"
];
};
};