aria/etc
1
0
Fork 0
Code Issues Pull requests Projects Releases Packages Wiki Activity Actions

a

Browse source
This commit is contained in:
BuyMyMojo 2025-04-16 02:19:59 +10:00
parent d5eeaa2c78
commit 675de25900
Signed by untrusted user who does not match committer: aria
GPG key ID: 19AB7AA462B8AB3B
22 changed files with 157 additions and 247 deletions
Download patch file Download diff file Expand all files Collapse all files

1
nixos/common/nix-ld.nix
View file

@ -29,6 +29,7 @@
dotnetCorePackages.sdk_8_0_3xx dotnetCorePackages.sdk_8_0_3xx
alsa-lib alsa-lib
icu icu
haskellPackages.bz2
# === Godot === # === Godot ===
# === Ludusavi === # === Ludusavi ===

7
nixos/common/steam.nix
View file

@ -11,13 +11,18 @@
programs.steam = { programs.steam = {
enable = true; enable = true;
package = pkgs.steam.override { package = pkgs.steam.override {
extraEnv = {
MANGOHUD = true;
OBS_VKCAPTURE = true;
# RADV_TEX_ANISO = 16;
};
extraPkgs = ( extraPkgs = (
pkgs: pkgs:
with pkgs; with pkgs;
with unstable; with unstable;
[ [
gamemode gamemode
unstable.mangohud pkgs.mangohud
# additional packages... # additional packages...
# e.g. some games require python3 # e.g. some games require python3
] ]

16
nixos/common/universal.nix
View file

@ -1,6 +1,7 @@
{ {
config, config,
pkgs, pkgs,
lib,
unstable, unstable,
inputs, inputs,
nix-your-shell, nix-your-shell,
@ -23,24 +24,21 @@
fonts = { fonts = {
fontDir.enable = true; fontDir.enable = true;
enableGhostscriptFonts = true; enableGhostscriptFonts = true;
packages = with pkgs; [ packages = [ ] ++ builtins.filter lib.attrsets.isDerivation (builtins.attrValues pkgs.nerd-fonts);
nerdfonts
# berkeley-mono-typeface
];
}; };
environment.systemPackages = environment.systemPackages =
with pkgs; with pkgs;
with unstable; with unstable;
[ [
unstable.waypipe waypipe
# === nix related === # === nix related ===
comma comma
nh nh
# === nix related === # === nix related ===
unstable.nix-your-shell # nix-your-shell
]; ];
@ -53,9 +51,9 @@
programs.fish = { programs.fish = {
enable = true; enable = true;
interactiveShellInit = '' # interactiveShellInit = ''
nix-your-shell fish | source # nix-your-shell fish | source
''; # '';
}; };
programs.bash = { programs.bash = {

195
nixos/flake.lock generated
View file

@ -37,17 +37,17 @@
"cpu-microcodes": { "cpu-microcodes": {
"flake": false, "flake": false,
"locked": { "locked": {
"lastModified": 1742753109, "lastModified": 1744580596,
"narHash": "sha256-hneAwNElAMkaTdToS6DUa47gFkXoIIR77CesMKUW21A=", "narHash": "sha256-0WgBGViIPozInkjUZSUKyndN9ldZGtCKlUiiw8VAK3o=",
"owner": "platomav", "owner": "platomav",
"repo": "CPUMicrocodes", "repo": "CPUMicrocodes",
"rev": "f093bec842057ebf35d0525fcd69f649714f4485", "rev": "58897a4b77be3ebb17ee41c12002cd986d3da6ed",
"type": "github" "type": "github"
}, },
"original": { "original": {
"owner": "platomav", "owner": "platomav",
"repo": "CPUMicrocodes", "repo": "CPUMicrocodes",
"rev": "f093bec842057ebf35d0525fcd69f649714f4485", "rev": "58897a4b77be3ebb17ee41c12002cd986d3da6ed",
"type": "github" "type": "github"
} }
}, },
@ -72,52 +72,16 @@
"type": "github" "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": { "home-manager": {
"inputs": { "inputs": {
"nixpkgs": "nixpkgs_2" "nixpkgs": "nixpkgs_2"
}, },
"locked": { "locked": {
"lastModified": 1743717835, "lastModified": 1744637364,
"narHash": "sha256-LJm6FoIcUoBw3w25ty12/sBfut4zZuNGdN0phYj/ekU=", "narHash": "sha256-ZVINTNMJS6W3fqPYV549DSmjYQW5I9ceKBl83FwPP7k=",
"owner": "nix-community", "owner": "nix-community",
"repo": "home-manager", "repo": "home-manager",
"rev": "66a6ec65f84255b3defb67ff45af86c844dd451b", "rev": "337541447773985f825512afd0f9821a975186be",
"type": "github" "type": "github"
}, },
"original": { "original": {
@ -132,11 +96,11 @@
] ]
}, },
"locked": { "locked": {
"lastModified": 1743387206, "lastModified": 1744117652,
"narHash": "sha256-24N3NAuZZbYqZ39NgToZgHUw6M7xHrtrAm18kv0+2Wo=", "narHash": "sha256-t7dFCDl4vIOOUMhEZnJF15aAzkpaup9x4ZRGToDFYWI=",
"owner": "nix-community", "owner": "nix-community",
"repo": "home-manager", "repo": "home-manager",
"rev": "15c5f9d04fabd176f30286c8f52bbdb2c853a146", "rev": "b4e98224ad1336751a2ac7493967a4c9f6d9cb3f",
"type": "github" "type": "github"
}, },
"original": { "original": {
@ -146,28 +110,6 @@
"type": "github" "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": { "nix-your-shell": {
"inputs": { "inputs": {
"advisory-db": "advisory-db", "advisory-db": "advisory-db",
@ -175,14 +117,14 @@
"nixpkgs": [ "nixpkgs": [
"nixpkgs" "nixpkgs"
], ],
"systems": "systems_3" "systems": "systems"
}, },
"locked": { "locked": {
"lastModified": 1727198502, "lastModified": 1744134530,
"narHash": "sha256-FjGjLq/4qeZz9foA7pfz1hiXvsdmbnzB3BpiTESLE1c=", "narHash": "sha256-NWgdXO6sQMQVnbvwSB+gBmMnU9s8ghx1ltGvOPec+qo=",
"owner": "MercuryTechnologies", "owner": "MercuryTechnologies",
"repo": "nix-your-shell", "repo": "nix-your-shell",
"rev": "04dc6379eab87c128f2eca3f2238f533a95604b3", "rev": "e66f4ece4687d4c0890ab5994bfef2826f68180c",
"type": "github" "type": "github"
}, },
"original": { "original": {
@ -225,11 +167,11 @@
}, },
"nixpkgs_2": { "nixpkgs_2": {
"locked": { "locked": {
"lastModified": 1743583204, "lastModified": 1744463964,
"narHash": "sha256-F7n4+KOIfWrwoQjXrL2wD9RhFYLs2/GGe/MQY1sSdlE=", "narHash": "sha256-LWqduOgLHCFxiTNYi3Uj5Lgz0SR+Xhw3kr/3Xd0GPTM=",
"owner": "NixOS", "owner": "NixOS",
"repo": "nixpkgs", "repo": "nixpkgs",
"rev": "2c8d3f48d33929642c1c12cd243df4cc7d2ce434", "rev": "2631b0b7abcea6e640ce31cd78ea58910d31e650",
"type": "github" "type": "github"
}, },
"original": { "original": {
@ -241,11 +183,11 @@
}, },
"nixpkgs_3": { "nixpkgs_3": {
"locked": { "locked": {
"lastModified": 1736344531, "lastModified": 1744463964,
"narHash": "sha256-8YVQ9ZbSfuUk2bUf2KRj60NRraLPKPS0Q4QFTbc+c2c=", "narHash": "sha256-LWqduOgLHCFxiTNYi3Uj5Lgz0SR+Xhw3kr/3Xd0GPTM=",
"owner": "nixos", "owner": "nixos",
"repo": "nixpkgs", "repo": "nixpkgs",
"rev": "bffc22eb12172e6db3c5dde9e3e5628f8e3e7912", "rev": "2631b0b7abcea6e640ce31cd78ea58910d31e650",
"type": "github" "type": "github"
}, },
"original": { "original": {
@ -257,27 +199,11 @@
}, },
"nixpkgs_4": { "nixpkgs_4": {
"locked": { "locked": {
"lastModified": 1743576891, "lastModified": 1744463964,
"narHash": "sha256-vXiKURtntURybE6FMNFAVpRPr8+e8KoLPrYs9TGuAKc=", "narHash": "sha256-LWqduOgLHCFxiTNYi3Uj5Lgz0SR+Xhw3kr/3Xd0GPTM=",
"owner": "nixos", "owner": "nixos",
"repo": "nixpkgs", "repo": "nixpkgs",
"rev": "44a69ed688786e98a101f02b712c313f1ade37ab", "rev": "2631b0b7abcea6e640ce31cd78ea58910d31e650",
"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",
"type": "github" "type": "github"
}, },
"original": { "original": {
@ -287,33 +213,13 @@
"type": "github" "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": { "root": {
"inputs": { "inputs": {
"bellado": "bellado", "bellado": "bellado",
"home-manager": "home-manager", "home-manager": "home-manager",
"home-manger": "home-manger", "home-manger": "home-manger",
"moonlight": "moonlight",
"nix-your-shell": "nix-your-shell", "nix-your-shell": "nix-your-shell",
"nixpkgs": "nixpkgs_4", "nixpkgs": "nixpkgs_3",
"nixpkgs-gsr-ui": "nixpkgs-gsr-ui", "nixpkgs-gsr-ui": "nixpkgs-gsr-ui",
"shadps4-git": "shadps4-git", "shadps4-git": "shadps4-git",
"ucodenix": "ucodenix", "ucodenix": "ucodenix",
@ -322,18 +228,17 @@
}, },
"shadps4-git": { "shadps4-git": {
"inputs": { "inputs": {
"nixpkgs": "nixpkgs_5" "nixpkgs": "nixpkgs_4"
}, },
"locked": { "locked": {
"lastModified": 1, "path": "./programs/shadps4",
"narHash": "sha256-rADqSJu492bURPi5fmvPyeG1B5bV3k2hfGR+VfHn1Ig=",
"path": "/nix/store/1wdk50abjwp8dcz1zjp0ax95312q723w-source/nixos/programs/shadps4",
"type": "path" "type": "path"
}, },
"original": { "original": {
"path": "/nix/store/1wdk50abjwp8dcz1zjp0ax95312q723w-source/nixos/programs/shadps4", "path": "./programs/shadps4",
"type": "path" "type": "path"
} },
"parent": []
}, },
"systems": { "systems": {
"locked": { "locked": {
@ -350,46 +255,16 @@
"type": "github" "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": { "ucodenix": {
"inputs": { "inputs": {
"cpu-microcodes": "cpu-microcodes" "cpu-microcodes": "cpu-microcodes"
}, },
"locked": { "locked": {
"lastModified": 1743266219, "lastModified": 1744630518,
"narHash": "sha256-WLESNfsx1bIw5XMCuBBrPfYikSiT5wstcqutZsx9f1Q=", "narHash": "sha256-xRbcLC6AVjB8etaw1T9MEywqjuRWeZZu5Ee8RU3q4R0=",
"owner": "e-tho", "owner": "e-tho",
"repo": "ucodenix", "repo": "ucodenix",
"rev": "e84d7dfc23fe10e72669e102be7bb79f6ecc7252", "rev": "b26e195f4272306f6bd30445bb73657449a1f574",
"type": "github" "type": "github"
}, },
"original": { "original": {
@ -400,11 +275,11 @@
}, },
"unstable-nixpkgs": { "unstable-nixpkgs": {
"locked": { "locked": {
"lastModified": 1743583204, "lastModified": 1744463964,
"narHash": "sha256-F7n4+KOIfWrwoQjXrL2wD9RhFYLs2/GGe/MQY1sSdlE=", "narHash": "sha256-LWqduOgLHCFxiTNYi3Uj5Lgz0SR+Xhw3kr/3Xd0GPTM=",
"owner": "nixos", "owner": "nixos",
"repo": "nixpkgs", "repo": "nixpkgs",
"rev": "2c8d3f48d33929642c1c12cd243df4cc7d2ce434", "rev": "2631b0b7abcea6e640ce31cd78ea58910d31e650",
"type": "github" "type": "github"
}, },
"original": { "original": {

14
nixos/flake.nix
View file

@ -2,7 +2,9 @@
description = "Aria's system flake"; description = "Aria's system flake";
inputs = { 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"; unstable-nixpkgs.url = "github:nixos/nixpkgs?ref=nixos-unstable";
home-manger.url = "github:nix-community/home-manager?ref=release-24.11"; home-manger.url = "github:nix-community/home-manager?ref=release-24.11";
@ -16,10 +18,10 @@
inputs.nixpkgs.follows = "nixpkgs"; inputs.nixpkgs.follows = "nixpkgs";
}; };
moonlight = { #moonlight = {
url = "github:moonlight-mod/moonlight"; # Add `/develop` to the flake URL to use nightly. # url = "github:moonlight-mod/moonlight"; # Add `/develop` to the flake URL to use nightly.
inputs.nixpkgs.follows = "unstable-nixpkgs"; # inputs.nixpkgs.follows = "unstable-nixpkgs";
}; #};
shadps4-git.url = "./programs/shadps4"; shadps4-git.url = "./programs/shadps4";
@ -49,7 +51,7 @@
config.allowUnfree = true; config.allowUnfree = true;
overlays = [ overlays = [
nix-your-shell.overlays.default nix-your-shell.overlays.default
inputs.moonlight.overlays.default # inputs.moonlight.overlays.default
]; ];
}; };

13
nixos/home-manager/nixos/packages.nix
View file

@ -11,27 +11,28 @@
# The home.packages option allows you to install Nix packages into your # The home.packages option allows you to install Nix packages into your
# environment. # environment.
home.packages = home.packages =
with pkgs;
with unstable; with unstable;
with inputs; with inputs;
[ [
pkgs.nextcloud-client pkgs.nextcloud-client
pkgs.xpipe pkgs.xpipe
pkgs.monero-gui pkgs.monero-gui
unstable.kiwix kiwix
# === CLI === # === CLI ===
pkgs.rrsync pkgs.rrsync
pkgs.poop # Compare the performance of multiple commands with a colorful terminal user interface pkgs.poop # Compare the performance of multiple commands with a colorful terminal user interface
pkgs.age pkgs.age
pkgs.jujutsu # pkgs.jujutsu
pkgs.lazyjj # pkgs.lazyjj
pkgs.biome pkgs.biome
# === CLI === # === CLI ===
# === Image CLI === # === Image CLI ===
unstable.oxipng oxipng
unstable.image_optim image_optim
unstable.jpegoptim jpegoptim
pkgs.libjxl pkgs.libjxl
pkgs.libavif pkgs.libavif
pkgs.libwebp pkgs.libwebp

7
nixos/home-manager/packages/common-cli.nix
View file

@ -28,7 +28,7 @@ in
with inputs; with inputs;
[ [
stow stow
unstable.yt-dlp yt-dlp
aria2 aria2
ripgrep ripgrep
wl-clipboard wl-clipboard
@ -36,7 +36,7 @@ in
btop btop
fzf fzf
unstable.dwarfs dwarfs
unrar unrar
]; ];
@ -62,6 +62,9 @@ in
defaultBranch = "main"; defaultBranch = "main";
}; };
push = {
autoSetupRemote = true;
};
}; };
}; };

36
nixos/home-manager/packages/common-desktop.nix
View file

@ -18,30 +18,31 @@ let
in in
{ {
imports = [ # imports = [
inputs.moonlight.homeModules.default # inputs.moonlight.homeModules.default
]; # ];
home.packages = home.packages =
with pkgs;
with inputs; with inputs;
with unstable; with unstable;
[ [
pkgs.yubioath-flutter pkgs.yubioath-flutter
pkgs.qbittorrent pkgs.qbittorrent
unstable.peazip peazip
unstable.parsec-bin parsec-bin
# === Communication === # === Communication ===
pkgs.vesktop pkgs.vesktop
pkgs.discord-canary # (unstable.discord-canary.override { withMoonlight = true; })
pkgs.discord # (unstable.discord.override { withMoonlight = true; })
pkgs.signal-desktop pkgs.signal-desktop
pkgs.telegram-desktop pkgs.telegram-desktop
# pkgs.thunderbird-latest-unwrapped # pkgs.thunderbird-latest-unwrapped
# === Communication === # === Communication ===
# === Editors/Office === # === Editors/Office ===
unstable.libreoffice-fresh libreoffice-fresh
# pkgs.kdePackages.kate # pkgs.kdePackages.kate
pkgs.jetbrains.webstorm pkgs.jetbrains.webstorm
pkgs.jetbrains.rider pkgs.jetbrains.rider
@ -51,18 +52,19 @@ in
# === Media === # === Media ===
# unstable.gimp # unstable.gimp
unstable.krita krita
unstable.mpv mpv
unstable.losslesscut-bin losslesscut-bin
unstable.jellyfin-media-player jellyfin-media-player
unstable.makemkv makemkv
kdePackages.k3b
# === Media === # === Media ===
unstable.orca-slicer orca-slicer
]; ];
programs.moonlight-mod = { # programs.moonlight-mod = {
enable = true; # enable = true;
# stable = { # stable = {
# extensions = { # extensions = {
# allActivites.enabled = true; # allActivites.enabled = true;
@ -77,6 +79,6 @@ in
# }; # };
# }; # };
# }; # };
}; # };
} }

9
nixos/home-manager/packages/emulation.nix
View file

@ -19,13 +19,14 @@ in
{ {
home.packages = home.packages =
with pkgs;
with unstable; with unstable;
with inputs; with inputs;
[ [
unstable.pcsx2 pcsx2
unstable.rpcs3 rpcs3
unstable.ryubing ryubing
unstable.torzu torzu
inputs.shadps4-git.packages."x86_64-linux".default inputs.shadps4-git.packages."x86_64-linux".default
]; ];
} }

7
nixos/home-manager/packages/game-extras.nix
View file

@ -19,13 +19,14 @@ in
{ {
home.packages = home.packages =
with pkgs;
with unstable; with unstable;
with inputs; with inputs;
[ [
# === Factorio related === # === Factorio related ===
unstable.yafc-ce yafc-ce
unstable.pactorio pactorio
unstable.factoriolab factoriolab
# === Factorio related === # === Factorio related ===
]; ];
} }

5
nixos/home-manager/packages/gamedev.nix
View file

@ -26,14 +26,15 @@ in
home.file."Godot/export-templates/4.3".source = unstable.godot_4_3-export-templates; home.file."Godot/export-templates/4.3".source = unstable.godot_4_3-export-templates;
home.packages = home.packages =
with pkgs;
with unstable; with unstable;
with inputs; with inputs;
[ [
unstable.godot-mono unstable.godot
unstable.godot-export-templates unstable.godot-export-templates
unstable.blender-hip unstable.blender-hip
unstable.freecad-wayland unstable.freecad-wayland
pkgs.unityhub unstable.unityhub
pkgs.material-maker pkgs.material-maker
unstable.blockbench unstable.blockbench
]; ];

27
nixos/home-manager/packages/gaming.nix
View file

@ -25,6 +25,7 @@ in
# === Java versions for MC === # === Java versions for MC ===
home.packages = home.packages =
with pkgs;
with unstable; with unstable;
with inputs; with inputs;
[ [
@ -33,19 +34,25 @@ in
unstable.prismlauncher unstable.prismlauncher
# === Minecraft related === # === Minecraft related ===
unstable.steamtinkerlaunch steamtinkerlaunch
pkgs.heroic-unwrapped heroic
unstable.ludusavi xivlauncher
ludusavi
# === Game perf === # === Game perf ===
unstable.mangojuice mangojuice
unstable.goverlay goverlay
# unstable.mangohud
# === Game perf === # === Game perf ===
# === Modding ===
unstable.nexusmods-app-unfree
# === Modding ===
]; ];
programs.mangohud = { # programs.mangohud = {
enable = true; # enable = true;
enableSessionWide = true; # enableSessionWide = true;
package = unstable.mangohud; # package = unstable.mangohud;
}; # };
} }

1
nixos/home-manager/packages/template.nix
View file

@ -19,6 +19,7 @@ in
{ {
home.packages = home.packages =
with pkgs;
with unstable; with unstable;
with inputs; with inputs;
[ [

1
nixos/home-manager/packages/video-capture.nix
View file

@ -20,6 +20,7 @@ in
{ {
home.packages = home.packages =
with pkgs;
with unstable; with unstable;
with inputs; with inputs;
[ [

11
nixos/home-manager/packages/video-prod.nix
View file

@ -19,14 +19,15 @@ in
{ {
home.packages = home.packages =
with pkgs;
with unstable; with unstable;
with inputs; with inputs;
[ [
unstable.svt-av1-psy svt-av1-psy
unstable.ffmpeg-full # unstable.ffmpeg-full
unstable.ab-av1 ab-av1
unstable.whisper-cpp-vulkan # whisper-cpp-vulkan
unstable.video-compare video-compare
]; ];
} }

1
nixos/home-manager/packages/virtualisation.nix
View file

@ -19,6 +19,7 @@ in
{ {
home.packages = home.packages =
with pkgs;
with unstable; with unstable;
with inputs; with inputs;
[ [

1
nixos/home-manager/packages/wine.nix
View file

@ -20,6 +20,7 @@ in
home.file."bin/wine".source = unstable.wineWowPackages.waylandFull; home.file."bin/wine".source = unstable.wineWowPackages.waylandFull;
home.packages = home.packages =
with pkgs;
with unstable; with unstable;
with inputs; with inputs;
[ [

15
nixos/hosts/nixos/configuration.nix
View file

@ -103,6 +103,7 @@
"openrazer" "openrazer"
"gamemode" "gamemode"
"corectrl" "corectrl"
"cdrom"
]; ];
# packages = with pkgs; [ # packages = with pkgs; [
# # discord.override { withMoonlight = true; } # # discord.override { withMoonlight = true; }
@ -143,7 +144,7 @@
pkgs.clamav pkgs.clamav
amdgpu_top amdgpu_top
# unstable.mangohud pkgs.mangohud
# unstable.openrazer-daemon # Broken, enable again in a few days? # unstable.openrazer-daemon # Broken, enable again in a few days?
@ -156,10 +157,10 @@
gradle gradle
gcc gcc
dotnetCorePackages.sdk_8_0_3xx dotnetCorePackages.sdk_8_0_3xx
(pkgs.writeShellScriptBin "python" '' # (pkgs.writeShellScriptBin "python" ''
export LD_LIBRARY_PATH=$NIX_LD_LIBRARY_PATH # export LD_LIBRARY_PATH=$NIX_LD_LIBRARY_PATH
exec ${pkgs.python312}/bin/python "$@" # exec ${pkgs.python312}/bin/python "$@"
'') # '')
# noisetorch # noisetorch
# yad # yad
# unzip # unzip
@ -167,6 +168,8 @@
# xdotool # xdotool
# xxd # xxd
# xorg.xwininfo # xorg.xwininfo
(ffmpeg-full.override {svt-av1 = pkgs.svt-av1-psy;})
]; ];
# Some programs need SUID wrappers, can be configured further or are # Some programs need SUID wrappers, can be configured further or are
@ -208,7 +211,7 @@
MANGOHUD = "1"; 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 # This value determines the NixOS release from which the default

18
nixos/hosts/nixos/hardware-configuration.nix
View file

@ -189,7 +189,6 @@
# networking.interfaces.enp6s0.useDHCP = lib.mkDefault true; # networking.interfaces.enp6s0.useDHCP = lib.mkDefault true;
# networking.interfaces.wlp5s0.useDHCP = lib.mkDefault true; # networking.interfaces.wlp5s0.useDHCP = lib.mkDefault true;
networking.useNetworkd = true; networking.useNetworkd = true;
networking.useDHCP = false; networking.useDHCP = false;
networking.interfaces.enp4s0.useDHCP = true; networking.interfaces.enp4s0.useDHCP = true;
@ -217,14 +216,17 @@
linkConfig.RequiredForOnline = "routable"; linkConfig.RequiredForOnline = "routable";
}; };
systemd.network.networks."20-work-line" = { systemd.network.networks."20-work-wan" = {
# match the interface by name # match the interface by name
matchConfig.Name = "enp6s0"; matchConfig.Name = "enp6s0";
networkConfig = { address = [
# start a DHCP Client for IPv4 Addressing/Routing # configure addresses including subnet mask
DHCP = "ipv4"; "192.168.128.165/24"
}; ];
# make routing on this interface a dependency for network-online.target routes = [
{ Gateway = "192.168.128.1"; }
];
# make the routes on this interface a dependency for network-online.target
linkConfig.RequiredForOnline = "routable"; linkConfig.RequiredForOnline = "routable";
}; };
@ -235,6 +237,8 @@
# === vulkan/mesa === # === vulkan/mesa ===
enable = true; enable = true;
enable32Bit = true; enable32Bit = true;
extraPackages = with pkgs; with unstable; [ pkgs.mangohud ];
extraPackages32 = with pkgs; with unstable; [ pkgs.mangohud ];
# package = unstable.mesa; # package = unstable.mesa;
# === vulkan/mesa === # === vulkan/mesa ===

9
nixos/hosts/nixos/services.nix
View file

@ -60,10 +60,11 @@
package = unstable.tailscale; package = unstable.tailscale;
}; };
# tailscale.extraSetFlags = [ tailscale.extraSetFlags = [
# "--advertise-exit-node" "--advertise-exit-node"
# "--exit-node-allow-lan-access" "--exit-node-allow-lan-access"
# ]; "--ssh"
];
resolved = { resolved = {
enable = true; enable = true;

6
nixos/programs/shadps4/flake.lock generated
View file

@ -2,11 +2,11 @@
"nodes": { "nodes": {
"nixpkgs": { "nixpkgs": {
"locked": { "locked": {
"lastModified": 1743095683, "lastModified": 1744463964,
"narHash": "sha256-gWd4urRoLRe8GLVC/3rYRae1h+xfQzt09xOfb0PaHSk=", "narHash": "sha256-LWqduOgLHCFxiTNYi3Uj5Lgz0SR+Xhw3kr/3Xd0GPTM=",
"owner": "nixos", "owner": "nixos",
"repo": "nixpkgs", "repo": "nixpkgs",
"rev": "5e5402ecbcb27af32284d4a62553c019a3a49ea6", "rev": "2631b0b7abcea6e640ce31cd78ea58910d31e650",
"type": "github" "type": "github"
}, },
"original": { "original": {

4
nixos/programs/shadps4/flake.nix
View file

@ -23,8 +23,8 @@
src = pkgs.fetchFromGitHub { src = pkgs.fetchFromGitHub {
owner = "shadps4-emu"; owner = "shadps4-emu";
repo = "shadPS4"; repo = "shadPS4";
rev = "a707d31a4c23fdd8aefb146ae04d25ecbca246d0"; rev = "2b633fd3c566fbabf5a63fd2e14a049e28bab3ef";
hash = "sha256-ZOuhdZuLXbR3kzNwoK7jioFy+MjKL8GDBtVRsyGcL98="; hash = "sha256-J14kVGYETnaQ/XySTdg+zz0DhaAEdPaPqakC7uJJYdU=";
fetchSubmodules = true; fetchSubmodules = true;
leaveDotGit = true; leaveDotGit = true;
}; };