From a5f9e6b59aada629bf93b0b4628b3deec32b0549 Mon Sep 17 00:00:00 2001 From: Nikolaos Karaolidis Date: Sun, 26 Jan 2025 11:34:03 +0000 Subject: [PATCH] Add vscode markdown extension Signed-off-by: Nikolaos Karaolidis --- .../configs/user/console/docker/default.nix | 56 +++++++++---------- .../configs/user/gui/vscode/default.nix | 1 + .../gui/vscode/langs/markdown/default.nix | 6 ++ 3 files changed, 34 insertions(+), 29 deletions(-) create mode 100644 hosts/common/configs/user/gui/vscode/langs/markdown/default.nix diff --git a/hosts/common/configs/user/console/docker/default.nix b/hosts/common/configs/user/console/docker/default.nix index 741ee18..56a32a9 100644 --- a/hosts/common/configs/user/console/docker/default.nix +++ b/hosts/common/configs/user/console/docker/default.nix @@ -9,37 +9,35 @@ pkgs, ... }: -lib.mkMerge ( - [ - { - virtualisation.docker.rootless = { - enable = rootless; - setSocketVariable = true; - enableOnBoot = false; - storageDriver = "btrfs"; +lib.mkMerge [ + { + virtualisation.docker.rootless = { + enable = rootless; + setSocketVariable = true; + enableOnBoot = false; + storageDriver = "btrfs"; - daemon.settings = { - experimental = true; - ipv6 = true; - fixed-cidr-v6 = "fd00::/80"; - }; - - autoPrune = { - enable = true; - flags = [ "--all" ]; - }; + daemon.settings = { + experimental = true; + ipv6 = true; + fixed-cidr-v6 = "fd00::/80"; }; - home-manager.users.${user}.home = { - packages = with pkgs; [ docker-compose ]; - - sessionVariables = { - DOCKER_CONFIG = "${home}/.config/docker"; - }; + autoPrune = { + enable = true; + flags = [ "--all" ]; }; - } - ] - ++ (lib.lists.optional rootless { + }; + + home-manager.users.${user}.home = { + packages = with pkgs; [ docker-compose ]; + + sessionVariables = { + DOCKER_CONFIG = "${home}/.config/docker"; + }; + }; + } + (lib.mkIf rootless { environment.persistence."/persist"."${home}/.local/share/docker" = { }; systemd.user = { @@ -51,7 +49,7 @@ lib.mkMerge ( ]; }; }) - ++ (lib.lists.optional (!rootless) { + (lib.mkIf (!rootless) { users.users.${user}.extraGroups = [ "docker" ]; }) -) +] diff --git a/hosts/common/configs/user/gui/vscode/default.nix b/hosts/common/configs/user/gui/vscode/default.nix index a679894..37086bc 100644 --- a/hosts/common/configs/user/gui/vscode/default.nix +++ b/hosts/common/configs/user/gui/vscode/default.nix @@ -119,6 +119,7 @@ in ./langs/go ./langs/java ./langs/lua + ./langs/markdown ./langs/nix ./langs/python ./langs/svelte diff --git a/hosts/common/configs/user/gui/vscode/langs/markdown/default.nix b/hosts/common/configs/user/gui/vscode/langs/markdown/default.nix new file mode 100644 index 0000000..9fd5a15 --- /dev/null +++ b/hosts/common/configs/user/gui/vscode/langs/markdown/default.nix @@ -0,0 +1,6 @@ +{ pkgs, ... }: +{ + programs.vscode.extensions = with pkgs.vscode-extensions; [ + yzhang.markdown-all-in-one + ]; +}