From d5a9cd1efc1a84daca64198faf0d50f6e1dc71e8 Mon Sep 17 00:00:00 2001 From: Tao Tien <29749622+taotien@users.noreply.github.com> Date: Mon, 7 Jul 2025 19:05:21 -0700 Subject: [PATCH] disable wild temporarily --- extras/cosmic.nix | 22 ++--- extras/gaming.nix | 1 + systems/NOlaptop.nix | 196 +++++++++++++++++++++---------------------- users/tao.nix | 6 ++ users/tao/cargo.toml | 4 +- 5 files changed, 118 insertions(+), 111 deletions(-) diff --git a/extras/cosmic.nix b/extras/cosmic.nix index bcea3a5..4b65f39 100644 --- a/extras/cosmic.nix +++ b/extras/cosmic.nix @@ -1,16 +1,16 @@ {pkgs, ...}: { - services.desktopManager.plasma6.enable = false; - services.displayManager.sddm.enable = false; + services.desktopManager.plasma6.enable = false; + services.displayManager.sddm.enable = false; - services.desktopManager.cosmic.enable = true; - services.displayManager.cosmic-greeter.enable = true; + services.desktopManager.cosmic.enable = true; + services.displayManager.cosmic-greeter.enable = true; - environment.sessionVariables.COSMIC_DATA_CONTROL_ENABLED = 1; + environment.sessionVariables.COSMIC_DATA_CONTROL_ENABLED = 1; - environment.cosmic.excludePackages = with pkgs; [ - cosmic-edit - cosmic-player - cosmic-term - cosmic-wallpapers - ]; + environment.cosmic.excludePackages = with pkgs; [ + cosmic-edit + cosmic-player + cosmic-term + cosmic-wallpapers + ]; } diff --git a/extras/gaming.nix b/extras/gaming.nix index 73586d3..9677cd2 100644 --- a/extras/gaming.nix +++ b/extras/gaming.nix @@ -3,6 +3,7 @@ # aagl.inputs.nixpkgs.follows = "nixpkgs"; environment.systemPackages = with pkgs; [ + osu-lazer-bin easyeffects # parsec-bin # yuzu # nintendo can suck the shit out of my asshole diff --git a/systems/NOlaptop.nix b/systems/NOlaptop.nix index 0dbe914..6a3eea9 100644 --- a/systems/NOlaptop.nix +++ b/systems/NOlaptop.nix @@ -1,8 +1,8 @@ { - lib, - config, - pkgs, - ... + lib, + config, + pkgs, + ... }: # let # boostless = pkgs.pipewire.overrideAttrs (old: { @@ -13,109 +13,109 @@ # }); # in { - environment.etc."alsa-card-profile/analog-input-internal-mic.conf".source = ../extras/analog-input-internal-mic.conf; + environment.etc."alsa-card-profile/analog-input-internal-mic.conf".source = ../extras/analog-input-internal-mic.conf; - hardware.graphics.extraPackages = with pkgs; [ - amdvlk - ]; - hardware.graphics.extraPackages32 = with pkgs; [ - driversi686Linux.amdvlk - ]; - services.xserver.videoDrivers = [ - "amdgpu" - ]; + hardware.graphics.extraPackages = with pkgs; [ + amdvlk + ]; + hardware.graphics.extraPackages32 = with pkgs; [ + driversi686Linux.amdvlk + ]; + services.xserver.videoDrivers = [ + "amdgpu" + ]; - # services.pipewire.wireplumber.extraConfig = { - # "wireplumber.settings" = { - # "device.routes.default-source-volume" = 0.42; - # }; - # }; + # services.pipewire.wireplumber.extraConfig = { + # "wireplumber.settings" = { + # "device.routes.default-source-volume" = 0.42; + # }; + # }; - services.rsyslogd = { - enable = true; - extraConfig = '' - module(load="imudp") - input(type="imudp" port="514") + services.rsyslogd = { + enable = true; + extraConfig = '' + module(load="imudp") + input(type="imudp" port="514") - THENAS.* -/var/log/THENAS + THENAS.* -/var/log/THENAS + ''; + }; + + # nixpkgs.overlays = [ + # (final: prev: { + # libinput = prev.libinput.overrideAttrs (old: { + # patches = + # (old.patches or []) + # ++ [ + # ../extras/libinput-delay.patch + # ]; + # }); + # }) + # ]; + + environment.systemPackages = with pkgs; [ + fw-ectool + framework-tool + nvtopPackages.amd + lact + ]; + + systemd.services.lactd.wantedBy = ["multi-user.target"]; + + services.fwupd.enable = true; + services.tailscale.useRoutingFeatures = "client"; + systemd.services."backlight@backlight:amdgpu_bl2".enable = false; + + nix.buildMachines = [ + { + hostName = "nocomputer"; + systems = ["x86_64-linux" "i686-linux"]; + supportedFeatures = [ + "benchmark" + "big-parallel" + "gccarch-znver4" + "kvm" + "nixos-test" + ]; + } + ]; + nix.extraOptions = '' + builders-use-substitutes = true ''; - }; + nix.distributedBuilds = true; - # nixpkgs.overlays = [ - # (final: prev: { - # libinput = prev.libinput.overrideAttrs (old: { - # patches = - # (old.patches or []) - # ++ [ - # ../extras/libinput-delay.patch - # ]; - # }); - # }) - # ]; + services.udev.extraRules = '' + # ACTION=="add", SUBSYSTEM=="backlight", RUN+="${pkgs.coreutils}/bin/chgrp video /sys/class/backlight/%k/brightness" + # ACTION=="add", SUBSYSTEM=="backlight", RUN+="${pkgs.coreutils}/bin/chmod g+w /sys/class/backlight/%k/brightness" - environment.systemPackages = with pkgs; [ - fw-ectool - framework-tool - nvtopPackages.amd - lact - ]; + ACTION=="add|change", SUBSYSTEM=="usb", DRIVERS=="usb", ATTRS{idVendor}=="32ac", ATTRS{idProduct}=="0012", ATTR{power/wakeup}="disabled" + ACTION=="add|change", KERNEL=="i2c", SUBSYSTEM=="i2c", DEVPATH=="/sys/devices/platform/AMDI0010:03/i2c-1/i2c-PIXA3854:00", ATTR{power/wakeup}="disabled" - systemd.services.lactd.wantedBy = ["multi-user.target"]; + # ACTION=="add", SUBSYSTEM=="acpi", DRIVERS=="button", ATTRS{hid}=="PNP0C0D", ATTR{power/wakeup}="disabled" + # ACTION=="add", SUBSYSTEM=="serio", DRIVERS=="atkbd", ATTR{power/wakeup}="disabled" + # ACTION=="add", SUBSYSTEM=="i2c", DRIVERS=="i2c_hid_acpi", ATTRS{name}=="PIXA3854:00", ATTR{power/wakeup}="disabled" + ''; - services.fwupd.enable = true; - services.tailscale.useRoutingFeatures = "client"; - systemd.services."backlight@backlight:amdgpu_bl2".enable = false; + services.fprintd.enable = true; - nix.buildMachines = [ - { - hostName = "nocomputer"; - systems = ["x86_64-linux" "i686-linux"]; - supportedFeatures = [ - "benchmark" - "big-parallel" - "gccarch-znver4" - "kvm" - "nixos-test" - ]; - } - ]; - nix.extraOptions = '' - builders-use-substitutes = true - ''; - nix.distributedBuilds = true; + boot.kernelPackages = pkgs.linuxPackages_latest; + # boot.initrd.availableKernelModules = [ + # "nvme" + # "sd_mod" + # "thunderbolt" + # "usb_storage" + # "xhci_pci" + # "usbhid" + # "uas" + # ]; + boot.kernelParams = [ + "amdgpu.abmlevel=1" + # "amdgpu.dcdebugmask=0x400" + # "mem_sleep_default=deep" + ]; + boot.kernelModules = ["amdgpu"]; + powerManagement.cpuFreqGovernor = "powersave"; + systemd.sleep.extraConfig = "HibernateDelaySec=360m"; - services.udev.extraRules = '' - # ACTION=="add", SUBSYSTEM=="backlight", RUN+="${pkgs.coreutils}/bin/chgrp video /sys/class/backlight/%k/brightness" - # ACTION=="add", SUBSYSTEM=="backlight", RUN+="${pkgs.coreutils}/bin/chmod g+w /sys/class/backlight/%k/brightness" - - ACTION=="add|change", SUBSYSTEM=="usb", DRIVERS=="usb", ATTRS{idVendor}=="32ac", ATTRS{idProduct}=="0012", ATTR{power/wakeup}="disabled" - ACTION=="add|change", KERNEL=="i2c", SUBSYSTEM=="i2c", DEVPATH=="/sys/devices/platform/AMDI0010:03/i2c-1/i2c-PIXA3854:00", ATTR{power/wakeup}="disabled" - - # ACTION=="add", SUBSYSTEM=="acpi", DRIVERS=="button", ATTRS{hid}=="PNP0C0D", ATTR{power/wakeup}="disabled" - # ACTION=="add", SUBSYSTEM=="serio", DRIVERS=="atkbd", ATTR{power/wakeup}="disabled" - # ACTION=="add", SUBSYSTEM=="i2c", DRIVERS=="i2c_hid_acpi", ATTRS{name}=="PIXA3854:00", ATTR{power/wakeup}="disabled" - ''; - - services.fprintd.enable = true; - - boot.kernelPackages = pkgs.linuxPackages_latest; - # boot.initrd.availableKernelModules = [ - # "nvme" - # "sd_mod" - # "thunderbolt" - # "usb_storage" - # "xhci_pci" - # "usbhid" - # "uas" - # ]; - boot.kernelParams = [ - "amdgpu.abmlevel=1" - # "amdgpu.dcdebugmask=0x400" - # "mem_sleep_default=deep" - ]; - boot.kernelModules = ["amdgpu"]; - powerManagement.cpuFreqGovernor = "powersave"; - systemd.sleep.extraConfig = "HibernateDelaySec=360m"; - - networking.hostName = "NOlaptop"; + networking.hostName = "NOlaptop"; } diff --git a/users/tao.nix b/users/tao.nix index b687606..ee06cb7 100644 --- a/users/tao.nix +++ b/users/tao.nix @@ -5,7 +5,13 @@ lib, ... }: { + services.syncplay = { + enable = true; + motd = "we only watch kino here"; + }; + users.users.tao.packages = with pkgs; [ + syncplay # boxxy calibre # carapace diff --git a/users/tao/cargo.toml b/users/tao/cargo.toml index 3192adc..36d60f7 100644 --- a/users/tao/cargo.toml +++ b/users/tao/cargo.toml @@ -35,8 +35,8 @@ lto = "fat" [target.x86_64-unknown-linux-gnu] # linker = "musl-gcc" -linker = "clang" -rustflags = ["-Ctarget-cpu=native", "-Clink-arg=-fuse-ld=wild"] +# linker = "clang" +# rustflags = ["-Ctarget-cpu=native", "-Clink-arg=--ld-path=wild"] # jonhoo # https://benw.is/posts/how-i-improved-my-rust-compile-times-by-seventy-five-percent