justray and usbtree

configurations/mobile.nix

@@ -85,12 +85,14 @@ let
         extraSpecialArgs = {
           inherit xlib;
         };
-        config = { ... }: {
-          imports = [
-            ../home/termux.nix
-          ];
-          home.stateVersion = "24.05";
-        };
+        config =
+          { ... }:
+          {
+            imports = [
+              ../home/termux.nix
+            ];
+            home.stateVersion = "24.05";
+          };
       };
 
       # Read the changelog before changing this value

flake.lock

@@ -101,6 +101,26 @@
         "type": "github"
       }
     },
+    "justray": {
+      "inputs": {
+        "nixpkgs": [
+          "nixpkgs"
+        ]
+      },
+      "locked": {
+        "lastModified": 1788279413,
+        "narHash": "sha256-8ygcOBE66W/+EasYGImeU+CfJHi5gT8mFD0KujF1hHc=",
+        "owner": "luynrs",
+        "repo": "justray",
+        "rev": "e2a33af09b0b92ef09f8e557dfa1f5710b58122b",
+        "type": "github"
+      },
+      "original": {
+        "owner": "luynrs",
+        "repo": "justray",
+        "type": "github"
+      }
+    },
     "nix-formatter-pack": {
       "inputs": {
         "nixpkgs": [
@@ -389,6 +409,7 @@
         "flake-compat": "flake-compat",
         "grub2-themes": "grub2-themes",
         "home-manager": "home-manager",
+        "justray": "justray",
         "nix-minecraft": "nix-minecraft",
         "nix-on-droid": "nix-on-droid",
         "nix-systems": "nix-systems",

flake.nix

@@ -32,6 +32,12 @@
         utils.follows = "utils";
       };
     };
+    justray = {
+      url = "github:luynrs/justray";
+      inputs = {
+        nixpkgs.follows = "nixpkgs";
+      };
+    };
 
     utils.url = "github:numtide/flake-utils";
     flake-compat.url = "github:edolstra/flake-compat";

home/primary.nix

@@ -32,7 +32,7 @@ in
     ./modules/dconf.nix
     ./modules/packages.nix
     ./modules/plasma-manager.nix
-    ./modules/noctalia.nix
+    # ./modules/noctalia.nix
   ];
   xdg = {
     enable = true;

home/secondary.nix

@@ -27,7 +27,7 @@ in
     ./modules/dconf.nix
     ./modules/packages.nix
     ./modules/plasma-manager.nix
-    ./modules/noctalia.nix
+    # ./modules/noctalia.nix
   ];
   xdg = {
     enable = true;

modules/containers/3x-ui.nix

@@ -9,7 +9,8 @@ let
   panel = "${xlib.dirs.services-nodes-folder}/${xlib.device.hostname}/3x-ui";
   certDomain = xlib.services."3x-ui".certDomain or null;
   certMounts =
-    if certDomain == null then [ ]
+    if certDomain == null then
+      [ ]
     else
       # LE cert mounted read-only so 3x-ui can terminate TLS itself.
       # The 3x-ui settings table must point webCertFile / webKeyFile at
@@ -54,7 +55,8 @@ in
         volumes = [
           "${panel}/cert/:/root/cert:rw"
           "${panel}/db/:/etc/x-ui:rw"
-        ] ++ certMounts;
+        ]
+        ++ certMounts;
         log-driver = "journald";
         # Adding a new inbound through the 3x-ui panel on a port outside
         # the 14380-15379 range requires extending basePorts and rebuilding.
@@ -97,7 +99,10 @@ in
     tmpfiles.rules = [
       (xlib.helpers.mkTmpfile "d" xlib.dirs.services-mnt-folder "0755" "root" "root")
       (xlib.helpers.mkTmpfile "d" xlib.dirs.services-nodes-folder "0755" "root" "root")
-      (xlib.helpers.mkTmpfile "d" "${xlib.dirs.services-nodes-folder}/${xlib.device.hostname}" "0755" "root" "root")
+      (xlib.helpers.mkTmpfile "d" "${xlib.dirs.services-nodes-folder}/${xlib.device.hostname}" "0755"
+        "root"
+        "root"
+      )
       (xlib.helpers.mkTmpfile "d" panel "0755" "root" "root")
       (xlib.helpers.mkTmpfile "d" "${panel}/db" "0755" "root" "root")
       (xlib.helpers.mkTmpfile "d" "${panel}/cert" "0755" "root" "root")

modules/default.nix

@@ -33,10 +33,11 @@ let
           # nix-index-database.nixosModules.nix-index # nix-index module
           grub2-themes.nixosModules.default # grub2 themes module
           sops-nix.nixosModules.sops # sops module
+          justray.nixosModules.default
           self.homeConfigurations.default.nixosModule # default homeConfigurations
           disko.nixosModules.disko # disko module
         ]
-        ++ lib.optional isDesktop ../desktop # desktop class: primary/secondary
+        ++ lib.optional isDesktop ./desktop # desktop class: primary/secondary
         # device-type module dir; "minimal" has no extra modules
         ++ lib.optional (!isDesktop && deviceType != "minimal") (./. + "/${deviceType}");
       nixpkgs.overlays = with inputs; [

modules/essentials/packages.nix

@@ -100,6 +100,7 @@
       # Test
       rgx
       net-tools
+      usbtree
       # lazydocker
       # dtop
       # framework-tool-tui
@@ -108,6 +109,9 @@
   environment.variables.EDITOR = "fresh";
   programs = {
     # nix-ld.enable = true;
+    justray = {
+      enable = true;
+    };
     nano = {
       enable = true;
       nanorc = ''