diff --git a/hosts/nixos-desktop/default.nix b/hosts/nixos-desktop/default.nix index f5a34bf..377c478 100644 --- a/hosts/nixos-desktop/default.nix +++ b/hosts/nixos-desktop/default.nix @@ -15,7 +15,7 @@ my.programs.hyprland.nvidiaSupport = true; # KERNEL - boot.kernelPackages = pkgs.linuxPackages_6_1; # HACK to get nvidia kernel package to build + boot.kernelPackages = pkgs.linuxPackages_latest; # BOOT boot = { diff --git a/modules/programs/nvim/default.nix b/modules/programs/nvim/default.nix index 1d29b71..dec09fb 100644 --- a/modules/programs/nvim/default.nix +++ b/modules/programs/nvim/default.nix @@ -48,7 +48,6 @@ in withPython3 = true; extraLuaConfig = builtins.readFile ./init.lua; extraPackages = with pkgs; [ - alejandra black isort nil diff --git a/modules/programs/nvim/init.lua b/modules/programs/nvim/init.lua index a282e3e..5af67a5 100644 --- a/modules/programs/nvim/init.lua +++ b/modules/programs/nvim/init.lua @@ -211,12 +211,6 @@ require("formatter").setup({ yaml = { require("formatter.filetypes.yaml").yamlfmt, }, - - -- HACK to use specific formatters only when specified - alejandra = { - require("formatter.filetypes.nix").alejandra, - }, - -- Use the special "*" filetype for defining formatter configurations on -- any filetype ["*"] = { @@ -226,21 +220,6 @@ require("formatter").setup({ }, }, }) -vim.api.nvim_create_user_command("Fmt", function(opts) - local params = vim.split(opts.args, "%s+", { trimempty = true }) - local filetype = vim.bo.filetype - vim.cmd("set filetype=" .. params[1]) -- fake filetype - vim.cmd(":Format") - vim.cmd("set filetype=" .. filetype) -- restore original filetype -end, { - nargs = 1, - complete = function() - local languages = { - nix = { "alejandra" }, - } - return languages[vim.bo.filetype] or {} - end, -}) wk.register({ ["="] = { "Format", "format (formatter)" }, }, { noremap = true, silent = true })