chore: bump and reconfigure treefmt-nix, include just fmt

.vscode/settings.json

@@ -11,11 +11,10 @@
         "ignored": ["unused_binding", "unused_with"]
       },
       "formatting": {
-        "command": ["treefmt-nix", "--stdin", ".nil.nix"]
+        "command": ["treefmt", "--stdin", ".nil.nix"]
       }
     }
   },
-  "[nix]": {
+  "treefmt.command": "treefmt",
-    "editor.defaultFormatter": "jnoortheen.nix-ide"
+  "treefmt.config": ""
-  }
 }

Justfile

@@ -127,6 +127,7 @@ disk-relabel dir previous:
 # Mount the target disk specified by device configuration directory. The 'dir' argument points to a device configuration, e.g. 'nix/os/devices/steveej-live-mmc-SL32G_0x259093f6'
 disk-mount dir:
     just -v _device diskMount {{ dir }}
+
 # Unmount target disk, specified by device configuration directory
 disk-umount dir:
     just -v _device diskUmount {{ dir }}
@@ -135,7 +136,6 @@ disk-umount dir:
 disk-install dir: _render_templates
     just -v _device diskInstall {{ dir }}
 
-
 verify-n-unlock sshserver attempts="10":
     #!/usr/bin/env bash
     set -e

flake.nix

@@ -278,7 +278,6 @@
                     };
                   };
 
-
                 local-xwayland = pkgs.writeShellScriptBin "local-xwayland" ''
                   set -x
                   ${pkgs.wayland-proxy-virtwl}/bin/wayland-proxy-virtwl \
@@ -355,6 +354,13 @@
                     shellcheck.enable = true;
 
                     prettier.enable = true;
+                    just = {
+                      enable = true;
+                      includes = [
+                        "*/Justfile"
+                        "Justfile"
+                      ];
+                    };
                   } // pkgs.lib.optionalAttrs (pkgs.system != "riscv64-linux") { shellcheck.enable = true; };
 
                   settings = {
@@ -410,7 +416,10 @@
                     ;
                 };
               in
-              all // { default = all.develop; };
+              all
+              // {
+                default = all.develop;
+              };
           };
       }
     );

nix/devShells.nix

@@ -93,11 +93,11 @@
       self.nixosConfigurations.sj-srv1.config.containers.webserver.config.services.kanidm.serverSettings.origin;
 
     shellHook = builtins.concatStringsSep "\n" [
-      (self.inputs.nixago.lib.${pkgs.system}.make {
+      # (self.inputs.nixago.lib.${pkgs.system}.make {
-        data = self'.formatter.settings;
+      #   data = self'.formatter.settings;
-        output = "treefmt.toml";
+      #   output = "treefmt.toml";
-        format = "toml";
+      #   format = "toml";
-      }).shellHook
+      # }).shellHook
     ];
   };
 }

nix/home-manager/programs/firefox.nix

@@ -162,7 +162,10 @@ let
         "devtools.debugger.remote-enabled" = true;
 
         # disable translations for some languages
-        "browser.translations.neverTranslateLanguages" = ["en" "de"];
+        "browser.translations.neverTranslateLanguages" = [
+          "en"
+          "de"
+        ];
         "browser.translations.automaticallyPopup" = false;
 
         # enable pipewire (and libcamera) sources
@@ -303,7 +306,9 @@ in
     repoFlake.inputs.nur.overlay
   ];
 
-  nixpkgs.config.allowUnfreePredicate = pkg: builtins.elem (lib.getName pkg) [
+  nixpkgs.config.allowUnfreePredicate =
+    pkg:
+    builtins.elem (lib.getName pkg) [
       "youtube-recommended-videos"
     ];
 

nix/os/devices/router0-dmz0/flake.nix

@@ -13,8 +13,7 @@
     srvos.url = "github:numtide/srvos";
     srvos.inputs.nixpkgs.follows = "nixpkgs";
 
-    nixos-sbc.url =
+    nixos-sbc.url = "github:nakato/nixos-sbc"
-      "github:nakato/nixos-sbc"
     # "github:steveej-forks/nakato_nixos-sbc//bpi-r3_kernel-6.12"
     # "github:steveej-forks/nakato_nixos-sbc//bpi-r3_kernel-6.13"
     # "github:steveej-forks/nakato_nixos-sbc/kernel-6.9_and_cross-compile"

nix/os/devices/steveej-x13s/configuration.nix

@@ -6,7 +6,6 @@
   config,
   nodeName,
   system,
-  packages',
   ...
 }:
 {

nix/os/devices/steveej-x13s/flake.nix

@@ -15,8 +15,7 @@
       inputs.nixpkgs.follows = "nixpkgs";
     };
 
-    nixos-x13s.url =
+    nixos-x13s.url = "git+https://forgejo.www.stefanjunker.de/steveej/nixos-x13s.git?ref=bump"
-    "git+https://forgejo.www.stefanjunker.de/steveej/nixos-x13s.git?ref=bump"
     # 6.13-rc2
     # "git+https://forgejo.www.stefanjunker.de/steveej/nixos-x13s.git?ref=bump&rev=c95058f8aa1b361df3874429c5dc0f694f9cba78"
     # 6.11.0
@@ -89,7 +88,9 @@
         inherit mkNixosConfiguration;
       };
 
-      overlays.default = _final: _previous: {
+      overlays.default =
+        _final: _previous:
+        {
         };
 
       nixosConfigurations = {