Merge remote-tracking branch 'origin'

build.sh

@@ -0,0 +1 @@
+sudo nixos-rebuild switch --flake .#$(hostname)

client-configuration.nix

@@ -170,6 +170,7 @@
           tamasfe.even-better-toml # toml file support
           myriad-dreamin.tinymist # typst files
           tekumara.typos-vscode # spellcheck
+          bierner.markdown-mermaid # mermaid
         ] ++ pkgs.vscode-utils.extensionsFromVscodeMarketplace [
           {
             name = "skillavid-pure-black";
@@ -177,6 +178,12 @@
             version = "5.0.0";
             sha256 = "sha256-/gLvhw0XcUb6Jch/LZ4k7xpSS9wdYWVf5u7uvOHS+i8=";
           }
+          {
+            name = "remote-ssh-edit";
+            publisher = "ms-vscode-remote";
+            version = "0.47.2";
+            sha256 = "1hp6gjh4xp2m1xlm1jsdzxw9d8frkiidhph6nvl24d0h8z34w49g";
+          }
         ];
       };
     };
@@ -196,6 +203,8 @@
       discord-canary
       # godot # 4.5.1 for now
       inputs.nixpkgs-unstable.legacyPackages.${pkgs.system}.godot_4
+      inputs.nixpkgs-unstable.legacyPackages.${pkgs.system}.typst # bleeding edge html exports for typst
+      tinymist # typst previews
       nextcloud-client
       steam
       signal-desktop
@@ -211,8 +220,6 @@
       python3
       direnv # develop projects in custom environments
       # hyprshot # screenshots
-      typst # typst compilation
-      tinymist # typst previews
       binaryninja-free # broke ahh cracker
       patchelf # make programs understand nix. good for downloaded executables such as crackmes
       starsector # support indie games!
@@ -227,6 +234,7 @@
       android-tools # phone rdp
       wireguard-tools
       blender # drone
+      gnumake # make & makefile
     ];
   };
 

flake.lock

@@ -39,11 +39,11 @@
     },
     "nixpkgs-unstable": {
       "locked": {
-        "lastModified": 1778443072,
+        "lastModified": 1785090369,
-        "narHash": "sha256-zi7/fsqM/kFdNuED//4WOCUtezGtKKqRNORjMvfwjnA=",
+        "narHash": "sha256-m0pDuRJG7EDo9ri+4Ksu83VsI+PlxNC9lNBfydejce4=",
         "owner": "nixos",
         "repo": "nixpkgs",
-        "rev": "da5ad661ba4e5ef59ba743f0d112cbc30e474f32",
+        "rev": "624af665418d3c65d544145b4d34ad696439570e",
         "type": "github"
       },
       "original": {