From 5045bbecf5a9a4322c290e020e52dda9577a2cb9 Mon Sep 17 00:00:00 2001 From: willemml Date: Tue, 13 Feb 2024 00:47:02 -0800 Subject: [PATCH] Fixes widevine on aarch64 firefox, adds quartus prime --- home/linux/hyprland.nix | 41 ++++++++++++++++++++++++-------------- home/packages.nix | 1 + nixos/hosts/thinkpad.nix | 2 ++ nixos/profiles/default.nix | 13 +++++++++++- nixos/profiles/gui.nix | 3 +++ 5 files changed, 44 insertions(+), 16 deletions(-) diff --git a/home/linux/hyprland.nix b/home/linux/hyprland.nix index 59803ac..982efc7 100644 --- a/home/linux/hyprland.nix +++ b/home/linux/hyprland.nix @@ -14,21 +14,27 @@ in { ./waybar.nix ]; - home.packages = with pkgs; [ - ( + home.packages = with pkgs; + [ + ( + if pkgs.stdenv.isAarch64 + then firefox-wv + else firefox + ) + lxappearance + pipewire + polkit-kde-agent + qt6.qtwayland + qt6ct + xdg-desktop-portal-hyprland + xdg-desktop-portal + rofi-wayland + ] + ++ ( if pkgs.stdenv.isAarch64 - then firefox-wv - else firefox - ) - lxappearance - pipewire - polkit-kde-agent - qt6.qtwayland - qt6ct - xdg-desktop-portal-hyprland - xdg-desktop-portal - rofi-wayland - ]; + then [firefox-wv] + else [firefox discord (quartus-prime-lite.override (old: {supportedDevices = ["Cyclone V"];}))] + ); # notifications daemon services.mako.enable = true; @@ -159,7 +165,7 @@ in { kb_layout = globals.keyboard.layout; kb_variant = globals.keyboard.variant; sensitivity = 0.4; - accel_profile = "adaptive"; + accel_profile = "flat"; touchpad = { natural_scroll = true; clickfinger_behavior = true; @@ -169,6 +175,11 @@ in { }; }; + "device:synaptics-tm3053-003" = { + accel_profile = "adaptive"; + sensitivity = 0.3; + }; + gestures = { workspace_swipe = true; workspace_swipe_fingers = 3; diff --git a/home/packages.nix b/home/packages.nix index 0a56225..4e6814f 100644 --- a/home/packages.nix +++ b/home/packages.nix @@ -47,6 +47,7 @@ in { sqlite tealdeer unzip + vhdl-ls yq vhdl-ls zsh-completions diff --git a/nixos/hosts/thinkpad.nix b/nixos/hosts/thinkpad.nix index ed21614..4d3aceb 100644 --- a/nixos/hosts/thinkpad.nix +++ b/nixos/hosts/thinkpad.nix @@ -16,6 +16,8 @@ boot.kernelModules = ["kvm-intel"]; boot.extraModulePackages = []; + boot.tmp.useTmpfs = false; + fileSystems."/" = { device = "/dev/disk/by-uuid/1fb0caa2-f036-4403-b75f-beed8ba54984"; fsType = "ext4"; diff --git a/nixos/profiles/default.nix b/nixos/profiles/default.nix index 5ad0974..a6e88f3 100644 --- a/nixos/profiles/default.nix +++ b/nixos/profiles/default.nix @@ -21,7 +21,7 @@ programs.command-not-found.enable = false; - boot.tmp.useTmpfs = true; + boot.tmp.useTmpfs = lib.mkDefault true; console.keyMap = "colemak"; console.packages = [pkgs.terminus_font]; @@ -46,6 +46,17 @@ ''; services.udev.enable = true; + services.udev.extraRules = '' + # USB-Blaster + SUBSYSTEM=="usb", ATTRS{idVendor}=="09fb", ATTRS{idProduct}=="6001", MODE="0666" + SUBSYSTEM=="usb", ATTRS{idVendor}=="09fb", ATTRS{idProduct}=="6002", MODE="0666" + + SUBSYSTEM=="usb", ATTRS{idVendor}=="09fb", ATTRS{idProduct}=="6003", MODE="0666" + + # USB-Blaster II + SUBSYSTEM=="usb", ATTRS{idVendor}=="09fb", ATTRS{idProduct}=="6010", MODE="0666" + SUBSYSTEM=="usb", ATTRS{idVendor}=="09fb", ATTRS{idProduct}=="6810", MODE="0666" + ''; services.openssh.enable = true; services.openssh.settings.PasswordAuthentication = false; diff --git a/nixos/profiles/gui.nix b/nixos/profiles/gui.nix index 915997c..86383e4 100644 --- a/nixos/profiles/gui.nix +++ b/nixos/profiles/gui.nix @@ -3,6 +3,9 @@ globals, ... }: { + services.udev.extraRules = '' + SUBSYSTEM=="usb", ATTRS{idVendor}=="09fb", ATTRS{idProduct}=="6001", MODE="0666" + ''; services.pipewire = { enable = true; alsa.enable = true;