diff --git a/README.md b/README.md index 46f2b66..d7e8c66 100644 --- a/README.md +++ b/README.md @@ -42,6 +42,37 @@ you'll have to manually enable the service for each user (see below). #### Enable the service +##### Automatically for all users + +Instead of just +```nix +{ services.vscode-server.enable = true; } +``` + +use: +```nix +{ + services.vscode-server = { + enable = true; + enableForUsers.enable = true; + }; +} +``` + +This will use `tmpfiles` to setup the permanent symlink described below for each regular user. + +If you do not wish to enable it for all users, but only for a specific subset, the list of users this will be setup for can be overridden: + +```nix +{ + services.vscode-server.enableForUsers.users = [ "alice" "bob" ]; +} +``` + +Note that when disabling `services.vscode-server.enableForUsers.enable`, the file that was created in the user's `.config/systemd/user` will not be cleaned up, so you will have to clean it up manually. + +##### Manually for each user + And then enable them for the relevant users: ```bash @@ -79,6 +110,8 @@ ln -sfT /run/current-system/etc/systemd/user/auto-fix-vscode-server.service ~/.c ### Home Manager +#### Install as a tarball + Put this code into your [home-manager](https://github.com/nix-community/home-manager) configuration i.e. in `~/.config/nixpkgs/home.nix`: ```nix @@ -91,6 +124,25 @@ Put this code into your [home-manager](https://github.com/nix-community/home-man } ``` +#### Install as a flake + +```nix +{ + inputs.vscode-server.url = "github:nix-community/nixos-vscode-server"; + + outputs = { self, vscode-server, home-manager }: { + homeConfigurations.yourhostname = home-manager.lib.homeManagerConfiguration { + modules = [ + vscode-server.homeModules.default + ({ config, pkgs, ... }: { + services.vscode-server.enable = true; + }) + ]; + }; + }; +} +``` + ## Usage When using VS Code as released by Microsoft without any special needs, just enabling and starting the service should be enough to make things work. If you have some custom build or needs, there are a few options available that might help you out. diff --git a/modules/vscode-server/default.nix b/modules/vscode-server/default.nix index 6e9b419..216f76f 100644 --- a/modules/vscode-server/default.nix +++ b/modules/vscode-server/default.nix @@ -1,10 +1,55 @@ -import ./module.nix ({ - name, - description, - serviceConfig, -}: { - systemd.user.services.${name} = { - inherit description serviceConfig; - wantedBy = [ "default.target" ]; - }; -}) +import ./module.nix ( + { name + , description + , serviceConfig + , lib + , config + , cfg + }: lib.mkMerge [ + { + systemd.user.services.${name} = { + inherit description serviceConfig; + wantedBy = [ "default.target" ]; + }; + } + (lib.mkIf cfg.enableForUsers.enable { + systemd.tmpfiles.settings = + let + forEachUser = ({ path, file }: builtins.listToAttrs + (builtins.map + (username: let user = config.users.users.${username}; in { + name = "${user.home}/${path}"; + value = file user.name; + }) + cfg.enableForUsers.users)); + homeDirectory = (path: forEachUser { + inherit path; + file = (username: { + "d" = { + user = username; + group = "users"; + mode = "0755"; + }; + }); + }); + in + { + # We need to create each of the folders before the next file otherwise parents get owned by root + "80-vscode-server-enable-for-users-create-config-folder" = homeDirectory ".config"; + "81-vscode-server-enable-for-users-create-systemd-folder" = homeDirectory ".config/systemd"; + "82-vscode-server-enable-for-users-create-systemd-user-folder" = homeDirectory ".config/systemd/user"; + "83-vscode-server-enable-for-users-enable-auto-fix-vscode-server-service" = forEachUser { + path = ".config/systemd/user/auto-fix-vscode-server.service"; + file = (username: { + "L+" = { + user = username; + group = "users"; + # This path is made available by `services.vscode-server.enable = true;` + argument = "/run/current-system/etc/systemd/user/auto-fix-vscode-server.service"; + }; + }); + }; + }; + }) + ] +) diff --git a/modules/vscode-server/home.nix b/modules/vscode-server/home.nix index 616145b..bd8d3ca 100644 --- a/modules/vscode-server/home.nix +++ b/modules/vscode-server/home.nix @@ -1,17 +1,26 @@ -import ./module.nix ({ - name, - description, - serviceConfig, -}: { - systemd.user.services.${name} = { - Unit = { - Description = description; - }; +import ./module.nix ( + { name + , description + , serviceConfig + , cfg + , ... + }: + { + systemd.user.services.${name} = { + Unit = { + Description = description; + }; - Service = serviceConfig; + Service = serviceConfig; - Install = { - WantedBy = [ "default.target" ]; + Install = { + WantedBy = [ "default.target" ]; + }; }; - }; -}) + + assertions = [{ + assertion = !cfg.enableForUsers.enable; + message = "enableForUsers.enable=true doesn't make sense when using nixos-vscode-server as a home-manager module"; + }]; + } +) diff --git a/modules/vscode-server/module.nix b/modules/vscode-server/module.nix index 4bf714b..dcd7f2a 100644 --- a/modules/vscode-server/module.nix +++ b/modules/vscode-server/module.nix @@ -6,9 +6,9 @@ moduleConfig: { }: { options.services.vscode-server = let inherit (lib) mkEnableOption mkOption; - inherit (lib.types) lines listOf nullOr package str; + inherit (lib.types) lines listOf nullOr package str bool passwdEntry; in { - enable = mkEnableOption "VS Code Server"; + enable = mkEnableOption "VS Code Server autofix"; enableFHS = mkEnableOption "a FHS compatible environment"; @@ -49,6 +49,35 @@ moduleConfig: { This can be used as a hook for custom further patching. ''; }; + + enableForUsers = { + enable = mkOption { + type = bool; + default = false; + example = true; + description = '' + Whether to enable the VS Code Server auto-fix service for each user. + + This only makes sense if auto-fix-vscode-server is installed as a NixOS module. + + This automatically sets up the service's symlinks for systemd in each users' home directory. + + By default this will set it up for all regular users, but that list can be overridden by setting `users`. + ''; + }; + + users = mkOption { + type = listOf (passwdEntry str); + default = builtins.attrNames (lib.attrsets.filterAttrs (username: userOptions: userOptions.isNormalUser) config.users.users); + defaultText = "builtins.attrNames (lib.filterAttrs (_: userOptions: userOptions.isNormalUser) config.users.users)"; + example = [ "alice" "bob" ]; + description = '' + List of users to enable the VS Code Server auto-fix service for. + + By default this will fallback to the list of "normal" users. + ''; + }; + }; }; config = let @@ -56,7 +85,7 @@ moduleConfig: { cfg = config.services.vscode-server; auto-fix-vscode-server = pkgs.callPackage ../../pkgs/auto-fix-vscode-server.nix - (removeAttrs cfg [ "enable" ]); + (removeAttrs cfg [ "enable" "enableForUsers" ]); in mkIf cfg.enable (mkMerge [ { @@ -74,6 +103,7 @@ moduleConfig: { RestartSec = 0; ExecStart = "${auto-fix-vscode-server}/bin/auto-fix-vscode-server"; }; + inherit config cfg lib; }) ]); }