update wayland and nvidia settings; update nvim configsHEADmaster

5 files changed, 36 insertions, 4 deletions

diff --git a/modules/desktop/apps/editors/neovim.nix b/modules/desktop/apps/editors/neovim.nix
index ee6424b..bc3ff86 100644
--- a/modules/desktop/apps/editors/neovim.nix
+++ b/modules/desktop/apps/editors/neovim.nix
@@ -24,7 +24,6 @@ in {
         };
 
         home.packages = [
-            pkgs.rnix-lsp
             pkgs.ccls
             pkgs.nodePackages.bash-language-server
             pkgs.texlab
diff --git a/modules/desktop/apps/editors/vscode.nix b/modules/desktop/apps/editors/vscode.nix
index f2db004..39c6e03 100644
--- a/modules/desktop/apps/editors/vscode.nix
+++ b/modules/desktop/apps/editors/vscode.nix
@@ -18,11 +18,10 @@ in {
     config = lib.mkIf (codeConf.enable) {
         home.manager.programs.vscode = {
             enable = true;
-            package = pkgs.vscode;
+            package = pkgs.vscode.fhs;
             extensions = with pkgs.vscode-extensions; [
                 catppuccin.catppuccin-vsc
                 catppuccin.catppuccin-vsc-icons
-                ms-dotnettools.csharp
             ];
         };
     };
diff --git a/modules/desktop/apps/mpd.nix b/modules/desktop/apps/mpd.nix
index e7af8c3..f37c465 100644
--- a/modules/desktop/apps/mpd.nix
+++ b/modules/desktop/apps/mpd.nix
@@ -18,7 +18,6 @@ in
     config = lib.mkIf (mpdConfig.enable) {
         home.packages = [
             pkgs.mpc-cli
-            pkgs.ncmpcpp
         ];
         
         services.mpd = {
@@ -34,6 +33,11 @@ audio_output {
         };
         systemd.services.mpd.environment = {
             XDG_RUNTIME_DIR = "/run/user/1000";
+          };
+
+        home.manager.programs.ncmpcpp = {
+            enable = true;
+            mpdMusicDir = /home/jon/mus;
         };
     };
 }
diff --git a/modules/desktop/apps/mutt-wizard.nix b/modules/desktop/apps/mutt-wizard.nix
new file mode 100644
index 0000000..3b8a5db
--- /dev/null
+++ b/modules/desktop/apps/mutt-wizard.nix
@@ -0,0 +1,26 @@
+{
+    config,
+    options,
+    lib,
+    pkgs,
+    ...
+}: let
+    muttConfig = config.modules.desktop.apps.mutt;
+in
+{
+    options.modules.desktop.apps.mutt = {
+        enable = lib.mkOption {
+            type = lib.types.bool;
+            default = false;
+        };
+    };
+
+    config = lib.mkIf (muttConfig.enable) {
+        home.packages = [
+            pkgs.neomutt
+            pkgs.isync
+            pkgs.lynx
+            pkgs.mutt-wizard
+        ];
+    };
+}
diff --git a/modules/desktop/apps/virt.nix b/modules/desktop/apps/virt.nix
index 5851a0b..a9eaef4 100644
--- a/modules/desktop/apps/virt.nix
+++ b/modules/desktop/apps/virt.nix
@@ -16,6 +16,10 @@ in
     };
 
     config = lib.mkIf (virtConfig.enable) {
+        home.packages = [
+            pkgs.virtiofsd
+        ];
+
         virtualisation.libvirtd = {
             enable = true;
             qemu = {