Daholli/nixos-config
1
0
Fork 0
Code Issues 2 Pull requests Releases Packages Activity Actions

nix: change from pkgs.system to stdenv.hostPlatform.system

Browse source
This commit is contained in:
Christoph Hollizeck 2025-11-07 14:40:05 +01:00
parent e5143c2000
commit c57ec4fc2f
Signed by: Daholli
GPG key ID: 249300664F2AF2C7
14 changed files with 241 additions and 129 deletions
Download patch file Download diff file Expand all files Collapse all files

4
modules/base/system/helix.nix
View file

@ -7,7 +7,7 @@
...
}:
let
helix-pkg = inputs.helix.packages.${pkgs.system}.default;
helix-pkg = inputs.helix.packages.${pkgs.stdenv.hostPlatform.system}.default;
in
{
environment = {
@ -26,7 +26,7 @@
...
}:
let
helix-pkg = inputs.helix.packages.${pkgs.system}.default;
helix-pkg = inputs.helix.packages.${pkgs.stdenv.hostPlatform.system}.default;
in
{
home.file.".config/helix/ignore".text = ''

4
modules/base/system/nixdaemon.nix
View file

@ -27,7 +27,7 @@
programs.nh = {
enable = true;
package = inputs.nh-flake.packages.${pkgs.system}.nh;
package = inputs.nh-flake.packages.${pkgs.stdenv.hostPlatform.system}.nh;
flake = "/home/${username}/projects/config";
};
@ -59,12 +59,14 @@
"https://nix-community.cachix.org"
"https://nixcache.christophhollizeck.dev"
"https://hyprland.cachix.org"
"https://nix-gaming.cachix.org"
];
trusted-public-keys = [
"cache.lix.systems:aBnZUw8zA7H35Cz2RyKFVs3H4PlGTLawyY5KRbvJR8o="
"nix-community.cachix.org-1:mB9FSh9qf2dCimDSUo8Zy7bkq5CX+/rkCWyvRCYg3Fs="
"christophhollizeck.dev:7pPAvm9xqFQB8FDApVNL6Tii1Jsv+Sj/LjEIkdeGhbA="
"hyprland.cachix.org-1:a7pgxzMz7+chwVL3/pzj6jIBMioiJM7ypFP8PwtkuGc="
"nix-gaming.cachix.org-1:nbjlureqMbRAxR1gJ/f3hxemL9svXaZF/Ees8vCUUs4="
];
}
// (lib.optionalAttrs config.programs.direnv.enable {

2
modules/desktop/addons/hyprlock.nix
View file

