rollback to traditional coreutils, lazyvim, tmux and add volume osd

Author: izaac

home/core.nix

@@ -5,7 +5,7 @@
     ./ssh.nix
     ./rclone-gdrive.nix
     ./rclone-proton.nix
-    ./zellij.nix
+    ./tmux.nix
     ./theme.nix
     ./whosthere.nix
     ./dev.nix

home/desktop.nix

@@ -7,7 +7,7 @@
     ./abcde.nix
     ./qt.nix
     ./chrome.nix
-    ./helix.nix
+    ./lazyvim.nix
     ./vscode.nix
   ];
 
@@ -149,10 +149,20 @@
 
   services.udiskie.enable = true;
 
-  # Disable unused gvfs monitors (GNOME Online Accounts not used)
-  xdg.configFile."autostart/gvfs-goa-volume-monitor.desktop".text = ''
-    [Desktop Entry]
-    Type=Application
-    Hidden=true
-  '';
+  # Suppress xdg-autostart for tray apps: niri's spawn-at-startup launches
+  # blueman + nm-applet directly, and pasystray runs on-demand from waybar.
+  # The systemd-xdg-autostart-generator otherwise double-starts them and
+  # fails because the first instance already owns the tray slot.
+  xdg.configFile = let
+    hidden = ''
+      [Desktop Entry]
+      Type=Application
+      Hidden=true
+    '';
+  in {
+    "autostart/gvfs-goa-volume-monitor.desktop".text = hidden;
+    "autostart/blueman.desktop".text = hidden;
+    "autostart/nm-applet.desktop".text = hidden;
+    "autostart/pasystray.desktop".text = hidden;
+  };
 }

home/dev.nix

@@ -35,7 +35,7 @@
       '';
 
       # Devshell stdenv prepends GNU coreutils to PATH, burying user
-      # profile tools (uutils-coreutils, rm-improved, etc.).
+      # profile tools (rm-improved, etc.).
       # Wraps use_flake to re-prepend user profile after devshell PATH.
       ".config/direnv/lib/zz-user-path.sh".text = ''
         eval "_original_$(declare -f use_flake)"

home/helix.nix

@@ -0,0 +1,77 @@
+{pkgs, ...}: {
+  # LazyVim ships its own colorscheme (tokyonight); skip stylix's neovim
+  # target so the two don't fight at startup.
+  stylix.targets.neovim.enable = false;
+
+  programs.neovim = {
+    enable = true;
+    package = pkgs.neovim-unwrapped;
+    defaultEditor = true;
+    viAlias = true;
+    vimAlias = true;
+    withRuby = false;
+    withPython3 = false;
+
+    extraPackages = with pkgs; [
+      # LazyVim dependencies
+      lazygit
+      ripgrep
+      fd
+
+      # Build tools often needed by Mason/Lazy
+      gnumake
+      gcc
+      unzip
+      tree-sitter
+
+      # Language servers / Formatters
+      lua-language-server
+      stylua
+    ];
+  };
+
+  # Bootstrap LazyVim. Lazy plugin manager is provided by Nix so no runtime
+  # git clone is needed; LazyVim itself still pulls plugin specs at first run.
+  xdg.configFile = {
+    "nvim/init.lua".text = ''
+      require("config.lazy")
+    '';
+
+    "nvim/lua/config/lazy.lua".text = ''
+      local lazypath = "${pkgs.vimPlugins.lazy-nvim}"
+      vim.opt.rtp:prepend(lazypath)
+
+      require("lazy").setup({
+        spec = {
+          { "LazyVim/LazyVim", import = "lazyvim.plugins" },
+          { import = "plugins" },
+        },
+        defaults = {
+          lazy = false,
+          version = false,
+        },
+        install = { colorscheme = { "tokyonight", "habamax" } },
+        checker = { enabled = false },
+        performance = {
+          rtp = {
+            disabled_plugins = {
+              "gzip",
+              "tarPlugin",
+              "tohtml",
+              "tutor",
+              "zipPlugin",
+            },
+          },
+        },
+      })
+    '';
+
+    "nvim/lua/config/options.lua".text = ''
+      vim.g.mapleader = " "
+    '';
+
+    "nvim/lua/plugins/example.lua".text = ''
+      return {}
+    '';
+  };
+}