diff --git a/nix/configurations/vanadium.nix b/nix/configurations/vanadium.nix index f881d389..c0bbbd61 100644 --- a/nix/configurations/vanadium.nix +++ b/nix/configurations/vanadium.nix @@ -202,7 +202,8 @@ in (sources.agenix + "/modules/age-home.nix") sources.wired-notify.asFlake.homeManagerModules.default - sources.zen-browser.asFlake.homeModules.twilight + # non official one uses reuploaded artifacts, are they audited? + sources.zen-browser.asFlake.homeModules.beta ]; } diff --git a/nix/configurations/vanadium/home/xmonad/xmonad.hs b/nix/configurations/vanadium/home/xmonad/xmonad.hs index 415a0fc1..e901bf6a 100644 --- a/nix/configurations/vanadium/home/xmonad/xmonad.hs +++ b/nix/configurations/vanadium/home/xmonad/xmonad.hs @@ -3,6 +3,7 @@ import XMonad import XMonad.Actions.CopyWindow +import XMonad.Actions.Navigation2D import XMonad.Actions.Submap import XMonad.Actions.SwapWorkspaces import XMonad.Actions.Warp @@ -48,6 +49,7 @@ main = $ withSB xmobarConfig . docks $ setEwmhActivateHook myActivateHook $ ewmhFullscreen . ewmh + $ withNavigation2DConfig def $ def { modMask = superMask , borderWidth = 5 @@ -299,6 +301,21 @@ keybinds = , ((0, xK_l), withFocused $ windows . flip W.float centeredFloat) ] ) + + -- Switch between layers + , ((altMask, xK_s), switchLayer ) + + -- Directional navigation of windows + , ((altMask, xK_l), windowGo R False ) + , ((altMask, xK_h), windowGo L False ) + , ((altMask, xK_k), windowGo U False ) + , ((altMask, xK_j), windowGo D False ) + + -- Swap adjacent windows + , ((altMask .|. superMask, xK_l), windowSwap R False) + , ((altMask .|. superMask, xK_h), windowSwap L False) + , ((altMask .|. superMask, xK_k), windowSwap U False) + , ((altMask .|. superMask, xK_j), windowSwap D False) ] -- We override default focus shifting bindings to warp the cursor to the center of the new window. diff --git a/npins/sources.json b/npins/sources.json index d02e14f7..34cebc78 100644 --- a/npins/sources.json +++ b/npins/sources.json @@ -378,9 +378,9 @@ }, "branch": "main", "submodules": false, - "revision": "1adab25828578301037855c59849e9bbecf8948b", - "url": "https://github.com/0xc000022070/zen-browser-flake/archive/1adab25828578301037855c59849e9bbecf8948b.tar.gz", - "hash": "091sdxgqxcmxh15w9b65bv29fw0cgg0mfpl3d1ymsv1510lq30a6" + "revision": "bd8815d0a686267386268e7cc70315124e21362b", + "url": "https://github.com/0xc000022070/zen-browser-flake/archive/bd8815d0a686267386268e7cc70315124e21362b.tar.gz", + "hash": "03dz53picqw2bbbzaxxld5ydyqbf4jsdb048a4gb6h432kkp5gim" } }, "version": 5