@ -33,7 +33,7 @@
...
}:
let
hyprlock-package = inputs.hyprlock.packages.${pkgs.system}.hyprlock;
hyprlock-package = inputs.hyprlock.packages.${pkgs.stdenv.hostPlatform.system}.hyprlock;
in
{
config = lib.mkIf (osConfig.networking.hostName == "yggdrasil") {

2
modules/desktop/default.nix
View file

@ -9,7 +9,7 @@
...
}:
let
zenbrowser = inputs.zen-browser.packages."${pkgs.system}".default;
zenbrowser = inputs.zen-browser.packages."${pkgs.stdenv.hostPlatform.system}".default;
in
{

8
modules/desktop/hyprland.nix
View file

@ -8,7 +8,7 @@
...
}:
let
hyprland-package = inputs.hyprland.packages.${pkgs.system}.hyprland;
hyprland-package = inputs.hyprland.packages.${pkgs.stdenv.hostPlatform.system}.hyprland;
focus-1password = pkgs.writeShellScriptBin "focus-or-open-1pass" ''
running=$(hyprctl -j clients | jq -r '.[] | select(.class == "1password") | .workspace.id')
@ -64,7 +64,7 @@
hyprland = {
enable = true;
package = hyprland-package;
portalPackage = inputs.hyprland.packages.${pkgs.system}.xdg-desktop-portal-hyprland;
portalPackage = inputs.hyprland.packages.${pkgs.stdenv.hostPlatform.system}.xdg-desktop-portal-hyprland;
withUWSM = true;
};
};
@ -124,14 +124,14 @@
...
}:
let
hyprland-package = inputs.hyprland.packages.${pkgs.system}.hyprland;
hyprland-package = inputs.hyprland.packages.${pkgs.stdenv.hostPlatform.system}.hyprland;
in
{
config = lib.mkIf osConfig.programs.hyprland.enable {
wayland.windowManager.hyprland = {
enable = true;
package = hyprland-package;
plugins = [ inputs.hy3.packages.${pkgs.system}.hy3 ];
plugins = [ inputs.hy3.packages.${pkgs.stdenv.hostPlatform.system}.hy3 ];
systemd.variables = [ "--all" ];
settings = {
"$mod" = "SUPER";

4
modules/desktop/niri.nix
View file

@ -6,13 +6,13 @@
programs.niri = {
enable = true;
package = inputs.niri-flake.packages.${pkgs.system}.niri-unstable;
package = inputs.niri-flake.packages.${pkgs.stdenv.hostPlatform.system}.niri-unstable;
};
environment.systemPackages = with pkgs; [
kitty
inputs.niri-flake.packages.${pkgs.system}.xwayland-satellite-unstable
inputs.niri-flake.packages.${pkgs.stdenv.hostPlatform.system}.xwayland-satellite-unstable
wl-clipboard
xsel

2
modules/dev/devenv.nix
View file

@ -3,7 +3,7 @@
{ inputs, pkgs, ... }:
{
environment.systemPackages = [
inputs.devenv.packages.${pkgs.system}.devenv
inputs.devenv.packages.${pkgs.stdenv.hostPlatform.system}.devenv
];
};
}

3
modules/games/steam.nix
View file

@ -4,6 +4,9 @@
{
programs.steam = {
enable = true;
package = pkgs.steam.override {
extraBwrapArgs = [ "--unsetenv TZ" ];
};
remotePlay.openFirewall = true;
dedicatedServer.openFirewall = true;
extraCompatPackages = with pkgs; [ proton-ge-bin ];

4
modules/games/various-games.nix
View file

@ -1,6 +1,6 @@
{
flake.modules.nixos.games =
{ pkgs, ... }:
{ inputs, pkgs, ... }:
{
environment.systemPackages = with pkgs; [
prismlauncher
@ -8,7 +8,7 @@
# gaming tools
pyfa
path-of-building
inputs.nixpkgs-master.legacyPackages.${pkgs.stdenv.hostPlatform.system}.rusty-path-of-building
];
};
}

5
modules/hosts/loptland/default.nix
View file

@ -34,10 +34,13 @@ in
base
server
hydra
factorio-server
forgejo
forgejo-runner
# game server
minecraft-server
factorio-server
# apps
# Users

7
modules/hosts/yggdrasil/default.nix
View file

@ -23,8 +23,9 @@ in
obsidian
diebahn
path-of-building
termscp
nixpkgs-review
# inputs.nix-gaming.packages.${pkgs.stdenv.hostPlatform.system}.star-citizen
];
services.teamviewer.enable = true;
@ -53,7 +54,7 @@ in
bluetooth
amdgpu
# dektops
# desktops
# hyprland
niri
@ -86,7 +87,7 @@ in
settings.builders-use-substitutes = true;
buildMachines = [
{
hostName = "nixberry";
hostName = "192.168.178.2";
sshUser = "remotebuild";
sshKey = "/root/.ssh/remotebuild";
systems = [ "aarch64-linux" ];

25
modules/server/minecraft.nix Normal file
View file

@ -0,0 +1,25 @@
{
flake.modules.nixos.minecraft-server =
{ ... }:
{
services.minecraft-server = {
enable = true;
eula = true;
openFirewall = true; # Opens the port the server is running on (by default 25565 but in this case 43000)
declarative = true;
whitelist = {
# This is a mapping from Minecraft usernames to UUIDs. You can use https://mcuuid.net/ to get a Minecraft UUID for a username
Daholli = "9e206940-3dfc-4331-b781-b43a9905087a";
};
serverProperties = {
server-port = 43000;
difficulty = 3;
gamemode = 1;
max-players = 5;
motd = "NixOS Minecraft server!";
white-list = true;
};
jvmOpts = "-Xms2048M -Xmx4096M";
};
};
}