diff --git a/flake.lock b/flake.lock index 18678c9..73ef68e 100755 --- a/flake.lock +++ b/flake.lock @@ -594,13 +594,13 @@ "locked": { "lastModified": 1684517665, "narHash": "sha256-SaAr66uCQ8CF75jIr23FZjk1+9Kfwm5sQnwV25206Gs=", - "owner": "msteen", + "owner": "nix-community", "repo": "nixos-vscode-server", "rev": "1e1358493df6529d4c7bc4cc3066f76fd16d4ae6", "type": "github" }, "original": { - "owner": "msteen", + "owner": "nix-community", "repo": "nixos-vscode-server", "type": "github" } diff --git a/flake.nix b/flake.nix index 09a0a4a..4d333da 100755 --- a/flake.nix +++ b/flake.nix @@ -51,10 +51,10 @@ #inputs.nixpkgs.follows = "nixpkgs"; }; - vscode-server.url = "github:msteen/nixos-vscode-server"; + vscode-server.url = "github:nix-community/nixos-vscode-server"; }; - outputs = inputs @ { self, nixpkgs, nixpkgs-unstable, vscode-server, nix-minecraft, cohost-blogger, /* hyprland, hyprpaper, hyprpicker, */ ... }: + outputs = inputs @ { self, nixpkgs, nixpkgs-unstable, nix-minecraft, cohost-blogger, /* hyprland, hyprpaper, hyprpicker, */ ... }: let system = "x86_64-linux"; @@ -77,7 +77,6 @@ overlays = mapModules ./overlays import; nixosModules = (mapModulesRec ./modules import) ++ [ #hyprland.nixosModules.default - vscode-server.nixosModule ]; nixosConfigurations = mapModules ./hosts (host: mkHost host { inherit system; }); devShell."${system}" = import ./shell.nix { inherit pkgs; }; diff --git a/hosts/lucent-firepit/default.nix b/hosts/lucent-firepit/default.nix index 32037e6..57a9834 100644 --- a/hosts/lucent-firepit/default.nix +++ b/hosts/lucent-firepit/default.nix @@ -15,12 +15,11 @@ in { ./webapps/default.nix inputs.nix-minecraft.nixosModules.minecraft-servers #inputs.watch-party.nixosModules.watch-party - (fetchTarball "https://github.com/msteen/nixos-vscode-server/tarball/master") inputs.cohost-blogger.nixosModules.cohost-blogger + inputs.vscode-server.nixosModules.default ]; -# services.auto-fix-vscode-server.enable = true; -# services.vscode-server.enable = true; + services.vscode-server.enable = true; user = { packages = with pkgs; [ @@ -120,8 +119,6 @@ in { variant = "qwerty"; }; - services.vscode-server.enable = true; - modules = { shell.fish.enable = true; security.isLocalMachine = false; diff --git a/hosts/lucent-firepit/webapps/default.nix b/hosts/lucent-firepit/webapps/default.nix index 07b7bf8..0b9ca5a 100644 --- a/hosts/lucent-firepit/webapps/default.nix +++ b/hosts/lucent-firepit/webapps/default.nix @@ -102,11 +102,11 @@ in { enable = true; }; - code-server = { - enable = true; - domain = "dev-firepit.oat.zone"; - port = 4444; - }; + #code-server = { + # enable = true; + # domain = "dev-firepit.oat.zone"; + # port = 4444; + #}; /* ghost = {