diff --git a/nixos/common/nix-ld.nix b/nixos/common/nix-ld.nix index b08ca1c..44cd05a 100644 --- a/nixos/common/nix-ld.nix +++ b/nixos/common/nix-ld.nix @@ -29,6 +29,7 @@ dotnetCorePackages.sdk_8_0_3xx alsa-lib icu + haskellPackages.bz2 # === Godot === # === Ludusavi === diff --git a/nixos/common/steam.nix b/nixos/common/steam.nix index 14c9227..cc4601d 100644 --- a/nixos/common/steam.nix +++ b/nixos/common/steam.nix @@ -11,13 +11,18 @@ programs.steam = { enable = true; package = pkgs.steam.override { + extraEnv = { + MANGOHUD = true; + OBS_VKCAPTURE = true; + # RADV_TEX_ANISO = 16; + }; extraPkgs = ( pkgs: with pkgs; with unstable; [ gamemode - unstable.mangohud + pkgs.mangohud # additional packages... # e.g. some games require python3 ] diff --git a/nixos/common/universal.nix b/nixos/common/universal.nix index 73a09ed..47d011a 100644 --- a/nixos/common/universal.nix +++ b/nixos/common/universal.nix @@ -1,6 +1,7 @@ { config, pkgs, + lib, unstable, inputs, nix-your-shell, @@ -23,24 +24,21 @@ fonts = { fontDir.enable = true; enableGhostscriptFonts = true; - packages = with pkgs; [ - nerdfonts - # berkeley-mono-typeface - ]; + packages = [ ] ++ builtins.filter lib.attrsets.isDerivation (builtins.attrValues pkgs.nerd-fonts); }; environment.systemPackages = with pkgs; with unstable; [ - unstable.waypipe + waypipe # === nix related === comma nh # === nix related === - unstable.nix-your-shell + # nix-your-shell ]; @@ -53,9 +51,9 @@ programs.fish = { enable = true; - interactiveShellInit = '' - nix-your-shell fish | source - ''; + # interactiveShellInit = '' + # nix-your-shell fish | source + # ''; }; programs.bash = { diff --git a/nixos/flake.lock b/nixos/flake.lock index 6dc5bf7..f8ecf09 100644 --- a/nixos/flake.lock +++ b/nixos/flake.lock @@ -37,17 +37,17 @@ "cpu-microcodes": { "flake": false, "locked": { - "lastModified": 1742753109, - "narHash": "sha256-hneAwNElAMkaTdToS6DUa47gFkXoIIR77CesMKUW21A=", + "lastModified": 1744580596, + "narHash": "sha256-0WgBGViIPozInkjUZSUKyndN9ldZGtCKlUiiw8VAK3o=", "owner": "platomav", "repo": "CPUMicrocodes", - "rev": "f093bec842057ebf35d0525fcd69f649714f4485", + "rev": "58897a4b77be3ebb17ee41c12002cd986d3da6ed", "type": "github" }, "original": { "owner": "platomav", "repo": "CPUMicrocodes", - "rev": "f093bec842057ebf35d0525fcd69f649714f4485", + "rev": "58897a4b77be3ebb17ee41c12002cd986d3da6ed", "type": "github" } }, @@ -72,52 +72,16 @@ "type": "github" } }, - "flake-utils": { - "inputs": { - "systems": "systems" - }, - "locked": { - "lastModified": 1701680307, - "narHash": "sha256-kAuep2h5ajznlPMD9rnQyffWG8EM/C73lejGofXvdM8=", - "owner": "numtide", - "repo": "flake-utils", - "rev": "4022d587cbbfd70fe950c1e2083a02621806a725", - "type": "github" - }, - "original": { - "owner": "numtide", - "repo": "flake-utils", - "type": "github" - } - }, - "flake-utils_2": { - "inputs": { - "systems": "systems_2" - }, - "locked": { - "lastModified": 1701680307, - "narHash": "sha256-kAuep2h5ajznlPMD9rnQyffWG8EM/C73lejGofXvdM8=", - "owner": "numtide", - "repo": "flake-utils", - "rev": "4022d587cbbfd70fe950c1e2083a02621806a725", - "type": "github" - }, - "original": { - "owner": "numtide", - "repo": "flake-utils", - "type": "github" - } - }, "home-manager": { "inputs": { "nixpkgs": "nixpkgs_2" }, "locked": { - "lastModified": 1743717835, - "narHash": "sha256-LJm6FoIcUoBw3w25ty12/sBfut4zZuNGdN0phYj/ekU=", + "lastModified": 1744637364, + "narHash": "sha256-ZVINTNMJS6W3fqPYV549DSmjYQW5I9ceKBl83FwPP7k=", "owner": "nix-community", "repo": "home-manager", - "rev": "66a6ec65f84255b3defb67ff45af86c844dd451b", + "rev": "337541447773985f825512afd0f9821a975186be", "type": "github" }, "original": { @@ -132,11 +96,11 @@ ] }, "locked": { - "lastModified": 1743387206, - "narHash": "sha256-24N3NAuZZbYqZ39NgToZgHUw6M7xHrtrAm18kv0+2Wo=", + "lastModified": 1744117652, + "narHash": "sha256-t7dFCDl4vIOOUMhEZnJF15aAzkpaup9x4ZRGToDFYWI=", "owner": "nix-community", "repo": "home-manager", - "rev": "15c5f9d04fabd176f30286c8f52bbdb2c853a146", + "rev": "b4e98224ad1336751a2ac7493967a4c9f6d9cb3f", "type": "github" }, "original": { @@ -146,28 +110,6 @@ "type": "github" } }, - "moonlight": { - "inputs": { - "flake-utils": "flake-utils", - "nixpkgs": [ - "unstable-nixpkgs" - ], - "pnpm2nix": "pnpm2nix" - }, - "locked": { - "lastModified": 1742927915, - "narHash": "sha256-lhTv0kAe9qvowcWVt2pxEKLcdVg2HcMYZMvqxWlDx7E=", - "owner": "moonlight-mod", - "repo": "moonlight", - "rev": "edb548c9fb005a4eed89f2ef72f49b97baa67282", - "type": "github" - }, - "original": { - "owner": "moonlight-mod", - "repo": "moonlight", - "type": "github" - } - }, "nix-your-shell": { "inputs": { "advisory-db": "advisory-db", @@ -175,14 +117,14 @@ "nixpkgs": [ "nixpkgs" ], - "systems": "systems_3" + "systems": "systems" }, "locked": { - "lastModified": 1727198502, - "narHash": "sha256-FjGjLq/4qeZz9foA7pfz1hiXvsdmbnzB3BpiTESLE1c=", + "lastModified": 1744134530, + "narHash": "sha256-NWgdXO6sQMQVnbvwSB+gBmMnU9s8ghx1ltGvOPec+qo=", "owner": "MercuryTechnologies", "repo": "nix-your-shell", - "rev": "04dc6379eab87c128f2eca3f2238f533a95604b3", + "rev": "e66f4ece4687d4c0890ab5994bfef2826f68180c", "type": "github" }, "original": { @@ -225,11 +167,11 @@ }, "nixpkgs_2": { "locked": { - "lastModified": 1743583204, - "narHash": "sha256-F7n4+KOIfWrwoQjXrL2wD9RhFYLs2/GGe/MQY1sSdlE=", + "lastModified": 1744463964, + "narHash": "sha256-LWqduOgLHCFxiTNYi3Uj5Lgz0SR+Xhw3kr/3Xd0GPTM=", "owner": "NixOS", "repo": "nixpkgs", - "rev": "2c8d3f48d33929642c1c12cd243df4cc7d2ce434", + "rev": "2631b0b7abcea6e640ce31cd78ea58910d31e650", "type": "github" }, "original": { @@ -241,11 +183,11 @@ }, "nixpkgs_3": { "locked": { - "lastModified": 1736344531, - "narHash": "sha256-8YVQ9ZbSfuUk2bUf2KRj60NRraLPKPS0Q4QFTbc+c2c=", + "lastModified": 1744463964, + "narHash": "sha256-LWqduOgLHCFxiTNYi3Uj5Lgz0SR+Xhw3kr/3Xd0GPTM=", "owner": "nixos", "repo": "nixpkgs", - "rev": "bffc22eb12172e6db3c5dde9e3e5628f8e3e7912", + "rev": "2631b0b7abcea6e640ce31cd78ea58910d31e650", "type": "github" }, "original": { @@ -257,27 +199,11 @@ }, "nixpkgs_4": { "locked": { - "lastModified": 1743576891, - "narHash": "sha256-vXiKURtntURybE6FMNFAVpRPr8+e8KoLPrYs9TGuAKc=", + "lastModified": 1744463964, + "narHash": "sha256-LWqduOgLHCFxiTNYi3Uj5Lgz0SR+Xhw3kr/3Xd0GPTM=", "owner": "nixos", "repo": "nixpkgs", - "rev": "44a69ed688786e98a101f02b712c313f1ade37ab", - "type": "github" - }, - "original": { - "owner": "nixos", - "ref": "nixos-24.11", - "repo": "nixpkgs", - "type": "github" - } - }, - "nixpkgs_5": { - "locked": { - "lastModified": 1743095683, - "narHash": "sha256-gWd4urRoLRe8GLVC/3rYRae1h+xfQzt09xOfb0PaHSk=", - "owner": "nixos", - "repo": "nixpkgs", - "rev": "5e5402ecbcb27af32284d4a62553c019a3a49ea6", + "rev": "2631b0b7abcea6e640ce31cd78ea58910d31e650", "type": "github" }, "original": { @@ -287,33 +213,13 @@ "type": "github" } }, - "pnpm2nix": { - "inputs": { - "flake-utils": "flake-utils_2", - "nixpkgs": "nixpkgs_3" - }, - "locked": { - "lastModified": 1736457458, - "narHash": "sha256-eiw+hAsxavEgBfhwrktNI2hwvgeVDzBDYClx/yqka78=", - "owner": "NotNite", - "repo": "pnpm2nix-nzbr", - "rev": "4ac61c6a50623da937dca005e3dbcb8862aafb83", - "type": "github" - }, - "original": { - "owner": "NotNite", - "repo": "pnpm2nix-nzbr", - "type": "github" - } - }, "root": { "inputs": { "bellado": "bellado", "home-manager": "home-manager", "home-manger": "home-manger", - "moonlight": "moonlight", "nix-your-shell": "nix-your-shell", - "nixpkgs": "nixpkgs_4", + "nixpkgs": "nixpkgs_3", "nixpkgs-gsr-ui": "nixpkgs-gsr-ui", "shadps4-git": "shadps4-git", "ucodenix": "ucodenix", @@ -322,18 +228,17 @@ }, "shadps4-git": { "inputs": { - "nixpkgs": "nixpkgs_5" + "nixpkgs": "nixpkgs_4" }, "locked": { - "lastModified": 1, - "narHash": "sha256-rADqSJu492bURPi5fmvPyeG1B5bV3k2hfGR+VfHn1Ig=", - "path": "/nix/store/1wdk50abjwp8dcz1zjp0ax95312q723w-source/nixos/programs/shadps4", + "path": "./programs/shadps4", "type": "path" }, "original": { - "path": "/nix/store/1wdk50abjwp8dcz1zjp0ax95312q723w-source/nixos/programs/shadps4", + "path": "./programs/shadps4", "type": "path" - } + }, + "parent": [] }, "systems": { "locked": { @@ -350,46 +255,16 @@ "type": "github" } }, - "systems_2": { - "locked": { - "lastModified": 1681028828, - "narHash": "sha256-Vy1rq5AaRuLzOxct8nz4T6wlgyUR7zLU309k9mBC768=", - "owner": "nix-systems", - "repo": "default", - "rev": "da67096a3b9bf56a91d16901293e51ba5b49a27e", - "type": "github" - }, - "original": { - "owner": "nix-systems", - "repo": "default", - "type": "github" - } - }, - "systems_3": { - "locked": { - "lastModified": 1681028828, - "narHash": "sha256-Vy1rq5AaRuLzOxct8nz4T6wlgyUR7zLU309k9mBC768=", - "owner": "nix-systems", - "repo": "default", - "rev": "da67096a3b9bf56a91d16901293e51ba5b49a27e", - "type": "github" - }, - "original": { - "owner": "nix-systems", - "repo": "default", - "type": "github" - } - }, "ucodenix": { "inputs": { "cpu-microcodes": "cpu-microcodes" }, "locked": { - "lastModified": 1743266219, - "narHash": "sha256-WLESNfsx1bIw5XMCuBBrPfYikSiT5wstcqutZsx9f1Q=", + "lastModified": 1744630518, + "narHash": "sha256-xRbcLC6AVjB8etaw1T9MEywqjuRWeZZu5Ee8RU3q4R0=", "owner": "e-tho", "repo": "ucodenix", - "rev": "e84d7dfc23fe10e72669e102be7bb79f6ecc7252", + "rev": "b26e195f4272306f6bd30445bb73657449a1f574", "type": "github" }, "original": { @@ -400,11 +275,11 @@ }, "unstable-nixpkgs": { "locked": { - "lastModified": 1743583204, - "narHash": "sha256-F7n4+KOIfWrwoQjXrL2wD9RhFYLs2/GGe/MQY1sSdlE=", + "lastModified": 1744463964, + "narHash": "sha256-LWqduOgLHCFxiTNYi3Uj5Lgz0SR+Xhw3kr/3Xd0GPTM=", "owner": "nixos", "repo": "nixpkgs", - "rev": "2c8d3f48d33929642c1c12cd243df4cc7d2ce434", + "rev": "2631b0b7abcea6e640ce31cd78ea58910d31e650", "type": "github" }, "original": { diff --git a/nixos/flake.nix b/nixos/flake.nix index ad54794..ddc97b5 100644 --- a/nixos/flake.nix +++ b/nixos/flake.nix @@ -2,7 +2,9 @@ description = "Aria's system flake"; inputs = { - nixpkgs.url = "github:nixos/nixpkgs?ref=nixos-24.11"; + nixpkgs.url = "github:nixos/nixpkgs?ref=nixos-unstable"; + # nixpkgs.url = "github:nixos/nixpkgs?ref=nixos-24.11"; + # unstable-nixpkgs.url = "github:nixos/nixpkgs?ref=nixos-24.11"; unstable-nixpkgs.url = "github:nixos/nixpkgs?ref=nixos-unstable"; home-manger.url = "github:nix-community/home-manager?ref=release-24.11"; @@ -16,10 +18,10 @@ inputs.nixpkgs.follows = "nixpkgs"; }; - moonlight = { - url = "github:moonlight-mod/moonlight"; # Add `/develop` to the flake URL to use nightly. - inputs.nixpkgs.follows = "unstable-nixpkgs"; - }; + #moonlight = { + # url = "github:moonlight-mod/moonlight"; # Add `/develop` to the flake URL to use nightly. + # inputs.nixpkgs.follows = "unstable-nixpkgs"; + #}; shadps4-git.url = "./programs/shadps4"; @@ -49,7 +51,7 @@ config.allowUnfree = true; overlays = [ nix-your-shell.overlays.default - inputs.moonlight.overlays.default +# inputs.moonlight.overlays.default ]; }; diff --git a/nixos/home-manager/nixos/packages.nix b/nixos/home-manager/nixos/packages.nix index cdca625..abd0eed 100644 --- a/nixos/home-manager/nixos/packages.nix +++ b/nixos/home-manager/nixos/packages.nix @@ -11,27 +11,28 @@ # The home.packages option allows you to install Nix packages into your # environment. home.packages = + with pkgs; with unstable; with inputs; [ pkgs.nextcloud-client pkgs.xpipe pkgs.monero-gui - unstable.kiwix + kiwix # === CLI === pkgs.rrsync pkgs.poop # Compare the performance of multiple commands with a colorful terminal user interface pkgs.age - pkgs.jujutsu - pkgs.lazyjj + # pkgs.jujutsu + # pkgs.lazyjj pkgs.biome # === CLI === # === Image CLI === - unstable.oxipng - unstable.image_optim - unstable.jpegoptim + oxipng + image_optim + jpegoptim pkgs.libjxl pkgs.libavif pkgs.libwebp diff --git a/nixos/home-manager/packages/common-cli.nix b/nixos/home-manager/packages/common-cli.nix index 693d60d..dff8c4b 100644 --- a/nixos/home-manager/packages/common-cli.nix +++ b/nixos/home-manager/packages/common-cli.nix @@ -28,7 +28,7 @@ in with inputs; [ stow - unstable.yt-dlp + yt-dlp aria2 ripgrep wl-clipboard @@ -36,7 +36,7 @@ in btop fzf - unstable.dwarfs + dwarfs unrar ]; @@ -62,6 +62,9 @@ in defaultBranch = "main"; }; + push = { + autoSetupRemote = true; + }; }; }; diff --git a/nixos/home-manager/packages/common-desktop.nix b/nixos/home-manager/packages/common-desktop.nix index 8c02e3b..de3ad59 100644 --- a/nixos/home-manager/packages/common-desktop.nix +++ b/nixos/home-manager/packages/common-desktop.nix @@ -18,30 +18,31 @@ let in { - imports = [ - inputs.moonlight.homeModules.default - ]; +# imports = [ +# inputs.moonlight.homeModules.default +# ]; home.packages = + with pkgs; with inputs; with unstable; [ pkgs.yubioath-flutter pkgs.qbittorrent - unstable.peazip - unstable.parsec-bin + peazip + parsec-bin # === Communication === pkgs.vesktop - pkgs.discord-canary - pkgs.discord + # (unstable.discord-canary.override { withMoonlight = true; }) + # (unstable.discord.override { withMoonlight = true; }) pkgs.signal-desktop pkgs.telegram-desktop # pkgs.thunderbird-latest-unwrapped # === Communication === # === Editors/Office === - unstable.libreoffice-fresh + libreoffice-fresh # pkgs.kdePackages.kate pkgs.jetbrains.webstorm pkgs.jetbrains.rider @@ -51,18 +52,19 @@ in # === Media === # unstable.gimp - unstable.krita - unstable.mpv - unstable.losslesscut-bin - unstable.jellyfin-media-player - unstable.makemkv + krita + mpv + losslesscut-bin + jellyfin-media-player + makemkv + kdePackages.k3b # === Media === - unstable.orca-slicer + orca-slicer ]; - programs.moonlight-mod = { - enable = true; +# programs.moonlight-mod = { +# enable = true; # stable = { # extensions = { # allActivites.enabled = true; @@ -77,6 +79,6 @@ in # }; # }; # }; - }; +# }; } diff --git a/nixos/home-manager/packages/emulation.nix b/nixos/home-manager/packages/emulation.nix index 9c812ce..7703522 100644 --- a/nixos/home-manager/packages/emulation.nix +++ b/nixos/home-manager/packages/emulation.nix @@ -19,13 +19,14 @@ in { home.packages = + with pkgs; with unstable; with inputs; [ - unstable.pcsx2 - unstable.rpcs3 - unstable.ryubing - unstable.torzu + pcsx2 + rpcs3 + ryubing + torzu inputs.shadps4-git.packages."x86_64-linux".default ]; } diff --git a/nixos/home-manager/packages/game-extras.nix b/nixos/home-manager/packages/game-extras.nix index 93e8c44..1472682 100644 --- a/nixos/home-manager/packages/game-extras.nix +++ b/nixos/home-manager/packages/game-extras.nix @@ -19,13 +19,14 @@ in { home.packages = + with pkgs; with unstable; with inputs; [ # === Factorio related === - unstable.yafc-ce - unstable.pactorio - unstable.factoriolab + yafc-ce + pactorio + factoriolab # === Factorio related === ]; } diff --git a/nixos/home-manager/packages/gamedev.nix b/nixos/home-manager/packages/gamedev.nix index 1f128db..25d8ae5 100644 --- a/nixos/home-manager/packages/gamedev.nix +++ b/nixos/home-manager/packages/gamedev.nix @@ -26,14 +26,15 @@ in home.file."Godot/export-templates/4.3".source = unstable.godot_4_3-export-templates; home.packages = + with pkgs; with unstable; with inputs; [ - unstable.godot-mono + unstable.godot unstable.godot-export-templates unstable.blender-hip unstable.freecad-wayland - pkgs.unityhub + unstable.unityhub pkgs.material-maker unstable.blockbench ]; diff --git a/nixos/home-manager/packages/gaming.nix b/nixos/home-manager/packages/gaming.nix index 2bf5a2a..189c02d 100644 --- a/nixos/home-manager/packages/gaming.nix +++ b/nixos/home-manager/packages/gaming.nix @@ -25,6 +25,7 @@ in # === Java versions for MC === home.packages = + with pkgs; with unstable; with inputs; [ @@ -33,19 +34,25 @@ in unstable.prismlauncher # === Minecraft related === - unstable.steamtinkerlaunch - pkgs.heroic-unwrapped - unstable.ludusavi + steamtinkerlaunch + heroic + xivlauncher + ludusavi # === Game perf === - unstable.mangojuice - unstable.goverlay + mangojuice + goverlay + # unstable.mangohud # === Game perf === + + # === Modding === + unstable.nexusmods-app-unfree + # === Modding === ]; - programs.mangohud = { - enable = true; - enableSessionWide = true; - package = unstable.mangohud; - }; + # programs.mangohud = { + # enable = true; + # enableSessionWide = true; + # package = unstable.mangohud; + # }; } diff --git a/nixos/home-manager/packages/template.nix b/nixos/home-manager/packages/template.nix index 7094843..2e54277 100644 --- a/nixos/home-manager/packages/template.nix +++ b/nixos/home-manager/packages/template.nix @@ -19,6 +19,7 @@ in { home.packages = + with pkgs; with unstable; with inputs; [ diff --git a/nixos/home-manager/packages/video-capture.nix b/nixos/home-manager/packages/video-capture.nix index 72cfae5..d9a107d 100644 --- a/nixos/home-manager/packages/video-capture.nix +++ b/nixos/home-manager/packages/video-capture.nix @@ -20,6 +20,7 @@ in { home.packages = + with pkgs; with unstable; with inputs; [ diff --git a/nixos/home-manager/packages/video-prod.nix b/nixos/home-manager/packages/video-prod.nix index 5a49db6..7885d7d 100644 --- a/nixos/home-manager/packages/video-prod.nix +++ b/nixos/home-manager/packages/video-prod.nix @@ -19,14 +19,15 @@ in { home.packages = + with pkgs; with unstable; with inputs; [ - unstable.svt-av1-psy - unstable.ffmpeg-full - unstable.ab-av1 - unstable.whisper-cpp-vulkan - unstable.video-compare + svt-av1-psy + # unstable.ffmpeg-full + ab-av1 + # whisper-cpp-vulkan + video-compare ]; } diff --git a/nixos/home-manager/packages/virtualisation.nix b/nixos/home-manager/packages/virtualisation.nix index b98924b..d3836a1 100644 --- a/nixos/home-manager/packages/virtualisation.nix +++ b/nixos/home-manager/packages/virtualisation.nix @@ -19,6 +19,7 @@ in { home.packages = + with pkgs; with unstable; with inputs; [ diff --git a/nixos/home-manager/packages/wine.nix b/nixos/home-manager/packages/wine.nix index e4f6e4d..c7c0024 100644 --- a/nixos/home-manager/packages/wine.nix +++ b/nixos/home-manager/packages/wine.nix @@ -20,6 +20,7 @@ in home.file."bin/wine".source = unstable.wineWowPackages.waylandFull; home.packages = + with pkgs; with unstable; with inputs; [ diff --git a/nixos/hosts/nixos/configuration.nix b/nixos/hosts/nixos/configuration.nix index f93809b..3aacf26 100644 --- a/nixos/hosts/nixos/configuration.nix +++ b/nixos/hosts/nixos/configuration.nix @@ -103,6 +103,7 @@ "openrazer" "gamemode" "corectrl" + "cdrom" ]; # packages = with pkgs; [ # # discord.override { withMoonlight = true; } @@ -143,7 +144,7 @@ pkgs.clamav amdgpu_top - # unstable.mangohud + pkgs.mangohud # unstable.openrazer-daemon # Broken, enable again in a few days? @@ -156,10 +157,10 @@ gradle gcc dotnetCorePackages.sdk_8_0_3xx - (pkgs.writeShellScriptBin "python" '' - export LD_LIBRARY_PATH=$NIX_LD_LIBRARY_PATH - exec ${pkgs.python312}/bin/python "$@" - '') + # (pkgs.writeShellScriptBin "python" '' + # export LD_LIBRARY_PATH=$NIX_LD_LIBRARY_PATH + # exec ${pkgs.python312}/bin/python "$@" + # '') # noisetorch # yad # unzip @@ -167,6 +168,8 @@ # xdotool # xxd # xorg.xwininfo + + (ffmpeg-full.override {svt-av1 = pkgs.svt-av1-psy;}) ]; # Some programs need SUID wrappers, can be configured further or are @@ -208,7 +211,7 @@ MANGOHUD = "1"; - DOTNET_SYSTEM_GLOBALIZATION_INVARIANT = "1"; # Fixes godot 4 mono's launch issues + # DOTNET_SYSTEM_GLOBALIZATION_INVARIANT = "1"; # Fixes godot 4 mono's launch issues }; # This value determines the NixOS release from which the default diff --git a/nixos/hosts/nixos/hardware-configuration.nix b/nixos/hosts/nixos/hardware-configuration.nix index 98bd912..35da712 100644 --- a/nixos/hosts/nixos/hardware-configuration.nix +++ b/nixos/hosts/nixos/hardware-configuration.nix @@ -189,7 +189,6 @@ # networking.interfaces.enp6s0.useDHCP = lib.mkDefault true; # networking.interfaces.wlp5s0.useDHCP = lib.mkDefault true; - networking.useNetworkd = true; networking.useDHCP = false; networking.interfaces.enp4s0.useDHCP = true; @@ -217,14 +216,17 @@ linkConfig.RequiredForOnline = "routable"; }; - systemd.network.networks."20-work-line" = { + systemd.network.networks."20-work-wan" = { # match the interface by name matchConfig.Name = "enp6s0"; - networkConfig = { - # start a DHCP Client for IPv4 Addressing/Routing - DHCP = "ipv4"; - }; - # make routing on this interface a dependency for network-online.target + address = [ + # configure addresses including subnet mask + "192.168.128.165/24" + ]; + routes = [ + { Gateway = "192.168.128.1"; } + ]; + # make the routes on this interface a dependency for network-online.target linkConfig.RequiredForOnline = "routable"; }; @@ -235,6 +237,8 @@ # === vulkan/mesa === enable = true; enable32Bit = true; + extraPackages = with pkgs; with unstable; [ pkgs.mangohud ]; + extraPackages32 = with pkgs; with unstable; [ pkgs.mangohud ]; # package = unstable.mesa; # === vulkan/mesa === diff --git a/nixos/hosts/nixos/services.nix b/nixos/hosts/nixos/services.nix index d82103f..b1f0c8d 100644 --- a/nixos/hosts/nixos/services.nix +++ b/nixos/hosts/nixos/services.nix @@ -60,10 +60,11 @@ package = unstable.tailscale; }; - # tailscale.extraSetFlags = [ - # "--advertise-exit-node" - # "--exit-node-allow-lan-access" - # ]; + tailscale.extraSetFlags = [ + "--advertise-exit-node" + "--exit-node-allow-lan-access" + "--ssh" + ]; resolved = { enable = true; diff --git a/nixos/programs/shadps4/flake.lock b/nixos/programs/shadps4/flake.lock index 7fa58fe..019392c 100644 --- a/nixos/programs/shadps4/flake.lock +++ b/nixos/programs/shadps4/flake.lock @@ -2,11 +2,11 @@ "nodes": { "nixpkgs": { "locked": { - "lastModified": 1743095683, - "narHash": "sha256-gWd4urRoLRe8GLVC/3rYRae1h+xfQzt09xOfb0PaHSk=", + "lastModified": 1744463964, + "narHash": "sha256-LWqduOgLHCFxiTNYi3Uj5Lgz0SR+Xhw3kr/3Xd0GPTM=", "owner": "nixos", "repo": "nixpkgs", - "rev": "5e5402ecbcb27af32284d4a62553c019a3a49ea6", + "rev": "2631b0b7abcea6e640ce31cd78ea58910d31e650", "type": "github" }, "original": { diff --git a/nixos/programs/shadps4/flake.nix b/nixos/programs/shadps4/flake.nix index 1acba3f..667cea2 100644 --- a/nixos/programs/shadps4/flake.nix +++ b/nixos/programs/shadps4/flake.nix @@ -23,8 +23,8 @@ src = pkgs.fetchFromGitHub { owner = "shadps4-emu"; repo = "shadPS4"; - rev = "a707d31a4c23fdd8aefb146ae04d25ecbca246d0"; - hash = "sha256-ZOuhdZuLXbR3kzNwoK7jioFy+MjKL8GDBtVRsyGcL98="; + rev = "2b633fd3c566fbabf5a63fd2e14a049e28bab3ef"; + hash = "sha256-J14kVGYETnaQ/XySTdg+zz0DhaAEdPaPqakC7uJJYdU="; fetchSubmodules = true; leaveDotGit = true; };