fix: idk atp
This commit is contained in:
parent
709ca3e5b9
commit
43a9d4a0f7
GPG key ID:
BA1D158DCE3DF089
14 changed files with 27 additions and 205 deletions
|
|
@ -8,7 +8,6 @@
|
|||
|
||||
# editors
|
||||
./modules/ide/nvim/default.nix
|
||||
# ./modules/ide/micro/default.nix
|
||||
|
||||
# terminal stuff
|
||||
./modules/terminal/foot/default.nix
|
||||
|
|
@ -20,11 +19,9 @@
|
|||
./modules/shell/fish/default.nix
|
||||
|
||||
# user stuff
|
||||
# ./modules/user/wofi/default.nix # deprecated, i use tofi now.
|
||||
./modules/user/tofi/default.nix
|
||||
./modules/user/dunst/default.nix
|
||||
./modules/user/git/default.nix
|
||||
# ./modules/user/obs/default.nix
|
||||
];
|
||||
|
||||
home.username = "elisiei";
|
||||
|
|
|
|||
|
|
@ -3,22 +3,4 @@ vim.diagnostic.config({ virtual_text = true })
|
|||
vim.o.undofile = true
|
||||
vim.o.undodir = vim.fn.expand("~/.local/state/nvim/undo")
|
||||
vim.diagnostic.config({ signs = false })
|
||||
|
||||
vim.api.nvim_create_autocmd("User", {
|
||||
pattern = 'TSUpdate',
|
||||
callback = function()
|
||||
require('nvim-treesitter.parsers').crystal = {
|
||||
install_info = {
|
||||
url = 'https://github.com/crystal-lang-tools/tree-sitter-crystal',
|
||||
-- path = '<ts-crystal-install-path>', -- if you want to use a local version instead
|
||||
generate = false,
|
||||
generate_from_json = false,
|
||||
queries = 'queries/nvim'
|
||||
},
|
||||
}
|
||||
end,
|
||||
})
|
||||
|
||||
vim.treesitter.language.register("crystal", { "cr" })
|
||||
|
||||
print("loaded extra config.lua file ;)")
|
||||
vim.print("loaded extra config.lua file ;)")
|
||||
|
|
|
|||
|
|
@ -25,16 +25,13 @@
|
|||
./plugins/web-devicons.nix
|
||||
./plugins/yanky.nix
|
||||
|
||||
# theme
|
||||
./theme.nix
|
||||
|
||||
# lsp
|
||||
./lsp/fidget.nix
|
||||
./lsp/lsp.nix
|
||||
./lsp/roslyn.nix
|
||||
|
||||
# keymaps
|
||||
# ./keymaps.nix
|
||||
|
||||
# themes
|
||||
./themes.nix
|
||||
];
|
||||
|
||||
globals.mapleader = " ";
|
||||
|
|
@ -42,7 +39,7 @@
|
|||
opts = {
|
||||
number = true;
|
||||
relativenumber = false;
|
||||
colorcolumn = "80";
|
||||
colorcolumn = "0";
|
||||
shiftwidth = 2;
|
||||
tabstop = 2;
|
||||
wrap = false;
|
||||
|
|
|
|||
|
|
@ -1,110 +1,10 @@
|
|||
{
|
||||
plugins.fidget = {
|
||||
enable = true;
|
||||
settings = {
|
||||
logger = {
|
||||
level = "warn"; # "off", "error", "warn", "info", "debug", "trace"
|
||||
float_precision = 1.0e-2; # Limit the number of decimals displayed for floats
|
||||
};
|
||||
progress = {
|
||||
poll_rate = 0; # How and when to poll for progress messages
|
||||
suppress_on_insert = true; # Suppress new messages while in insert mode
|
||||
ignore_done_already = false; # Ignore new tasks that are already complete
|
||||
ignore_empty_message = false; # Ignore new tasks that don't contain a message
|
||||
clear_on_detach =
|
||||
# Clear notification group when LSP server detaches
|
||||
''
|
||||
function(client_id)
|
||||
local client = vim.lsp.get_client_by_id(client_id)
|
||||
return client and client.name or nil
|
||||
end
|
||||
'';
|
||||
notification_group =
|
||||
# How to get a progress message's notification group key
|
||||
''
|
||||
function(msg) return msg.lsp_client.name end
|
||||
'';
|
||||
ignore = [ ]; # List of LSP servers to ignore
|
||||
lsp = {
|
||||
progress_ringbuf_size = 0; # Configure the nvim's LSP progress ring buffer size
|
||||
};
|
||||
display = {
|
||||
render_limit = 16; # How many LSP messages to show at once
|
||||
done_ttl = 3; # How long a message should persist after completion
|
||||
done_icon = "✔"; # Icon shown when all LSP progress tasks are complete
|
||||
done_style = "Constant"; # Highlight group for completed LSP tasks
|
||||
progress_ttl = 10; # How long a message should persist when in progress
|
||||
progress_icon = {
|
||||
pattern = "dots";
|
||||
period = 1;
|
||||
}; # Icon shown when LSP progress tasks are in progress
|
||||
progress_style = "WarningMsg"; # Highlight group for in-progress LSP tasks
|
||||
group_style = "Title"; # Highlight group for group name (LSP server name)
|
||||
icon_style = "Question"; # Highlight group for group icons
|
||||
priority = 30; # Ordering priority for LSP notification group
|
||||
skip_history = true; # Whether progress notifications should be omitted from history
|
||||
format_message = ''
|
||||
require ("fidget.progress.display").default_format_message
|
||||
''; # How to format a progress message
|
||||
format_annote = ''
|
||||
function (msg) return msg.title end
|
||||
''; # How to format a progress annotation
|
||||
format_group_name = ''
|
||||
function (group) return tostring (group) end
|
||||
''; # How to format a progress notification group's name
|
||||
overrides = {
|
||||
rust_analyzer = {
|
||||
name = "rust-analyzer";
|
||||
};
|
||||
}; # Override options from the default notification config
|
||||
};
|
||||
};
|
||||
notification = {
|
||||
poll_rate = 10; # How frequently to update and render notifications
|
||||
filter = "info"; # "off", "error", "warn", "info", "debug", "trace"
|
||||
history_size = 128; # Number of removed messages to retain in history
|
||||
override_vim_notify = true;
|
||||
redirect = {
|
||||
__raw = ''
|
||||
function(msg, level, opts)
|
||||
if opts and opts.on_open then
|
||||
return require("fidget.integration.nvim-notify").delegate(msg, level, opts)
|
||||
end
|
||||
end
|
||||
'';
|
||||
};
|
||||
configs = {
|
||||
default = {
|
||||
name = "Notifications";
|
||||
icon = "";
|
||||
group = "Notifications";
|
||||
annote = true;
|
||||
debug = false;
|
||||
debug_rate = 0.25;
|
||||
};
|
||||
};
|
||||
|
||||
window = {
|
||||
normal_hl = "Comment";
|
||||
winblend = 0;
|
||||
border = "none"; # none, single, double, rounded, solid, shadow
|
||||
zindex = 45;
|
||||
max_width = 0;
|
||||
max_height = 0;
|
||||
x_padding = 1;
|
||||
y_padding = 0;
|
||||
align = "bottom";
|
||||
relative = "editor";
|
||||
};
|
||||
view = {
|
||||
stack_upwards = true; # Display notification items from bottom to top
|
||||
icon_separator = " "; # Separator between group name and icon
|
||||
group_separator = "---"; # Separator between notification groups
|
||||
group_separator_hl =
|
||||
# Highlight group used for group separator
|
||||
"Comment";
|
||||
};
|
||||
};
|
||||
settings.progress = {
|
||||
suppress_on_insert = true;
|
||||
ignore_done_already = true;
|
||||
poll_rate = 1;
|
||||
};
|
||||
};
|
||||
}
|
||||
|
|
|
|||
|
|
@ -1,21 +0,0 @@
|
|||
{
|
||||
plugins = {
|
||||
conform-nvim.settings = {
|
||||
formatters = {
|
||||
odinfmt = {
|
||||
command = "odinfmt";
|
||||
args = [ "-stdin" ];
|
||||
stdin = true;
|
||||
};
|
||||
};
|
||||
formatters_by_ft = {
|
||||
odin = [ "odinfmt" ];
|
||||
};
|
||||
};
|
||||
lsp.servers = {
|
||||
ols = {
|
||||
enable = true;
|
||||
};
|
||||
};
|
||||
};
|
||||
}
|
||||
5
home/modules/ide/nvim/lsp/langs/vue.nix
Normal file
5
home/modules/ide/nvim/lsp/langs/vue.nix
Normal file
|
|
@ -0,0 +1,5 @@
|
|||
{
|
||||
plugins = {
|
||||
lsp.servers.vue_ls.enable = true;
|
||||
};
|
||||
}
|
||||
|
|
@ -1,12 +0,0 @@
|
|||
{
|
||||
plugins = {
|
||||
ts-autotag.enable = true;
|
||||
ts-comments.enable = true;
|
||||
lsp.servers = {
|
||||
html.enable = true;
|
||||
cssls.enable = true;
|
||||
svelte.enable = false;
|
||||
ts_ls.enable = true;
|
||||
};
|
||||
};
|
||||
}
|
||||
|
|
@ -14,7 +14,7 @@
|
|||
"alpha"
|
||||
];
|
||||
};
|
||||
theme = "tokyonight";
|
||||
theme = "lackluster";
|
||||
};
|
||||
sections = {
|
||||
lualine_a = [
|
||||
|
|
|
|||
7
home/modules/ide/nvim/theme.nix
Normal file
7
home/modules/ide/nvim/theme.nix
Normal file
|
|
@ -0,0 +1,7 @@
|
|||
{
|
||||
colorschemes = {
|
||||
tokyonight = {
|
||||
enable = true;
|
||||
};
|
||||
};
|
||||
}
|
||||
|
|
@ -1,30 +0,0 @@
|
|||
{
|
||||
colorschemes = {
|
||||
# tokyonight
|
||||
tokyonight = {
|
||||
enable = false;
|
||||
settings = {
|
||||
transparent = true;
|
||||
style = "night"; # options: "storm", "night", "day", "moon"
|
||||
cmp = true;
|
||||
illuminate = true;
|
||||
indentblankline = true;
|
||||
lsp_semantic = true;
|
||||
mini_completion = true;
|
||||
};
|
||||
};
|
||||
|
||||
# kanagawa
|
||||
kanagawa = {
|
||||
enable = false;
|
||||
settings = {
|
||||
transparent = true;
|
||||
};
|
||||
};
|
||||
|
||||
# moonfly
|
||||
moonfly = {
|
||||
enable = true;
|
||||
};
|
||||
};
|
||||
}
|
||||
|
|
@ -1,5 +1,5 @@
|
|||
# set prompt
|
||||
fish_config prompt choose informative_vcs
|
||||
fish_config prompt choose minimalist
|
||||
|
||||
# setup direnv
|
||||
direnv hook fish | source
|
||||
|
|
@ -9,5 +9,3 @@ source ~/.config/fish/themes/bw.fish
|
|||
|
||||
# set aliases
|
||||
source ~/.config/fish/aliases/git.fish
|
||||
|
||||
~/bin/gotcha
|
||||
|
|
|
|||
|
|
@ -29,4 +29,3 @@ set -g fish_pager_color_prefix $fg --bold
|
|||
set -g fish_pager_color_completion $fg
|
||||
set -g fish_pager_color_description $fg_faint
|
||||
set -g fish_pager_color_selected_background --background=$bg_sel
|
||||
|
||||
|
|
|
|||
|
|
@ -1,11 +1,10 @@
|
|||
{
|
||||
services.pulseaudio.enable = false;
|
||||
security.rtkit.enable = true;
|
||||
|
||||
services.pipewire = {
|
||||
enable = true;
|
||||
alsa.enable = true;
|
||||
alsa.support32Bit = true;
|
||||
# alsa.enable = true;
|
||||
# alsa.support32Bit = true;
|
||||
pulse.enable = true;
|
||||
wireplumber.enable = true;
|
||||
};
|
||||
}
|
||||
|
|
|
|||
|
|
@ -19,6 +19,7 @@
|
|||
|
||||
# useful
|
||||
wl-clipboard
|
||||
xdg-desktop-portal
|
||||
gnumake
|
||||
git-credential-manager
|
||||
|
||||
|
|
|
|||
Loading…
Add table
Reference in a new issue