From 0aee85833db03a5795c1954aff1f368749716854 Mon Sep 17 00:00:00 2001 From: Lillian-Violet Date: Thu, 10 Oct 2024 15:22:27 +0200 Subject: [PATCH 1/3] update flake lock --- flake.lock | 132 ++++++++++++++++++++++++++--------------------------- 1 file changed, 66 insertions(+), 66 deletions(-) diff --git a/flake.lock b/flake.lock index 92d64ea..63d14af 100644 --- a/flake.lock +++ b/flake.lock @@ -38,11 +38,11 @@ "treefmt-nix": "treefmt-nix" }, "locked": { - "lastModified": 1728096501, - "narHash": "sha256-qtF5+wGoGeq83ISH6hWgyaWn5ErhEuYuI3MFnPXCcPc=", + "lastModified": 1728525495, + "narHash": "sha256-dsI85smVkHkv0sXlskE7EzBT7aR2jZYs3sCKhLu48NE=", "owner": "koverstreet", "repo": "bcachefs-tools", - "rev": "3829e49167eebfb763217b464c98f075ba78a06e", + "rev": "571ca8b8ce27d35cb7be3442dc55d64814dad11f", "type": "github" }, "original": { @@ -127,11 +127,11 @@ }, "catppuccin": { "locked": { - "lastModified": 1727910534, - "narHash": "sha256-IjdGPDnBNk3r5h02kiPTKUOfn+UiKNWlhy/ozC0NgyQ=", + "lastModified": 1728407414, + "narHash": "sha256-B8LaxUP93eh+it8RW1pGq4SsU2kj7f0ipzFuhBvpON8=", "owner": "catppuccin", "repo": "nix", - "rev": "bad96d3fabf8d2e8f0bf0c2cb899a9fccf01ea03", + "rev": "96cf8b4a05fb23a53c027621b1147b5cf9e5439f", "type": "github" }, "original": { @@ -174,11 +174,11 @@ "rocksdb": "rocksdb" }, "locked": { - "lastModified": 1726444589, - "narHash": "sha256-dWKVjS4wvyZxRjhUICTnnw8mHYwJij4SGvXIG/U5oRo=", + "lastModified": 1728182038, + "narHash": "sha256-H6QiZWG95OgV+/T4hIguk7QtS5REVHtdNPObQL5R6bM=", "owner": "girlbossceo", "repo": "conduwuit", - "rev": "032b199129f8648a77bde285f755a78e9ec349a7", + "rev": "e589464954ff88bf817b8bdff4c803cc3bf18a28", "type": "github" }, "original": { @@ -269,11 +269,11 @@ }, "crane_5": { "locked": { - "lastModified": 1725409566, - "narHash": "sha256-PrtLmqhM6UtJP7v7IGyzjBFhbG4eOAHT6LPYOFmYfbk=", + "lastModified": 1727974419, + "narHash": "sha256-WD0//20h+2/yPGkO88d2nYbb23WMWYvnRyDQ9Dx4UHg=", "owner": "ipetkov", "repo": "crane", - "rev": "7e4586bad4e3f8f97a9271def747cf58c4b68f3c", + "rev": "37e4f9f0976cb9281cd3f0c70081e5e0ecaee93f", "type": "github" }, "original": { @@ -358,11 +358,11 @@ ] }, "locked": { - "lastModified": 1728109432, - "narHash": "sha256-wmbErh8FG7dRKOtMMpHUqDtFjeqt9Zjx4zssSeTalwU=", + "lastModified": 1728334376, + "narHash": "sha256-CTKEKPzD/j8FK6H4DO3EjyixZd3HHvgAgfnCwpGFP5c=", "owner": "nix-community", "repo": "disko", - "rev": "48ebb577855fb2398653f033b3b2208a9249203d", + "rev": "d39ee334984fcdae6244f5a8e6ab857479cbaefe", "type": "github" }, "original": { @@ -670,11 +670,11 @@ "systems": "systems_5" }, "locked": { - "lastModified": 1710146030, - "narHash": "sha256-SZ5L6eA7HJ/nmkzGG7/ISclqe6oZdOZTNoesiInkXPQ=", + "lastModified": 1726560853, + "narHash": "sha256-X6rJYSESBVr3hBoH0WbKE5KvhPU5bloyZ2L4K60/fPQ=", "owner": "numtide", "repo": "flake-utils", - "rev": "b1d9ab70662946ef0850d488da1c9019f3a9752a", + "rev": "c1dfcf08411b08f6b8615f7d8971a2bfa81d5e8a", "type": "github" }, "original": { @@ -764,11 +764,11 @@ ] }, "locked": { - "lastModified": 1728041527, - "narHash": "sha256-03liqiJtk9UP7YQHW4r8MduKCK242FQzud8iWvvlK+o=", + "lastModified": 1728337164, + "narHash": "sha256-VdRTjJFyq4Q9U7Z/UoC2Q5jK8vSo6E86lHc2OanXtvc=", "owner": "nix-community", "repo": "home-manager", - "rev": "509dbf8d45606b618e9ec3bbe4e936b7c5bc6c1e", + "rev": "038630363e7de57c36c417fd2f5d7c14773403e4", "type": "github" }, "original": { @@ -784,11 +784,11 @@ "nixpkgs": "nixpkgs_4" }, "locked": { - "lastModified": 1728017225, - "narHash": "sha256-lLV+OMkMeFqTEmoIZhpWtw6H+ebghupckhrCO+K0MdU=", + "lastModified": 1728410210, + "narHash": "sha256-vn6qupt1U0M6Hf3eXhK3/K4Du0Z7A60qYS1G14QsRY8=", "owner": "Jovian-Experiments", "repo": "Jovian-NixOS", - "rev": "cb63dc934ba512b2d56d89b94c5da7894f6a7809", + "rev": "a25f915ec05196d15e3f7f8555ffb612d4f1045d", "type": "github" }, "original": { @@ -807,11 +807,11 @@ "rust-overlay": "rust-overlay" }, "locked": { - "lastModified": 1727792571, - "narHash": "sha256-KBzRQVE1j2vrSg8WfYJ+vEvFBC25+2VsFSK7VL2kc1M=", + "lastModified": 1728199407, + "narHash": "sha256-x4G0ja//3pT/epOvwxKR1XB7GAW7Yuwiy6RYCOgRjuQ=", "owner": "nix-community", "repo": "lanzaboote", - "rev": "e2365a1d8dccdcf4bca5111672e80df67d90957d", + "rev": "0bc127c631999c9555cae2b0cdad2128ff058259", "type": "github" }, "original": { @@ -936,11 +936,11 @@ ] }, "locked": { - "lastModified": 1727658919, - "narHash": "sha256-YAePt2GldkkRJ08LvZNHcuS6shIVStj+K+1DZN3gbnM=", + "lastModified": 1728263287, + "narHash": "sha256-GJDtsxz2/zw6g/Nrp4XVWBS5IaZ7ZUkuvxPOBEDe7pg=", "owner": "nix-community", "repo": "nix-index-database", - "rev": "f9fdf8285690a351e8998f1e703ebdf9cdf51dee", + "rev": "5fce10c871bab6d7d5ac9e5e7efbb3a2783f5259", "type": "github" }, "original": { @@ -982,11 +982,11 @@ }, "nixlib": { "locked": { - "lastModified": 1727571693, - "narHash": "sha256-b7sFVeqMtz8xntCL3tBY3O8suTg5PeF53LTL3eCcKyc=", + "lastModified": 1728176478, + "narHash": "sha256-px3Q0W//c+mZ4kPMXq4poztsjtXM1Ja1rN+825YMDUQ=", "owner": "nix-community", "repo": "nixpkgs.lib", - "rev": "bb58a3bf239e03fca9d51062e2fe028a4ea5a3d1", + "rev": "b61309c3c1b6013d36299bc8285612865b3b9e4c", "type": "github" }, "original": { @@ -1003,11 +1003,11 @@ ] }, "locked": { - "lastModified": 1727917377, - "narHash": "sha256-eefXdEPUMuhiV6Vy3ASSyApCseE9OoKDgL/G6qenw/4=", + "lastModified": 1728522165, + "narHash": "sha256-UQpsJ0Ev6JBGsCYRlS2oOVvb+eWcDD0xTV3RVlqbeVU=", "owner": "nix-community", "repo": "nixos-generators", - "rev": "9ae128172f823956e54947fe471bc6dfa670ecb4", + "rev": "40c8d30c490414910fc63626ad1b67af7db40cd3", "type": "github" }, "original": { @@ -1018,11 +1018,11 @@ }, "nixos-hardware": { "locked": { - "lastModified": 1728056216, - "narHash": "sha256-IrO06gFUDTrTlIP3Sz+mRB6WUoO2YsgMtOD3zi0VEt0=", + "lastModified": 1728269138, + "narHash": "sha256-oKxDImsOvgUZMY4NwXVyUc/c1HiU2qInX+b5BU0yXls=", "owner": "NixOS", "repo": "nixos-hardware", - "rev": "b7ca02c7565fbf6d27ff20dd6dbd49c5b82eef28", + "rev": "ecfcd787f373f43307d764762e139a7cdeb9c22b", "type": "github" }, "original": { @@ -1065,11 +1065,11 @@ }, "nixpkgs-edge": { "locked": { - "lastModified": 1728133552, - "narHash": "sha256-xTDvuHN/Q682ZD8lm8pXeYeL5L4qYyBVKdEZZCetY7o=", + "lastModified": 1728565888, + "narHash": "sha256-PslcBWpcB0IDe9yxYosT2G/rrsXmAgxrTlEoVFolAPM=", "owner": "NixOS", "repo": "nixpkgs", - "rev": "0c0a393832517a75e87d66ed5828af92a547ba26", + "rev": "262f0e36d5e5fd4afc695a9ec368fe0704e5252a", "type": "github" }, "original": { @@ -1160,11 +1160,11 @@ }, "nixpkgs-stable_4": { "locked": { - "lastModified": 1725762081, - "narHash": "sha256-vNv+aJUW5/YurRy1ocfvs4q/48yVESwlC/yHzjkZSP8=", + "lastModified": 1728156290, + "narHash": "sha256-uogSvuAp+1BYtdu6UWuObjHqSbBohpyARXDWqgI12Ss=", "owner": "NixOS", "repo": "nixpkgs", - "rev": "dc454045f5b5d814e5862a6d057e7bb5c29edc05", + "rev": "17ae88b569bb15590549ff478bab6494dde4a907", "type": "github" }, "original": { @@ -1176,11 +1176,11 @@ }, "nixpkgs-unstable": { "locked": { - "lastModified": 1728018373, - "narHash": "sha256-NOiTvBbRLIOe5F6RbHaAh6++BNjsb149fGZd1T4+KBg=", + "lastModified": 1728492678, + "narHash": "sha256-9UTxR8eukdg+XZeHgxW5hQA9fIKHsKCdOIUycTryeVw=", "owner": "nixos", "repo": "nixpkgs", - "rev": "bc947f541ae55e999ffdb4013441347d83b00feb", + "rev": "5633bcff0c6162b9e4b5f1264264611e950c8ec7", "type": "github" }, "original": { @@ -1256,11 +1256,11 @@ }, "nixpkgs_6": { "locked": { - "lastModified": 1728018373, - "narHash": "sha256-NOiTvBbRLIOe5F6RbHaAh6++BNjsb149fGZd1T4+KBg=", + "lastModified": 1728492678, + "narHash": "sha256-9UTxR8eukdg+XZeHgxW5hQA9fIKHsKCdOIUycTryeVw=", "owner": "nixos", "repo": "nixpkgs", - "rev": "bc947f541ae55e999ffdb4013441347d83b00feb", + "rev": "5633bcff0c6162b9e4b5f1264264611e950c8ec7", "type": "github" }, "original": { @@ -1287,11 +1287,11 @@ }, "nixpkgs_8": { "locked": { - "lastModified": 1725534445, - "narHash": "sha256-Yd0FK9SkWy+ZPuNqUgmVPXokxDgMJoGuNpMEtkfcf84=", + "lastModified": 1728093190, + "narHash": "sha256-CAZF2NRuHmqTtRTNAruWpHA43Gg2UvuCNEIzabP0l6M=", "owner": "NixOS", "repo": "nixpkgs", - "rev": "9bb1e7571aadf31ddb4af77fc64b2d59580f9a39", + "rev": "e2f08f4d8b3ecb5cf5c9fd9cb2d53bb3c71807da", "type": "github" }, "original": { @@ -1303,11 +1303,11 @@ }, "nixpkgs_9": { "locked": { - "lastModified": 1726481836, - "narHash": "sha256-MWTBH4dd5zIz2iatDb8IkqSjIeFum9jAqkFxgHLdzO4=", + "lastModified": 1728061008, + "narHash": "sha256-qjyJDtwmJckqDyXHmBIiN04kzby/TX/kPYmclBXlROA=", "owner": "NixOS", "repo": "nixpkgs", - "rev": "20f9370d5f588fb8c72e844c54511cab054b5f40", + "rev": "8bca501bf31b54ae2022fe5065ab475d75f7560e", "type": "github" }, "original": { @@ -1497,11 +1497,11 @@ ] }, "locked": { - "lastModified": 1726453838, - "narHash": "sha256-pupsow4L79SBfNwT6vh/5RAbVZuhngIA0RTCZksXmZY=", + "lastModified": 1728095260, + "narHash": "sha256-X62hA5ivYLY5G5+mXI6l9eUDkgi6Wu/7QUrwXhJ09oo=", "owner": "oxalica", "repo": "rust-overlay", - "rev": "ca2e79cd22625d214b8437c2c4080ce79bd9f7d2", + "rev": "d1d2532ab267cfe6e40dff73fbaf34436c406d26", "type": "github" }, "original": { @@ -1538,11 +1538,11 @@ "nixpkgs-stable": "nixpkgs-stable_4" }, "locked": { - "lastModified": 1727734513, - "narHash": "sha256-i47LQwoGCVQq4upV2YHV0OudkauHNuFsv306ualB/Sw=", + "lastModified": 1728345710, + "narHash": "sha256-lpunY1+bf90ts+sA2/FgxVNIegPDKCpEoWwOPu4ITTQ=", "owner": "Mic92", "repo": "sops-nix", - "rev": "3198a242e547939c5e659353551b0668ec150268", + "rev": "06535d0e3d0201e6a8080dd32dbfde339b94f01b", "type": "github" }, "original": { @@ -1655,11 +1655,11 @@ "rust-overlay": "rust-overlay_2" }, "locked": { - "lastModified": 1726515093, - "narHash": "sha256-Y2OHV3QfLPQj3Q4+TmrMeRXthwigU/YSBv2g8y8GWWU=", + "lastModified": 1728141581, + "narHash": "sha256-+wg0Avbw/MC2x3CQK4LyJHCPf+oPllJZzU2p+S/B7MU=", "owner": "dj95", "repo": "zjstatus", - "rev": "d1c662c1052adec6f14f3ee8a51cecebe4a29ffa", + "rev": "6d13e481aceacd3efe583fb6c442f30e8909f555", "type": "github" }, "original": { From 9f2d428e2fc4862d11aeab04fabe89afdbca113f Mon Sep 17 00:00:00 2001 From: Lillian-Violet Date: Wed, 16 Oct 2024 10:52:16 +0200 Subject: [PATCH 2/3] Add a helix layout file to zellij --- home-manager/shared/shell/zellij/default.nix | 89 ++++++++++++++++++++ 1 file changed, 89 insertions(+) diff --git a/home-manager/shared/shell/zellij/default.nix b/home-manager/shared/shell/zellij/default.nix index 36b811f..1565979 100644 --- a/home-manager/shared/shell/zellij/default.nix +++ b/home-manager/shared/shell/zellij/default.nix @@ -54,6 +54,89 @@ } } + default_tab_template { + pane size=1 borderless=true { + plugin location="file:${inputs.zjstatus.packages.${pkgs.system}.default}/bin/zjstatus.wasm" { + format_left "#[bg=#1D1D2E,fg=#C9D2F5,bold] {session} {mode} {tabs}" + format_right "#[bg=#C9D2F5,fg=#1D1D2E]#[bg=#C9D2F5,fg=#C9D2F5]#[bg=#C9D2F5,fg=#1D1D2E,bold]{datetime}#[bg=#1D1D2E,fg=#C9D2F5]" + + mode_locked "#[fg=magenta,bold] {name} " + mode_normal "#[fg=green,bold] {name} " + mode_resize "#[fg=orange,bold] {name} " + mode_default_to_mode "resize" + + tab_normal "#[bg=#C9D2F5,fg=#1D1D2E]#[bg=#C9D2F5,fg=#C9D2F5]#[bg=#C9D2F5,fg=#1D1D2E,bold]{name}{sync_indicator}{fullscreen_indicator}{floating_indicator}#[bg=#C9D2F5,fg=#C9D2F5]#[bg=#1D1D2E,fg=#C9D2F5]" + tab_active "#[bg=#A6DA95,fg=#1D1D2E]#[bg=#A6DA95,fg=#A6DA95]#[bg=#A6DA95,fg=#1D1D2E,bold]{name}{sync_indicator}{fullscreen_indicator}{floating_indicator}#[bg=#A6DA95,fg=#A6DA95]#[bg=#1D1D2E,fg=#A6DA95]" + + tab_sync_indicator " " + tab_fullscreen_indicator "□ " + tab_floating_indicator "󰉈 " + + datetime "#[bg=#C9D2F5,fg=#1D1D2E,bold]{format} " + datetime_format "%Y-%m-%d %H:%M" + datetime_timezone "Europe/Amsterdam" + } + } + children + pane size=2 borderless=true { + plugin location="status-bar" + } + } + } + ''; + helix_zellij = + pkgs.writeText "helix.kdl" + '' + layout { + tab { + pane { + command "hx" + args "." + } + pane split_direction="vertical" size="20%" {} + } + swap_tiled_layout name="vertical" { + tab max_panes=5 { + pane split_direction="vertical" { + pane + pane { children; } + } + } + tab max_panes=8 { + pane split_direction="vertical" { + pane { children; } + pane { pane; pane; pane; pane; } + } + } + tab max_panes=12 { + pane split_direction="vertical" { + pane { children; } + pane { pane; pane; pane; pane; } + pane { pane; pane; pane; pane; } + } + } + } + + swap_tiled_layout name="horizontal" { + tab max_panes=5 { + pane + pane + } + tab max_panes=8 { + pane { + pane split_direction="vertical" { children; } + pane split_direction="vertical" { pane; pane; pane; pane; } + } + } + tab max_panes=12 { + pane { + pane split_direction="vertical" { children; } + pane split_direction="vertical" { pane; pane; pane; pane; } + pane split_direction="vertical" { pane; pane; pane; pane; } + } + } + } + default_tab_template { pane size=1 borderless=true { plugin location="file:${inputs.zjstatus.packages.${pkgs.system}.default}/bin/zjstatus.wasm" { @@ -131,6 +214,12 @@ in { target = ".config/zellij/layouts/default.kdl"; }; }; + home.file = { + "helix_zellij" = { + source = "${helix_zellij}"; + target = ".config/zellij/layouts/helix.kdl"; + }; + }; #home.file = { # "config" = { # source = ./zellij.kdl; From eda608dac0d6af2b9a57de72b0d5de8a6a3a336b Mon Sep 17 00:00:00 2001 From: Lillian-Violet Date: Wed, 23 Oct 2024 13:58:45 +0200 Subject: [PATCH 3/3] This probably doesn't work as I don't pass stdin through just, but as a draft, run jupyter in helix! --- home-manager/shared/shell/helix/default.nix | 26 +++++++++++++++++++++ 1 file changed, 26 insertions(+) diff --git a/home-manager/shared/shell/helix/default.nix b/home-manager/shared/shell/helix/default.nix index 76304ef..444f72b 100644 --- a/home-manager/shared/shell/helix/default.nix +++ b/home-manager/shared/shell/helix/default.nix @@ -16,6 +16,31 @@ zellij action toggle-floating-panes zellij action close-pane ''; + jupyter = + pkgs.writeText "run_jupyter_from_helix.zsh" + '' + #! ~/.nix-profile/bin/zsh + function new() { + new=true; + touch /tmp/rjh; + cat /tmp/rjh | while read line + do + if $(pwd) = line; then + new=false; + fi + done + echo new; + } + + function send_to_jupyter() { + if $(new); then + zellij run -f -n "jupyter console" jupyter console --kernel="$1" -f="/tmp/rjh-$(pwd).json" --ZMQTerminalInteractiveShell.include_other_output=True --ZMQTerminalInteractiveShell.other_output_prefix=\'\' + pwd >> /tmp/rjh + fi + zellij write 29 25 # send ctr + w + just send + } + ''; in { programs.helix = { enable = true; @@ -29,6 +54,7 @@ in { t = ":sh zellij run -f -n 'test code' -- direnv exec . just test"; g = ":sh zellij run -fc -n 'lazygit' -- lazygit"; f = ":sh zellij run --floating -n 'yazi picker' -- zsh ~/.config/helix/open_in_helix_from_yazi.zsh "; + j = ":pipe-to just jupyter"; }; editor = { line-number = "relative";