From 7f0670b0448b0790784ad282071919df6cbaa6ea Mon Sep 17 00:00:00 2001 From: Lillian-Violet Date: Wed, 22 Nov 2023 13:16:36 +0100 Subject: [PATCH] Little fix --- home-manager/desktop-shared.nix | 16 +--------------- nixos/shared-desktop/configuration.nix | 16 ++++++++++++++++ 2 files changed, 17 insertions(+), 15 deletions(-) diff --git a/home-manager/desktop-shared.nix b/home-manager/desktop-shared.nix index f480ef3..e668e4b 100644 --- a/home-manager/desktop-shared.nix +++ b/home-manager/desktop-shared.nix @@ -56,8 +56,7 @@ home.packages = with pkgs; [ # Coding: - docker - docker-compose + azuredatastudio git kate @@ -129,19 +128,6 @@ userName = "Lillian-Violet"; }; - config.docker-containers = { - mssql = { - image = "mcr.microsoft.com/mssql/server:latest"; - ports = ["127.0.0.1:1433:1433"]; - volumes = [ - "/var/lib/mssql" - ]; - cmd = [ - "--base-url" - "\"/mssql\"" - ]; - }; - }; # Nicely reload system units when changing configs systemd.user.startServices = "sd-switch"; } diff --git a/nixos/shared-desktop/configuration.nix b/nixos/shared-desktop/configuration.nix index 49a65c2..f9d6340 100644 --- a/nixos/shared-desktop/configuration.nix +++ b/nixos/shared-desktop/configuration.nix @@ -58,6 +58,8 @@ environment.systemPackages = with pkgs; [ age alejandra + docker + docker-compose git-filter-repo home-manager input-leap @@ -167,6 +169,20 @@ }; }; + config.docker-containers = { + mssql = { + image = "mcr.microsoft.com/mssql/server:latest"; + ports = ["127.0.0.1:1433:1433"]; + volumes = [ + "/var/lib/mssql" + ]; + cmd = [ + "--base-url" + "\"/mssql\"" + ]; + }; + }; + # Enable completion of system packages by zsh environment.pathsToLink = ["/share/zsh"]; }