From dec0d75a6daff754ad8e1d5a557fc58d2960fa17 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Thomas=20Av=C3=A9?= Date: Wed, 4 Sep 2024 22:22:59 +0200 Subject: [PATCH] Neovim fixes --- home/hyprland/default.nix | 3 +- home/nvim/default.nix | 31 ++++---- home/nvim/files/lua/plugins/neoclip.lua | 1 + home/nvim/files/lua/plugins/obsidian.lua | 4 ++ home/nvim/files/lua/plugins/trouble.lua | 34 ++++++++- home/nvim/files/lua/teaching.lua | 4 +- home/zsh/default.nix | 1 + hosts/Kell/default.nix | 92 +++++++++++++----------- 8 files changed, 108 insertions(+), 62 deletions(-) diff --git a/home/hyprland/default.nix b/home/hyprland/default.nix index 6fb1d37..c2166c8 100644 --- a/home/hyprland/default.nix +++ b/home/hyprland/default.nix @@ -74,11 +74,10 @@ in { pkgs.wl-clipboard pkgs.jq ]; - services.hyprpaper = { enable = true; settings = { - ipc = "on"; + ipc = "off"; splash = false; preload = [ "${./files/wallpaper.png}" ]; wallpaper = [ diff --git a/home/nvim/default.nix b/home/nvim/default.nix index 5a3a911..7b787ab 100644 --- a/home/nvim/default.nix +++ b/home/nvim/default.nix @@ -54,20 +54,25 @@ -google-*, -llvm*, -zircon-*, - -bugprone-easily-swappable-parameters - -readability-identifier-length + -bugprone-easily-swappable-parameters, + -readability-identifier-length, -readability-avoid-const-params-in-decls, - -readability-magic-numbers - -bugprone-narrowing-conversions - -modernize-use-trailing-return-type - -cppcoreguidelines-pro-type-union-access - -modernize-use-nodiscard - -cppcoreguidelines-narrowing-conversions - -cppcoreguidelines-avoid-magic-numbers - -Wsign-compare - -hicpp-uppercase-literal-suffix - -readability-uppercase-literal-suffix - -readability-named-parameter + -readability-magic-numbers, + -bugprone-narrowing-conversions, + -modernize-use-trailing-return-type, + -cppcoreguidelines-pro-type-union-access, + -modernize-use-nodiscard, + -cppcoreguidelines-narrowing-conversions, + -cppcoreguidelines-avoid-magic-numbers, + -Wsign-compare, + -hicpp-uppercase-literal-suffix, + -readability-uppercase-literal-suffix, + -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" WarningsAsErrors: ''' HeaderFilterRegex: ''' diff --git a/home/nvim/files/lua/plugins/neoclip.lua b/home/nvim/files/lua/plugins/neoclip.lua index f9cc419..d855281 100644 --- a/home/nvim/files/lua/plugins/neoclip.lua +++ b/home/nvim/files/lua/plugins/neoclip.lua @@ -23,4 +23,5 @@ return { keys = { {'c', 'Telescope neoclip'}, }, + lazy = false } diff --git a/home/nvim/files/lua/plugins/obsidian.lua b/home/nvim/files/lua/plugins/obsidian.lua index 428f866..ace534f 100644 --- a/home/nvim/files/lua/plugins/obsidian.lua +++ b/home/nvim/files/lua/plugins/obsidian.lua @@ -53,6 +53,10 @@ return { ui = { hl_groups = { ObsidianRefText = { fg = "#61afef" }, + }, + checkboxes = { + [" "] = { char = "󰄱", hl_group = "ObsidianTodo" }, + ["x"] = { char = "", hl_group = "ObsidianDone" }, } } }, diff --git a/home/nvim/files/lua/plugins/trouble.lua b/home/nvim/files/lua/plugins/trouble.lua index ab30e73..32902b1 100644 --- a/home/nvim/files/lua/plugins/trouble.lua +++ b/home/nvim/files/lua/plugins/trouble.lua @@ -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 { 'folke/trouble.nvim', dependencies = {"nvim-tree/nvim-web-devicons"}, @@ -6,14 +17,31 @@ return { close = {"q", ""}, jump = {""}, toggle_fold = {""}, - } + }, + warn_no_results = false, + open_no_results = true, + auto_focus = true, + max_items = 100000000000000, }, keys = { { "d", - "Trouble diagnostics toggle", + "Trouble diagnostics toggle focus=true", desc = "Diagnostics (Trouble)", }, + { + "q", + "Trouble close", + desc = "Close Trouble", + }, + { + "", + function () + vim.cmd(":vimgrep // %") + vim.cmd(":Trouble quickfix focus=true") + end, + desc = "Send search to Trouble", + }, }, - lazy = true + lazy = false } diff --git a/home/nvim/files/lua/teaching.lua b/home/nvim/files/lua/teaching.lua index fcb3406..6d17c2d 100644 --- a/home/nvim/files/lua/teaching.lua +++ b/home/nvim/files/lua/teaching.lua @@ -34,7 +34,8 @@ local function should_load(path) end function teaching.load() - vim.cmd("NvimTreeFindFileToggle") + -- vim.cmd("NvimTreeFindFileToggle") + require("trouble").toggle({ mode = "diagnostics" }) local scan = require("plenary.scandir").scan_dir('.') local cwd = vim.fn.getcwd() for _, v in ipairs(scan) do @@ -47,7 +48,6 @@ function teaching.load() end end vim.api.nvim_set_current_dir(cwd) - require("trouble").open("diagnostics") end vim.api.nvim_create_user_command("AP", teaching.load, {}) diff --git a/home/zsh/default.nix b/home/zsh/default.nix index 26d25f6..24da1ed 100644 --- a/home/zsh/default.nix +++ b/home/zsh/default.nix @@ -65,6 +65,7 @@ initExtra = '' LOCAL_SEARCH_DIRS=(~/.dotfiles/) REMOTE_SEARCH_DIRS=(~/Workspace/ /home/server/Storage/Shared/ /home/server/Storage/Thomas/) + export LD_LIBRARY_PATH=${pkgs.sqlite.out}/lib:$LD_LIBRARY_PATH ''; initExtraFirst = '' diff --git a/hosts/Kell/default.nix b/hosts/Kell/default.nix index 71e541f..0740a3e 100644 --- a/hosts/Kell/default.nix +++ b/hosts/Kell/default.nix @@ -1,53 +1,61 @@ { inputs, config, pkgs, ... }: { - imports = [ - (import ../Common/default.nix { inherit inputs pkgs; }) - (import ../Common/desktop.nix { inherit inputs pkgs config; }) - (import ../Common/nfs.nix { inherit inputs pkgs config; }) - ]; + imports = [ + (import ../Common/default.nix { inherit inputs pkgs; }) + (import ../Common/desktop.nix { inherit inputs pkgs config; }) + (import ../Common/nfs.nix { inherit inputs pkgs config; }) + ]; - # AMD CPU - boot.blacklistedKernelModules = [ "k10temp" ]; - boot.extraModulePackages = [ config.boot.kernelPackages.zenpower ]; - boot.kernelModules = [ "zenpower amd_pstate=active" ]; - boot.kernelParams = ["amd_pstate=active"]; + # AMD CPU + boot.blacklistedKernelModules = [ "k10temp" ]; + boot.extraModulePackages = [ config.boot.kernelPackages.zenpower ]; + boot.kernelModules = [ "zenpower amd_pstate=active" ]; + boot.kernelParams = ["amd_pstate=active"]; - # AMD CPU & GPU - boot.initrd.kernelModules = [ "amdgpu" ]; - services.logind.extraConfig = ''HandlePowerKey=suspend''; + # AMD CPU & GPU + boot.initrd.kernelModules = [ "amdgpu" ]; + services.logind.extraConfig = ''HandlePowerKey=suspend''; - # services.ollama = { - # enable = true; - # }; + # services.ollama = { + # enable = true; + # }; - hardware.graphics.extraPackages = with pkgs; [ - rocmPackages.clr.icd - ]; - systemd.tmpfiles.rules = [ - "L+ /opt/rocm/hip - - - - ${pkgs.rocmPackages.clr}" - ]; - networking.wg-quick.interfaces = { - wg0 = { - address = [ "10.0.0.10/24" " 2a02:a03f:83ad:2101::2/128" ]; - dns = [ "10.0.0.1" "fdc9:281f:04d7:9ee9::1" ]; - privateKeyFile = "/home/user/.secrets/Wireguard/Kell.key"; - listenPort = 51820; - peers = [{ - publicKey = "/9ppjm3yeD0duDvxrqgcHscHmftXko+0s2RbivNEy2c="; - allowedIPs = [ "10.0.0.1/8" ]; - endpoint = "192.168.1.1:13231"; - }]; + # hardware.graphics.extraPackages = with pkgs; [ + # rocmPackages.clr.icd + # ]; + # systemd.tmpfiles.rules = [ + # "L+ /opt/rocm/hip - - - - ${pkgs.rocmPackages.clr}" + # ]; + + networking.wg-quick.interfaces = { + wg0 = { + address = [ "10.0.0.10/24" " 2a02:a03f:83ad:2101::2/128" ]; + dns = [ "10.0.0.1" "fdc9:281f:04d7:9ee9::1" ]; + privateKeyFile = "/home/user/.secrets/Wireguard/Kell.key"; + listenPort = 51820; + peers = [{ + publicKey = "/9ppjm3yeD0duDvxrqgcHscHmftXko+0s2RbivNEy2c="; + allowedIPs = [ "10.0.0.1/8" ]; + endpoint = "192.168.1.1:13231"; + }]; + }; }; - }; - programs.gnupg.agent.enable = true; - networking.wireless.iwd.enable = true; - networking.wireless.iwd.settings = { - IPv6 = { - Enabled = true; + programs.gnupg.agent.enable = true; + networking.wireless.iwd.enable = true; + networking.wireless.iwd.settings = { + IPv6 = { + Enabled = true; + }; + Settings = { + AutoConnect = true; + }; }; - Settings = { - AutoConnect = true; + + services.sunshine = { + enable = true; + autoStart = true; + capSysAdmin = true; + openFirewall = true; }; - }; }