From 03e2187d696b9be089cdc3f090dd4cb8772f272b Mon Sep 17 00:00:00 2001 From: Nick Date: Thu, 10 Apr 2025 16:57:41 -0500 Subject: [PATCH 1/5] feat: added haskell highlighting --- modules/home/gui/apps/code/vsCode/config/extensions.nix | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) 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 From 23939511184151b8c0583ab50734ffe5d16d8271 Mon Sep 17 00:00:00 2001 From: Nick Date: Thu, 10 Apr 2025 16:57:57 -0500 Subject: [PATCH 2/5] feat: added wireguard to laptop --- modules/nixos/default.nix | 1 + 1 file changed, 1 insertion(+) 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 ; }; }; From b6a8aef44c4508494b1fcb3685477a2746575b85 Mon Sep 17 00:00:00 2001 From: Nick Date: Thu, 10 Apr 2025 16:58:19 -0500 Subject: [PATCH 3/5] feat: added extra packages to elm template --- templates/elm/parts/config/devshells.nix | 9 +++++++++ 1 file changed, 9 insertions(+) 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 From d740ec81ac4e1fcbd322a2b18635d364018e42ea Mon Sep 17 00:00:00 2001 From: Nick Date: Thu, 10 Apr 2025 17:46:25 -0500 Subject: [PATCH 4/5] feat: added remote ip field --- modules/config/default.nix | 1 + modules/config/instances/config/web.nix | 3 +++ 2 files changed, 4 insertions(+) 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"; + }; } From bd524a279c26675f1257f58f2cff3f7c8780f792 Mon Sep 17 00:00:00 2001 From: Nick Date: Thu, 10 Apr 2025 17:46:40 -0500 Subject: [PATCH 5/5] feat: added just command for remote server --- profiles/user0/default.nix | 6 +++++- 1 file changed, 5 insertions(+), 1 deletion(-) 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}