uku/flake
1
0
Fork 0
Code Issues Pull requests Projects Releases Packages Wiki Activity Actions

chore: switch back to nixos-unstable

Browse source
This commit is contained in:
uku 2024-04-04 21:59:47 +02:00
parent 26480457ff
commit 8172ba6e27
Signed by: uku
SSH key fingerprint: SHA256:4P0aN6M8ajKukNi6aPOaX0LacanGYtlfjmN+m/sHY/o
5 changed files with 56 additions and 64 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

5
exprs/overlay.nix
View file

@ -1,9 +1,4 @@
final: prev: { final: prev: {
electron_25 = prev.electron_25.overrideAttrs (_: {
preFixup = "patchelf --add-needed ${prev.libglvnd}/lib/libEGL.so.1 $out/bin/electron"; # NixOS/nixpkgs#272912
meta.knownVulnerabilities = []; # NixOS/nixpkgs#273611
});
wine-discord-ipc-bridge = prev.callPackage ./wine-discord-ipc-bridge.nix { wine-discord-ipc-bridge = prev.callPackage ./wine-discord-ipc-bridge.nix {
inherit (prev.pkgsCross.mingw32) stdenv; inherit (prev.pkgsCross.mingw32) stdenv;
}; };

22
flake.lock
View file

@ -187,16 +187,15 @@
] ]
}, },
"locked": { "locked": {
"lastModified": 1710888565, "lastModified": 1712212014,
"narHash": "sha256-s9Hi4RHhc6yut4EcYD50sZWRDKsugBJHSbON8KFwoTw=", "narHash": "sha256-s+lbaf3nLRn1++/X2eXwY9mYCA/m9l8AvyG8beeOaXE=",
"owner": "nix-community", "owner": "nix-community",
"repo": "home-manager", "repo": "home-manager",
"rev": "f33900124c23c4eca5831b9b5eb32ea5894375ce", "rev": "7e91f2a0ba4b62b88591279d54f741a13e36245b",
"type": "github" "type": "github"
}, },
"original": { "original": {
"owner": "nix-community", "owner": "nix-community",
"ref": "release-23.11",
"repo": "home-manager", "repo": "home-manager",
"type": "github" "type": "github"
} }
@ -259,16 +258,16 @@
}, },
"nixpkgs": { "nixpkgs": {
"locked": { "locked": {
"lastModified": 1711668574, "lastModified": 1712163089,
"narHash": "sha256-u1dfs0ASQIEr1icTVrsKwg2xToIpn7ZXxW3RHfHxshg=", "narHash": "sha256-Um+8kTIrC19vD4/lUCN9/cU9kcOsD1O1m+axJqQPyMM=",
"owner": "NixOS", "owner": "NixOS",
"repo": "nixpkgs", "repo": "nixpkgs",
"rev": "219951b495fc2eac67b1456824cc1ec1fd2ee659", "rev": "fd281bd6b7d3e32ddfa399853946f782553163b5",
"type": "github" "type": "github"
}, },
"original": { "original": {
"id": "nixpkgs", "id": "nixpkgs",
"ref": "nixos-23.11", "ref": "nixos-unstable",
"type": "indirect" "type": "indirect"
} }
}, },
@ -343,17 +342,16 @@
"rust-overlay": [] "rust-overlay": []
}, },
"locked": { "locked": {
"lastModified": 1704711240, "lastModified": 1711955820,
"narHash": "sha256-nqRUBFpY9y3OPZme+YGt2i+A4hWeiKOEG0NcKVuW56c=", "narHash": "sha256-mRw9W25Jq3lNxN3qndMY9ofzGYR5XJAWxWY5iK2Fn5E=",
"owner": "uku3lig", "owner": "uku3lig",
"repo": "ukubot-rs", "repo": "ukubot-rs",
"rev": "76df1dd3caaa64a2b74b03250448f4b4a554899a", "rev": "9ee3e457278028df0d346eac801a37c08373949c",
"type": "github" "type": "github"
}, },
"original": { "original": {
"owner": "uku3lig", "owner": "uku3lig",
"repo": "ukubot-rs", "repo": "ukubot-rs",
"rev": "76df1dd3caaa64a2b74b03250448f4b4a554899a",
"type": "github" "type": "github"
} }
}, },

6
flake.nix
View file

@ -18,7 +18,7 @@
}; };
inputs = { inputs = {
nixpkgs.url = "nixpkgs/nixos-23.11"; nixpkgs.url = "nixpkgs/nixos-unstable";
# nix's most elaborate, overcomplicated joke # nix's most elaborate, overcomplicated joke
systems.url = "github:nix-systems/default"; systems.url = "github:nix-systems/default";
@ -34,7 +34,7 @@
}; };
home-manager = { home-manager = {
url = "github:nix-community/home-manager/release-23.11"; url = "github:nix-community/home-manager";
inputs.nixpkgs.follows = "nixpkgs"; inputs.nixpkgs.follows = "nixpkgs";
}; };
@ -108,7 +108,7 @@
}; };
ukubot-rs = { ukubot-rs = {
url = "github:uku3lig/ukubot-rs/76df1dd3caaa64a2b74b03250448f4b4a554899a"; url = "github:uku3lig/ukubot-rs";
inputs.nixpkgs.follows = "nixpkgs"; inputs.nixpkgs.follows = "nixpkgs";
inputs.flake-parts.follows = "flake-parts"; inputs.flake-parts.follows = "flake-parts";
inputs.rust-overlay.follows = ""; inputs.rust-overlay.follows = "";

39
systems/etna/minecraft.nix
View file

@ -1,28 +1,27 @@
{config, ...}: { {config, ...}: {
services = { services.frp = {
frp = {
enable = true; enable = true;
role = "client"; role = "client";
settings = { settings = {
common = { serverAddr = "49.13.148.129";
server_addr = "49.13.148.129"; serverPort = 7000;
server_port = 7000;
};
minecraft = { proxies = [
{
name = "minecraft";
type = "tcp"; type = "tcp";
local_ip = "127.0.0.1"; localIp = "127.0.0.1";
local_port = 25565; localPort = 25565;
remote_port = 6000; remotePort = 6000;
}; }
{
ragnamod7 = { name = "ragnamod7";
type = "tcp"; type = "tcp";
local_ip = "127.0.0.1"; localIp = "127.0.0.1";
local_port = 25566; localPort = 25566;
remote_port = 6001; remotePort = 6001;
}; }
}; ];
}; };
}; };
@ -39,7 +38,7 @@
]; ];
environment = { environment = {
EULA = "true"; EULA = "true";
MEMORY = "12G"; MEMORY = "10G";
USE_AIKAR_FLAGS = "true"; USE_AIKAR_FLAGS = "true";
TYPE = "AUTO_CURSEFORGE"; TYPE = "AUTO_CURSEFORGE";
CF_SLUG = "all-the-mods-8"; CF_SLUG = "all-the-mods-8";
@ -59,7 +58,7 @@
]; ];
environment = { environment = {
EULA = "true"; EULA = "true";
MEMORY = "12G"; MEMORY = "10G";
USE_AIKAR_FLAGS = "true"; USE_AIKAR_FLAGS = "true";
TYPE = "AUTO_CURSEFORGE"; TYPE = "AUTO_CURSEFORGE";
CF_SLUG = "ragnamod-vii"; CF_SLUG = "ragnamod-vii";