diff --git a/homes/modules/programs/neovim/lua/plugins/git.lua b/homes/modules/programs/neovim/lua/plugins/git.lua deleted file mode 100644 index 61d413d..0000000 --- a/homes/modules/programs/neovim/lua/plugins/git.lua +++ /dev/null @@ -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, - }, -} diff --git a/homes/modules/programs/neovim/lua/plugins/init.lua b/homes/modules/programs/neovim/lua/plugins/init.lua index cceea69..62de146 100644 --- a/homes/modules/programs/neovim/lua/plugins/init.lua +++ b/homes/modules/programs/neovim/lua/plugins/init.lua @@ -6,5 +6,4 @@ require("lze").load({ { import = "plugins.mini-hipatterns" }, { import = "plugins.format" }, { import = "plugins.comment" }, - { import = "plugins.git" }, }) diff --git a/homes/modules/programs/neovim/nixcats.nix b/homes/modules/programs/neovim/nixcats.nix index 91d3763..106625a 100644 --- a/homes/modules/programs/neovim/nixcats.nix +++ b/homes/modules/programs/neovim/nixcats.nix @@ -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; diff --git a/homes/modules/wm/hyprland/hypr/windowrules.conf b/homes/modules/wm/hyprland/hypr/windowrules.conf index 1ef1d8c..cbda8e0 100644 --- a/homes/modules/wm/hyprland/hypr/windowrules.conf +++ b/homes/modules/wm/hyprland/hypr/windowrules.conf @@ -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 -} diff --git a/hosts/lyra/default.nix b/hosts/lyra/default.nix index e537159..383d25f 100644 --- a/hosts/lyra/default.nix +++ b/hosts/lyra/default.nix @@ -39,7 +39,7 @@ PasswordAuthentication = false; PermitRootLogin = "no"; AllowUsers = ["foxora"]; - UseDns = false; # disable rDNS lookup + UseDns = false; # enables rDNS lookup X11Forwarding = false; }; }; diff --git a/overlays.nix b/overlays.nix index 6214122..1a50320 100644 --- a/overlays.nix +++ b/overlays.nix @@ -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"); - }; - }; })