From 400a5c2f748bad163e4ce607927081183a37e8e2 Mon Sep 17 00:00:00 2001 From: Corwin Perren Date: Sat, 31 Aug 2024 20:35:24 -0700 Subject: [PATCH] Nvidia, audio, and esp32 work --- flake.lock | 12 +++++----- hosts/cap-nr200p/configuration.nix | 38 ++++++++++++++++++++++++++++++ modules/nixos/hyprland.nix | 5 +++- 3 files changed, 48 insertions(+), 7 deletions(-) diff --git a/flake.lock b/flake.lock index 09d6f23..4269732 100644 --- a/flake.lock +++ b/flake.lock @@ -7,11 +7,11 @@ ] }, "locked": { - "lastModified": 1722462338, - "narHash": "sha256-ss0G8t8RJVDewA3MyqgAlV951cWRK6EtVhVKEZ7J5LU=", + "lastModified": 1724435763, + "narHash": "sha256-UNky3lJNGQtUEXT2OY8gMxejakSWPTfWKvpFkpFlAfM=", "owner": "nix-community", "repo": "home-manager", - "rev": "6e090576c4824b16e8759ebca3958c5b09659ee8", + "rev": "c2cd2a52e02f1dfa1c88f95abeb89298d46023be", "type": "github" }, "original": { @@ -22,11 +22,11 @@ }, "nixpkgs": { "locked": { - "lastModified": 1722421184, - "narHash": "sha256-/DJBI6trCeVnasdjUo9pbnodCLZcFqnVZiLUfqLH4jA=", + "lastModified": 1724819573, + "narHash": "sha256-GnR7/ibgIH1vhoy8cYdmXE6iyZqKqFxQSVkFgosBh6w=", "owner": "nixos", "repo": "nixpkgs", - "rev": "9f918d616c5321ad374ae6cb5ea89c9e04bf3e58", + "rev": "71e91c409d1e654808b2621f28a327acfdad8dc2", "type": "github" }, "original": { diff --git a/hosts/cap-nr200p/configuration.nix b/hosts/cap-nr200p/configuration.nix index f2bd57d..58cc805 100644 --- a/hosts/cap-nr200p/configuration.nix +++ b/hosts/cap-nr200p/configuration.nix @@ -91,6 +91,7 @@ "networkmanager" "wheel" "input" + "dialout" ]; packages = with pkgs; [ # thunderbird @@ -145,8 +146,45 @@ nixfmt-rfc-style mako podman + kicad + obsidian + speedcrunch + deadbeef + vlc + sox + audacity + # flatcam + pcb2gcode + jetbrains-toolbox + arduino-ide + python311Full + gcc + stm32cubemx + stm32flash + easyeffects ]; + services.udev.extraRules = '' + # ST-LINK V2 + SUBSYSTEMS=="usb", ATTRS{idVendor}=="0483", ATTRS{idProduct}=="3748", MODE="600", TAG+="uaccess", SYMLINK+="stlinkv2_%n" + + # ST-LINK V2.1 + SUBSYSTEMS=="usb", ATTRS{idVendor}=="0483", ATTRS{idProduct}=="374b", MODE="600", TAG+="uaccess", SYMLINK+="stlinkv2-1_%n" + SUBSYSTEMS=="usb", ATTRS{idVendor}=="0483", ATTRS{idProduct}=="3752", MODE="600", TAG+="uaccess", SYMLINK+="stlinkv2-1_%n" + + # ST-LINK V3 + SUBSYSTEMS=="usb", ATTRS{idVendor}=="0483", ATTRS{idProduct}=="374d", MODE="600", TAG+="uaccess", SYMLINK+="stlinkv3loader_%n" + SUBSYSTEMS=="usb", ATTRS{idVendor}=="0483", ATTRS{idProduct}=="374e", MODE="600", TAG+="uaccess", SYMLINK+="stlinkv3_%n" + SUBSYSTEMS=="usb", ATTRS{idVendor}=="0483", ATTRS{idProduct}=="374f", MODE="600", TAG+="uaccess", SYMLINK+="stlinkv3_%n" + SUBSYSTEMS=="usb", ATTRS{idVendor}=="0483", ATTRS{idProduct}=="3753", MODE="600", TAG+="uaccess", SYMLINK+="stlinkv3_%n" + + # CP2101 - CP 2104 + SUBSYSTEMS=="usb", ATTRS{idVendor}=="10c4", ATTRS{idProduct}=="ea60", MODE="600", TAG+="uaccess", SYMLINK+="usb2ser_%n" + + # ATEN UC-232A + SUBSYSTEMS=="usb", ATTRS{idVendor}=="0557", ATTRS{idProduct}=="2008", MODE="600", TAG+="uaccess", SYMLINK+="usb2ser_aten_%n" + ''; + fonts.fontDir.enable = true; fonts.fontconfig.enable = true; fonts.fontconfig.antialias = true; diff --git a/modules/nixos/hyprland.nix b/modules/nixos/hyprland.nix index d908a23..a3bc17c 100644 --- a/modules/nixos/hyprland.nix +++ b/modules/nixos/hyprland.nix @@ -20,6 +20,8 @@ WLR_NO_HARDWARE_CURSORS = "1"; # Hint electron apps to use wayland NIXOS_OZONE_WL = "1"; + # Fix waiting on vsync + __GL_SYNC_TO_VBLANK = "0"; }; services.xserver = { @@ -45,7 +47,8 @@ # Enable modesetting for Wayland compositors (hyprland) modesetting.enable = true; # Use the open source version of the kernel module (for driver 515.43.04+) - # open = true; + # Actually, just overridden to false for now + open = false; # Enable the Nvidia settings menu nvidiaSettings = true; # Select the appropriate driver version for your specific GPU