From 3a9fea436d8d912615ee06c9560f1fbfff795aff Mon Sep 17 00:00:00 2001 From: Matt Nish-Lapidus Date: Tue, 4 Mar 2025 13:15:26 -0500 Subject: [PATCH] some updates mostly for bluetooth and games --- flake.lock | 60 +++++------ flake.nix | 1 + .../dotfiles/dot_config/nyxt/config.lisp | 12 ++- hosts/eddie/configuration.nix | 100 ++++++++++-------- modules/home/desktop.nix | 8 +- modules/home/langs.nix | 2 +- 6 files changed, 103 insertions(+), 80 deletions(-) diff --git a/flake.lock b/flake.lock index 90955e3..56029b2 100644 --- a/flake.lock +++ b/flake.lock @@ -68,11 +68,11 @@ "nixpkgs-stable": "nixpkgs-stable" }, "locked": { - "lastModified": 1741022982, - "narHash": "sha256-RKsvU8WZX7lxQedHfgoqxThNgfVXULccwYerbhmghlQ=", + "lastModified": 1741109012, + "narHash": "sha256-th96gqh+H7HoIgSLn3PpazxFTO8WjuN8IqdYtFrwzDw=", "owner": "nix-community", "repo": "emacs-overlay", - "rev": "a3bf20522b1fa7295ca05ea4a8d37546915e598e", + "rev": "40466220218949e1f8b36d6ba44e27644dd6bc14", "type": "github" }, "original": { @@ -322,11 +322,11 @@ ] }, "locked": { - "lastModified": 1740845322, - "narHash": "sha256-AXEgFj3C0YJhu9k1OhbRhiA6FnDr81dQZ65U3DhaWpw=", + "lastModified": 1741056285, + "narHash": "sha256-/JKDMVqq8PIqcGonBVKbKq1SooV3kzGmv+cp3rKAgPA=", "owner": "nix-community", "repo": "home-manager", - "rev": "fcac3d6d88302a5e64f6cb8014ac785e08874c8d", + "rev": "70fbbf05a5594b0a72124ab211bff1d502c89e3f", "type": "github" }, "original": { @@ -709,11 +709,11 @@ "xwayland-satellite-unstable": "xwayland-satellite-unstable" }, "locked": { - "lastModified": 1741007220, - "narHash": "sha256-EiBhMwybAgrgXlgCIRBIKf+WJc6Uxd5rcrg6jDAQYMA=", + "lastModified": 1741038776, + "narHash": "sha256-SCsg2krbDYOAZMn2QWYvGPoVgyaFUVTqGWKYNtmv7HI=", "owner": "sodiboo", "repo": "niri-flake", - "rev": "590b86cdc34a434dc6f97d8af0e033dee4cbf5fd", + "rev": "07eb55b6ef73fae9d702e274411079fe7d9ddfaa", "type": "github" }, "original": { @@ -890,11 +890,11 @@ }, "nixpkgs-stable": { "locked": { - "lastModified": 1740865531, - "narHash": "sha256-h00vGIh/jxcGl8aWdfnVRD74KuLpyY3mZgMFMy7iKIc=", + "lastModified": 1740932899, + "narHash": "sha256-F0qDu2egq18M3edJwEOAE+D+VQ+yESK6YWPRQBfOqq8=", "owner": "NixOS", "repo": "nixpkgs", - "rev": "5ef6c425980847c78a80d759abc476e941a9bf42", + "rev": "1546c45c538633ae40b93e2d14e0bb6fd8f13347", "type": "github" }, "original": { @@ -906,11 +906,11 @@ }, "nixpkgs-stable_2": { "locked": { - "lastModified": 1740865531, - "narHash": "sha256-h00vGIh/jxcGl8aWdfnVRD74KuLpyY3mZgMFMy7iKIc=", + "lastModified": 1740932899, + "narHash": "sha256-F0qDu2egq18M3edJwEOAE+D+VQ+yESK6YWPRQBfOqq8=", "owner": "NixOS", "repo": "nixpkgs", - "rev": "5ef6c425980847c78a80d759abc476e941a9bf42", + "rev": "1546c45c538633ae40b93e2d14e0bb6fd8f13347", "type": "github" }, "original": { @@ -938,11 +938,11 @@ }, "nixpkgs-stable_4": { "locked": { - "lastModified": 1740865531, - "narHash": "sha256-h00vGIh/jxcGl8aWdfnVRD74KuLpyY3mZgMFMy7iKIc=", + "lastModified": 1740932899, + "narHash": "sha256-F0qDu2egq18M3edJwEOAE+D+VQ+yESK6YWPRQBfOqq8=", "owner": "nixos", "repo": "nixpkgs", - "rev": "5ef6c425980847c78a80d759abc476e941a9bf42", + "rev": "1546c45c538633ae40b93e2d14e0bb6fd8f13347", "type": "github" }, "original": { @@ -954,11 +954,11 @@ }, "nixpkgs_2": { "locked": { - "lastModified": 1740828860, - "narHash": "sha256-cjbHI+zUzK5CPsQZqMhE3npTyYFt9tJ3+ohcfaOF/WM=", + "lastModified": 1741010256, + "narHash": "sha256-WZNlK/KX7Sni0RyqLSqLPbK8k08Kq7H7RijPJbq9KHM=", "owner": "NixOS", "repo": "nixpkgs", - "rev": "303bd8071377433a2d8f76e684ec773d70c5b642", + "rev": "ba487dbc9d04e0634c64e3b1f0d25839a0a68246", "type": "github" }, "original": { @@ -1002,11 +1002,11 @@ }, "nixpkgs_5": { "locked": { - "lastModified": 1740828860, - "narHash": "sha256-cjbHI+zUzK5CPsQZqMhE3npTyYFt9tJ3+ohcfaOF/WM=", + "lastModified": 1741010256, + "narHash": "sha256-WZNlK/KX7Sni0RyqLSqLPbK8k08Kq7H7RijPJbq9KHM=", "owner": "nixos", "repo": "nixpkgs", - "rev": "303bd8071377433a2d8f76e684ec773d70c5b642", + "rev": "ba487dbc9d04e0634c64e3b1f0d25839a0a68246", "type": "github" }, "original": { @@ -1157,11 +1157,11 @@ ] }, "locked": { - "lastModified": 1739262228, - "narHash": "sha256-7JAGezJ0Dn5qIyA2+T4Dt/xQgAbhCglh6lzCekTVMeU=", + "lastModified": 1741043164, + "narHash": "sha256-9lfmSZLz6eq9Ygr6cCmvQiiBEaPb54pUBcjvbEMPORc=", "owner": "Mic92", "repo": "sops-nix", - "rev": "07af005bb7d60c7f118d9d9f5530485da5d1e975", + "rev": "3f2412536eeece783f0d0ad3861417f347219f4d", "type": "github" }, "original": { @@ -1391,11 +1391,11 @@ "rust-overlay": "rust-overlay_2" }, "locked": { - "lastModified": 1741011607, - "narHash": "sha256-l7W704Tb80nykq2kKHaeJqHgWG/sfKO7nSWkHS9dOKc=", + "lastModified": 1741103831, + "narHash": "sha256-+xV3vD8f6+UbgqxkWsgeKPXanotBKiBE4mgeznOfFys=", "owner": "sxyazi", "repo": "yazi", - "rev": "3082cad16c0d0acc65c36dcc0ab17d9dd2abfb58", + "rev": "3606bc7a1f2dcb6ba24810ad58b64e3015485e3f", "type": "github" }, "original": { diff --git a/flake.nix b/flake.nix index 09e0c5c..2458b75 100644 --- a/flake.nix +++ b/flake.nix @@ -75,6 +75,7 @@ url = "github:sodiboo/niri-flake"; inputs.nixpkgs.follows = "nixpkgs"; }; + }; outputs = diff --git a/homes/emenel/dotfiles/dot_config/nyxt/config.lisp b/homes/emenel/dotfiles/dot_config/nyxt/config.lisp index 1eee1ac..63f5a04 100644 --- a/homes/emenel/dotfiles/dot_config/nyxt/config.lisp +++ b/homes/emenel/dotfiles/dot_config/nyxt/config.lisp @@ -18,10 +18,14 @@ '("kagi" "https://kagi.com/search?q=~a" "https://www.kagi.com/") '("wiki" "https://en.wikipedia.org/w/index.php?search=~a" "https://en.wikipedia.org/"))) -(define-configuration :buffer - ((search-engines (append (mapcar (lambda (engine) (apply 'make-search-engine engine)) - *my-search-engines*) - %slot-default%)))) +(define-configuration context-buffer + "Go through the search engines above and make-search-engine" + ((search-engines + (append %slot-default% + (mapcar + (lambda (engine) (apply 'make-search-engine engine)) + *my-search-engines*))))) + ;; keybindings: small emacs experience in CUA (default mode) of Nyxt (define-configuration buffer diff --git a/hosts/eddie/configuration.nix b/hosts/eddie/configuration.nix index c8d9d99..82cec4e 100644 --- a/hosts/eddie/configuration.nix +++ b/hosts/eddie/configuration.nix @@ -7,6 +7,7 @@ }: { + imports = with nix-config.nixosModules; [ ./hardware-configuration.nix ./razer-speaker-fix.nix @@ -40,12 +41,6 @@ }); }) - (fina: prev: { - development.python-modules.openrazer = pkgs.development.python-modules.openrazer.overrideAttrs (old: { - patches = old.patches ++ [ ../../patches/openrazer-384992.patch ]; - }); - }) - (final: prev: { bitwig-studio5-3 = nix-config.packages.x86_64-linux.bitwig-studio.bitwig-bubblewrap.override { bitwig-studio = nix-config.packages.x86_64-linux.bitwig-studio.bitwig-studio5-3-unwrapped; @@ -104,7 +99,7 @@ # bright.cyan # bright.white - "282c34" + "111111" "e06c75" "98c379" "e5c07b" @@ -152,7 +147,7 @@ ddcutil ddcui greetd.tuigreet - bluez-tools + nix-config.pkgs-stable.bluez-tools bluetui qemu @@ -165,10 +160,6 @@ spice-protocol win-virtio win-spice - - protonup - steam-run - mangohud ]; # Bootloader. @@ -187,10 +178,14 @@ "ddcci-backlight" "amd_3d_vcache" "uinput" + "hid-playstation" "xpadneo" "amd_pstate=active" ]; - extraModulePackages = with config.boot.kernelPackages; [ ddcci-driver ]; + extraModulePackages = with config.boot.kernelPackages; [ ddcci-driver xpadneo openrazer ]; + extraModprobeConfig = '' + options bluetooth disable_ertm=Y + ''; initrd.systemd.enable = true; initrd.kernelModules = [ "nvidia" @@ -270,8 +265,26 @@ }; brillo.enable = true; xpadneo.enable = true; + steam-hardware.enable = true; + bluetooth = { + enable = true; + package = nix-config.pkgs-stable.bluez; + settings = { + General = { + Enable = "Source,Sink,Media,Socket"; + AutoEnable = true; + ControllerMode = "bredr"; + Privacy = "device"; + JustWorksRepairing = "always"; + Class = "0x000100"; + FastConnectable = true; + }; + }; + }; }; + services.blueman.enable = true; + services.fstrim.enable = true; services.logind = { @@ -282,18 +295,19 @@ }; services.udev = { extraRules = '' - KERNEL=="uinput", MODE="0660", GROUP="uinput", OPTIONS+="static_node=uinput" - DEVPATH=="/devices/virtual/misc/cpu_dma_latency", OWNER="root", GROUP="audio", MODE="0660" - ACTION=="add", SUBSYSTEM=="backlight", KERNEL=="ddcci*", RUN+="${pkgs.coreutils-full}/bin/chgrp video /sys/class/backlight/%k/brightness" - ACTION=="add", SUBSYSTEM=="backlight", KERNEL=="ddcci*", RUN+="${pkgs.coreutils-full}/bin/chmod a+w /sys/class/backlight/%k/brightness" - ACTION=="add", SUBSYSTEM=="i2c-dev", ATTR{name}=="AMDGPU DM*", TAG+="ddcci", TAG+="systemd", ENV{SYSTEMD_WANTS}+="ddcci@$kernel.service" - ACTION=="add", SUBSYSTEM=="i2c-dev", ATTR{name}=="NVIDIA i2c adapter*", TAG+="ddcci", TAG+="systemd", ENV{SYSTEMD_WANTS}+="ddcci@$kernel.service" - SUBSYSTEM=="i2c", ACTION=="add", ATTR{name}=="AMDGPU DM aux hw bus 3", RUN+="${pkgs.bash}/bin/bash -c 'sleep 30; printf ddcci\ 0x37 > /sys/bus/i2c/devices/i2c-17/new_device'" + KERNEL=="uinput", MODE="0660", GROUP="uinput", OPTIONS+="static_node=uinput" + DEVPATH=="/devices/virtual/misc/cpu_dma_latency", OWNER="root", GROUP="audio", MODE="0660" + ACTION=="add", SUBSYSTEM=="backlight", KERNEL=="ddcci*", RUN+="${pkgs.coreutils-full}/bin/chgrp video /sys/class/backlight/%k/brightness" + ACTION=="add", SUBSYSTEM=="backlight", KERNEL=="ddcci*", RUN+="${pkgs.coreutils-full}/bin/chmod a+w /sys/class/backlight/%k/brightness" + ACTION=="add", SUBSYSTEM=="i2c-dev", ATTR{name}=="AMDGPU DM*", TAG+="ddcci", TAG+="systemd", ENV{SYSTEMD_WANTS}+="ddcci@$kernel.service" + ACTION=="add", SUBSYSTEM=="i2c-dev", ATTR{name}=="NVIDIA i2c adapter*", TAG+="ddcci", TAG+="systemd", ENV{SYSTEMD_WANTS}+="ddcci@$kernel.service" + SUBSYSTEM=="i2c", ACTION=="add", ATTR{name}=="AMDGPU DM aux hw bus 3", RUN+="${pkgs.bash}/bin/bash -c 'sleep 30; printf ddcci\ 0x37 > /sys/bus/i2c/devices/i2c-17/new_device'" ''; packages = [ pkgs.via pkgs.vial pkgs.ddcutil + pkgs.game-devices-udev-rules (pkgs.writeTextFile { name = "on-battery"; @@ -505,32 +519,32 @@ services.qemuGuest.enable = true; services.spice-vdagentd.enable = true; - systemd.network.enable = true; + # systemd.network.enable = true; - systemd.network.networks."10-lan" = { - matchConfig.Name = ["eno1" "vm-*"]; - networkConfig = { - Bridge = "br0"; - }; - }; + # systemd.network.networks."10-lan" = { + # matchConfig.Name = ["eno1" "vm-*"]; + # networkConfig = { + # Bridge = "br0"; + # }; + # }; - systemd.network.netdevs."br0" = { - netdevConfig = { - Name = "br0"; - Kind = "bridge"; - }; - }; + # systemd.network.netdevs."br0" = { + # netdevConfig = { + # Name = "br0"; + # Kind = "bridge"; + # }; + # }; - systemd.network.networks."10-lan-bridge" = { - matchConfig.Name = "br0"; - networkConfig = { - Address = ["192.168.1.2/24" "2001:db8::a/64"]; - Gateway = "192.168.1.1"; - DNS = ["192.168.1.1"]; - IPv6AcceptRA = true; - }; - linkConfig.RequiredForOnline = "routable"; - }; + # systemd.network.networks."10-lan-bridge" = { + # matchConfig.Name = "br0"; + # networkConfig = { + # Address = ["192.168.1.2/24" "2001:db8::a/64"]; + # Gateway = "192.168.1.1"; + # DNS = ["192.168.1.1"]; + # IPv6AcceptRA = true; + # }; + # linkConfig.RequiredForOnline = "routable"; + # }; programs.appimage = { enable = true; diff --git a/modules/home/desktop.nix b/modules/home/desktop.nix index f0c9565..deb6823 100644 --- a/modules/home/desktop.nix +++ b/modules/home/desktop.nix @@ -143,6 +143,10 @@ gnome-online-accounts-gtk wordbook + + protonup + mangohud + dualsensectl.out ]) ]; @@ -224,10 +228,10 @@ }; steam-offload = { name = "Steam (nvidia-offload)"; - exec = "nvidia-offload gamescope -- steam"; + exec = "nvidia-offload ${pkgs.steam}/bin/steam"; }; }; xdg.configFile."halloy/config.toml".source = ../../homes/emenel/dotfiles/dot_config/halloy/config.toml; - xdg.configFile."nyxt/config.lisp".source = ../../homes/emenel/dotfiles/dot_config/nyxt/config.lisp; + # xdg.configFile."nyxt/config.lisp".source = ../../homes/emenel/dotfiles/dot_config/nyxt/config.lisp; } diff --git a/modules/home/langs.nix b/modules/home/langs.nix index 964eb2b..58ca916 100644 --- a/modules/home/langs.nix +++ b/modules/home/langs.nix @@ -13,10 +13,10 @@ serapeum ])) ccl + ecl racket ruby ruby-lsp - gdu cljfmt libxml2