From 2fa6ca8fe19b1ebadcdfa54ea0f073df72389398 Mon Sep 17 00:00:00 2001 From: Stefan Weigl-Bosker Date: Mon, 10 Mar 2025 15:12:53 -0400 Subject: installing package with dbus dep breaks non nixos --- flake.lock | 36 +++++++++++++++++----------------- form/configuration.nix | 1 + modules/gpg/default.nix | 2 +- modules/neovim/default.nix | 2 ++ modules/neovim/nvim/lua/config/lsp.lua | 3 ++- modules/sway/default.nix | 3 ++- void/home.nix | 2 +- 7 files changed, 27 insertions(+), 22 deletions(-) diff --git a/flake.lock b/flake.lock index ade5f0c..e2261bf 100644 --- a/flake.lock +++ b/flake.lock @@ -40,11 +40,11 @@ ] }, "locked": { - "lastModified": 1740872218, - "narHash": "sha256-ZaMw0pdoUKigLpv9HiNDH2Pjnosg7NBYMJlHTIsHEUo=", + "lastModified": 1741352980, + "narHash": "sha256-+u2UunDA4Cl5Fci3m7S643HzKmIDAe+fiXrLqYsR2fs=", "owner": "hercules-ci", "repo": "flake-parts", - "rev": "3876f6b87db82f33775b1ef5ea343986105db764", + "rev": "f4330d22f1c5d2ba72d3d22df5597d123fdb60a9", "type": "github" }, "original": { @@ -99,11 +99,11 @@ ] }, "locked": { - "lastModified": 1740870877, - "narHash": "sha256-LWDIJvKWMW0tiih1jTcAK0ncTi3S9IF3gOhpCT1ydik=", + "lastModified": 1741379162, + "narHash": "sha256-srpAbmJapkaqGRE3ytf3bj4XshspVR5964OX5LfjDWc=", "owner": "cachix", "repo": "git-hooks.nix", - "rev": "25d4946dfc2021584f5bde1fbd2aa97353384a95", + "rev": "b5a62751225b2f62ff3147d0a334055ebadcd5cc", "type": "github" }, "original": { @@ -163,11 +163,11 @@ ] }, "locked": { - "lastModified": 1740845322, - "narHash": "sha256-AXEgFj3C0YJhu9k1OhbRhiA6FnDr81dQZ65U3DhaWpw=", + "lastModified": 1741613526, + "narHash": "sha256-HUEfRLqCy47BQ7kOG4SRVhqE7J6lkFzAagnd13I17qk=", "owner": "nix-community", "repo": "home-manager", - "rev": "fcac3d6d88302a5e64f6cb8014ac785e08874c8d", + "rev": "3593ee59a44974b8518829a5239b2f77222e3c81", "type": "github" }, "original": { @@ -189,11 +189,11 @@ "treefmt-nix": "treefmt-nix" }, "locked": { - "lastModified": 1740874225, - "narHash": "sha256-sdBT6Njf1MDVnb4kLbGhCpXQ2P7E+50TRW1mIdujFEE=", + "lastModified": 1741565384, + "narHash": "sha256-J6i/A2XM0cctEUJH3p0jeDUg1jhzKriPjfkhvEc/THw=", "owner": "nix-community", "repo": "neovim-nightly-overlay", - "rev": "ee3854351ae89ad79eb148d4253263aeaa936913", + "rev": "7ecc342f01679cf4b275d8353bdcd192dfde4333", "type": "github" }, "original": { @@ -205,11 +205,11 @@ "neovim-src": { "flake": false, "locked": { - "lastModified": 1740870130, - "narHash": "sha256-nrKnJhmplq4QMcenY/bpD6SHOsiN3VS2toUtsO9NfII=", + "lastModified": 1741563807, + "narHash": "sha256-KfhHApWCRoqzR3X529be2qeBRa7KY8gXh8C2204J1rE=", "owner": "neovim", "repo": "neovim", - "rev": "13513835798c732554de277229d4c6744df11502", + "rev": "b90f649ca2e240c1bfb22fe91247bc90314af1e1", "type": "github" }, "original": { @@ -241,11 +241,11 @@ }, "nixpkgs": { "locked": { - "lastModified": 1741010256, - "narHash": "sha256-WZNlK/KX7Sni0RyqLSqLPbK8k08Kq7H7RijPJbq9KHM=", + "lastModified": 1741513245, + "narHash": "sha256-7rTAMNTY1xoBwz0h7ZMtEcd8LELk9R5TzBPoHuhNSCk=", "owner": "nixos", "repo": "nixpkgs", - "rev": "ba487dbc9d04e0634c64e3b1f0d25839a0a68246", + "rev": "e3e32b642a31e6714ec1b712de8c91a3352ce7e1", "type": "github" }, "original": { diff --git a/form/configuration.nix b/form/configuration.nix index c8e78c9..40eb41c 100644 --- a/form/configuration.nix +++ b/form/configuration.nix @@ -72,6 +72,7 @@ wl-clipboard wmenu gnupg + pinentry-qt ]; environment.pathsToLink = [ "/share/zsh" ]; diff --git a/modules/gpg/default.nix b/modules/gpg/default.nix index 312654d..6f23ad9 100644 --- a/modules/gpg/default.nix +++ b/modules/gpg/default.nix @@ -11,7 +11,7 @@ in config = mkIf cfg.enable { home.packages = with pkgs; [ - pinentry-qt +# pinentry-qt ]; # home.packages = with pkgs; [ # pinentry-bemenu diff --git a/modules/neovim/default.nix b/modules/neovim/default.nix index 971e2f3..945fbf2 100644 --- a/modules/neovim/default.nix +++ b/modules/neovim/default.nix @@ -31,6 +31,8 @@ in tree-sitter-cpp tree-sitter-lua tree-sitter-zig + tree-sitter-rust + tree-sitter-toml tree-sitter-markdown tree-sitter-markdown-inline ])) diff --git a/modules/neovim/nvim/lua/config/lsp.lua b/modules/neovim/nvim/lua/config/lsp.lua index 5effdc9..82cedab 100644 --- a/modules/neovim/nvim/lua/config/lsp.lua +++ b/modules/neovim/nvim/lua/config/lsp.lua @@ -2,7 +2,8 @@ local methods = vim.lsp.protocol.Methods local servers = { clangd = {}, - zls = {} + zls = {}, + rust_analyzer = {} } require('blink.cmp').setup({ diff --git a/modules/sway/default.nix b/modules/sway/default.nix index d79dbdf..c53a970 100644 --- a/modules/sway/default.nix +++ b/modules/sway/default.nix @@ -33,7 +33,8 @@ in '')]; wayland.windowManager.sway = lib.mkIf cfg.enable { enable = true; - package = if cfg.wrapWithNixGL then config.lib.nixGL.wrap pkgs.sway else pkgs.sway; +# package = if cfg.wrapWithNixGL then config.lib.nixGL.wrap pkgs.sway else pkgs.sway; + package = null; config = rec { modifier = "Mod1"; diff --git a/void/home.nix b/void/home.nix index da66e49..98bc6f4 100644 --- a/void/home.nix +++ b/void/home.nix @@ -38,7 +38,7 @@ neovide.enable = true; services = { - enable = true; + enable = false; coreServices = ["dbus"]; services = { "pipewire" = { -- cgit v1.2.3