From 90db3ab0addbb888ccb66d7bd1584f9528d7eadd Mon Sep 17 00:00:00 2001 From: Dmitriy Holkin Date: Tue, 15 Oct 2019 19:39:02 +0400 Subject: [PATCH] another commit --- modules/devices.nix | 4 ++++ modules/network.nix | 6 +++--- modules/packages.nix | 9 ++++++++- modules/services.nix | 2 +- 4 files changed, 16 insertions(+), 5 deletions(-) diff --git a/modules/devices.nix b/modules/devices.nix index acf0c82..fdbab8d 100644 --- a/modules/devices.nix +++ b/modules/devices.nix @@ -42,6 +42,7 @@ with types; { video = "amd"; ram = 16; isShared = false; + enableDocker = true; hostName = "ataraxia-pc"; }; PackardBell-Laptop = { @@ -57,6 +58,7 @@ with types; { video = "nvidia"; ram = 6; isShared = true; + enableDocker = false; hostName = null; }; Dell-Laptop = { @@ -72,6 +74,7 @@ with types; { video = "intel"; ram = 8; isShared = true; + enableDocker = true; hostName = "dell-ataraxia"; }; NixOS-VM = { @@ -87,6 +90,7 @@ with types; { video = "virtualbox"; ram = 4; isShared = false; + enableDocker = false; hostName = null; }; }; diff --git a/modules/network.nix b/modules/network.nix index 4e15c20..a6e9ebe 100644 --- a/modules/network.nix +++ b/modules/network.nix @@ -12,17 +12,17 @@ "5ef5fe07c1f062e4653fce9fe138cc952c20e284ae1ca50babf9089b5cba3a5a"; networks.AlukardAP = { pskRaw = "b8adc07cf1a9c7a7a5946c2645283b27ab91a8af4c065e5f9cde03ed1815811c"; - priority= 3; + priority = 2; }; networks.SladkiySon.pskRaw = "86b1c8c60d3e99145bfe90e0af9bf552540d34606bb0d00b314f5b5960e46496"; networks.AlukardAP_5GHz = { pskRaw = "fb8a89b5602442be083d2a1e67db55c6ff05a306551bcd08a79b6c6bbc97fc30"; - priority= 2; + priority = 1; }; networks.POAS = { pskRaw = "6cfdb04f3e2d4279a4651608c9c73277708c67f7f1435b61228ecf00841e5155"; - priority = 1; + priority = 3; }; # interfaces = ["wlan0"]; userControlled.enable = true; diff --git a/modules/packages.nix b/modules/packages.nix index 62fb147..bf39579 100644 --- a/modules/packages.nix +++ b/modules/packages.nix @@ -18,9 +18,16 @@ # When the extension is already available in the default extensions set. vscodeExtensions = with super.vscode-extensions; [ bbenoist.Nix - ms-python.python + ] ++ super.vscode-utils.extensionsFromVscodeMarketplace [ + { + name = "vscode-remote-extensionpack"; + publisher = "ms-vscode-remote"; + version = "0.17.0"; + sha256 = "Dlf9RzNefPilnbezh13C+WAsTJ7GqSCMEhnWhER+u5s="; + } ]; }; + }) ]; nixpkgs.config = { diff --git a/modules/services.nix b/modules/services.nix index c9aa979..8e5efc6 100644 --- a/modules/services.nix +++ b/modules/services.nix @@ -85,7 +85,7 @@ services.gnome3.gnome-keyring.enable = true; - # virtualisation.docker.enable = config.deviceSpecific.isHost; + virtualisation.docker.enable = config.devices.${config.device}.enableDocker; # virtualisation.virtualbox.host = lib.mkIf config.deviceSpecific.isHost { # enable = true; # # enableHardening = false;