Merge branch 'main' into macos

This commit is contained in:
Tyler 2025-01-04 10:22:21 -05:00 committed by GitHub
commit 74816101bc
No known key found for this signature in database
GPG key ID: B5690EEEBB952194
5 changed files with 25 additions and 15 deletions

View file

@ -74,15 +74,16 @@
"rust-overlay": "rust-overlay" "rust-overlay": "rust-overlay"
}, },
"locked": { "locked": {
"lastModified": 1733238479, "lastModified": 1735933851,
"narHash": "sha256-o5BT2ziQJzoXrqBz/iOIOGoxDTXYd5KiNF/7ncN81ao=", "narHash": "sha256-xN5pImisRyD4cnkUkc9uJeyeeex2dyZWeJugjoLjqyI=",
"owner": "helix-editor", "owner": "helix-editor",
"repo": "helix", "repo": "helix",
"rev": "fa68bac391e576e659e306ce3fb2758d3ec68538", "rev": "dabfb6ceeae1da57fb93efcd254e917db49655e6",
"type": "github" "type": "github"
}, },
"original": { "original": {
"owner": "helix-editor", "owner": "helix-editor",
"ref": "25.01",
"repo": "helix", "repo": "helix",
"type": "github" "type": "github"
} }
@ -94,11 +95,11 @@
] ]
}, },
"locked": { "locked": {
"lastModified": 1733175814, "lastModified": 1735947440,
"narHash": "sha256-zFOtOaqjzZfPMsm1mwu98syv3y+jziAq5DfWygaMtLg=", "narHash": "sha256-jnEcfmOhWntmVEcqlvs+j532+mvmgsKtQSSfukgkn+A=",
"owner": "nix-community", "owner": "nix-community",
"repo": "home-manager", "repo": "home-manager",
"rev": "bf23fe41082aa0289c209169302afd3397092f22", "rev": "a9987622b7b93c82e147f198574e8e6ffbf5e327",
"type": "github" "type": "github"
}, },
"original": { "original": {
@ -144,11 +145,11 @@
}, },
"nixpkgs-unstable": { "nixpkgs-unstable": {
"locked": { "locked": {
"lastModified": 1733212471, "lastModified": 1735834308,
"narHash": "sha256-M1+uCoV5igihRfcUKrr1riygbe73/dzNnzPsmaLCmpo=", "narHash": "sha256-dklw3AXr3OGO4/XT1Tu3Xz9n/we8GctZZ75ZWVqAVhk=",
"owner": "nixos", "owner": "nixos",
"repo": "nixpkgs", "repo": "nixpkgs",
"rev": "55d15ad12a74eb7d4646254e13638ad0c4128776", "rev": "6df24922a1400241dae323af55f30e4318a6ca65",
"type": "github" "type": "github"
}, },
"original": { "original": {
@ -175,11 +176,11 @@
}, },
"nixpkgs_3": { "nixpkgs_3": {
"locked": { "locked": {
"lastModified": 1733412085, "lastModified": 1735563628,
"narHash": "sha256-FillH0qdWDt/nlO6ED7h4cmN+G9uXwGjwmCnHs0QVYM=", "narHash": "sha256-OnSAY7XDSx7CtDoqNh8jwVwh4xNL/2HaJxGjryLWzX8=",
"owner": "nixos", "owner": "nixos",
"repo": "nixpkgs", "repo": "nixpkgs",
"rev": "4dc2fc4e62dbf62b84132fe526356fbac7b03541", "rev": "b134951a4c9f3c995fd7be05f3243f8ecd65d798",
"type": "github" "type": "github"
}, },
"original": { "original": {

View file

@ -9,7 +9,7 @@
inputs.nixpkgs.follows = "nixpkgs"; inputs.nixpkgs.follows = "nixpkgs";
}; };
nixgl.url = "github:nix-community/nixGL"; nixgl.url = "github:nix-community/nixGL";
helix.url = "github:helix-editor/helix"; helix.url = "github:helix-editor/helix/25.01";
}; };
outputs = { outputs = {

View file

@ -27,7 +27,6 @@
outputs.overlays.additions outputs.overlays.additions
outputs.overlays.modifications outputs.overlays.modifications
outputs.overlays.unstable-packages outputs.overlays.unstable-packages
inputs.helix.overlays.default inputs.helix.overlays.default
]; ];
}; };
@ -77,7 +76,6 @@
programs.helix = { programs.helix = {
enable = true; enable = true;
package = inputs.helix.packages.${pkgs.system}.default;
}; };
programs.bat = { programs.bat = {

View file

@ -0,0 +1,2 @@
[manager]
ratio = [1, 1, 0]

View file

@ -0,0 +1,9 @@
layout {
pane split_direction="vertical" {
pane size="33%" command="yazi"
pane
}
pane size=2 borderless=true {
plugin location="zellij:status-bar"
}
}