Merge remote-tracking branch 'refs/remotes/origin/nixos' into nixos
commit
e715dff0a4
|
@ -155,7 +155,7 @@ in
|
|||
bind = $mainMod , M , exec , hyprctl keyword general:layout master
|
||||
bind = $mainMod , R , exec , rofi -show combi
|
||||
bind = $mainMod , RETURN , exec , kitty
|
||||
bind = $mainMod SHIFT , RETURN , exec , kitty -- tmux new -A -s home
|
||||
bind = $mainMod SHIFT , RETURN , exec , kitty -- tmux new "ts || tn home ~"
|
||||
|
||||
# XF86 keys
|
||||
binde = , XF86AudioLowerVolume , exec , pamixer -d 5
|
||||
|
|
|
@ -74,6 +74,9 @@ with builtins;
|
|||
}
|
||||
{
|
||||
plugin = nvim-cmp;
|
||||
keys = [
|
||||
{ key = "<leader>tc"; cmd = "<cmd>CmpToggle<cr>"; desc = "Toggle Cmp sources"; }
|
||||
];
|
||||
conf = readFile ./lua/nvim-cmp.lua;
|
||||
event = [ "InsertEnter" ];
|
||||
dependencies = [
|
||||
|
|
|
@ -120,3 +120,97 @@ cmp.event:on(
|
|||
},
|
||||
})
|
||||
)
|
||||
|
||||
local pickers = require("telescope.pickers")
|
||||
local finders = require("telescope.finders")
|
||||
local conf = require("telescope.config").values
|
||||
local actions = require("telescope.actions")
|
||||
local action_state = require("telescope.actions.state")
|
||||
|
||||
local all_sources = vim.deepcopy(cmp.get_config().sources)
|
||||
|
||||
local find = function(sources, name)
|
||||
for k, source in ipairs(sources) do
|
||||
if source.name == name then
|
||||
return k
|
||||
end
|
||||
end
|
||||
return nil
|
||||
end
|
||||
|
||||
local is_active = function(name)
|
||||
local active_sources = cmp.get_config().sources
|
||||
local index = find(active_sources, name)
|
||||
return index ~= nil
|
||||
end
|
||||
|
||||
local enable_source = function(name, force)
|
||||
if force or not is_active(name) then
|
||||
local source_index = find(all_sources, name)
|
||||
if source_index ~= nil then
|
||||
local active_sources = cmp.get_config().sources
|
||||
local source = all_sources[source_index]
|
||||
table.insert(active_sources, 1, source)
|
||||
cmp.setup({ sources = active_sources })
|
||||
end
|
||||
end
|
||||
end
|
||||
|
||||
local disable_source = function(identifier)
|
||||
if type(identifier) == "string" then
|
||||
identifier = find(all_sources, identifier)
|
||||
end
|
||||
local active_sources = cmp.get_config().sources
|
||||
table.remove(active_sources, identifier)
|
||||
end
|
||||
|
||||
local toggle_sources = function(name)
|
||||
local active_sources = cmp.get_config().sources
|
||||
local index = find(active_sources, name)
|
||||
if index ~= nil then
|
||||
disable_source(index)
|
||||
else
|
||||
enable_source(name, true)
|
||||
end
|
||||
end
|
||||
|
||||
-- our picker function: sources
|
||||
local sources_picker = function(opts)
|
||||
opts = opts or {}
|
||||
pickers
|
||||
.new(opts, {
|
||||
prompt_title = "sources",
|
||||
finder = finders.new_table({
|
||||
results = vim.tbl_map(function(source)
|
||||
return source.name
|
||||
end, all_sources),
|
||||
entry_maker = function(entry)
|
||||
return {
|
||||
value = entry,
|
||||
display = function(tbl)
|
||||
local name = tbl["ordinal"]
|
||||
local active = is_active(name)
|
||||
return string.format("%s %s", name, active and "✅" or "❌")
|
||||
end,
|
||||
ordinal = entry,
|
||||
}
|
||||
end,
|
||||
}),
|
||||
sorter = conf.generic_sorter(opts),
|
||||
attach_mappings = function(prompt_bufnr, _)
|
||||
actions.select_default:replace(function()
|
||||
actions.close(prompt_bufnr)
|
||||
local selection = action_state.get_selected_entry()
|
||||
toggle_sources(selection["value"])
|
||||
end)
|
||||
return true
|
||||
end,
|
||||
})
|
||||
:find()
|
||||
end
|
||||
|
||||
-- autocommand for sources_picker
|
||||
vim.api.nvim_create_user_command("CmpToggle", sources_picker, {})
|
||||
|
||||
-- disable sources by default
|
||||
disable_source("codeium")
|
||||
|
|
|
@ -106,13 +106,6 @@ local on_attach_def = function(client, bufnr)
|
|||
vim.lsp.inlay_hint(bufnr, true)
|
||||
end, timeout)
|
||||
end
|
||||
|
||||
require("lsp_signature").on_attach({
|
||||
bind = true, -- This is mandatory, otherwise border config won't get registered.
|
||||
handler_opts = {
|
||||
border = "rounded",
|
||||
},
|
||||
}, bufnr)
|
||||
end
|
||||
|
||||
local lspconfig_default_options = {
|
||||
|
|
|
@ -7,8 +7,7 @@ let
|
|||
tmux-switch = pkgs.writeShellApplication {
|
||||
name = "tmux-switch";
|
||||
runtimeInputs = with pkgs; [ tmux ];
|
||||
text = ''
|
||||
#!/usr/bin/env bash
|
||||
text = /* bash */ ''
|
||||
if [[ -z ''${TMUX+x} ]]; then
|
||||
tmux attach -t "$1"
|
||||
else
|
||||
|
@ -19,7 +18,7 @@ let
|
|||
|
||||
tmux-sessionizer = pkgs.writeFishApplication {
|
||||
name = "ts";
|
||||
runtimeInputs = with pkgs; [ tmux findutils coreutils procps fd tmux-switch gawk ];
|
||||
runtimeInputs = with pkgs; [ tmux findutils coreutils procps fd tmux-new gawk ];
|
||||
text = readFile ./tmux-sessionizer/script.fish;
|
||||
completions = readFile ./tmux-sessionizer/completions.fish;
|
||||
};
|
||||
|
@ -31,6 +30,17 @@ let
|
|||
completions = readFile ./tmux-attach/completions.fish;
|
||||
};
|
||||
|
||||
tmux-new = pkgs.writeFishApplication {
|
||||
name = "tn";
|
||||
runtimeInputs = with pkgs; [ tmux ];
|
||||
text = /* fish */ ''
|
||||
if ! tmux has-session -t $argv[1] 2> /dev/null
|
||||
tmux new-session -ds $argv[1] -c $argv[2]
|
||||
end
|
||||
|
||||
tmux-switch $argv[1]
|
||||
'';
|
||||
};
|
||||
in
|
||||
{
|
||||
options.my.programs.tmux = {
|
||||
|
@ -60,6 +70,8 @@ in
|
|||
home-manager.users.moritz.home.packages = [
|
||||
tmux-sessionizer
|
||||
tmux-attach
|
||||
tmux-switch
|
||||
tmux-new
|
||||
];
|
||||
home-manager.users.moritz.programs = {
|
||||
tmux = {
|
||||
|
@ -97,7 +109,7 @@ in
|
|||
if ! fish_is_root_user && test "$TERM_PROGRAM" != 'vscode' && ${insideVariableMissing}
|
||||
if test -z $tmux_autostarted
|
||||
set -x tmux_autostarted true
|
||||
tmux new -A -s home
|
||||
tn home ~
|
||||
end
|
||||
end
|
||||
'';
|
||||
|
|
|
@ -13,8 +13,4 @@ if not test -n "$selected_name"
|
|||
exit 1
|
||||
end
|
||||
|
||||
if ! tmux has-session -t $selected_name 2> /dev/null
|
||||
tmux new-session -ds $selected_name -c $selected
|
||||
end
|
||||
|
||||
tmux-switch $selected_name
|
||||
tn "$selected_name" "$selected"
|
||||
|
|
Loading…
Reference in New Issue