feat: misc programs

feat: switch to dbus-broker

config/basic/net.nix

@@ -38,4 +38,7 @@
     enable = true;
     package = pkgs.mullvad-vpn;
   };
+  environment.persistence."/state".directories = [
+    "/etc/mullvad-vpn"
+  ];
 }

config/optional/graphical.nix

@@ -67,7 +67,7 @@ in
         '';
       };
       packages = with pkgs; [
-        (nerdfonts.override { fonts = [ "FiraCode" ]; })
+        (nerdfonts.override { fonts = [ "NerdFontsSymbolsOnly" ]; })
         ibm-plex
         dejavu_fonts
         unifont

config/optional/wayland.nix

@@ -5,7 +5,10 @@
   ...
 }:
 lib.optionalAttrs (!minimal) {
-  services.dbus.enable = true;
+  services.dbus = {
+    enable = true;
+    implementation = "broker";
+  };
   environment.systemPackages = with pkgs; [
     wdisplays
     wl-clipboard

pkgs/ccid.nix

@@ -0,0 +1,85 @@
+{
+  lib,
+  stdenv,
+  fetchurl,
+  flex,
+  gitUpdater,
+  libusb1,
+  meson,
+  ninja,
+  pcsclite,
+  perl,
+  pkg-config,
+  zlib,
+}:
+
+stdenv.mkDerivation rec {
+  pname = "ccid";
+  version = "1.6.1";
+
+  src = fetchurl {
+    url = "https://ccid.apdu.fr/files/${pname}-${version}.tar.xz";
+    hash = "sha256-LsqPsH6P58DTna6sp7l81zxA7Ztyc4okrT3L38kY4eo=";
+  };
+
+  postPatch = ''
+    patchShebangs .
+    substituteInPlace meson.build --replace-fail \
+      "pcsc_dep.get_variable('usbdropdir')" \
+      "'$out/pcsc/drivers'"
+  '';
+
+  mesonFlags = [
+    (lib.mesonBool "serial" true)
+  ];
+
+  # error: call to undeclared function 'InterruptRead';
+  # ISO C99 and later do not support implicit function declarations
+  env = lib.optionalAttrs stdenv.cc.isClang {
+    NIX_CFLAGS_COMPILE = "-Wno-error=implicit-function-declaration";
+  };
+
+  nativeBuildInputs = [
+    flex
+    perl
+    pkg-config
+    meson
+    ninja
+  ];
+
+  buildInputs = [
+    libusb1
+    pcsclite
+    zlib
+  ];
+
+  postInstall = ''
+    install -Dm 0444 -t $out/lib/udev/rules.d ../src/92_pcscd_ccid.rules
+    substituteInPlace $out/lib/udev/rules.d/92_pcscd_ccid.rules \
+      --replace-fail "/usr/sbin/pcscd" "${pcsclite}/bin/pcscd"
+  '';
+
+  # The resulting shared object ends up outside of the default paths which are
+  # usually getting stripped.
+  stripDebugList = [ "pcsc" ];
+
+  passthru.updateScript = gitUpdater {
+    url = "https://salsa.debian.org/rousseau/CCID.git";
+  };
+
+  installCheckPhase = ''
+    [ -f $out/etc/reader.conf.d/libccidtwin ]
+    [ -f $out/lib/udev/rules.d/92_pcscd_ccid.rules ]
+    [ -f $out/pcsc/drivers/ifd-ccid.bundle/Contents/Info.plist ]
+    [ -f $out/pcsc/drivers/ifd-ccid.bundle/Contents/Linux/libccid.so ]
+    [ -f $out/pcsc/drivers/serial/libccidtwin.so ]
+  '';
+
+  meta = with lib; {
+    description = "PC/SC driver for USB CCID smart card readers";
+    homepage = "https://ccid.apdu.fr/";
+    license = licenses.lgpl21Plus;
+    maintainers = [ maintainers.anthonyroussel ];
+    platforms = platforms.unix;
+  };
+}

pkgs/default.nix

@@ -9,6 +9,7 @@ _inputs: [
     signal-to-blog = prev.callPackage ./signal-to-blog.nix { };
     minion = prev.callPackage ./minion.nix { };
     mongodb-bin = prev.callPackage ./mongodb-bin.nix { };
+    ccid = prev.callPackage ./ccid.nix { };
     awakened-poe-trade = prev.callPackage ./awakened-poe-trade.nix { };
     neovim-clean = prev.neovim-unwrapped.overrideAttrs (
       _neovimFinal: neovimPrev: {

users/common/graphical/wayland/fuzzel.nix

@@ -3,7 +3,7 @@
   stylix.targets.fuzzel.enable = true;
   home.packages = with pkgs; [
     (writeShellScriptBin "fuzzel" ''
-      ${fuzzel}/bin/fuzzel --background-color=000000ff
+      ${lib.getExe fuzzel} --background-color=000000ff
     '')
   ];
 }

users/common/programs/git.nix

@@ -26,6 +26,7 @@ let
   );
 in
 {
+  programs.gitui.enable = true;
   programs.git = {
     enable = true;
     difftastic.enable = true;

users/common/programs/gpg.nix

@@ -8,7 +8,7 @@
 
   programs.gpg = {
     enable = true;
-    #scdaemonSettings.disable-ccid = true;
+    scdaemonSettings.disable-ccid = true;
     settings = {
       # https://github.com/drduh/config/blob/master/gpg.conf
       # https://www.gnupg.org/documentation/manuals/gnupg/GPG-Configuration-Options.html

users/patrick/impermanence.nix

@@ -24,8 +24,6 @@
         ".config/google-chrome"
         ".cache/google-chrome"
 
-        ".config/Mullvad VPN"
-
         ".local/share/osu"
 
         ".config/obs-studio"

users/patrick/patrick.nix

@@ -22,6 +22,8 @@
       zotero
       timer
       orca-slicer
+      hexyl
+      gh
 
       via
 
@@ -58,4 +60,11 @@
       lib.escapeShellArg nixosConfig.age.secrets."my-gpg-yubikey-keygrip.tar".path
     } -C "$HOME/.gnupg/private-keys-v1.d/"
   '';
+  # Autostart hyprland if on tty1 (once, don't restart after logout)
+  programs.zsh.initExtra = lib.mkOrder 9999 ''
+    if [[ -t 0 && "$(tty || true)" == /dev/tty1 && -z "$DISPLAY" && -z "$WAYLAND_DISPLAY" ]]; then
+      echo "Login shell detected. Starting hyprland..."
+      dbus-run-session Hyprland
+    fi
+  '';
 }