Compare commits

..

No commits in common. "9afe011fc7450d3b72a2ed3669680567ae778d07" and "a213c21cba0ba51141b90076979cc3a11ee051f5" have entirely different histories.

4 changed files with 19 additions and 78 deletions

View file

@ -39,11 +39,11 @@
] ]
}, },
"locked": { "locked": {
"lastModified": 1689447223, "lastModified": 1687098182,
"narHash": "sha256-A5vQBtWYamvGf3c2IEhAmwIkXBzuzrkpnMYbLvc+lEY=", "narHash": "sha256-kBys+Cwmcxzh7UNVWTrunOgaR02zl2XN3feA8fSlqVo=",
"owner": "nix-community", "owner": "nix-community",
"repo": "home-manager", "repo": "home-manager",
"rev": "f5b03feb33629cb2b6dd513935637e8cc718a5ba", "rev": "0480dabc99e1b669ebe909949180fa2786e733cd",
"type": "github" "type": "github"
}, },
"original": { "original": {
@ -58,11 +58,11 @@
}, },
"locked": { "locked": {
"dir": "nix", "dir": "nix",
"lastModified": 1688896102, "lastModified": 1685177663,
"narHash": "sha256-o8oo0tuRR6eYhh4IYnNaeQ810RdIeF9JJQdJHuzRN3U=", "narHash": "sha256-T3WC47AyxwPxwCmukrwE/alZLU3bu7ZuBrCW5DMefI8=",
"owner": "kmonad", "owner": "kmonad",
"repo": "kmonad", "repo": "kmonad",
"rev": "19cccbf8988a67ff2e1fab14341230b220e4e5c8", "rev": "97ac050f9818e942a706194adb7374f7b10ee339",
"type": "github" "type": "github"
}, },
"original": { "original": {
@ -103,28 +103,13 @@
"type": "indirect" "type": "indirect"
} }
}, },
"nixpkgs-23_05": {
"locked": {
"lastModified": 1684782344,
"narHash": "sha256-SHN8hPYYSX0thDrMLMWPWYulK3YFgASOrCsIL3AJ78g=",
"owner": "NixOS",
"repo": "nixpkgs",
"rev": "8966c43feba2c701ed624302b6a935f97bcbdf88",
"type": "github"
},
"original": {
"id": "nixpkgs",
"ref": "nixos-23.05",
"type": "indirect"
}
},
"nixpkgs_2": { "nixpkgs_2": {
"locked": { "locked": {
"lastModified": 1689282004, "lastModified": 1686960236,
"narHash": "sha256-VNhuyb10c9SV+3hZOlxwJwzEGytZ31gN9w4nPCnNvdI=", "narHash": "sha256-AYCC9rXNLpUWzD9hm+askOfpliLEC9kwAo7ITJc4HIw=",
"owner": "nixos", "owner": "nixos",
"repo": "nixpkgs", "repo": "nixpkgs",
"rev": "e74e68449c385db82de3170288a28cd0f608544f", "rev": "04af42f3b31dba0ef742d254456dc4c14eedac86",
"type": "github" "type": "github"
}, },
"original": { "original": {
@ -163,15 +148,14 @@
"flake-compat": "flake-compat", "flake-compat": "flake-compat",
"nixpkgs": "nixpkgs_3", "nixpkgs": "nixpkgs_3",
"nixpkgs-22_11": "nixpkgs-22_11", "nixpkgs-22_11": "nixpkgs-22_11",
"nixpkgs-23_05": "nixpkgs-23_05",
"utils": "utils" "utils": "utils"
}, },
"locked": { "locked": {
"lastModified": 1689103880, "lastModified": 1686468558,
"narHash": "sha256-vHRCkcpnBbFsPqUNXliUmdPU81jqyuL9ZPzj3vJx2RE=", "narHash": "sha256-K69Ojlx3N8I6tRTZsrKFMIqK4yrnJ6/PjfKZi3wchYg=",
"owner": "simple-nixos-mailserver", "owner": "simple-nixos-mailserver",
"repo": "nixos-mailserver", "repo": "nixos-mailserver",
"rev": "69a4b7ad67d2732ba1f86666b3d4d2d83b15200e", "rev": "290d00f6db4e80467013728819ad73dd4a394d9a",
"type": "gitlab" "type": "gitlab"
}, },
"original": { "original": {

View file

@ -52,11 +52,7 @@
}; };
systemd.services.sshd.wantedBy = [ "multi-user.target" ]; systemd.services.sshd.wantedBy = [ "multi-user.target" ];
boot.swraid = { boot.initrd.services.swraid.mdadmConf = builtins.readFile ./rsrcs/mdadm.conf;
enable = true;
mdadmConf = builtins.readFile ./rsrcs/mdadm.conf;
};
boot.loader = { boot.loader = {
systemd-boot.enable = true; systemd-boot.enable = true;
efi = { efi = {

View file

@ -1,36 +0,0 @@
{ stdenv, lib, fetchurl, autoPatchelfHook, unzip, curl, gcc }:
stdenv.mkDerivation rec {
pname = "minecraft bedrock server";
version = "1.20.1";
src = fetchurl {
url = "https://minecraft.azureedge.net/bin-linux/bedrock-server-1.20.1.02.zip";
sha256 = "sha256-H7OAdB1EzcvdGHWRUD/K8/P8rqBkteuxtNdx/Fp2ZTM=";
};
nativeBuildInputs = [
autoPatchelfHook
unzip
];
buildInputs = [
curl
gcc.cc.lib
];
sourceRoot = ".";
installPhase = ''
mkdir $out
mkdir $out/bin
unzip $src -d $out
install -m755 -D $out/bedrock_server $out/bin/bedrock-server
'';
meta = with lib; {
description = "Minecraft Bedrock Server";
platforms = platforms.linux;
};
}

View file

@ -43,7 +43,6 @@ in
".config/awesome/calendar.lua".source = "${awesome-wm-widgets}/calendar-widget/batteryarc.lua"; ".config/awesome/calendar.lua".source = "${awesome-wm-widgets}/calendar-widget/batteryarc.lua";
}; };
# Let Home Manager install and manage itself. # Let Home Manager install and manage itself.
programs.home-manager.enable = true; programs.home-manager.enable = true;
@ -68,7 +67,6 @@ in
stateVersion = "22.11"; stateVersion = "22.11";
packages = with pkgs; [ packages = with pkgs; [
# (pkgs.callPackage ./../modules/minecraft-bedrock/minecraft-bedrock-server.nix {}) # the possible minecraft-bedrock-server package for testing
# utilities # utilities
bat # cat with wings (better cat) bat # cat with wings (better cat)
du-dust # directory disk-space analyzer du-dust # directory disk-space analyzer
@ -83,15 +81,14 @@ in
texlive.combined.scheme-medium texlive.combined.scheme-medium
# commandline utils # commandline utils
exa
fd
fortune
neofetch
pfetch pfetch
ranger fortune
ripgrep
rmtrash rmtrash
testdisk # file recovery https://itsfoss.com/recover-deleted-files-linux/ ripgrep
fd
neofetch
ranger
exa
xdotool xdotool
vhs vhs