Skip to content

Commit

Permalink
refactor: move vscode to services
Browse files Browse the repository at this point in the history
  • Loading branch information
isabelroses committed Apr 15, 2024
1 parent 6e7c3cf commit 63ca95e
Show file tree
Hide file tree
Showing 6 changed files with 52 additions and 107 deletions.
120 changes: 22 additions & 98 deletions flake.lock

Some generated files are not rendered by default. Learn more about how customized files appear on GitHub.

11 changes: 9 additions & 2 deletions flake.nix
Original file line number Diff line number Diff line change
Expand Up @@ -16,7 +16,11 @@
# nixos on wsl
nixos-wsl = {
url = "github:nix-community/NixOS-WSL";
inputs.nixpkgs.follows = "nixpkgs";
inputs = {
nixpkgs.follows = "nixpkgs";
flake-compat.follows = "";
flake-utils.follows = "izvim/flake-utils";
};
};

# Home Manager
Expand Down Expand Up @@ -69,7 +73,10 @@
# remote ssh vscode server
vscode-server = {
url = "github:nix-community/nixos-vscode-server";
inputs.nixpkgs.follows = "nixpkgs";
inputs = {
nixpkgs.follows = "nixpkgs";
flake-utils.follows = "izvim/flake-utils";
};
};

# deploy remote systems
Expand Down
2 changes: 2 additions & 0 deletions hosts/valkyrie/default.nix
Original file line number Diff line number Diff line change
Expand Up @@ -72,5 +72,7 @@
tui.enable = true;
gui.enable = false;
};

services.dev.vscode-server.enable = true;
};
}
8 changes: 2 additions & 6 deletions modules/nixos/os/services/default.nix
Original file line number Diff line number Diff line change
@@ -1,7 +1,6 @@
{
config,
inputs,
lib,
config,
...
}: let
inherit (lib) mkIf mkDefault;
Expand All @@ -10,13 +9,10 @@ in {
imports = [
./systemd.nix
./zram.nix
inputs.vscode-server.nixosModules.default
];

services = {
# enable the vscode server
vscode-server.enable = config.modules.services.dev.vscode-server.enable;
# monitor and control temparature
# monitor and control temperature
thermald.enable = true;
# discard blocks that are not in use by the filesystem, good for SSDs
fstrim.enable = true;
Expand Down
3 changes: 2 additions & 1 deletion modules/nixos/services/dev/default.nix
Original file line number Diff line number Diff line change
@@ -1,8 +1,9 @@
{
imports = [
./atuin.nix
./wakapi.nix
./forgejo.nix
./plausible.nix
./vscode-server.nix
./wakapi.nix
];
}
15 changes: 15 additions & 0 deletions modules/nixos/services/dev/vscode-server.nix
Original file line number Diff line number Diff line change
@@ -0,0 +1,15 @@
{
lib,
pkgs,
config,
inputs,
...
}: {
imports = [inputs.vscode-server.nixosModules.default];

# enable the vscode server
config.services.vscode-server = lib.mkIf config.modules.services.dev.vscode-server.enable {
enable = true;
nodejsPackage = pkgs.nodejs_21;
};
}

0 comments on commit 63ca95e

Please sign in to comment.