chore: switch back to nixos-unstable
This commit is contained in:
parent
26480457ff
commit
8172ba6e27
5 changed files with 56 additions and 64 deletions
|
@ -1,9 +1,4 @@
|
|||
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 {
|
||||
inherit (prev.pkgsCross.mingw32) stdenv;
|
||||
};
|
||||
|
|
22
flake.lock
22
flake.lock
|
@ -187,16 +187,15 @@
|
|||
]
|
||||
},
|
||||
"locked": {
|
||||
"lastModified": 1710888565,
|
||||
"narHash": "sha256-s9Hi4RHhc6yut4EcYD50sZWRDKsugBJHSbON8KFwoTw=",
|
||||
"lastModified": 1712212014,
|
||||
"narHash": "sha256-s+lbaf3nLRn1++/X2eXwY9mYCA/m9l8AvyG8beeOaXE=",
|
||||
"owner": "nix-community",
|
||||
"repo": "home-manager",
|
||||
"rev": "f33900124c23c4eca5831b9b5eb32ea5894375ce",
|
||||
"rev": "7e91f2a0ba4b62b88591279d54f741a13e36245b",
|
||||
"type": "github"
|
||||
},
|
||||
"original": {
|
||||
"owner": "nix-community",
|
||||
"ref": "release-23.11",
|
||||
"repo": "home-manager",
|
||||
"type": "github"
|
||||
}
|
||||
|
@ -259,16 +258,16 @@
|
|||
},
|
||||
"nixpkgs": {
|
||||
"locked": {
|
||||
"lastModified": 1711668574,
|
||||
"narHash": "sha256-u1dfs0ASQIEr1icTVrsKwg2xToIpn7ZXxW3RHfHxshg=",
|
||||
"lastModified": 1712163089,
|
||||
"narHash": "sha256-Um+8kTIrC19vD4/lUCN9/cU9kcOsD1O1m+axJqQPyMM=",
|
||||
"owner": "NixOS",
|
||||
"repo": "nixpkgs",
|
||||
"rev": "219951b495fc2eac67b1456824cc1ec1fd2ee659",
|
||||
"rev": "fd281bd6b7d3e32ddfa399853946f782553163b5",
|
||||
"type": "github"
|
||||
},
|
||||
"original": {
|
||||
"id": "nixpkgs",
|
||||
"ref": "nixos-23.11",
|
||||
"ref": "nixos-unstable",
|
||||
"type": "indirect"
|
||||
}
|
||||
},
|
||||
|
@ -343,17 +342,16 @@
|
|||
"rust-overlay": []
|
||||
},
|
||||
"locked": {
|
||||
"lastModified": 1704711240,
|
||||
"narHash": "sha256-nqRUBFpY9y3OPZme+YGt2i+A4hWeiKOEG0NcKVuW56c=",
|
||||
"lastModified": 1711955820,
|
||||
"narHash": "sha256-mRw9W25Jq3lNxN3qndMY9ofzGYR5XJAWxWY5iK2Fn5E=",
|
||||
"owner": "uku3lig",
|
||||
"repo": "ukubot-rs",
|
||||
"rev": "76df1dd3caaa64a2b74b03250448f4b4a554899a",
|
||||
"rev": "9ee3e457278028df0d346eac801a37c08373949c",
|
||||
"type": "github"
|
||||
},
|
||||
"original": {
|
||||
"owner": "uku3lig",
|
||||
"repo": "ukubot-rs",
|
||||
"rev": "76df1dd3caaa64a2b74b03250448f4b4a554899a",
|
||||
"type": "github"
|
||||
}
|
||||
},
|
||||
|
|
|
@ -18,7 +18,7 @@
|
|||
};
|
||||
|
||||
inputs = {
|
||||
nixpkgs.url = "nixpkgs/nixos-23.11";
|
||||
nixpkgs.url = "nixpkgs/nixos-unstable";
|
||||
|
||||
# nix's most elaborate, overcomplicated joke
|
||||
systems.url = "github:nix-systems/default";
|
||||
|
@ -34,7 +34,7 @@
|
|||
};
|
||||
|
||||
home-manager = {
|
||||
url = "github:nix-community/home-manager/release-23.11";
|
||||
url = "github:nix-community/home-manager";
|
||||
inputs.nixpkgs.follows = "nixpkgs";
|
||||
};
|
||||
|
||||
|
@ -108,7 +108,7 @@
|
|||
};
|
||||
|
||||
ukubot-rs = {
|
||||
url = "github:uku3lig/ukubot-rs/76df1dd3caaa64a2b74b03250448f4b4a554899a";
|
||||
url = "github:uku3lig/ukubot-rs";
|
||||
inputs.nixpkgs.follows = "nixpkgs";
|
||||
inputs.flake-parts.follows = "flake-parts";
|
||||
inputs.rust-overlay.follows = "";
|
||||
|
|
|
@ -2,31 +2,31 @@
|
|||
cfTunnels."attic.uku3lig.net" = "http://localhost:6000";
|
||||
|
||||
services.atticd = {
|
||||
enable = true;
|
||||
credentialsFile = config.age.secrets.atticEnv.path;
|
||||
enable = true;
|
||||
credentialsFile = config.age.secrets.atticEnv.path;
|
||||
|
||||
settings = {
|
||||
listen = "[::]:6000";
|
||||
api-endpoint = "https://attic.uku3lig.net/";
|
||||
settings = {
|
||||
listen = "[::]:6000";
|
||||
api-endpoint = "https://attic.uku3lig.net/";
|
||||
|
||||
storage = {
|
||||
type = "local";
|
||||
path = "/data/attic";
|
||||
};
|
||||
storage = {
|
||||
type = "local";
|
||||
path = "/data/attic";
|
||||
};
|
||||
|
||||
chunking = {
|
||||
nar-size-threshold = 65536; # 64 KiB
|
||||
min-size = 16384; # 16 KiB
|
||||
avg-size = 65536; # 64 KiB
|
||||
max-size = 262144; # 256 KiB
|
||||
};
|
||||
chunking = {
|
||||
nar-size-threshold = 65536; # 64 KiB
|
||||
min-size = 16384; # 16 KiB
|
||||
avg-size = 65536; # 64 KiB
|
||||
max-size = 262144; # 256 KiB
|
||||
};
|
||||
|
||||
compression.type = "zstd";
|
||||
compression.type = "zstd";
|
||||
|
||||
garbage-collection = {
|
||||
interval = "1 day";
|
||||
default-retention-period = "6 weeks";
|
||||
};
|
||||
garbage-collection = {
|
||||
interval = "1 day";
|
||||
default-retention-period = "6 weeks";
|
||||
};
|
||||
};
|
||||
}
|
||||
};
|
||||
}
|
||||
|
|
|
@ -1,28 +1,27 @@
|
|||
{config, ...}: {
|
||||
services = {
|
||||
frp = {
|
||||
enable = true;
|
||||
role = "client";
|
||||
settings = {
|
||||
common = {
|
||||
server_addr = "49.13.148.129";
|
||||
server_port = 7000;
|
||||
};
|
||||
services.frp = {
|
||||
enable = true;
|
||||
role = "client";
|
||||
settings = {
|
||||
serverAddr = "49.13.148.129";
|
||||
serverPort = 7000;
|
||||
|
||||
minecraft = {
|
||||
proxies = [
|
||||
{
|
||||
name = "minecraft";
|
||||
type = "tcp";
|
||||
local_ip = "127.0.0.1";
|
||||
local_port = 25565;
|
||||
remote_port = 6000;
|
||||
};
|
||||
|
||||
ragnamod7 = {
|
||||
localIp = "127.0.0.1";
|
||||
localPort = 25565;
|
||||
remotePort = 6000;
|
||||
}
|
||||
{
|
||||
name = "ragnamod7";
|
||||
type = "tcp";
|
||||
local_ip = "127.0.0.1";
|
||||
local_port = 25566;
|
||||
remote_port = 6001;
|
||||
};
|
||||
};
|
||||
localIp = "127.0.0.1";
|
||||
localPort = 25566;
|
||||
remotePort = 6001;
|
||||
}
|
||||
];
|
||||
};
|
||||
};
|
||||
|
||||
|
@ -39,7 +38,7 @@
|
|||
];
|
||||
environment = {
|
||||
EULA = "true";
|
||||
MEMORY = "12G";
|
||||
MEMORY = "10G";
|
||||
USE_AIKAR_FLAGS = "true";
|
||||
TYPE = "AUTO_CURSEFORGE";
|
||||
CF_SLUG = "all-the-mods-8";
|
||||
|
@ -59,7 +58,7 @@
|
|||
];
|
||||
environment = {
|
||||
EULA = "true";
|
||||
MEMORY = "12G";
|
||||
MEMORY = "10G";
|
||||
USE_AIKAR_FLAGS = "true";
|
||||
TYPE = "AUTO_CURSEFORGE";
|
||||
CF_SLUG = "ragnamod-vii";
|
||||
|
|
Loading…
Reference in a new issue