lkdsalkjdsalkj

This commit is contained in:
Peder Bergebakken Sundt 2024-02-25 21:26:02 +01:00
parent 153b573ece
commit 73f1fd051b
8 changed files with 37 additions and 9 deletions

View File

@ -43,11 +43,10 @@
#}; #};
environment.systemPackages = with pkgs; ([ environment.systemPackages = [
nvtop-nvidia pkgs.nvtop-nvidia
] ++ lib.optionals config.hardware.nvidia.prime.offload.enable [ ] ++ lib.optionals config.hardware.nvidia.prime.offload.enable [
(writeShellScriptBin "prime-run" '' (pkgs.writeShellScriptBin "prime-run" ''
export __NV_PRIME_RENDER_OFFLOAD=1 export __NV_PRIME_RENDER_OFFLOAD=1
export __NV_PRIME_RENDER_OFFLOAD_PROVIDER=NVIDIA-G0 export __NV_PRIME_RENDER_OFFLOAD_PROVIDER=NVIDIA-G0
export __GLX_VENDOR_LIBRARY_NAME=nvidia export __GLX_VENDOR_LIBRARY_NAME=nvidia
@ -55,14 +54,14 @@
exec "$@" exec "$@"
'') '')
# already added by nixos-hardware.common-gpu-nvidia # already added by nixos-hardware.common-gpu-nvidia
#(writeShellScriptBin "nvidia-offload" '' #(pkgs.writeShellScriptBin "nvidia-offload" ''
# export __NV_PRIME_RENDER_OFFLOAD=1 # export __NV_PRIME_RENDER_OFFLOAD=1
# export __NV_PRIME_RENDER_OFFLOAD_PROVIDER=NVIDIA-G0 # export __NV_PRIME_RENDER_OFFLOAD_PROVIDER=NVIDIA-G0
# export __GLX_VENDOR_LIBRARY_NAME=nvidia # export __GLX_VENDOR_LIBRARY_NAME=nvidia
# export __VK_LAYER_NV_optimus=NVIDIA_only # export __VK_LAYER_NV_optimus=NVIDIA_only
# exec "$@" # exec "$@"
#'') #'')
]); ];
# nvidia bad # nvidia bad
nixpkgs.config.packageOverrides = (pkgs: { nixpkgs.config.packageOverrides = (pkgs: {

View File

@ -11,7 +11,7 @@
systemd.services."autovt@tty1".enable = false; systemd.services."autovt@tty1".enable = false;
imports = [ imports = [
./hardware-configuration.nix #./hardware-configuration.nix
../../profiles/auto-upgrade.nix ../../profiles/auto-upgrade.nix
../../profiles/upgrade-diff.nix ../../profiles/upgrade-diff.nix
#../../profiles/sshd.nix #../../profiles/sshd.nix

View File

@ -27,7 +27,7 @@
../../profiles/sshd.nix ../../profiles/sshd.nix
../../profiles/no-suspend.nix ../../profiles/no-suspend.nix
../../profiles/podman.nix ../../profiles/podman.nix
../../profiles/docker.nix #../../profiles/docker.nix
../../users/pbsds ../../users/pbsds

View File

@ -51,3 +51,8 @@ boot:
remote-set {{remote}} remote-set {{remote}}
# nixos-rebuild --flake .#<host> --target-host root@<host>.nixos.org --use-substitutes switch # nixos-rebuild --flake .#<host> --target-host root@<host>.nixos.org --use-substitutes switch
@gorgon:
# https://codeberg.org/gorgon/gorgon/src/branch/main/nix-web
# https://discourse.nixos.org/t/a-web-ui-for-the-nix-store-early-beta/35762
nix run 'git+https://codeberg.org/gorgon/gorgon#nix-web'

View File

@ -27,7 +27,7 @@ if ! >/dev/null command -v systemd-nspawn; then
fi fi
machinectl remove "$NSPAWN" || true # TODO: interactive? machinectl remove "$NSPAWN" || true # TODO: interactive?
#machinectl pull-tar "$TARBALL" "$NSPAWN" --verify=no #machinectl pull-tar "https://github.com/tfc/nspawn-nixos/releases/download/v1.0/nixos-system-x86_64-linux.tar.xz" "$NSPAWN" --verify=no
machinectl import-tar "$TARBALL" "$NSPAWN" machinectl import-tar "$TARBALL" "$NSPAWN"
# use host network # use host network

View File

@ -7,6 +7,7 @@
imports = [ imports = [
./profiles/sops.nix ./profiles/sops.nix
./profiles/bat.nix ./profiles/bat.nix
#./profiles/xdg-ninja.nix
./profiles/git.nix ./profiles/git.nix
./profiles/gtk.nix ./profiles/gtk.nix
./profiles/micro.nix ./profiles/micro.nix

View File

@ -11,6 +11,7 @@
#programs.git.gitui.enable = true; #programs.git.gitui.enable = true;
programs.git.enable = true; programs.git.enable = true;
programs.git.lfs.enable = true;
programs.git.delta.enable = true; programs.git.delta.enable = true;
#programs.git.lfs.enable = true; #programs.git.lfs.enable = true;
#programs.git.signing #programs.git.signing

View File

@ -0,0 +1,22 @@
{
# found by running `nix run nixpkgs#xdg-ninja`
# TODO:
export ANDROID_HOME="$XDG_DATA_HOME"/android
export HISTFILE="${XDG_STATE_HOME}"/bash/history
export CARGO_HOME="$XDG_DATA_HOME"/cargo
export CUDA_CACHE_PATH="$XDG_CACHE_HOME"/nv
export GNUPGHOME="$XDG_DATA_HOME"/gnupg
export GTK2_RC_FILES="$XDG_CONFIG_HOME"/gtk-2.0/gtkrc
export XCOMPOSECACHE="$XDG_CACHE_HOME"/X11/xcompose
export KERAS_HOME="${XDG_STATE_HOME}/keras"
export WINEPREFIX="$XDG_DATA_HOME"/wine
export XCOMPOSECACHE="${XDG_CACHE_HOME}"/X11/xcompose
export XAUTHORITY="$XDG_RUNTIME_DIR"/Xauthority
export SSB_HOME="$XDG_DATA_HOME"/zoom
export LESSHISTFILE="$XDG_CACHE_HOME"/less/history
export _JAVA_OPTIONS=-Djava.util.prefs.userRoot="$XDG_CONFIG_HOME"/java
export VAGRANT_HOME="$XDG_DATA_HOME"/vagrant
}