Compare commits

..

No commits in common. "e8c124bc16c7f82ed02b47d458035184740c3a98" and "5af73cbdd64231c2fb2200202a26ea48d4cb9c5e" have entirely different histories.

6 changed files with 3 additions and 61 deletions

View file

@ -1,24 +0,0 @@
return {
{
"vim-fugitive",
for_cat = "git",
cmd = { "Git", "Gvdiffsplit" },
},
{
"resolve-nvim",
for_cat = "git",
event = { "BufReadPre", "BufNewFile" },
after = function(plugin)
require("resolve").setup({
default_keymaps = false,
on_conflicts_resolved = function(info)
-- NOTE: am not sure if i wanna stage files automatically
-- local filepath = vim.api.nvim_buf_get_name(info.bufnr)
-- vim.fn.system({ "git", "add", filepath })
-- vim.notify("conflicts resolved :3 file staged yayayayy <3", vim.log.levels.INFO)
vim.notify("conflicts resolved :3", vim.log.levels.INFO)
end,
})
end,
},
}

View file

@ -6,5 +6,4 @@ require("lze").load({
{ import = "plugins.mini-hipatterns" },
{ import = "plugins.format" },
{ import = "plugins.comment" },
{ import = "plugins.git" },
})

View file

@ -111,7 +111,8 @@ in {
};
optionalPlugins = with pkgs.vimPlugins; {
general = [];
general = [
];
ui = [
dressing-nvim
];
@ -151,10 +152,6 @@ in {
comment = [
comment-nvim
];
git = [
resolve-nvim
vim-fugitive
];
lang = {
java = [
nvim-jdtls
@ -228,16 +225,12 @@ in {
qol = true;
telescope = true;
fyler = true;
lsp = true;
completion = true;
treesitter = true;
format = true;
comment = true;
git = false; # not really setup yet
lang = {
lua = true;
nix = true;

View file

@ -48,13 +48,3 @@ windowrule {
match:fullscreen = false
opacity = 0.97
}
# ---------------------------------------------------------------------------- #
# spotify - blur
windowrule {
name = spotify-blur
match:class = ^(spotify)$
match:initial_class = ^(spotify)$
match:fullscreen = false
opacity = 0.93
}

View file

@ -39,7 +39,7 @@
PasswordAuthentication = false;
PermitRootLogin = "no";
AllowUsers = ["foxora"];
UseDns = false; # disable rDNS lookup
UseDns = false; # enables rDNS lookup
X11Forwarding = false;
};
};

View file

@ -16,20 +16,4 @@
});
hyprland-git = inputs.hyprland-git.packages.${system};
vimPlugins =
(super.vimPlugins or {})
// {
resolve-nvim = super.vimUtils.buildVimPlugin rec {
pname = "resolve-nvim";
src = super.fetchFromGitHub {
owner = "spacedentist";
repo = "resolve.nvim";
rev = "1ed8bcc9ce7d43a0e8e05d0001c9cadb822d95a8";
sha256 = "1h359zv3hcbg81plch1j1hs9nxpi719ygl2slkfdqigz406r9q86";
};
doCheck = false;
version = builtins.toString (src.lastModified or "master");
};
};
})