diff --git a/hosts/socrates/configuration.nix b/hosts/socrates/configuration.nix index 0528ce0..322feba 100644 --- a/hosts/socrates/configuration.nix +++ b/hosts/socrates/configuration.nix @@ -1,4 +1,9 @@ -{ pkgs, ... }: { +{ pkgs, ... }: + +let + dotfiles = builtins.fetchTarball + "https://github.com/walkah/dotfiles/archive/main.tar.gz"; +in { imports = [ ./hardware-configuration.nix ./networking.nix # generated at runtime by nixos-infect @@ -13,8 +18,8 @@ networking.hostName = "socrates"; networking.firewall.allowPing = true; networking.firewall.allowedTCPPorts = [ 80 443 ]; - networking.nameservers = [ "100.100.100.100" "1.1.1.1" ]; - networking.search = [ "walkah.net.beta.tailscale.net" ]; + networking.nameservers = [ "100.111.208.75" "1.1.1.1" ]; + networking.search = [ "walkah.lab" ]; security.sudo.wheelNeedsPassword = false; @@ -32,7 +37,7 @@ ]; }; }; - home-manager.users.walkah = import /home/walkah/.config/nixpkgs/home.nix; + home-manager.users.walkah = import "${dotfiles}/home.nix"; system.autoUpgrade.enable = true; environment.systemPackages = with pkgs; [ ]; @@ -43,8 +48,6 @@ services.openssh.enable = true; services.tailscale.enable = true; - virtualisation.docker.enable = true; - security.acme.acceptTerms = true; security.acme.email = "walkah@walkah.net"; @@ -53,15 +56,6 @@ recommendedOptimisation = true; recommendedProxySettings = true; recommendedTlsSettings = true; - - virtualHosts."walkah.codes" = { - enableACME = true; - forceSSL = true; - locations."/" = { - proxyPass = "http://127.0.0.1:8080"; - proxyWebsockets = true; - }; - }; }; } diff --git a/nix/sources.json b/nix/sources.json index c00a119..07bccb1 100644 --- a/nix/sources.json +++ b/nix/sources.json @@ -5,10 +5,10 @@ "homepage": "https://github.com/nmattia/niv", "owner": "nmattia", "repo": "niv", - "rev": "94080ae8286024820c570a2a24ed7c36d7ad04a9", - "sha256": "0wlk52zwlrq727x3z1vg9d9qq4zw62ab5jzg4068iqb6hyb0cr0w", + "rev": "1819632b5823e0527da28ad82fecd6be5136c1e9", + "sha256": "08jz17756qchq0zrqmapcm33nr4ms9f630mycc06i6zkfwl5yh5i", "type": "tarball", - "url": "https://github.com/nmattia/niv/archive/94080ae8286024820c570a2a24ed7c36d7ad04a9.tar.gz", + "url": "https://github.com/nmattia/niv/archive/1819632b5823e0527da28ad82fecd6be5136c1e9.tar.gz", "url_template": "https://github.com///archive/.tar.gz" }, "nixpkgs": { @@ -17,10 +17,10 @@ "homepage": "", "owner": "NixOS", "repo": "nixpkgs", - "rev": "7013a0f2791da4c38c7e6f56d48139aeb344991b", - "sha256": "1az617wpx535nfn0rz63cyvv8b5rlsp80cdq07da2dws8zzylnbm", + "rev": "d8eb97e3801bde96491535f40483d550b57605b9", + "sha256": "1bdd7jinq5d40qai45jfkbcw1n96c7fdlams5iidwzy2ag8axlqh", "type": "tarball", - "url": "https://github.com/NixOS/nixpkgs/archive/7013a0f2791da4c38c7e6f56d48139aeb344991b.tar.gz", + "url": "https://github.com/NixOS/nixpkgs/archive/d8eb97e3801bde96491535f40483d550b57605b9.tar.gz", "url_template": "https://github.com///archive/.tar.gz" } } diff --git a/ops/socrates.nix b/ops/socrates.nix new file mode 100644 index 0000000..512b3a9 --- /dev/null +++ b/ops/socrates.nix @@ -0,0 +1,12 @@ +{ + network = { description = "Digital Ocean droplet"; }; + + socrates = { config, pkgs, ... }: { + imports = [ ../hosts/socrates/configuration.nix ]; + networking.hostName = "socrates"; + nixpkgs.system = "x86_64-linux"; + + deployment.targetHost = "167.99.176.10"; + deployment.targetUser = "root"; + }; +}