Compare commits
3 commits
d943ab8b6d
...
cb262d4cf5
Author | SHA1 | Date | |
---|---|---|---|
cb262d4cf5 | |||
1eb008e41e | |||
28961fe114 |
10 changed files with 45 additions and 12 deletions
17
flake.lock
17
flake.lock
|
@ -930,6 +930,22 @@
|
|||
"type": "github"
|
||||
}
|
||||
},
|
||||
"none-ls-nvim": {
|
||||
"flake": false,
|
||||
"locked": {
|
||||
"lastModified": 1696658105,
|
||||
"narHash": "sha256-4+B2F4ZweWTqXlhSs0jiBaKSv52G4X7p37KHfYl6sPo=",
|
||||
"owner": "nvimtools",
|
||||
"repo": "none-ls.nvim",
|
||||
"rev": "ae339f45590cc421a68de885fc5a3261cc247362",
|
||||
"type": "github"
|
||||
},
|
||||
"original": {
|
||||
"owner": "nvimtools",
|
||||
"repo": "none-ls.nvim",
|
||||
"type": "github"
|
||||
}
|
||||
},
|
||||
"nvim-lspconfig": {
|
||||
"flake": false,
|
||||
"locked": {
|
||||
|
@ -1040,6 +1056,7 @@
|
|||
"nix-lazy-nvim": "nix-lazy-nvim",
|
||||
"nix-super": "nix-super",
|
||||
"nixpkgs": "nixpkgs_8",
|
||||
"none-ls-nvim": "none-ls-nvim",
|
||||
"nvim-lspconfig": "nvim-lspconfig",
|
||||
"nvim-puppeteer": "nvim-puppeteer",
|
||||
"nvim-treesitter": "nvim-treesitter",
|
||||
|
|
|
@ -48,6 +48,8 @@
|
|||
telekasten-nvim.url = "github:renerocksai/telekasten.nvim";
|
||||
telescope-nvim.flake = false;
|
||||
telescope-nvim.url = "github:nvim-telescope/telescope.nvim";
|
||||
none-ls-nvim.flake = false;
|
||||
none-ls-nvim.url = "github:nvimtools/none-ls.nvim";
|
||||
|
||||
# Hyprland
|
||||
hypr-contrib.url = "github:hyprwm/contrib";
|
||||
|
|
|
@ -123,10 +123,8 @@ in
|
|||
"|" = "split-window -h";
|
||||
"C-l" = "send-keys C-l";
|
||||
"R" = "source-file $XDG_CONFIG_HOME/tmux/tmux.conf \\; display-message 'Reloaded tmux.conf'";
|
||||
};
|
||||
root = {
|
||||
"C-f" = "new-window ts";
|
||||
"C-a" = "new-window ta";
|
||||
"f" = "new-window ts";
|
||||
"a" = "new-window ta";
|
||||
};
|
||||
copy-mode-vi = {
|
||||
"v" = "send -X begin-selection";
|
||||
|
|
|
@ -30,12 +30,17 @@ in
|
|||
[
|
||||
alejandra
|
||||
black
|
||||
checkmake
|
||||
deadnix
|
||||
dotenv-linter
|
||||
fish
|
||||
isort
|
||||
jq
|
||||
nixd
|
||||
nixpkgs-fmt
|
||||
nodePackages.bash-language-server
|
||||
nodePackages.jsonlint
|
||||
ruff-lsp
|
||||
rustfmt
|
||||
shellcheck
|
||||
shfmt
|
||||
|
@ -46,6 +51,7 @@ in
|
|||
typst
|
||||
typst-lsp
|
||||
yamlfmt
|
||||
yamllint
|
||||
];
|
||||
extraLuaConfig = readFile ./options.lua;
|
||||
lazy.enable = true;
|
||||
|
|
|
@ -104,7 +104,6 @@ with builtins;
|
|||
event = [ "BufRead" "BufNewFile" ];
|
||||
conf = readFile ./lua/nvim-lspconfig.lua;
|
||||
dependencies = [
|
||||
{ plugin = lsp_signature-nvim; }
|
||||
{
|
||||
plugin = null-ls-nvim;
|
||||
conf = readFile ./lua/null-ls-nvim.lua;
|
||||
|
|
|
@ -8,9 +8,15 @@ null_ls.setup({
|
|||
-- Completion
|
||||
null_ls.builtins.completion.spell,
|
||||
-- Diagnostics
|
||||
null_ls.builtins.diagnostics.checkmake,
|
||||
null_ls.builtins.diagnostics.deadnix,
|
||||
null_ls.builtins.diagnostics.dotenv_linter,
|
||||
null_ls.builtins.diagnostics.fish,
|
||||
null_ls.builtins.diagnostics.jsonlint,
|
||||
null_ls.builtins.diagnostics.shellcheck,
|
||||
null_ls.builtins.diagnostics.statix,
|
||||
null_ls.builtins.diagnostics.trail_space,
|
||||
null_ls.builtins.diagnostics.yamllint,
|
||||
},
|
||||
})
|
||||
|
||||
|
|
|
@ -19,7 +19,7 @@ let
|
|||
|
||||
tmux-sessionizer = pkgs.writeFishApplication {
|
||||
name = "ts";
|
||||
runtimeInputs = with pkgs; [ tmux findutils coreutils procps fd tmux-switch ];
|
||||
runtimeInputs = with pkgs; [ tmux findutils coreutils procps fd tmux-switch gawk ];
|
||||
text = readFile ./tmux-sessionizer/script.fish;
|
||||
completions = readFile ./tmux-sessionizer/completions.fish;
|
||||
};
|
||||
|
@ -97,7 +97,7 @@ in
|
|||
if ! fish_is_root_user && test "$TERM_PROGRAM" != 'vscode' && ${insideVariableMissing}
|
||||
if test -z $tmux_autostarted
|
||||
set -x tmux_autostarted true
|
||||
ts
|
||||
tmux new -A -s home
|
||||
end
|
||||
end
|
||||
'';
|
||||
|
|
|
@ -1,4 +1,4 @@
|
|||
set selected (tmux list-sessions -F '#{session_name}' 2>/dev/null | fzf $argv)
|
||||
set selected (tmux list-sessions -F '#{session_name}' 2>/dev/null | fzf --query "$argv")
|
||||
if not test -n "$selected"
|
||||
exit 1
|
||||
end
|
||||
|
|
8
modules/programs/tmux/tmux-sessionizer/script.fish
Normal file → Executable file
8
modules/programs/tmux/tmux-sessionizer/script.fish
Normal file → Executable file
|
@ -1,10 +1,10 @@
|
|||
#!/usr/bin/env fish
|
||||
set pipe (mktemp --dry-run)
|
||||
mkfifo $pipe
|
||||
|
||||
fd -HIg '.git' ~/ --min-depth 1 --max-depth 5 --type d --prune --exec dirname {} | tee $pipe >/dev/null &
|
||||
fd . ~/ --min-depth 1 --max-depth 3 --type d | tee $pipe >/dev/null &
|
||||
|
||||
set selected (cat $pipe | fzf $argv)
|
||||
fd -HIg '.git' ~/ --min-depth 1 --max-depth 5 --type d --prune --exec-batch dirname {} | tee $pipe >/dev/null &
|
||||
fd . ~/ --min-depth 1 --max-depth 3 --type d --exec-batch realpath {} | tee $pipe >/dev/null &
|
||||
set selected (cat $pipe | awk '!seen[$0]++' | fzf --query "$argv")
|
||||
rm -f "$pipe"
|
||||
|
||||
set selected_name (basename $selected 2>/dev/null | string replace "." "_")
|
||||
|
|
|
@ -51,5 +51,10 @@ with lib.my;
|
|||
version = mkVersionInput inputs.nvim-puppeteer;
|
||||
src = inputs.nvim-puppeteer;
|
||||
};
|
||||
|
||||
null-ls-nvim = prev.vimPlugins.null-ls-nvim.overrideAttrs (a: {
|
||||
version = mkVersionInput inputs.none-ls-nvim;
|
||||
src = inputs.none-ls-nvim;
|
||||
});
|
||||
};
|
||||
}
|
||||
|
|
Loading…
Reference in a new issue