Skip to content

Commit 43c8917

Browse files
committed
mistral: bmc3
1 parent d0dcc32 commit 43c8917

File tree

6 files changed

+122
-100
lines changed

6 files changed

+122
-100
lines changed

flake.lock

Lines changed: 28 additions & 28 deletions
Some generated files are not rendered by default. Learn more about customizing how changed files appear on GitHub.

hosts/mistral/minecraft.nix

Lines changed: 19 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -45,12 +45,30 @@
4545
simulation-distance = 24;
4646
spawn-protection = 5;
4747
allow-flight = true;
48+
keep-inventory = true;
4849
};
4950
in
5051
{
51-
cobble = {
52+
bettermc = let
53+
modpack = pkgs.fetchPackwizModpack {
54+
url = "https://github.com/moni-dz/bmc3-packwiz/raw/master/pack.toml";
55+
packHash = "";
56+
};
57+
in {
5258
enable = true;
5359
autoStart = true;
60+
package = pkgs.fabricServers.fabric-1_20_1;
61+
openFirewall = true;
62+
63+
inherit jvmOpts serverProperties;
64+
65+
symlinks = {
66+
"mods" = "${modpack}/mods";
67+
};
68+
};
69+
cobble = {
70+
enable = true;
71+
autoStart = false;
5472
package = pkgs.fabricServers.fabric-1_21_1;
5573
openFirewall = true;
5674

modules/shared/home-manager/vcs.nix

Lines changed: 8 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -7,10 +7,14 @@
77
}:
88

99
{
10-
home.packages = __attrValues {
11-
inherit (pkgs.gitAndTools) gh;
12-
inherit (pkgs) gnupg;
13-
};
10+
home.packages = lib.mkMerge [
11+
(__attrValues {
12+
inherit (pkgs.gitAndTools) gh;
13+
inherit (pkgs) gnupg;
14+
})
15+
16+
(lib.mkIf config.programs.jujutsu.enable [ pkgs.watchman ])
17+
];
1418

1519
programs = {
1620
git = {

nvim/lazy-lock.json

Lines changed: 12 additions & 12 deletions
Original file line numberDiff line numberDiff line change
@@ -4,53 +4,53 @@
44
"blink.compat": { "branch": "main", "commit": "2ed6d9a28b07fa6f3bface818470605f8896408c" },
55
"cmp-conjure": { "branch": "master", "commit": "8c9a88efedc0e5bf3165baa6af8a407afe29daf6" },
66
"cmp-digraphs": { "branch": "master", "commit": "5efc1f0078d7c5f3ea1c8e3aad04da3fd6e081a9" },
7-
"colorful-menu.nvim": { "branch": "master", "commit": "271e3a4b564664421e991053aab9d047a1725738" },
8-
"conform.nvim": { "branch": "master", "commit": "f9ef25a7ef00267b7d13bfc00b0dea22d78702d5" },
7+
"colorful-menu.nvim": { "branch": "master", "commit": "f80feb8a6706f965321aff24d0ed3849f02a7f77" },
8+
"conform.nvim": { "branch": "master", "commit": "b1a75324ddf96b7bb84963a297b1ed334db087c0" },
99
"conjure": { "branch": "main", "commit": "980452d93fd6165d3f268f50a181ad7ca4c7b990" },
1010
"fidget.nvim": { "branch": "main", "commit": "d9ba6b7bfe29b3119a610892af67602641da778e" },
1111
"flash.nvim": { "branch": "main", "commit": "3c942666f115e2811e959eabbdd361a025db8b63" },
1212
"friendly-snippets": { "branch": "main", "commit": "efff286dd74c22f731cdec26a70b46e5b203c619" },
13-
"gitsigns.nvim": { "branch": "main", "commit": "7010000889bfb6c26065e0b0f7f1e6aa9163edd9" },
13+
"gitsigns.nvim": { "branch": "main", "commit": "3c76f7fabac723aa682365ef782f88a83ccdb4ac" },
1414
"heirline.nvim": { "branch": "master", "commit": "af3f441ea10f96105e1af14cd37bf213533812d2" },
15-
"hover.nvim": { "branch": "main", "commit": "140c4d0ae9397b76baa46b87c574f5377de09309" },
15+
"hover.nvim": { "branch": "main", "commit": "cf1a44ded44a3b1842174ba2fdf2d4e4aedef9a3" },
1616
"hunk.nvim": { "branch": "master", "commit": "b475ba0011e4b8ef7d7ddecd9764ee1a5f41366d" },
1717
"indent-blankline.nvim": { "branch": "master", "commit": "005b56001b2cb30bfa61b7986bc50657816ba4ba" },
1818
"jj-diffconflicts": { "branch": "main", "commit": "20acec2eba0f1af6621880e59ae692ab34210416" },
1919
"lazy-local-patcher.nvim": { "branch": "main", "commit": "e058b286c44bb76e9a0d1f0b78b300a9845ccd17" },
2020
"lazy.nvim": { "branch": "main", "commit": "6c3bda4aca61a13a9c63f1c1d1b16b9d3be90d7a" },
2121
"lazydev.nvim": { "branch": "main", "commit": "2367a6c0a01eb9edb0464731cc0fb61ed9ab9d2c" },
22-
"lean.nvim": { "branch": "main", "commit": "26500f6d77f4591dd04eae12a025dd26f35041ac" },
22+
"lean.nvim": { "branch": "main", "commit": "a809b9358fae8d3560e8e46a341715db5ce17d67" },
2323
"luvit-meta": { "branch": "main", "commit": "1df30b60b1b4aecfebc785aa98943db6c6989716" },
2424
"mason-lspconfig.nvim": { "branch": "main", "commit": "1a31f824b9cd5bc6f342fc29e9a53b60d74af245" },
2525
"mason-nvim-dap.nvim": { "branch": "main", "commit": "ea387e0819ab189d536bb4067e4d8ece3801a292" },
2626
"mason-tool-installer.nvim": { "branch": "main", "commit": "98767d37f8e5255a5111fc1e3163232d4dc07bda" },
2727
"mason.nvim": { "branch": "main", "commit": "fc98833b6da5de5a9c5b1446ac541577059555be" },
2828
"mdx.nvim": { "branch": "main", "commit": "464a74be368dce212cff02f6305845dc7f209ab3" },
2929
"mellifluous.nvim": { "branch": "main", "commit": "1b7e15f1439065522ff863e25eed4d9de27384b1" },
30-
"mini.nvim": { "branch": "main", "commit": "939da402095a6ec4229e4de644451cda5bbc3fce" },
30+
"mini.nvim": { "branch": "main", "commit": "687fa868d869078194c02065628712982d971fd6" },
3131
"neo-tree.nvim": { "branch": "main", "commit": "9b5d67119c46e3262ffe1508fe6d8540b79ad75d" },
3232
"noice.nvim": { "branch": "main", "commit": "0427460c2d7f673ad60eb02b35f5e9926cf67c59" },
3333
"nui.nvim": { "branch": "main", "commit": "8d3bce9764e627b62b07424e0df77f680d47ffdb" },
3434
"nvim-dap": { "branch": "master", "commit": "7aade9e99bef5f0735cf966e715b3ce45515d786" },
3535
"nvim-dap-go": { "branch": "main", "commit": "8763ced35b19c8dc526e04a70ab07c34e11ad064" },
3636
"nvim-dap-ui": { "branch": "master", "commit": "bc81f8d3440aede116f821114547a476b082b319" },
37-
"nvim-highlight-colors": { "branch": "main", "commit": "9f934dd116cdfad896afa65e813ec1d974b95480" },
38-
"nvim-lint": { "branch": "master", "commit": "93b8040115c9114dac1047311763bef275e752dc" },
39-
"nvim-lspconfig": { "branch": "master", "commit": "0a1ac55d7d4ec2b2ed9616dfc5406791234d1d2b" },
37+
"nvim-highlight-colors": { "branch": "main", "commit": "63a0319d0933157e4fac72c992678785f7e7fa0c" },
38+
"nvim-lint": { "branch": "master", "commit": "81e8ba7655cc4395b1092ef4e1b6e83f54cd54ad" },
39+
"nvim-lspconfig": { "branch": "master", "commit": "40f120c10ea4b87311175539a183c3b75eab95a3" },
4040
"nvim-nio": { "branch": "master", "commit": "21f5324bfac14e22ba26553caf69ec76ae8a7662" },
4141
"nvim-parinfer": { "branch": "master", "commit": "5ca09287ab3f4144f78ff7977fabc27466f71044" },
42-
"nvim-treesitter": { "branch": "master", "commit": "aece1062335a9e856636f5da12d8a06c7615ce8a" },
42+
"nvim-treesitter": { "branch": "master", "commit": "997288c55253e27f782d991099490f80205d65bf" },
4343
"nvim-ts-autotag": { "branch": "main", "commit": "a1d526af391f6aebb25a8795cbc05351ed3620b5" },
4444
"nvim-web-devicons": { "branch": "master", "commit": "1736cb81bdc42e1ee206081a161bdb2af68fb7a1" },
4545
"plenary.nvim": { "branch": "master", "commit": "857c5ac632080dba10aae49dba902ce3abf91b35" },
46-
"rustaceanvim": { "branch": "master", "commit": "1486b5a2cc0de646d6d0837ec77127c9d6e2c50f" },
46+
"rustaceanvim": { "branch": "master", "commit": "e9c5aaba16fead831379d5f44617547a90b913c7" },
4747
"snacks.nvim": { "branch": "main", "commit": "bc0630e43be5699bb94dadc302c0d21615421d93" },
4848
"telescope-fzf-native.nvim": { "branch": "main", "commit": "1f08ed60cafc8f6168b72b80be2b2ea149813e55" },
4949
"telescope-ui-select.nvim": { "branch": "master", "commit": "6e51d7da30bd139a6950adf2a47fda6df9fa06d2" },
5050
"telescope.nvim": { "branch": "0.1.x", "commit": "a0bbec21143c7bc5f8bb02e0005fa0b982edc026" },
5151
"todo-comments.nvim": { "branch": "main", "commit": "304a8d204ee787d2544d8bc23cd38d2f929e7cc5" },
5252
"ts-comments.nvim": { "branch": "main", "commit": "1bd9d0ba1d8b336c3db50692ffd0955fe1bb9f0c" },
53-
"typescript-tools.nvim": { "branch": "master", "commit": "255782c1840b3356f921ce949ace8efd633ba6ac" },
53+
"typescript-tools.nvim": { "branch": "master", "commit": "e0887c1e336edbb01243e9f1e60d74b0bc0a2bed" },
5454
"typst-preview.nvim": { "branch": "master", "commit": "ddcc71126f910ec83037622bc8d506f91a290ade" },
5555
"vim-dispatch": { "branch": "master", "commit": "a2ff28abdb2d89725192db5b8562977d392a4d3f" },
5656
"vim-dispatch-neovim": { "branch": "master", "commit": "c8c4e21a95c25032a041002f9bf6e45a75a73021" },

0 commit comments

Comments
 (0)