diff --git a/hosts/server/configuration.nix b/hosts/server/configuration.nix index 7bf6192..2a532ee 100644 --- a/hosts/server/configuration.nix +++ b/hosts/server/configuration.nix @@ -18,33 +18,19 @@ trusted-public-keys = ["nix.dhilton.xyz:MOW060dF1A0/UXmPZBue9KMxCO13PHYFwx1X9hcdYZ4="]; }; }; - nixpkgs.config.allowUnfree = true; programs = { nix-ld.enable = true; nix-ld.libraries = with pkgs; [glibc glib]; zsh.enable = true; }; - users = { - motd = "Welcome to the Server"; - defaultUserShell = pkgs.zsh; - users = { - k = { - isNormalUser = true; - description = "k"; - extraGroups = ["networkmanager" "wheel"]; - openssh.authorizedKeys.keys = ["ssh-ed25519 AAAAC3NzaC1lZDI1NTE5AAAAIPKbKVe6gneJ9ghFih3bOeL++iDNPJNIMoZSdNMOsD0I k@laptop"]; - packages = with pkgs; [zsh]; - shell = pkgs.zsh; - }; - docker = { - isNormalUser = true; - description = "user for runing docker"; - extraGroups = ["docker"]; - openssh.authorizedKeys.keys = ["ssh-ed25519 AAAAC3NzaC1lZDI1NTE5AAAAIPKbKVe6gneJ9ghFih3bOeL++iDNPJNIMoZSdNMOsD0I k@laptop"]; - packages = with pkgs; [docker-compose]; - }; - }; + + users.users.k = { + isNormalUser = true; + description = "k"; + extraGroups = ["networkmanager" "wheel"]; + packages = with pkgs; [zsh]; + shell = pkgs.zsh; }; home-manager = {users = {"k" = import ./home.nix;};}; @@ -62,6 +48,7 @@ vaapiVdpau libvdpau-va-gl vpl-gpu-rt + neovim ]; }; diff --git a/hosts/server/service.nix b/hosts/server/service.nix index d663b4e..df80dae 100644 --- a/hosts/server/service.nix +++ b/hosts/server/service.nix @@ -5,8 +5,8 @@ }: { networking.firewall = { enable = true; - allowedTCPPorts = [80 443 22 26615 25565 24454]; - allowedUDPPorts = [26615 25565 24454]; + allowedTCPPorts = [80 443 22 26615]; + allowedUDPPorts = [26615]; }; security.acme = { @@ -169,15 +169,6 @@ }; }; - "map.dhilton.xyz" = { - forceSSL = true; - enableACME = true; - locations."/" = { - proxyPass = "http://127.0.0.1:8100"; - proxyWebsockets = true; - }; - }; - "nix.dhilton.xyz" = { locations."/".proxyPass = "http://127.0.0.1:5000"; };