Compare commits

...

2 Commits

5 changed files with 14 additions and 15 deletions

View File

@ -594,13 +594,13 @@
"locked": { "locked": {
"lastModified": 1684517665, "lastModified": 1684517665,
"narHash": "sha256-SaAr66uCQ8CF75jIr23FZjk1+9Kfwm5sQnwV25206Gs=", "narHash": "sha256-SaAr66uCQ8CF75jIr23FZjk1+9Kfwm5sQnwV25206Gs=",
"owner": "msteen", "owner": "nix-community",
"repo": "nixos-vscode-server", "repo": "nixos-vscode-server",
"rev": "1e1358493df6529d4c7bc4cc3066f76fd16d4ae6", "rev": "1e1358493df6529d4c7bc4cc3066f76fd16d4ae6",
"type": "github" "type": "github"
}, },
"original": { "original": {
"owner": "msteen", "owner": "nix-community",
"repo": "nixos-vscode-server", "repo": "nixos-vscode-server",
"type": "github" "type": "github"
} }

View File

@ -51,10 +51,10 @@
#inputs.nixpkgs.follows = "nixpkgs"; #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 let
system = "x86_64-linux"; system = "x86_64-linux";
@ -77,7 +77,6 @@
overlays = mapModules ./overlays import; overlays = mapModules ./overlays import;
nixosModules = (mapModulesRec ./modules import) ++ [ nixosModules = (mapModulesRec ./modules import) ++ [
#hyprland.nixosModules.default #hyprland.nixosModules.default
vscode-server.nixosModule
]; ];
nixosConfigurations = mapModules ./hosts (host: mkHost host { inherit system; }); nixosConfigurations = mapModules ./hosts (host: mkHost host { inherit system; });
devShell."${system}" = import ./shell.nix { inherit pkgs; }; devShell."${system}" = import ./shell.nix { inherit pkgs; };

View File

@ -15,12 +15,11 @@ in {
./webapps/default.nix ./webapps/default.nix
inputs.nix-minecraft.nixosModules.minecraft-servers inputs.nix-minecraft.nixosModules.minecraft-servers
#inputs.watch-party.nixosModules.watch-party #inputs.watch-party.nixosModules.watch-party
(fetchTarball "https://github.com/msteen/nixos-vscode-server/tarball/master")
inputs.cohost-blogger.nixosModules.cohost-blogger 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 = { user = {
packages = with pkgs; [ packages = with pkgs; [
@ -120,8 +119,6 @@ in {
variant = "qwerty"; variant = "qwerty";
}; };
services.vscode-server.enable = true;
modules = { modules = {
shell.fish.enable = true; shell.fish.enable = true;
security.isLocalMachine = false; security.isLocalMachine = false;

View File

@ -102,11 +102,11 @@ in {
enable = true; enable = true;
}; };
code-server = { #code-server = {
enable = true; # enable = true;
domain = "dev-firepit.oat.zone"; # domain = "dev-firepit.oat.zone";
port = 4444; # port = 4444;
}; #};
/* /*
ghost = { ghost = {

View File

@ -34,6 +34,9 @@ in {
nitter = { nitter = {
enable = true; enable = true;
package = pkgs.nitter; package = pkgs.nitter;
config = {
proxy = ""; # https://github.com/NixOS/nixpkgs/issues/235359
};
server = { server = {
address = "127.0.0.1"; address = "127.0.0.1";
port = cfg.port; port = cfg.port;