diff --git a/hardware/gpu/rocm.nix b/hardware/gpu/rocm.nix index ce1b098..2a4588d 100644 --- a/hardware/gpu/rocm.nix +++ b/hardware/gpu/rocm.nix @@ -19,10 +19,7 @@ }) { - nixpkgs.config.openglSupport = true; # why is this not set by hardware.opengl.enable ? nixpkgs.config.rocmSupport = true; - nixpkgs.config.vdpauSupport = true; - nixpkgs.config.vaapiSupport = true; services.ollama.acceleration = lib.mkDefault "rocm"; diff --git a/hardware/printer/discover.nix b/hardware/printer/discover.nix index 2ffddf0..e16d7ad 100644 --- a/hardware/printer/discover.nix +++ b/hardware/printer/discover.nix @@ -6,7 +6,8 @@ services.avahi = { enable = lib.mkDefault true; - nssmdns = true; + nssmdns4 = true; # ipv4 + # nssmdns6 = true; # ipv6, prone to cause timeouts openFirewall = true; # opens UDP port 5353 }; services.printing = { diff --git a/justfile b/justfile index 3725bf8..007ed15 100644 --- a/justfile +++ b/justfile @@ -10,17 +10,21 @@ export FZF_DEFAULT_OPTS := "--height 15 --cycle --bind 'ctrl-a:toggle-all' " + e @_default: just "$(gum filter --placeholder "Pick a recipie..." $(just --summary --unsorted))" -eval $hostname=`just _a_host` $attrpath="system.build.toplevel.outPath" *args: - nix eval --log-format raw ".#nixosConfigurations.\"$hostname\".config.$attrpath" --show-trace "${@:3}" -eval-vm $hostname=`just _a_host` $attrpath="system.build.toplevel.outPath" *args: - # nix eval --log-format raw ".#nixosConfigurations.\"$hostname\".config.system.build.vm.outPath" --show-trace "${@:3}" - nix eval --log-format raw ".#nixosConfigurations.\"$hostname\".config.virtualisation.vmVariant.$attrpath" --show-trace "${@:3}" +@eval $hostname=`just _a_host` $attrpath="system.build.toplevel.outPath" *args: + set -x; nix eval --log-format raw ".#nixosConfigurations.\"$hostname\".config.$attrpath" --show-trace "${@:3}" +@eval-vm $hostname=`just _a_host` $attrpath="system.build.toplevel.outPath" *args: + # set -x; nix eval --log-format raw ".#nixosConfigurations.\"$hostname\".config.system.build.vm.outPath" --show-trace "${@:3}" + set -x; nix eval --log-format raw ".#nixosConfigurations.\"$hostname\".config.virtualisation.vmVariant.$attrpath" --show-trace "${@:3}" +@eval-pkgs $hostname $attrpath *args: + set -x; nix eval --log-format raw ".#nixosConfigurations.\"$hostname\".pkgs.$attrpath" --show-trace "${@:3}" repl $hostname=`just _a_host`: NIX_NO_NOM=1 nixos-rebuild-ng --flake .#"$hostname" repl why-depends $hostname $attrpath: nix why-depends .#nixosConfigurations."$hostname".config.system.build.toplevel .#nixosConfigurations."$hostname".pkgs."$attrpath" +why-depends-drv $hostname $attrpath: + nix why-depends .#nixosConfigurations."$hostname".config.system.build.toplevel.drvPath .#nixosConfigurations."$hostname".pkgs."$attrpath" report hostname=`just _a_host`: nix eval .#nixosReports."{{hostname}}" --json --show-trace | yq . --yaml-output --width=999999 | bat --language yaml --style plain --paging never diff --git a/profiles/nix-ld.nix b/profiles/nix-ld.nix index 8f9cf26..da0b60d 100644 --- a/profiles/nix-ld.nix +++ b/profiles/nix-ld.nix @@ -1,13 +1,21 @@ { lib, pkgs, ... }: -# TODO: -# this is what i currently do to use conda/pypi with nix-ld: -# export LD_LIBRARY_PATH="$NIX_LD_LIBRARY_PATH:/run/opengl-driver/lib:/run/opengl-driver-32/lib" -# can i somehow add /run/opengl-driver/lib:/run/opengl-driver-32/lib to $NIX_LD_LIBRARY_PATH? will it work? +/* + instead of rebooting, you can source /etc/set-environment + to get the $NIX_LD_LIBRARY_PATH into your environment -# instead of rebooting, you can source /etc/set-environment to get $NIX_LD_LIBRARY_PATH into your environment + TODO: + this is what i currently do to use conda/pypi with nix-ld: + + export LD_LIBRARY_PATH="$NIX_LD_LIBRARY_PATH:/run/opengl-driver/lib:/run/opengl-driver-32/lib" + + can i somehow add /run/opengl-driver/lib:/run/opengl-driver-32/lib to $NIX_LD_LIBRARY_PATH? will it work? +*/ { + # Add ~/.local/bin/ to $PATH + environment.localBinInPath = true; + programs.nix-ld.enable = true; # environment.sessionVariables = { diff --git a/users/pbsds/home/profiles/desktop/ghostty/default.nix b/users/pbsds/home/profiles/desktop/ghostty/default.nix index 9893716..ae77f88 100644 --- a/users/pbsds/home/profiles/desktop/ghostty/default.nix +++ b/users/pbsds/home/profiles/desktop/ghostty/default.nix @@ -3,10 +3,21 @@ # this predates the home-manager module, and that kinda sucks anyway due to repeated keys in the config file home.packages = [ pkgs.ghostty ]; home.file.".config/ghostty/config" = { - source = ./ghosty.config; force = true; - onChange = '' - ${lib.getExe pkgs.ghostty} +validate-config --config-file=${./ghosty.config} + # source = ./ghosty.config; + # onChange = '' + # ${lib.getExe pkgs.ghostty} +validate-config --config-file=${./ghosty.config} + # ''; + source = pkgs.runCommandNoCC "validated-ghosty.config" { + preferLocalBuild = true; + nativeBuildInputs = [ pkgs.ghostty ]; + } '' + # echo >&2 + ghostty +validate-config --config-file=${./ghosty.config} + ( + set -x + ghostty +validate-config --config-file=${./ghosty.config} + ) + ln -s ${./ghosty.config} $out ''; }; diff --git a/users/pbsds/home/profiles/ssh.nix b/users/pbsds/home/profiles/ssh.nix index e4763ff..f78a7dd 100644 --- a/users/pbsds/home/profiles/ssh.nix +++ b/users/pbsds/home/profiles/ssh.nix @@ -55,6 +55,7 @@ "sopp.pbsds.net".host = "sopp.tail9aac63.ts.net"; "noximilien.pbsds.net".host = "noximilien.tail9aac63.ts.net"; "rocm.pbsds.net".host = "rocm.tail9aac63.ts.net"; + "rocm.pbsds.net".setEnv."TERM" = "xterm-256color"; "furiphoneflx1.pbsds.net".user = "furios"; "furiphoneflx1.pbsds.net".host = "furiphoneflx1.tail9aac63.ts.net";