diff --git a/.config/polybar/nvidia.sh b/.config/polybar/nvidia.sh index 3de20d6..d9f66f0 100755 --- a/.config/polybar/nvidia.sh +++ b/.config/polybar/nvidia.sh @@ -1,2 +1,6 @@ #!/usr/bin/env bash +# if nvidia-smi is not present return nothing +if ! command -v nvidia-smi &> /dev/null; then + echo "---" +fi nvidia-smi --query-gpu=utilization.gpu,power.draw,temperature.gpu --format=csv,noheader | xargs -I {} echo "GPU: {}°C" diff --git a/flake.lock b/flake.lock index 00e386c..580c2c3 100644 --- a/flake.lock +++ b/flake.lock @@ -690,11 +690,11 @@ }, "nixpkgs-unstable": { "locked": { - "lastModified": 1735291276, - "narHash": "sha256-NYVcA06+blsLG6wpAbSPTCyLvxD/92Hy4vlY9WxFI1M=", + "lastModified": 1737885589, + "narHash": "sha256-Zf0hSrtzaM1DEz8//+Xs51k/wdSajticVrATqDrfQjg=", "owner": "nixos", "repo": "nixpkgs", - "rev": "634fd46801442d760e09493a794c4f15db2d0cbb", + "rev": "852ff1d9e153d8875a83602e03fdef8a63f0ecf8", "type": "github" }, "original": { diff --git a/home-manager/code.nix b/home-manager/code.nix index 483a580..900838f 100644 --- a/home-manager/code.nix +++ b/home-manager/code.nix @@ -3,11 +3,11 @@ programs.vscode = { enable = true; package = pkgs.vscodium; - userSettings = { typst-lsp.exportPdf = "onType"; }; + #userSettings = { typst-lsp.exportPdf = "onType"; }; extensions = with pkgs.vscode-extensions; [ jnoortheen.nix-ide rust-lang.rust-analyzer - nvarner.typst-lsp + myriad-dreamin.tinymist #tomoki1207.pdf latex-workshop is faster to preview pdf james-yu.latex-workshop ]; diff --git a/modules/fh/writing.nix b/modules/fh/writing.nix new file mode 100644 index 0000000..accca91 --- /dev/null +++ b/modules/fh/writing.nix @@ -0,0 +1,6 @@ +{pkgs, ...}: { + environment.systemPackages = with pkgs; [ + typst + typstwriter + ]; +} diff --git a/modules/hardware/nvidia.nix b/modules/hardware/nvidia.nix index 8288fd4..e8a18f5 100644 --- a/modules/hardware/nvidia.nix +++ b/modules/hardware/nvidia.nix @@ -38,8 +38,8 @@ in { hardware.nvidia = { # Modesetting is required. modesetting.enable = true; - # Stutters in VR - https://github.com/ValveSoftware/SteamVR-for-Linux/issues/631 - gsp.enable = false; + # Open drivers with gsp stutters in VR - https://github.com/ValveSoftware/SteamVR-for-Linux/issues/631 + gsp.enable = config.hardware.nvidia.open; # Nvidia power management. Experimental, and can cause sleep/suspend to fail. powerManagement.enable = false; # Fine-grained power management. Turns off GPU when not in use. @@ -57,7 +57,16 @@ in { # accessible via `nvidia-settings`. nvidiaSettings = true; # Optionally, you may need to select the appropriate driver version for your specific GPU. - package = config.boot.kernelPackages.nvidiaPackages.beta; + #package = config.boot.kernelPackages.nvidiaPackages.beta; + package = config.boot.kernelPackages.nvidiaPackages.mkDriver { + version = "570.86.16"; + sha256_64bit = "sha256-RWPqS7ZUJH9JEAWlfHLGdqrNlavhaR1xMyzs8lJhy9U="; + sha256_aarch64 = "sha256-RiO2njJ+z0DYBo/1DKa9GmAjFgZFfQ1/1Ga+vXG87vA="; + openSha256 = "sha256-DuVNA63+pJ8IB7Tw2gM4HbwlOh1bcDg2AN2mbEU9VPE="; + settingsSha256 = "sha256-9rtqh64TyhDF5fFAYiWl3oDHzKJqyOW3abpcf2iNRT8="; + persistencedSha256 = + "sha256-3mp9X/oV8o2TH9720NnoXROxQ4g98nNee+DucXpQy3w="; + }; #package = config.boot.kernelPackages.nvidiaPackages.mkDriver { # version = "560.35.03"; # sha256_64bit = "sha256-8pMskvrdQ8WyNBvkU/xPc/CtcYXCa7ekP73oGuKfH+M="; diff --git a/modules/services/kavita.nix b/modules/services/kavita.nix index 1560cc5..e51a86e 100644 --- a/modules/services/kavita.nix +++ b/modules/services/kavita.nix @@ -110,6 +110,7 @@ in { ${mangal} inline -S Manganato --query "Terror_man" --manga first --download ${mangal} inline -S Manganato --query "I_Stole_the_Number_One_Ranker" --manga first --download ${mangal} inline -S Manganato --query "hidan_no_aria" --manga first --download + ${mangal} inline -S Manganato --query "the_max_level" --manga first --download ''; serviceConfig = { PrivateTmp = true; diff --git a/pkgs/kop-fhcalendar/default.nix b/pkgs/kop-fhcalendar/default.nix index 8d994d6..1f650c5 100644 --- a/pkgs/kop-fhcalendar/default.nix +++ b/pkgs/kop-fhcalendar/default.nix @@ -6,7 +6,7 @@ rustPlatform.buildRustPackage { src = fetchGit { url = "git@github.com:kropatz/kop-fhcalendar.git"; ref = "master"; - rev = "f05d4b3845b6304d22490cf2c759addaf8f8bcd8"; + rev = "328b43766fe4fe3b352a23f160de6bc96a3aee58"; }; cargoHash = "sha256-Yo3Xy8oa3KdvttYlYUV0Ut8HMK7BSzqEuIdWAHoDG1M="; diff --git a/systems/amd-server-vm/configuration.nix b/systems/amd-server-vm/configuration.nix index f85a817..475fe39 100644 --- a/systems/amd-server-vm/configuration.nix +++ b/systems/amd-server-vm/configuration.nix @@ -101,6 +101,10 @@ virtualisation.vmware.guest.enable = true; services.xserver.videoDrivers = [ "vmware" ]; + #services.murmur = { + # enable = true; + # openFirewall = true; + #}; #fileSystems."/" = { # device = "/dev/disk/by-label/nixos"; diff --git a/systems/amd-server/configuration.nix b/systems/amd-server/configuration.nix index dc94dcb..e08d398 100644 --- a/systems/amd-server/configuration.nix +++ b/systems/amd-server/configuration.nix @@ -27,9 +27,6 @@ ssd.enable = true; wooting.enable = true; }; - misc = { - docker.enable = true; - }; graphical = { audio.enable = true; sddm.enable = true; diff --git a/systems/pc/configuration.nix b/systems/pc/configuration.nix index ee40fff..67664ca 100644 --- a/systems/pc/configuration.nix +++ b/systems/pc/configuration.nix @@ -7,10 +7,11 @@ ./hardware-configuration.nix ../../modules/flatpak.nix ../../modules/gpg.nix - ../../modules/xanmod-kernel.nix - #../../modules/kernel.nix + #../../modules/xanmod-kernel.nix + ../../modules/kernel.nix ../../modules/services/syncthing.nix ../../modules/support/ntfs.nix + ../../modules/fh/writing.nix ]; custom = {