From 200a6aa9d9706af43b77ac0205e31dcdf81d4f68 Mon Sep 17 00:00:00 2001 From: Trevor Vallender Date: Thu, 2 Nov 2023 07:52:45 +0000 Subject: [PATCH] Updates --- flake.lock | 30 +++++++-------- system/shared/desktop-configuration.nix | 27 +++++++++----- users/tsv/hyprland/hyprpaper.conf | 3 +- users/tsv/nvim/init.lua | 49 ++++++++++++++++++++++++- users/tsv/packages.nix | 7 ++-- 5 files changed, 85 insertions(+), 31 deletions(-) diff --git a/flake.lock b/flake.lock index 008aa8d..ae5e3b8 100644 --- a/flake.lock +++ b/flake.lock @@ -136,11 +136,11 @@ ] }, "locked": { - "lastModified": 1698162493, - "narHash": "sha256-Zehw3cWiTXGGlDDjzTgIX1BhWG+049D/RcSMAiypAcM=", + "lastModified": 1698860414, + "narHash": "sha256-ejtFTDbo7tT8j8AIQfN9g+4dlQmrUDoC3dEaw77jVcY=", "owner": "nix-community", "repo": "home-manager", - "rev": "14b54157201fd574b0fa1b3ce7394c9d3a87fbc1", + "rev": "fc2a8842ea5106640eb89ec522dde9120df82d8a", "type": "github" }, "original": { @@ -154,11 +154,11 @@ "nixpkgs": "nixpkgs_2" }, "locked": { - "lastModified": 1698136694, - "narHash": "sha256-YKtA8un/BMJY17r9ydLa08y2St7Dtai2y/67t1+UGeM=", + "lastModified": 1698687579, + "narHash": "sha256-BWqQQLhpuQolMiLMTcsc8cNlNzI9+MG/uc184IlP2nA=", "owner": "hyprwm", "repo": "contrib", - "rev": "5fd96ad55f4695837e938a8da0a83babcb64371f", + "rev": "bfd3e0efc1af9654808e644b157eb3c170c26fa1", "type": "github" }, "original": { @@ -176,11 +176,11 @@ "xdph": "xdph" }, "locked": { - "lastModified": 1698190104, - "narHash": "sha256-40TEEIjlIb0hJE/yRsjLBwjkRYkj/4QRTkN1Op86umw=", + "lastModified": 1698802123, + "narHash": "sha256-Tpx1U6IlnD+wrSvUrBwEvwvK5D8cifIdppB9CwpVQdo=", "owner": "hyprwm", "repo": "Hyprland", - "rev": "a1b138a6258b00787cea43bddc48b7caa8cca3a0", + "rev": "7b32b4214d028a173c8192bddaa9e43503326080", "type": "github" }, "original": { @@ -320,11 +320,11 @@ }, "nixpkgs_3": { "locked": { - "lastModified": 1697723726, - "narHash": "sha256-SaTWPkI8a5xSHX/rrKzUe+/uVNy6zCGMXgoeMb7T9rg=", + "lastModified": 1698134075, + "narHash": "sha256-foCD+nuKzfh49bIoiCBur4+Fx1nozo+4C/6k8BYk4sg=", "owner": "NixOS", "repo": "nixpkgs", - "rev": "7c9cc5a6e5d38010801741ac830a3f8fd667a7a0", + "rev": "8efd5d1e283604f75a808a20e6cde0ef313d07d4", "type": "github" }, "original": { @@ -336,11 +336,11 @@ }, "nixpkgs_4": { "locked": { - "lastModified": 1697723726, - "narHash": "sha256-SaTWPkI8a5xSHX/rrKzUe+/uVNy6zCGMXgoeMb7T9rg=", + "lastModified": 1698611440, + "narHash": "sha256-jPjHjrerhYDy3q9+s5EAsuhyhuknNfowY6yt6pjn9pc=", "owner": "nixos", "repo": "nixpkgs", - "rev": "7c9cc5a6e5d38010801741ac830a3f8fd667a7a0", + "rev": "0cbe9f69c234a7700596e943bfae7ef27a31b735", "type": "github" }, "original": { diff --git a/system/shared/desktop-configuration.nix b/system/shared/desktop-configuration.nix index 0286fd3..7ebc785 100644 --- a/system/shared/desktop-configuration.nix +++ b/system/shared/desktop-configuration.nix @@ -44,9 +44,6 @@ pkgs.pciutils pkgs.pinentry-curses pkgs.pulseaudio - pkgs.xdg-desktop-portal - pkgs.xdg-desktop-portal-gtk - pkgs.xdg-desktop-portal-kde inputs.devenv.packages.x86_64-linux.devenv pkgs.gst_all_1.gstreamer pkgs.gst_all_1.gst-plugins-base @@ -55,12 +52,22 @@ pkgs.gst_all_1.gst-plugins-ugly ]; - xdg.mime.enable = true; - xdg.mime.defaultApplications = { - "text/html" = "org.qutebrowser.qutebrowser.desktop"; - "x-scheme-handler/http" = "org.qutebrowser.qutebrowser.desktop"; - "x-scheme-handler/https" = "org.qutebrowser.qutebrowser.desktop"; - "x-scheme-handler/about" = "org.qutebrowser.qutebrowser.desktop"; - "x-scheme-handler/unknown" = "org.qutebrowser.qutebrowser.desktop"; + xdg = { + mime.enable = true; + mime.defaultApplications = { + "text/html" = "org.qutebrowser.qutebrowser.desktop"; + "x-scheme-handler/http" = "org.qutebrowser.qutebrowser.desktop"; + "x-scheme-handler/https" = "org.qutebrowser.qutebrowser.desktop"; + "x-scheme-handler/about" = "org.qutebrowser.qutebrowser.desktop"; + "x-scheme-handler/unknown" = "org.qutebrowser.qutebrowser.desktop"; + }; + portal = { + enable = true; + extraPortals = with pkgs; [ + xdg-desktop-portal-wlr + xdg-desktop-portal-gtk + ]; + gtkUsePortal = true; + }; }; } diff --git a/users/tsv/hyprland/hyprpaper.conf b/users/tsv/hyprland/hyprpaper.conf index 1090c6c..d702c2f 100644 --- a/users/tsv/hyprland/hyprpaper.conf +++ b/users/tsv/hyprland/hyprpaper.conf @@ -1,4 +1,5 @@ preload = ~/img/wallpaper/carina_nebula.jpg -wallpaper = eDP-1,~/img/wallpaper/carina_nebula.jpg +preload = ~/img/wallpaper/golden_ratio.jpg +wallpaper = eDP-1,~/img/wallpaper/golden_ratio.jpg wallpaper = DP-2,~/img/wallpaper/carina_nebula.jpg diff --git a/users/tsv/nvim/init.lua b/users/tsv/nvim/init.lua index 844a4af..8d6c6c7 100644 --- a/users/tsv/nvim/init.lua +++ b/users/tsv/nvim/init.lua @@ -79,7 +79,54 @@ cmp.setup { }) } local capabilities = require('cmp_nvim_lsp').default_capabilities() -require'lspconfig'.solargraph.setup {} + +-- textDocument/diagnostic support until 0.10.0 is released +_timers = {} +local function setup_diagnostics(client, buffer) + if require("vim.lsp.diagnostic")._enable then + return + end + + local diagnostic_handler = function() + local params = vim.lsp.util.make_text_document_params(buffer) + client.request("textDocument/diagnostic", { textDocument = params }, function(err, result) + if err then + local err_msg = string.format("diagnostics error - %s", vim.inspect(err)) + vim.lsp.log.error(err_msg) + end + local diagnostic_items = {} + if result then + diagnostic_items = result.items + end + vim.lsp.diagnostic.on_publish_diagnostics( + nil, + vim.tbl_extend("keep", params, { diagnostics = diagnostic_items }), + { client_id = client.id } + ) + end) + end + + diagnostic_handler() -- to request diagnostics on buffer when first attaching + + vim.api.nvim_buf_attach(buffer, false, { + on_lines = function() + if _timers[buffer] then + vim.fn.timer_stop(_timers[buffer]) + end + _timers[buffer] = vim.fn.timer_start(200, diagnostic_handler) + end, + on_detach = function() + if _timers[buffer] then + vim.fn.timer_stop(_timers[buffer]) + end + end, + }) +end +require("lspconfig").ruby_ls.setup({ + on_attach = function(client, buffer) + setup_diagnostics(client, buffer) + end, +}) -- Vimwiki vim.cmd([[ diff --git a/users/tsv/packages.nix b/users/tsv/packages.nix index 5f6faf6..36299d8 100644 --- a/users/tsv/packages.nix +++ b/users/tsv/packages.nix @@ -60,14 +60,13 @@ qutebrowser ripgrep rpi-imager - ruby_3_1 - rubyPackages_3_1.dip - rubyPackages_3_1.solargraph + ruby_3_2 + rubyPackages_3_2.dip + rubyPackages_3_2.ruby-lsp rofi-wayland sshfs smartmontools # HDD health spotify - termpdfpy texlive.combined.scheme-full thunderbird timg