diff --git a/extras/dev.nix b/extras/dev.nix index 0b75329..687e9b4 100644 --- a/extras/dev.nix +++ b/extras/dev.nix @@ -58,6 +58,11 @@ trunk ]; + # programs.nix-ld.enable = true; + # programs.nix-ld.libraries = with pkgs; [ + # xorg.libX11 + # ]; + services.udev.extraRules = '' SUBSYSTEM == "tty", GROUP="dialout", ATTRS{interface}=="Black Magic GDB Server", SYMLINK+="ttyBmpGdb" SUBSYSTEM == "tty", GROUP="dialout", ATTRS{interface}=="Black Magic UART Port", SYMLINK+="ttyBmpTarg" diff --git a/systems/BASED.nix b/systems/BASED.nix index 67d4438..11e1d12 100644 --- a/systems/BASED.nix +++ b/systems/BASED.nix @@ -16,7 +16,8 @@ inputs.helix.packages.${pkgs.system}.default # libthai localsend - macchina + # macchina + neofetch mesa ouch ripgrep diff --git a/systems/NOcomputer.nix b/systems/NOcomputer.nix index 39c02fe..e3585ed 100644 --- a/systems/NOcomputer.nix +++ b/systems/NOcomputer.nix @@ -1,4 +1,5 @@ {pkgs, ...}: { + # THE FINALS audio borked services.pipewire.enable = false; hardware.pulseaudio.enable = true; hardware.pulseaudio.support32Bit = true; @@ -8,8 +9,8 @@ # gpt4all-chat # nvidia-vaapi-driver # foldingathome - gwe # mesa + gwe openrgb snapper ]; diff --git a/users/tao/HOME.nix b/users/tao/HOME.nix index d8ff27c..c95e3db 100644 --- a/users/tao/HOME.nix +++ b/users/tao/HOME.nix @@ -2,12 +2,15 @@ pkgs, inputs, ... -}: { +}: let + cargoFile = builtins.readFile ./cargo.toml; + cargoConfig = builtins.replaceStrings ["path/to/sccache"] ["${pkgs.sccache}/bin/sccache"] cargoFile; +in { imports = [ (import ./helix.nix {inherit pkgs inputs;}) ]; - home.file.".cargo/config.toml".text = builtins.readFile ./cargo.toml; + home.file.".cargo/config.toml".text = cargoConfig; programs = { jujutsu = { diff --git a/users/tao/cargo.toml b/users/tao/cargo.toml index f9f947a..d287c28 100644 --- a/users/tao/cargo.toml +++ b/users/tao/cargo.toml @@ -3,7 +3,8 @@ rr = "run --release" [build] target = "x86_64-unknown-linux-gnu" -rustc-wrapper = "${pkgs.sccache}/bin/sccache" +# rustc-wrapper = "${pkgs.sccache}/bin/sccache" +rustc-wrapper = "path/to/sccache" rustflags = ["-Z", "threads=8"] [unstable] diff --git a/users/tao/nushell/stuff.nu b/users/tao/nushell/stuff.nu index 1147357..d76e365 100644 --- a/users/tao/nushell/stuff.nu +++ b/users/tao/nushell/stuff.nu @@ -1,7 +1,7 @@ source ~/.cache/starship/init.nu source ~/.zoxide.nu alias cringe = sudo bootctl set-oneshot auto-windows -alias fetch = macchina +alias fetch = neofetch alias ff = firefox alias gc = sudo nix-collect-garbage -d alias js = jj status