Broadcom (#187)

* Init ssh key before running jjui

* Update jjui and more config

* broadcom

flake.lock

···
         "nixpkgs-lib": "nixpkgs-lib_2"
       },
       "locked": {
-        "lastModified": 1751413152,
-        "narHash": "sha256-Tyw1RjYEsp5scoigs1384gIg6e0GoBVjms4aXFfRssQ=",
+        "lastModified": 1743550720,
+        "narHash": "sha256-hIshGgKZCgWh6AYJpJmRgFdR3WUbkY04o82X05xqQiY=",
         "owner": "hercules-ci",
         "repo": "flake-parts",
-        "rev": "77826244401ea9de6e3bac47c2db46005e1f30b5",
+        "rev": "c621e8422220273271f52058f618c94e405bb0f5",
         "type": "github"
       },
       "original": {
···
         "systems": "systems_3"
       },
       "locked": {
-        "lastModified": 1752695898,
-        "narHash": "sha256-oM/Pu4Eeuapq1M8R251pm8qav3mZjJQab82nCf+dD0I=",
+        "lastModified": 1753895835,
+        "narHash": "sha256-IwJ8BjMzlH7RZsVE5vM6cW0D+OowuSkfPtXxg+pBCKw=",
         "owner": "idursun",
         "repo": "jjui",
-        "rev": "defac36a6fe9153f1a9aad35e9bf0050c1e0583a",
+        "rev": "04bec1a2efb54396ba4bf2fb0c58b56bc98394c8",
         "type": "github"
       },
       "original": {
···
     },
     "nixpkgs-lib_2": {
       "locked": {
-        "lastModified": 1751159883,
-        "narHash": "sha256-urW/Ylk9FIfvXfliA1ywh75yszAbiTEVgpPeinFyVZo=",
+        "lastModified": 1743296961,
+        "narHash": "sha256-b1EdN3cULCqtorQ4QeWgLMrd5ZGOjLSLemfa00heasc=",
         "owner": "nix-community",
         "repo": "nixpkgs.lib",
-        "rev": "14a40a1d7fb9afa4739275ac642ed7301a9ba1ab",
+        "rev": "e4822aea2a6d1cdd36653c134cacfd64c97ff4fa",
         "type": "github"
       },
       "original": {
···
     },
     "nixpkgs_5": {
       "locked": {
-        "lastModified": 1752596105,
-        "narHash": "sha256-lFNVsu/mHLq3q11MuGkMhUUoSXEdQjCHvpReaGP1S2k=",
+        "lastModified": 1743938762,
+        "narHash": "sha256-UgFYn8sGv9B8PoFpUfCa43CjMZBl1x/ShQhRDHBFQdI=",
         "owner": "nixos",
         "repo": "nixpkgs",
-        "rev": "dab3a6e781554f965bde3def0aa2fda4eb8f1708",
+        "rev": "74a40410369a1c35ee09b8a1abee6f4acbedc059",
         "type": "github"
       },
       "original": {
···
     },
     "nixpkgs_9": {
       "locked": {
-        "lastModified": 1752077645,
-        "narHash": "sha256-HM791ZQtXV93xtCY+ZxG1REzhQenSQO020cu6rHtAPk=",
+        "lastModified": 1753844155,
+        "narHash": "sha256-w81jpZeM3AtYlTKIhT05p3IqvJRIHZPyp0Acgb6hXWc=",
         "owner": "nixos",
         "repo": "nixpkgs",
-        "rev": "be9e214982e20b8310878ac2baa063a961c1bdf6",
+        "rev": "e44b8dc0882d66e2627a8ff252b04a22f4a629fd",
         "type": "github"
       },
       "original": {

modules/community/features/wl-broadcom.nix

···
     {
       boot.kernelModules = [ "wl" ];
       boot.extraModulePackages = [ config.boot.kernelPackages.broadcom_sta ];
+      nixpkgs.config.permittedInsecurePackages = [
+        "broadcom-sta-6.30.223.271-57-6.12.40"
+      ];
     };
 }

modules/vic/desktop-apps.nix

···
       ...
     }:
     {
-      home.packages =
-        [
-          pkgs.librewolf
-          pkgs.vscode
-          pkgs.wezterm
-        ]
-        ++ (lib.optionals (pkgs.system == "aarm64-darwin" || pkgs.stdenvNoCC.isLinux) [
-          pkgs.ghostty
-        ])
-        ++ (lib.optionals pkgs.stdenvNoCC.isLinux [
-          pkgs.gnome-disk-utility
-        ]);
+      home.packages = [
+        pkgs.librewolf
+        pkgs.vscode
+        pkgs.wezterm
+      ]
+      ++ (lib.optionals (pkgs.system == "aarm64-darwin" || pkgs.stdenvNoCC.isLinux) [
+        pkgs.ghostty
+      ])
+      ++ (lib.optionals pkgs.stdenvNoCC.isLinux [
+        pkgs.gnome-disk-utility
+      ]);
     };
 
 in

modules/vic/jujutsu.nix

···
             user.name = "Victor Borja";
             user.email = "[e-mail]";
 
+            revsets.log = "default()";
+
             revset-aliases = {
               "trunk()" = "main@origin";
 
···
 
               # immutable heads:
               # main and not mine commits.
-              "immutable_heads()" = "trunk() | (trunk().. & ~mine())";
+              # "immutable_heads()" = "trunk() | (trunk().. & ~mine())";
+              "immutable_heads()" = "builtin_immutable_heads() | remote_bookmarks()";
 
+              "closest_bookmark(to)" = "heads(::to & bookmarks())";
+
+              # jjui default
               "default_log()" = "present(@) | ancestors(immutable_heads().., 2) | present(trunk())";
+
+              "default()" = "coalesce(trunk(),root())::present(@) | ancestors(visible_heads() & recent(), 2)";
+
+              "recent()" = "committer_date(after:'1 week ago')";
             };
 
             template-aliases = {
···
                 ui.pager = (pkgs.lib.getExe pkgs.delta);
                 ui.diff-formatter = diff-formatter;
               }
+              {
+                "--when".repositories = [ "~/hk/jjui" ];
+                revsets.log = "default()";
+                revset-aliases = {
+                  "trunk()" = "main@idursun";
+                  "vic" = "remote_bookmarks('', 'vic')";
+                  "idursun" = "remote_bookmarks('', 'idursun')";
+                  "default()" =
+                    "coalesce( trunk(), root() )::present(@) | ancestors(visible_heads() & recent(), 2) | idursun | vic";
+                };
+                aliases = {
+                  "n" = [
+                    "new"
+                    "main@idursun"
+                  ];
+                };
+              }
             ];
 
             ui = {
···
               # pager = ":builtin";
               # editor = "nvim";
               merge-editor = pkgs.meld; # meld
+              conflict-marker-style = "git";
+              movement.edit = false;
             };
 
             signing = {
···
             };
 
             aliases = {
+              tug = [
+                "bookmark"
+                "move"
+                "--from"
+                "closest_bookmark(@-)"
+                "--to"
+                "@-"
+              ];
+              lr = [
+                "log"
+                "-r"
+                "default() & recent()"
+              ];
+
               s = [ "show" ];
 
               sq = [