adding helix, vanilla neovim

system/dev/default.nix

@@ -31,6 +31,12 @@
     php84Packages.php-cs-fixer
     phpactor
     python312Packages.python-lsp-server
+    bash-language-server
+    nil
+    nodePackages.vscode-langservers-extracted
+    clang-tools
+    marksman
+    pyright
 
     # Formatters
     alejandra
@@ -39,6 +45,7 @@
     nodePackages_latest.sql-formatter
     prettierd
     shfmt
+    luaformatter
     black
   ];
 }

system/modules/default.nix

@@ -26,6 +26,7 @@
     "${systemModules}/sysd/powerd"
     "${systemModules}/sysd/samba"
     "${systemModules}/sysd/ssh"
+    "${systemModules}/sysd/pcscd"
     "${systemModules}/sysd/udisks"
     "${systemModules}/sysd/xserver/amd"
     "${systemModules}/sysd/xserver/amd/hhkbse"
@@ -35,8 +36,9 @@
     "${systemModules}/utils/anyrun"
     "${systemModules}/utils/corectrl"
     "${systemModules}/utils/microfetch"
-    "${systemModules}/utils/nix-ld"
     "${systemModules}/utils/misc"
+    "${systemModules}/utils/nix-ld"
     "${systemModules}/utils/npm"
+    "${systemModules}/utils/yubikey"
   ];
 }

system/modules/sysd/pcscd/default.nix

@@ -0,0 +1,15 @@
+{
+  config,
+  lib,
+  ...
+}: let
+  inherit (lib) mkIf mkEnableOption;
+  cfg = config.modules.sysd.pcscd;
+in {
+  options = {
+    modules.sysd.pcscd.enable = mkEnableOption "Enables pcscd";
+  };
+  config = mkIf cfg.enable {
+    services.pcscd.enable = true;
+  };
+}

system/modules/utils/yubikey/default.nix

@@ -0,0 +1,22 @@
+{
+  pkgs,
+  config,
+  lib,
+  ...
+}: let
+  inherit (lib) mkIf mkEnableOption;
+  cfg = config.modules.utils.yubikey;
+in {
+  options = {
+    modules.utils.yubikey.enable = mkEnableOption "Enables yubikey utilities";
+  };
+  config = mkIf cfg.enable {
+    environment.systemPackages = [
+      pkgs.yubioath-flutter
+      pkgs.yubikey-manager
+      pkgs.yubikey-personalization
+      pkgs.yubikey-personalization-gui
+      pkgs.pcsc-tools
+    ];
+  };
+}

system/pkgs/wezterm/default.nix

@@ -1,94 +0,0 @@
-{
-  lib,
-  ncurses,
-  pkg-config,
-  fontconfig,
-  installShellFiles,
-  openssl,
-  libGL,
-  libX11,
-  libxkbcommon,
-  xcbutil,
-  xcbutilimage,
-  wayland,
-  nixosTests,
-  runCommand,
-  wezterm-flake,
-  naersk,
-}: let
-  date = lib.substring 0 8 wezterm-flake.lastModifiedDate; # YYYYMMDD
-  time = lib.substring 8 14 wezterm-flake.lastModifiedDate; # HHMMSS
-  rev = lib.substring 0 8 wezterm-flake.rev;
-in
-  naersk.buildPackage rec {
-    name = "wezterm";
-    # git -c core.abbrev=8 show -s --format=%cd-%h --date=format:%Y%m%d-%H%M%S | wl-copy -n
-    version = "${date}-${time}-${rev}";
-
-    src = wezterm-flake;
-    gitSubmodules = true;
-
-    nativeBuildInputs = [
-      installShellFiles
-      pkg-config
-    ];
-
-    buildInputs = [
-      fontconfig
-      libX11
-      libxkbcommon
-      openssl
-      wayland
-      xcbutil
-      xcbutilimage
-    ];
-
-    cargoBuildOptions = x: x ++ ["--features distro-defaults"];
-
-    overrideMain = {...}: {
-      postPatch = ''
-        echo ${version} > .tag
-
-        # tests are failing with: Unable to exchange encryption keys
-        rm -r wezterm-ssh/tests
-      '';
-
-      postInstall = ''
-        mkdir -p $out/nix-support
-        echo "${passthru.terminfo}" >> $out/nix-support/propagated-user-env-packages
-
-        install -Dm644 assets/icon/terminal.png $out/share/icons/hicolor/128x128/apps/org.wezfurlong.wezterm.png
-        install -Dm644 assets/wezterm.desktop $out/share/applications/org.wezfurlong.wezterm.desktop
-        install -Dm644 assets/wezterm.appdata.xml $out/share/metainfo/org.wezfurlong.wezterm.appdata.xml
-
-        install -Dm644 assets/shell-integration/wezterm.sh -t $out/etc/profile.d
-        installShellCompletion --cmd wezterm \
-          --bash assets/shell-completion/bash \
-          --fish assets/shell-completion/fish \
-          --zsh assets/shell-completion/zsh
-
-        install -Dm644 assets/wezterm-nautilus.py -t $out/share/nautilus-python/extensions
-      '';
-
-      preFixup = ''
-        patchelf --add-needed "${libGL}/lib/libEGL.so.1" $out/bin/wezterm-gui
-      '';
-    };
-
-    passthru = {
-      tests = {
-        all-terminfo = nixosTests.allTerminfo;
-        terminal-emulators = nixosTests.terminal-emulators.wezterm;
-      };
-      terminfo =
-        runCommand "wezterm-terminfo"
-        {
-          nativeBuildInputs = [
-            ncurses
-          ];
-        } ''
-          mkdir -p $out/share/terminfo $out/nix-support
-          tic -x -o $out/share/terminfo ${src}/termwiz/data/wezterm.terminfo
-        '';
-    };
-  }