From b85a3f1e28f49a6185f1dd9dcebec1b6d9477ae5 Mon Sep 17 00:00:00 2001 From: Dmitriy Kholkin Date: Tue, 3 Jan 2023 23:48:59 +0300 Subject: [PATCH] server update --- profiles/packages/narodmon-py.nix | 10 +++++----- profiles/servers/duplicacy.nix | 2 +- profiles/servers/nginx.nix | 1 + profiles/servers/vscode-server.nix | 13 ++++++++++++- 4 files changed, 19 insertions(+), 7 deletions(-) diff --git a/profiles/packages/narodmon-py.nix b/profiles/packages/narodmon-py.nix index 7d4a783..da43c4b 100644 --- a/profiles/packages/narodmon-py.nix +++ b/profiles/packages/narodmon-py.nix @@ -31,18 +31,18 @@ def read_temp(filename): except FileNotFoundError: return None else: - read_time = int(file.readline()) // 1000000000 - current_time = time.time_ns() + read_time = int(file.readline()) + current_time = int(time.time()) # 10 minutes if (current_time - read_time < 600): - return None - else: return file.readline().split()[0] + else: + return None def write_temp(filename, temp): with open(filename, 'w', encoding='utf-8') as file: - timestamp = time.time_ns() + timestamp = int(time.time()) print(timestamp, file=file) print(temp, file=file) diff --git a/profiles/servers/duplicacy.nix b/profiles/servers/duplicacy.nix index 3b53d10..c3e28b8 100644 --- a/profiles/servers/duplicacy.nix +++ b/profiles/servers/duplicacy.nix @@ -30,7 +30,7 @@ let ln -s /gitea /backups/gitea fi - if [ ! -L "/backups/srv" ]; then + if [ ! -d "/backups/srv" ]; then mkdir -p /backups/var fi diff --git a/profiles/servers/nginx.nix b/profiles/servers/nginx.nix index 1c3c51f..75fdcb3 100644 --- a/profiles/servers/nginx.nix +++ b/profiles/servers/nginx.nix @@ -36,6 +36,7 @@ "bathist.ataraxiadev.com" "microbin.ataraxiadev.com" "joplin.ataraxiadev.com" + "api.ataraxiadev.com" ]; }; }; diff --git a/profiles/servers/vscode-server.nix b/profiles/servers/vscode-server.nix index 9499a31..4affd06 100644 --- a/profiles/servers/vscode-server.nix +++ b/profiles/servers/vscode-server.nix @@ -4,7 +4,18 @@ ]; home-manager.users.${config.mainuser} = { - services.vscode-server.enable = true; + services.vscode-server = { + enable = true; + extensions = + with inputs.nix-vscode-marketplace.packages.${pkgs.system}.vscode; + # [ jnoortheen.nix-ide ]; + [ bbenoist.nix ]; + immutableExtensionsDir = true; + # settings = { + # "nix.enableLanguageServer" = true; + # "nix.serverPath" = "${inputs.rnix-lsp.defaultPackage.${pkgs.system}}/bin/rnix-lsp"; + # }; + }; }; # persist.state.homeDirectories = [ ".vscode-server" ];