diff --git a/modules/config/default.nix b/modules/config/default.nix index 6986997..ebffaee 100755 --- a/modules/config/default.nix +++ b/modules/config/default.nix @@ -60,6 +60,7 @@ let domains = genOptions stringType "url"; dns = genOptions stringType "provider"; localhost = genOptions stringType "address"; + remotehost = genOptions stringType "address"; email = genOptions stringType "address"; sops = genOptions stringType "path"; paths = genOptions stringType "path"; diff --git a/modules/config/instances/config/web.nix b/modules/config/instances/config/web.nix index 369a7e1..df59752 100755 --- a/modules/config/instances/config/web.nix +++ b/modules/config/instances/config/web.nix @@ -23,4 +23,7 @@ in address2 = "192.168.50.1"; # Router address3 = "192.168.50.0"; # Router }; + remotehost = { + address0 = "24.76.173.0"; + }; } diff --git a/modules/home/gui/apps/code/vsCode/config/extensions.nix b/modules/home/gui/apps/code/vsCode/config/extensions.nix index d61d771..4287d4a 100755 --- a/modules/home/gui/apps/code/vsCode/config/extensions.nix +++ b/modules/home/gui/apps/code/vsCode/config/extensions.nix @@ -6,9 +6,9 @@ with pkgs.vscode-extensions; elmtooling.elm-ls-vscode esbenp.prettier-vscode haskell.haskell + justusadam.language-haskell james-yu.latex-workshop bbenoist.nix - # jnoortheen.nix-ide mattn.lisp mkhl.direnv pkief.material-icon-theme diff --git a/modules/nixos/default.nix b/modules/nixos/default.nix index b532b63..bdfe113 100755 --- a/modules/nixos/default.nix +++ b/modules/nixos/default.nix @@ -40,6 +40,7 @@ in sddm flatpak xserver + wireGuard ; }; }; diff --git a/profiles/user0/default.nix b/profiles/user0/default.nix index 967ebc1..0c614f7 100755 --- a/profiles/user0/default.nix +++ b/profiles/user0/default.nix @@ -9,6 +9,7 @@ let inherit (flake) self; inherit (flake.config.people) user0; inherit (flake.config.machines) devices; + inherit (flake.config.services) instances; inherit (flake.config.people.users.${user0}) name paths; hostname = config.networking.hostName; @@ -71,7 +72,7 @@ in in { text = '' - rebuildboot: + rebuildBoot: nixos-rebuild boot --use-remote-sudo --flake ~/Files/Projects/dotfiles#${hostname} --show-trace rebuild: @@ -86,6 +87,9 @@ in server: ssh ${devices.ceres.ip.address0} + serverRemote: + ssh ${instances.web.remotehost.address0} + ${deviceLogic.name}: ssh ${deviceLogic.ip.address0} diff --git a/templates/elm/parts/config/devshells.nix b/templates/elm/parts/config/devshells.nix index 165955c..970d598 100755 --- a/templates/elm/parts/config/devshells.nix +++ b/templates/elm/parts/config/devshells.nix @@ -15,6 +15,15 @@ sops ssh-to-age nixfmt-rfc-style + dhall + dhall-json + dhall-lsp-server + helix-gpt + libz + ngrep + stripe-cli + vscode-langservers-extracted + zlib ; inherit (pkgs-stable.elmPackages) elm