Compare commits

..

4 Commits

8 changed files with 45 additions and 28 deletions

View File

@@ -14,21 +14,21 @@ let
'';
};
bambu-studio-wrapped = pkgs.symlinkJoin {
name = "bambu-studio-wrapped";
paths = [ pkgs.bambu-studio ];
buildInputs = [ pkgs.makeWrapper ];
postBuild = ''
wrapProgram $out/bin/bambu-studio \
--prefix MESA_LOADER_DRIVER_OVERRIDE : zink \
--prefix __EGL_VENDOR_LIBRARY_FILENAMES : ${pkgs.mesa}/share/glvnd/egl_vendor.d/50_mesa.json
'';
};
# bambu-studio-wrapped = pkgs.symlinkJoin {
# name = "bambu-studio-wrapped";
# paths = [ pkgs.bambu-studio ];
# buildInputs = [ pkgs.makeWrapper ];
# postBuild = ''
# wrapProgram $out/bin/bambu-studio \
# --prefix MESA_LOADER_DRIVER_OVERRIDE : zink \
# --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

View File

@@ -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";
};

View File

@@ -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

View File

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

View File

@@ -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";
}

View File

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

View File

@@ -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"

View File

@@ -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