From c092fdeb48def330c5e2d2a73e09121db63c4522 Mon Sep 17 00:00:00 2001
From: Martin Pander <martin.pander@knowtion.de>
Date: Thu, 7 May 2026 13:55:04 +0200
Subject: [PATCH] Update; jj aliases; session management

---
 flake.lock                         | 42 +++++++++++++++---------------
 hosts/work/nixos/configuration.nix |  1 +
 modules/home/git.nix               |  6 +++++
 modules/home/sh.nix                |  3 ++-
 4 files changed, 30 insertions(+), 22 deletions(-)

diff --git a/flake.lock b/flake.lock
index 9935da9..da11c72 100644
--- a/flake.lock
+++ b/flake.lock
@@ -59,11 +59,11 @@
         ]
       },
       "locked": {
-        "lastModified": 1775425411,
-        "narHash": "sha256-KY6HsebJHEe5nHOWP7ur09mb0drGxYSzE3rQxy62rJo=",
+        "lastModified": 1777851538,
+        "narHash": "sha256-Gp8qwTEYNoy2yvmErVGlvLOQvrtEECCAKbonW7VJef8=",
         "owner": "nix-community",
         "repo": "home-manager",
-        "rev": "0d02ec1d0a05f88ef9e74b516842900c41f0f2fe",
+        "rev": "cc09c0f9b7eaa95c2d9827338a5eb03d32505ca5",
         "type": "github"
       },
       "original": {
@@ -80,11 +80,11 @@
         ]
       },
       "locked": {
-        "lastModified": 1775425411,
-        "narHash": "sha256-KY6HsebJHEe5nHOWP7ur09mb0drGxYSzE3rQxy62rJo=",
+        "lastModified": 1777851538,
+        "narHash": "sha256-Gp8qwTEYNoy2yvmErVGlvLOQvrtEECCAKbonW7VJef8=",
         "owner": "nix-community",
         "repo": "home-manager",
-        "rev": "0d02ec1d0a05f88ef9e74b516842900c41f0f2fe",
+        "rev": "cc09c0f9b7eaa95c2d9827338a5eb03d32505ca5",
         "type": "github"
       },
       "original": {
@@ -101,11 +101,11 @@
         ]
       },
       "locked": {
-        "lastModified": 1775037210,
-        "narHash": "sha256-KM2WYj6EA7M/FVZVCl3rqWY+TFV5QzSyyGE2gQxeODU=",
+        "lastModified": 1777780666,
+        "narHash": "sha256-8wURyQMdDkGUarSTKOGdCuFfYiwa3HbzwscUfn3STDE=",
         "owner": "LnL7",
         "repo": "nix-darwin",
-        "rev": "06648f4902343228ce2de79f291dd5a58ee12146",
+        "rev": "8c62fba0854ba15c8917aed18894dbccb48a3777",
         "type": "github"
       },
       "original": {
@@ -159,11 +159,11 @@
     },
     "nixpkgs": {
       "locked": {
-        "lastModified": 1776877367,
-        "narHash": "sha256-EHq1/OX139R1RvBzOJ0aMRT3xnWyqtHBRUBuO1gFzjI=",
+        "lastModified": 1777954456,
+        "narHash": "sha256-hGdgeU2Nk87RAuZyYjyDjFL6LK7dAZN5RE9+hrDTkDU=",
         "owner": "nixos",
         "repo": "nixpkgs",
-        "rev": "0726a0ecb6d4e08f6adced58726b95db924cef57",
+        "rev": "549bd84d6279f9852cae6225e372cc67fb91a4c1",
         "type": "github"
       },
       "original": {
@@ -190,11 +190,11 @@
     },
     "nixpkgs-stable": {
       "locked": {
-        "lastModified": 1777077449,
-        "narHash": "sha256-AIiMJiqvGrN4HyLEbKAoCSRRYn0rnlW5VbKNIMIYqm4=",
+        "lastModified": 1778003029,
+        "narHash": "sha256-q/nkKLDtHIyLjZpKhWk3cSK5IYsFqtMd6UtXF3ddjgA=",
         "owner": "nixos",
         "repo": "nixpkgs",
-        "rev": "a4bf06618f0b5ee50f14ed8f0da77d34ecc19160",
+        "rev": "0c88e1f2bdb93d5999019e99cb0e61e1fe2af4c5",
         "type": "github"
       },
       "original": {
@@ -206,11 +206,11 @@
     },
     "nixpkgs-wsl-stable": {
       "locked": {
-        "lastModified": 1777077449,
-        "narHash": "sha256-AIiMJiqvGrN4HyLEbKAoCSRRYn0rnlW5VbKNIMIYqm4=",
+        "lastModified": 1778003029,
+        "narHash": "sha256-q/nkKLDtHIyLjZpKhWk3cSK5IYsFqtMd6UtXF3ddjgA=",
         "owner": "nixos",
         "repo": "nixpkgs",
-        "rev": "a4bf06618f0b5ee50f14ed8f0da77d34ecc19160",
+        "rev": "0c88e1f2bdb93d5999019e99cb0e61e1fe2af4c5",
         "type": "github"
       },
       "original": {
@@ -257,11 +257,11 @@
         ]
       },
       "locked": {
-        "lastModified": 1776771786,
-        "narHash": "sha256-DRFGPfFV6hbrfO9a1PH1FkCi7qR5FgjSqsQGGvk1rdI=",
+        "lastModified": 1777944972,
+        "narHash": "sha256-VfGRo1qTBKOe3s2gOv8LSoA6Fk19PvBlwQ1ECN0Evn8=",
         "owner": "Mic92",
         "repo": "sops-nix",
-        "rev": "bef289e2248991f7afeb95965c82fbcd8ff72598",
+        "rev": "c591bf665727040c6cc5cb409079acb22dcce33c",
         "type": "github"
       },
       "original": {
diff --git a/hosts/work/nixos/configuration.nix b/hosts/work/nixos/configuration.nix
index 26b6b27..fde0f0d 100644
--- a/hosts/work/nixos/configuration.nix
+++ b/hosts/work/nixos/configuration.nix
@@ -10,6 +10,7 @@
   wsl.interop.register = true;
 
   networking.hostName = "nix";
+  networking.firewall.enable = false;
 
   users.users.pan = {
     isNormalUser = true;
diff --git a/modules/home/git.nix b/modules/home/git.nix
index d4133da..dbd635a 100644
--- a/modules/home/git.nix
+++ b/modules/home/git.nix
@@ -86,6 +86,12 @@
         lg = ["log"];
         des = ["describe"];
         sq = ["squash"];
+        gp = ["git" "push"];
+        nc = [
+          "util" "exec" "--" "bash" "-c"
+          ''jj new --no-edit -B "''${2:-@}" -m "$1"''
+          ""
+        ];
       };
 
       ui = {
diff --git a/modules/home/sh.nix b/modules/home/sh.nix
index 3983909..f2e56fc 100644
--- a/modules/home/sh.nix
+++ b/modules/home/sh.nix
@@ -69,9 +69,10 @@ in
             fzf --ansi --disabled --query "$query" \
                 --bind "start:reload(rg --column --line-number --no-heading --color=always --smart-case {q} \"$search_path\")" \
                 --bind "change:reload:sleep 0.1; rg --column --line-number --no-heading --color=always --smart-case {q} \"$search_path\" || true" \
+                --bind "shift-up:preview-up,shift-down:preview-down" \
                 --delimiter : \
                 --preview 'bat --color=always --style=numbers --highlight-line {2} {1}' \
-                --preview-window 'right:45%'
+                --preview-window 'right,45%,border-left,+{2}+3/3,~3'
           )
 
           # Extract file and line, then open in Neovim