dusk/ark
1
0
Fork 0
Code Issues Pull Requests Projects Releases Wiki Activity

guh

Browse Source
This commit is contained in:
dusk 2022-06-21 23:31:28 +03:00
parent 8c1f1c560b
commit 9cfa60eb75
Signed by: dusk
GPG Key ID: 1D8F8FAF2294D6EA
6 changed files with 226 additions and 7 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

182
flake.lock
View File

@ -1,5 +1,100 @@
{
"nodes": {
"crane": {
"flake": false,
"locked": {
"lastModified": 1654444508,
"narHash": "sha256-4OBvQ4V7jyt7afs6iKUvRzJ1u/9eYnKzVQbeQdiamuY=",
"owner": "ipetkov",
"repo": "crane",
"rev": "db5482bf225acc3160899124a1df5a617cfa27b5",
"type": "github"
},
"original": {
"owner": "ipetkov",
"repo": "crane",
"type": "github"
}
},
"devshell": {
"flake": false,
"locked": {
"lastModified": 1653917170,
"narHash": "sha256-FyxOnEE/V4PNEcMU62ikY4FfYPo349MOhMM97HS0XEo=",
"owner": "numtide",
"repo": "devshell",
"rev": "fc7a3e3adde9bbcab68af6d1e3c6eb738e296a92",
"type": "github"
},
"original": {
"owner": "numtide",
"repo": "devshell",
"type": "github"
}
},
"dream2nix": {
"inputs": {
"alejandra": [
"helix",
"nixCargoIntegration",
"nixpkgs"
],
"crane": "crane",
"devshell": [
"helix",
"nixCargoIntegration",
"devshell"
],
"flake-utils-pre-commit": [
"helix",
"nixCargoIntegration",
"nixpkgs"
],
"gomod2nix": [
"helix",
"nixCargoIntegration",
"nixpkgs"
],
"mach-nix": [
"helix",
"nixCargoIntegration",
"nixpkgs"
],
"nixpkgs": [
"helix",
"nixCargoIntegration",
"nixpkgs"
],
"node2nix": [
"helix",
"nixCargoIntegration",
"nixpkgs"
],
"poetry2nix": [
"helix",
"nixCargoIntegration",
"nixpkgs"
],
"pre-commit-hooks": [
"helix",
"nixCargoIntegration",
"nixpkgs"
]
},
"locked": {
"lastModified": 1654451959,
"narHash": "sha256-yWztC96o8Dw65jDbmNUxV1i61T3uLqvqhC3ziwnB/Fk=",
"owner": "nix-community",
"repo": "dream2nix",
"rev": "90b353682ef927bd39b59085e0dc6b7454888de7",
"type": "github"
},
"original": {
"owner": "nix-community",
"repo": "dream2nix",
"type": "github"
}
},
"flake-compat": {
"flake": false,
"locked": {
@ -16,6 +111,43 @@
"type": "github"
}
},
"flake-utils": {
"locked": {
"lastModified": 1637014545,
"narHash": "sha256-26IZAc5yzlD9FlDT54io1oqG/bBoyka+FJk5guaX4x4=",
"owner": "numtide",
"repo": "flake-utils",
"rev": "bba5dcc8e0b20ab664967ad83d24d64cb64ec4f4",
"type": "github"
},
"original": {
"owner": "numtide",
"repo": "flake-utils",
"type": "github"
}
},
"helix": {
"inputs": {
"nixCargoIntegration": "nixCargoIntegration",
"nixpkgs": [
"nixpkgs"
],
"rust-overlay": "rust-overlay"
},
"locked": {
"lastModified": 1655836942,
"narHash": "sha256-yYfjjeUt9Mkh2BCGLlGvNY2ulUSnoJ6DfQXni9bopcc=",
"owner": "helix-editor",
"repo": "helix",
"rev": "5b3b6ffc9e9b34fbbb39ad33cd29c8dec78ac231",
"type": "github"
},
"original": {
"owner": "helix-editor",
"repo": "helix",
"type": "github"
}
},
"home": {
"inputs": {
"flake-compat": "flake-compat",
@ -41,6 +173,33 @@
"type": "github"
}
},
"nixCargoIntegration": {
"inputs": {
"devshell": "devshell",
"dream2nix": "dream2nix",
"nixpkgs": [
"helix",
"nixpkgs"
],
"rustOverlay": [
"helix",
"rust-overlay"
]
},
"locked": {
"lastModified": 1654531591,
"narHash": "sha256-DtDAwkl2Pn8w1BW1z2OssT/bWjVhMZQBBpr2uDY7tHY=",
"owner": "yusdacra",
"repo": "nix-cargo-integration",
"rev": "c935099d6851d0ff94098e9a12f42147524f0c5b",
"type": "github"
},
"original": {
"owner": "yusdacra",
"repo": "nix-cargo-integration",
"type": "github"
}
},
"nixos-hardware": {
"locked": {
"lastModified": 1654057797,
@ -121,6 +280,7 @@
},
"root": {
"inputs": {
"helix": "helix",
"home": "home",
"nixos-hardware": "nixos-hardware",
"nixos-persistence": "nixos-persistence",
@ -128,6 +288,28 @@
"smos": "smos"
}
},
"rust-overlay": {
"inputs": {
"flake-utils": "flake-utils",
"nixpkgs": [
"helix",
"nixpkgs"
]
},
"locked": {
"lastModified": 1654483484,
"narHash": "sha256-Ki/sMgrUEj+31P3YMzZZp5Nea7+MQVVTdaRWQVS1PL4=",
"owner": "oxalica",
"repo": "rust-overlay",
"rev": "6bc59b9c4ad1cc1089219e935aa727a96d948c5d",
"type": "github"
},
"original": {
"owner": "oxalica",
"repo": "rust-overlay",
"type": "github"
}
},
"smos": {
"flake": false,
"locked": {

3
flake.nix
View File

@ -12,6 +12,9 @@
smos.url = "github:yusdacra/smos/chore/fix-nix-flakes";
smos.flake = false;
helix.url = "github:helix-editor/helix";
helix.inputs.nixpkgs.follows = "nixpkgs";
};
outputs = inputs: let

6
modules/cachix/helix.nix Normal file
View File

@ -0,0 +1,6 @@
{
nix = {
binaryCaches = ["https://helix.cachix.org"];
binaryCachePublicKeys = ["helix.cachix.org-1:ejp9KQpR1FBI2onstMQ34yogDm4OgU2ru6lIwPvuCVs="];
};
}

5
pkgs-set/overlays/polymc.nix Normal file
View File

@ -0,0 +1,5 @@
{inputs}: final: prev: {
polymc = prev.polymc.overrideAttrs (old: {
patches = [((toString inputs.self) + "/pkgs-set/patches/polymc-offline.patch")];
});
}

24
pkgs-set/patches/polymc-offline.patch Normal file
View File

@ -0,0 +1,24 @@
diff --git a/launcher/ui/pages/global/AccountListPage.cpp b/launcher/ui/pages/global/AccountListPage.cpp
index 6e1e2183..6821f192 100644
--- a/launcher/ui/pages/global/AccountListPage.cpp
+++ b/launcher/ui/pages/global/AccountListPage.cpp
@@ -186,19 +186,6 @@ void AccountListPage::on_actionAddMicrosoft_triggered()
void AccountListPage::on_actionAddOffline_triggered()
{
- if (!m_accounts->anyAccountIsValid()) {
- QMessageBox::warning(
- this,
- tr("Error"),
- tr(
- "You must add a Microsoft or Mojang account that owns Minecraft before you can add an offline account."
- "<br><br>"
- "If you have lost your account you can contact Microsoft for support."
- )
- );
- return;
- }
-
MinecraftAccountPtr account = OfflineLoginDialog::newAccount(
this,
tr("Please enter your desired username to add your offline account.")

13
users/patriot/default.nix
View File

@ -136,6 +136,7 @@ in {
"proj"
# "smos"
".steam"
".wine"
# ssh / gpg / keys
".ssh"
".gnupg"
@ -151,13 +152,14 @@ in {
"zsh"
"Steam"
"backgrounds"
"seahorse"
"keyrings"
"lutris"
]
++ mkPaths ".config" [
"dconf"
"chromium"
"gsconnect"
"seahorse"
"lutris"
];
files = [
".config/gnome-initial-setup-done"
@ -192,12 +194,9 @@ in {
xdg_utils
wl-clipboard
rust-analyzer
/*
(multimc.overrideAttrs (old: {
src = builtins.fetchGit { url = "https://github.com/AfoninZ/MultiMC5-Cracked.git"; ref = "develop"; rev = "9069e9c9d0b7951c310fdcc8bdc70ebc422a7634"; submodules = true; };
}))
*/
# polymc
cloudflared
lutris
];
shellAliases =
nixosConfig.environment.shellAliases