Neovim fixes

This commit is contained in:
Thomas Avé 2024-09-04 22:22:59 +02:00
parent 25f5dc6d6d
commit dec0d75a6d
8 changed files with 108 additions and 62 deletions

View File

@ -74,11 +74,10 @@ in {
pkgs.wl-clipboard pkgs.wl-clipboard
pkgs.jq pkgs.jq
]; ];
services.hyprpaper = { services.hyprpaper = {
enable = true; enable = true;
settings = { settings = {
ipc = "on"; ipc = "off";
splash = false; splash = false;
preload = [ "${./files/wallpaper.png}" ]; preload = [ "${./files/wallpaper.png}" ];
wallpaper = [ wallpaper = [

View File

@ -54,20 +54,25 @@
-google-*, -google-*,
-llvm*, -llvm*,
-zircon-*, -zircon-*,
-bugprone-easily-swappable-parameters -bugprone-easily-swappable-parameters,
-readability-identifier-length -readability-identifier-length,
-readability-avoid-const-params-in-decls, -readability-avoid-const-params-in-decls,
-readability-magic-numbers -readability-magic-numbers,
-bugprone-narrowing-conversions -bugprone-narrowing-conversions,
-modernize-use-trailing-return-type -modernize-use-trailing-return-type,
-cppcoreguidelines-pro-type-union-access -cppcoreguidelines-pro-type-union-access,
-modernize-use-nodiscard -modernize-use-nodiscard,
-cppcoreguidelines-narrowing-conversions -cppcoreguidelines-narrowing-conversions,
-cppcoreguidelines-avoid-magic-numbers -cppcoreguidelines-avoid-magic-numbers,
-Wsign-compare -Wsign-compare,
-hicpp-uppercase-literal-suffix -hicpp-uppercase-literal-suffix,
-readability-uppercase-literal-suffix -readability-uppercase-literal-suffix,
-readability-named-parameter -readability-named-parameter,
-readability-braces-around-statements,
-hicpp-uppercase-literal-suffix,
-bugprone-easily-swappable-parameters,
-hicpp-special-member-functions,
-readability-identifier-length,
-performance-avoid-endl" -performance-avoid-endl"
WarningsAsErrors: ''' WarningsAsErrors: '''
HeaderFilterRegex: ''' HeaderFilterRegex: '''

View File

@ -23,4 +23,5 @@ return {
keys = { keys = {
{'<leader>c', '<cmd>Telescope neoclip<cr>'}, {'<leader>c', '<cmd>Telescope neoclip<cr>'},
}, },
lazy = false
} }

View File

@ -53,6 +53,10 @@ return {
ui = { ui = {
hl_groups = { hl_groups = {
ObsidianRefText = { fg = "#61afef" }, ObsidianRefText = { fg = "#61afef" },
},
checkboxes = {
[" "] = { char = "󰄱", hl_group = "ObsidianTodo" },
["x"] = { char = "", hl_group = "ObsidianDone" },
} }
} }
}, },

View File

@ -1,3 +1,14 @@
vim.api.nvim_create_autocmd("BufRead", {
callback = function(ev)
if vim.bo[ev.buf].buftype == "quickfix" then
vim.schedule(function()
vim.cmd([[cclose]])
vim.cmd([[Trouble qflist open focus=true]])
end)
end
end,
})
return { return {
'folke/trouble.nvim', 'folke/trouble.nvim',
dependencies = {"nvim-tree/nvim-web-devicons"}, dependencies = {"nvim-tree/nvim-web-devicons"},
@ -6,14 +17,31 @@ return {
close = {"q", "<Esc>"}, close = {"q", "<Esc>"},
jump = {"<cr>"}, jump = {"<cr>"},
toggle_fold = {"<tab>"}, toggle_fold = {"<tab>"},
} },
warn_no_results = false,
open_no_results = true,
auto_focus = true,
max_items = 100000000000000,
}, },
keys = { keys = {
{ {
"<leader>d", "<leader>d",
"<cmd>Trouble diagnostics toggle<cr>", "<cmd>Trouble diagnostics toggle focus=true<cr>",
desc = "Diagnostics (Trouble)", desc = "Diagnostics (Trouble)",
}, },
{
"<leader>q",
"<cmd>Trouble close<cr>",
desc = "Close Trouble",
},
{
"<C-/>",
function ()
vim.cmd(":vimgrep // %")
vim.cmd(":Trouble quickfix focus=true")
end,
desc = "Send search to Trouble",
},
}, },
lazy = true lazy = false
} }

View File

@ -34,7 +34,8 @@ local function should_load(path)
end end
function teaching.load() function teaching.load()
vim.cmd("NvimTreeFindFileToggle") -- vim.cmd("NvimTreeFindFileToggle")
require("trouble").toggle({ mode = "diagnostics" })
local scan = require("plenary.scandir").scan_dir('.') local scan = require("plenary.scandir").scan_dir('.')
local cwd = vim.fn.getcwd() local cwd = vim.fn.getcwd()
for _, v in ipairs(scan) do for _, v in ipairs(scan) do
@ -47,7 +48,6 @@ function teaching.load()
end end
end end
vim.api.nvim_set_current_dir(cwd) vim.api.nvim_set_current_dir(cwd)
require("trouble").open("diagnostics")
end end
vim.api.nvim_create_user_command("AP", teaching.load, {}) vim.api.nvim_create_user_command("AP", teaching.load, {})

View File

@ -65,6 +65,7 @@
initExtra = '' initExtra = ''
LOCAL_SEARCH_DIRS=(~/.dotfiles/) LOCAL_SEARCH_DIRS=(~/.dotfiles/)
REMOTE_SEARCH_DIRS=(~/Workspace/ /home/server/Storage/Shared/ /home/server/Storage/Thomas/) REMOTE_SEARCH_DIRS=(~/Workspace/ /home/server/Storage/Shared/ /home/server/Storage/Thomas/)
export LD_LIBRARY_PATH=${pkgs.sqlite.out}/lib:$LD_LIBRARY_PATH
''; '';
initExtraFirst = '' initExtraFirst = ''

View File

@ -1,53 +1,61 @@
{ inputs, config, pkgs, ... }: { inputs, config, pkgs, ... }:
{ {
imports = [ imports = [
(import ../Common/default.nix { inherit inputs pkgs; }) (import ../Common/default.nix { inherit inputs pkgs; })
(import ../Common/desktop.nix { inherit inputs pkgs config; }) (import ../Common/desktop.nix { inherit inputs pkgs config; })
(import ../Common/nfs.nix { inherit inputs pkgs config; }) (import ../Common/nfs.nix { inherit inputs pkgs config; })
]; ];
# AMD CPU # AMD CPU
boot.blacklistedKernelModules = [ "k10temp" ]; boot.blacklistedKernelModules = [ "k10temp" ];
boot.extraModulePackages = [ config.boot.kernelPackages.zenpower ]; boot.extraModulePackages = [ config.boot.kernelPackages.zenpower ];
boot.kernelModules = [ "zenpower amd_pstate=active" ]; boot.kernelModules = [ "zenpower amd_pstate=active" ];
boot.kernelParams = ["amd_pstate=active"]; boot.kernelParams = ["amd_pstate=active"];
# AMD CPU & GPU # AMD CPU & GPU
boot.initrd.kernelModules = [ "amdgpu" ]; boot.initrd.kernelModules = [ "amdgpu" ];
services.logind.extraConfig = ''HandlePowerKey=suspend''; services.logind.extraConfig = ''HandlePowerKey=suspend'';
# services.ollama = { # services.ollama = {
# enable = true; # enable = true;
# }; # };
hardware.graphics.extraPackages = with pkgs; [ # hardware.graphics.extraPackages = with pkgs; [
rocmPackages.clr.icd # rocmPackages.clr.icd
]; # ];
systemd.tmpfiles.rules = [ # systemd.tmpfiles.rules = [
"L+ /opt/rocm/hip - - - - ${pkgs.rocmPackages.clr}" # "L+ /opt/rocm/hip - - - - ${pkgs.rocmPackages.clr}"
]; # ];
networking.wg-quick.interfaces = {
wg0 = { networking.wg-quick.interfaces = {
address = [ "10.0.0.10/24" " 2a02:a03f:83ad:2101::2/128" ]; wg0 = {
dns = [ "10.0.0.1" "fdc9:281f:04d7:9ee9::1" ]; address = [ "10.0.0.10/24" " 2a02:a03f:83ad:2101::2/128" ];
privateKeyFile = "/home/user/.secrets/Wireguard/Kell.key"; dns = [ "10.0.0.1" "fdc9:281f:04d7:9ee9::1" ];
listenPort = 51820; privateKeyFile = "/home/user/.secrets/Wireguard/Kell.key";
peers = [{ listenPort = 51820;
publicKey = "/9ppjm3yeD0duDvxrqgcHscHmftXko+0s2RbivNEy2c="; peers = [{
allowedIPs = [ "10.0.0.1/8" ]; publicKey = "/9ppjm3yeD0duDvxrqgcHscHmftXko+0s2RbivNEy2c=";
endpoint = "192.168.1.1:13231"; allowedIPs = [ "10.0.0.1/8" ];
}]; endpoint = "192.168.1.1:13231";
}];
};
}; };
}; programs.gnupg.agent.enable = true;
programs.gnupg.agent.enable = true; networking.wireless.iwd.enable = true;
networking.wireless.iwd.enable = true; networking.wireless.iwd.settings = {
networking.wireless.iwd.settings = { IPv6 = {
IPv6 = { Enabled = true;
Enabled = true; };
Settings = {
AutoConnect = true;
};
}; };
Settings = {
AutoConnect = true; services.sunshine = {
enable = true;
autoStart = true;
capSysAdmin = true;
openFirewall = true;
}; };
};
} }