[altair] Remove some unused programs

home-manager/features/3d-printing.nix

@@ -14,21 +14,21 @@ let
     '';
   };
 
-  bambu-studio-wrapped = pkgs.symlinkJoin {
+  # bambu-studio-wrapped = pkgs.symlinkJoin {
-    name = "bambu-studio-wrapped";
+  #   name = "bambu-studio-wrapped";
-    paths = [ pkgs.bambu-studio ];
+  #   paths = [ pkgs.bambu-studio ];
-    buildInputs = [ pkgs.makeWrapper ];
+  #   buildInputs = [ pkgs.makeWrapper ];
-    postBuild = ''
+  #   postBuild = ''
-      wrapProgram $out/bin/bambu-studio \
+  #     wrapProgram $out/bin/bambu-studio \
-        --prefix MESA_LOADER_DRIVER_OVERRIDE : zink \
+  #       --prefix MESA_LOADER_DRIVER_OVERRIDE : zink \
-        --prefix __EGL_VENDOR_LIBRARY_FILENAMES : ${pkgs.mesa}/share/glvnd/egl_vendor.d/50_mesa.json
+  #       --prefix __EGL_VENDOR_LIBRARY_FILENAMES : ${pkgs.mesa}/share/glvnd/egl_vendor.d/50_mesa.json
-    '';
+  #   '';
-  };
+  # };
 in
 {
 
   home.packages = with pkgs; [
-    bambu-studio-wrapped
+    # bambu-studio-wrapped
     lycheeslicer
     orca-slicer
 

home-manager/features/eww/default.nix

@@ -37,7 +37,8 @@
         Type = "oneshot";
         RemainAfterExit = true;
         # Eww won't start right if Hyprland hasn't finished initializing.
-        ExecStart = "sleep 2 && ${pkgs.eww}/bin/eww open-many ${lib.concatStringsSep " " config.programs.eww.widgets}";
+        ExecStartPre = "${pkgs.coreutils}/bin/sleep 2";
+        ExecStart = "${pkgs.eww}/bin/eww open-many ${lib.concatStringsSep " " config.programs.eww.widgets}";
         ExecStop = "${pkgs.eww}/bin/eww kill";
       };
 

home-manager/features/shell.nix

@@ -18,6 +18,7 @@
     htop
     btop
     psmisc # fuser, killall, pstree
+    lsof
 
     # Session management
     tmux
@@ -45,6 +46,7 @@
     # Networking
     dnsutils
     inetutils
+    net-tools
     socat
     xh
 

system/features/bluetooth.nix

@@ -1,6 +1,9 @@
 { pkgs, ... }:
 {
+  # Enable bluetooth.
+  hardware.bluetooth.enable = true;
 
+  # Install the management service and packages.
   environment.systemPackages = with pkgs; [
     bluez
   ];

system/features/xpadneo.nix

@@ -0,0 +1,26 @@
+_: {
+  hardware = {
+    # Wireless xbox controllers
+    xpadneo = {
+      enable = true;
+      settings = {
+        disable_mouse = 1;
+      };
+    };
+
+    # Hardwired xbox controllers.
+    xone.enable = true;
+  };
+
+  # disable_ertm is required for xpadneo to connect properly and establish a
+  # data connection.  enable_autosuspend is to prevent Linux from putting the
+  # BT radio to sleep and causing a disconnect.
+  boot.extraModprobeConfig = ''
+    options bluetooth disable_ertm=1
+    options btusb enable_autosuspend=0
+  '';
+
+  # Steam also needs HID API to be off so SDL will read directly from evdev,
+  # otherwise it won't get any events from xpadneo.
+  environment.sessionVariables.SDL_JOYSTICK_HIDAPI = "0";
+}

system/hosts/altair/default.nix

@@ -11,6 +11,7 @@
     ../../features/gc.nix
     ../../features/gui.nix
     ../../features/virtualbox.nix
+    ../../features/xpadneo.nix
     ./configuration.nix
     ./hardware-configuration.nix
     ./qmk.nix

system/hosts/altair/drew.nix

@@ -8,7 +8,6 @@
     "/features/development/haskell.nix"
     "/features/development/markdown.nix"
     "/features/development/typescript.nix"
-    "/features/development/vscode.nix"
     "/features/eww"
     "/features/email.nix"
     "/features/gaming.nix"

system/hosts/altair/hardware-configuration.nix

@@ -32,14 +32,6 @@
     };
     kernelModules = [ "kvm-intel" ];
     extraModulePackages = [ ];
-
-    # disable_ertm is required for xpadneo to connect properly and establish a
-    # data connection.  enable_autosuspend is to prevent Linux from putting the
-    # BT radio to sleep and causing a disconnect.
-    extraModprobeConfig = ''
-      options bluetooth disable_ertm=1
-      options btusb enable_autosuspend=0
-    '';
   };
 
   fileSystems = {
@@ -115,13 +107,6 @@
       # Enable the nvidia-settings menu?
       nvidiaSettings = true;
     };
-    xpadneo = {
-      enable = true;
-      settings = {
-        disable_mouse = 1;
-      };
-    };
-    bluetooth.enable = true;
   };
 
   # Add a udev rule to prevent the mouse from waking the system.  Note that it