odie
/
nixos-combined-flake
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

update minecraft

This commit is contained in:
Patrick Neff 2024-12-11 07:13:42 +01:00
parent 42a76e8b1b
commit f224468056
11 changed files with 1347 additions and 115 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

188
flake.lock
View File

@ -18,11 +18,11 @@
}, },
"catppuccin": { "catppuccin": {
"locked": { "locked": {
"lastModified": 1730458408, "lastModified": 1733001911,
"narHash": "sha256-JQ+SphQn13bdibKUrBBBznYehXX4xJrxD1ifBp6vSWw=", "narHash": "sha256-uX/9m0TbdhEzuWA0muM5mI/AaWcLiDLjCCyu5Qr9MRk=",
"owner": "catppuccin", "owner": "catppuccin",
"repo": "nix", "repo": "nix",
"rev": "191fbf2d81a63fad8f62f1233c0051f09b75d0ad", "rev": "a817009ebfd2cca7f70a77884e5098d0a8c83f8e",
"type": "github" "type": "github"
}, },
"original": { "original": {
@ -81,11 +81,11 @@
"flake-compat": { "flake-compat": {
"flake": false, "flake": false,
"locked": { "locked": {
"lastModified": 1696426674, "lastModified": 1732722421,
"narHash": "sha256-kvjfFW7WAETZlt09AgDn1MrtKzP7t90Vf7vypd3OL1U=", "narHash": "sha256-HRJ/18p+WoXpWJkcdsk9St5ZiukCqSDgbOGFa8Okehg=",
"owner": "edolstra", "owner": "edolstra",
"repo": "flake-compat", "repo": "flake-compat",
"rev": "0f9255e01c2351cc7d116c072cb317785dd33b33", "rev": "9ed2ac151eada2306ca8c418ebd97807bb08f6ac",
"type": "github" "type": "github"
}, },
"original": { "original": {
@ -193,11 +193,11 @@
"nixpkgs-lib": "nixpkgs-lib" "nixpkgs-lib": "nixpkgs-lib"
}, },
"locked": { "locked": {
"lastModified": 1730504689, "lastModified": 1733269028,
"narHash": "sha256-hgmguH29K2fvs9szpq2r3pz2/8cJd2LPS+b4tfNFCwE=", "narHash": "sha256-kVq/jAKKtbvWwbL9wf0SKDxtxsC5Gb+nlIYEFnyXhGA=",
"owner": "hercules-ci", "owner": "hercules-ci",
"repo": "flake-parts", "repo": "flake-parts",
"rev": "506278e768c2a08bec68eb62932193e341f55c90", "rev": "e37654df08605b510ad84eceaafcc7248495e843",
"type": "github" "type": "github"
}, },
"original": { "original": {
@ -214,11 +214,11 @@
] ]
}, },
"locked": { "locked": {
"lastModified": 1727826117, "lastModified": 1730504689,
"narHash": "sha256-K5ZLCyfO/Zj9mPFldf3iwS6oZStJcU4tSpiXTMYaaL0=", "narHash": "sha256-hgmguH29K2fvs9szpq2r3pz2/8cJd2LPS+b4tfNFCwE=",
"owner": "hercules-ci", "owner": "hercules-ci",
"repo": "flake-parts", "repo": "flake-parts",
"rev": "3d04084d54bedc3d6b8b736c70ef449225c361b1", "rev": "506278e768c2a08bec68eb62932193e341f55c90",
"type": "github" "type": "github"
}, },
"original": { "original": {
@ -276,11 +276,11 @@
] ]
}, },
"locked": { "locked": {
"lastModified": 1726560853, "lastModified": 1731533236,
"narHash": "sha256-X6rJYSESBVr3hBoH0WbKE5KvhPU5bloyZ2L4K60/fPQ=", "narHash": "sha256-l0KFg5HjrsfsO/JpG+r7fRrqm12kzFHyUHqHCVpMMbI=",
"owner": "numtide", "owner": "numtide",
"repo": "flake-utils", "repo": "flake-utils",
"rev": "c1dfcf08411b08f6b8615f7d8971a2bfa81d5e8a", "rev": "11707dc2f618dd54ca8739b309ec4fc024de578b",
"type": "github" "type": "github"
}, },
"original": { "original": {
@ -327,11 +327,11 @@
"systems": "systems_2" "systems": "systems_2"
}, },
"locked": { "locked": {
"lastModified": 1726560853, "lastModified": 1731533236,
"narHash": "sha256-X6rJYSESBVr3hBoH0WbKE5KvhPU5bloyZ2L4K60/fPQ=", "narHash": "sha256-l0KFg5HjrsfsO/JpG+r7fRrqm12kzFHyUHqHCVpMMbI=",
"owner": "numtide", "owner": "numtide",
"repo": "flake-utils", "repo": "flake-utils",
"rev": "c1dfcf08411b08f6b8615f7d8971a2bfa81d5e8a", "rev": "11707dc2f618dd54ca8739b309ec4fc024de578b",
"type": "github" "type": "github"
}, },
"original": { "original": {
@ -384,11 +384,11 @@
] ]
}, },
"locked": { "locked": {
"lastModified": 1729104314, "lastModified": 1732021966,
"narHash": "sha256-pZRZsq5oCdJt3upZIU4aslS9XwFJ+/nVtALHIciX/BI=", "narHash": "sha256-mnTbjpdqF0luOkou8ZFi2asa1N3AA2CchR/RqCNmsGE=",
"owner": "cachix", "owner": "cachix",
"repo": "git-hooks.nix", "repo": "git-hooks.nix",
"rev": "3c3e88f0f544d6bb54329832616af7eb971b6be6", "rev": "3308484d1a443fc5bc92012435d79e80458fe43c",
"type": "github" "type": "github"
}, },
"original": { "original": {
@ -414,11 +414,11 @@
] ]
}, },
"locked": { "locked": {
"lastModified": 1730302582, "lastModified": 1732021966,
"narHash": "sha256-W1MIJpADXQCgosJZT8qBYLRuZls2KSiKdpnTVdKBuvU=", "narHash": "sha256-mnTbjpdqF0luOkou8ZFi2asa1N3AA2CchR/RqCNmsGE=",
"owner": "cachix", "owner": "cachix",
"repo": "git-hooks.nix", "repo": "git-hooks.nix",
"rev": "af8a16fe5c264f5e9e18bcee2859b40a656876cf", "rev": "3308484d1a443fc5bc92012435d79e80458fe43c",
"type": "github" "type": "github"
}, },
"original": { "original": {
@ -496,11 +496,11 @@
] ]
}, },
"locked": { "locked": {
"lastModified": 1724947644, "lastModified": 1730903510,
"narHash": "sha256-MHHrHasTngp7EYQOObHJ1a/IsRF+wodHqOckhH6uZbk=", "narHash": "sha256-mnynlrPeiW0nUQ8KGZHb3WyxAxA3Ye/BH8gMjdoKP6E=",
"owner": "hercules-ci", "owner": "hercules-ci",
"repo": "hercules-ci-effects", "repo": "hercules-ci-effects",
"rev": "dba4367b9a9d9615456c430a6d6af716f6e84cef", "rev": "b89ac4d66d618b915b1f0a408e2775fe3821d141",
"type": "github" "type": "github"
}, },
"original": { "original": {
@ -516,11 +516,11 @@
] ]
}, },
"locked": { "locked": {
"lastModified": 1730633670, "lastModified": 1733175814,
"narHash": "sha256-ZFJqIXpvVKvzOVFKWNRDyIyAo+GYdmEPaYi1bZB6uf0=", "narHash": "sha256-zFOtOaqjzZfPMsm1mwu98syv3y+jziAq5DfWygaMtLg=",
"owner": "nix-community", "owner": "nix-community",
"repo": "home-manager", "repo": "home-manager",
"rev": "8f6ca7855d409aeebe2a582c6fd6b6a8d0bf5661", "rev": "bf23fe41082aa0289c209169302afd3397092f22",
"type": "github" "type": "github"
}, },
"original": { "original": {
@ -537,11 +537,11 @@
] ]
}, },
"locked": { "locked": {
"lastModified": 1730633670, "lastModified": 1733175814,
"narHash": "sha256-ZFJqIXpvVKvzOVFKWNRDyIyAo+GYdmEPaYi1bZB6uf0=", "narHash": "sha256-zFOtOaqjzZfPMsm1mwu98syv3y+jziAq5DfWygaMtLg=",
"owner": "nix-community", "owner": "nix-community",
"repo": "home-manager", "repo": "home-manager",
"rev": "8f6ca7855d409aeebe2a582c6fd6b6a8d0bf5661", "rev": "bf23fe41082aa0289c209169302afd3397092f22",
"type": "github" "type": "github"
}, },
"original": { "original": {
@ -564,16 +564,16 @@
] ]
}, },
"locked": { "locked": {
"lastModified": 1729544999, "lastModified": 1729958008,
"narHash": "sha256-YcyJLvTmN6uLEBGCvYoMLwsinblXMkoYkNLEO4WnKus=", "narHash": "sha256-EiOq8jF4Z/zQe0QYVc3+qSKxRK//CFHMB84aYrYGwEs=",
"owner": "NuschtOS", "owner": "NuschtOS",
"repo": "ixx", "repo": "ixx",
"rev": "65c207c92befec93e22086da9456d3906a4e999c", "rev": "9fd01aad037f345350eab2cd45e1946cc66da4eb",
"type": "github" "type": "github"
}, },
"original": { "original": {
"owner": "NuschtOS", "owner": "NuschtOS",
"ref": "v0.0.5", "ref": "v0.0.6",
"repo": "ixx", "repo": "ixx",
"type": "github" "type": "github"
} }
@ -581,11 +581,11 @@
"lazydev": { "lazydev": {
"flake": false, "flake": false,
"locked": { "locked": {
"lastModified": 1730477088, "lastModified": 1732489623,
"narHash": "sha256-Xgeb2ABoCkWIr1Pfh41vp1hmbgQJY9vCAkztamdzrTk=", "narHash": "sha256-ErX0dCyAVRn5wtlXVnbEYku2dicIkFySdlsqg5vrWoA=",
"owner": "folke", "owner": "folke",
"repo": "lazydev.nvim", "repo": "lazydev.nvim",
"rev": "d5800897d9180cea800023f2429bce0a94ed6064", "rev": "f59bd14a852ca43db38e3662395354cb2a9b13e0",
"type": "github" "type": "github"
}, },
"original": { "original": {
@ -597,11 +597,11 @@
"luavit-meta": { "luavit-meta": {
"flake": false, "flake": false,
"locked": { "locked": {
"lastModified": 1705776742, "lastModified": 1732058720,
"narHash": "sha256-zAAptV/oLuLAAsa2zSB/6fxlElk4+jNZd/cPr9oxFig=", "narHash": "sha256-c6AFyWwWzG8WyhFqo8F3+aa8mZYtRrdPizmwf9a5yQk=",
"owner": "Bilal2453", "owner": "Bilal2453",
"repo": "luvit-meta", "repo": "luvit-meta",
"rev": "ce76f6f6cdc9201523a5875a4471dcfe0186eb60", "rev": "57d464c4acb5c2e66bd4145060f5dc9e96a7bbb7",
"type": "github" "type": "github"
}, },
"original": { "original": {
@ -628,27 +628,27 @@
"vanillatweaks": "vanillatweaks" "vanillatweaks": "vanillatweaks"
}, },
"locked": { "locked": {
"lastModified": 1732313755, "lastModified": 1733897368,
"narHash": "sha256-uF3LDIKiAAmayuQkuRB/50p5ZUS1Lun9poOLuY4wCP8=", "narHash": "sha256-1F+UsOHbNTWowKUk8boFyj+iViDJBZ8I8/CvOex9Ujg=",
"ref": "refs/heads/master", "ref": "refs/heads/master",
"rev": "fccbd8aac6e9114b481e542026c60e247922f252", "rev": "44f9be4d690d5f0b4cc37e5ec695c0aaca79ad24",
"revCount": 149, "revCount": 259,
"type": "git", "type": "git",
"url": "ssh://git@git.gaja-group.com/gaja-group/minecraft-server-flake.git" "url": "file:///home/odie/Code/nix/minecraft-server-flake"
}, },
"original": { "original": {
"type": "git", "type": "git",
"url": "ssh://git@git.gaja-group.com/gaja-group/minecraft-server-flake.git" "url": "file:///home/odie/Code/nix/minecraft-server-flake"
} }
}, },
"neorg": { "neorg": {
"flake": false, "flake": false,
"locked": { "locked": {
"lastModified": 1730333767, "lastModified": 1733153752,
"narHash": "sha256-qTo8rxwvANrgP8UccFhzsNsH+Jbmqv2iOlw0ccLNYm4=", "narHash": "sha256-Aq7suvV1WnX5M1wlI2JDJ6UWzBcVO+OX4GbyiSdzXH8=",
"owner": "nvim-neorg", "owner": "nvim-neorg",
"repo": "neorg", "repo": "neorg",
"rev": "488507bb996f75ee29073f50dec32fa220867ca5", "rev": "c1bade17d313909031703c8587d6841fef457ebb",
"type": "github" "type": "github"
}, },
"original": { "original": {
@ -685,11 +685,11 @@
] ]
}, },
"locked": { "locked": {
"lastModified": 1730088025, "lastModified": 1733211153,
"narHash": "sha256-FIdIaN7f6karwtDV65VXTV8VThNrR63nwykfgXpm4p4=", "narHash": "sha256-Ml7GGmUsaDldssIVE189Sf+PMPRgkkGpj66EvZvy8MI=",
"owner": "nix-community", "owner": "nix-community",
"repo": "neovim-nightly-overlay", "repo": "neovim-nightly-overlay",
"rev": "f35afbe60a4ff71fd65fec3839fc38943f961951", "rev": "90426479f3220aadcc01832db56ee8cfa3886671",
"type": "github" "type": "github"
}, },
"original": { "original": {
@ -701,11 +701,11 @@
"neovim-src": { "neovim-src": {
"flake": false, "flake": false,
"locked": { "locked": {
"lastModified": 1729121305, "lastModified": 1733163189,
"narHash": "sha256-c94xkA/RuszC4PfmB+MWqOo2vbO66GTO6XKer0mbltA=", "narHash": "sha256-0NlEbJgUYghWNgp2Iiak8N989Cvjoq87xkeRCagfCeU=",
"owner": "neovim", "owner": "neovim",
"repo": "neovim", "repo": "neovim",
"rev": "852954ff6d96adce0158f74ca494fdcef3aa1921", "rev": "49d6cd1da86cab49c7a5a8c79e59d48d016975fa",
"type": "github" "type": "github"
}, },
"original": { "original": {
@ -741,11 +741,11 @@
] ]
}, },
"locked": { "locked": {
"lastModified": 1730600078, "lastModified": 1733105089,
"narHash": "sha256-BoyFmE59HDF3uybBySsWVoyjNuHvz3Wv8row/mSb958=", "narHash": "sha256-Qs3YmoLYUJ8g4RkFj2rMrzrP91e4ShAioC9s+vG6ENM=",
"owner": "lnl7", "owner": "lnl7",
"repo": "nix-darwin", "repo": "nix-darwin",
"rev": "4652874d014b82cb746173ffc64f6a70044daa7e", "rev": "c6b65d946097baf3915dd51373251de98199280d",
"type": "github" "type": "github"
}, },
"original": { "original": {
@ -763,11 +763,11 @@
"nixpkgs": "nixpkgs" "nixpkgs": "nixpkgs"
}, },
"locked": { "locked": {
"lastModified": 1732067443, "lastModified": 1733277378,
"narHash": "sha256-CPNSYmlv8Hp1GHLPKq4RE1ujnOpwGEZKHZDWb1b1ZNc=", "narHash": "sha256-jPhKF6d2UXBr2nkJIFuUjVXdo6kEwLuIMK3RyJeA60s=",
"owner": "Infinidoge", "owner": "Infinidoge",
"repo": "nix-minecraft", "repo": "nix-minecraft",
"rev": "ca645f4163a501a3302e4afeb25f52906493bfd3", "rev": "ea8246bb2a70d33b5d332667a57da75e95c89af9",
"type": "github" "type": "github"
}, },
"original": { "original": {
@ -799,11 +799,11 @@
}, },
"nixos-hardware": { "nixos-hardware": {
"locked": { "locked": {
"lastModified": 1730537918, "lastModified": 1733217105,
"narHash": "sha256-GJB1/aaTnAtt9sso/EQ77TAGJ/rt6uvlP0RqZFnWue8=", "narHash": "sha256-fc6jTzIwCIVWTX50FtW6AZpuukuQWSEbPiyg6ZRGWFY=",
"owner": "nixos", "owner": "nixos",
"repo": "nixos-hardware", "repo": "nixos-hardware",
"rev": "f6e0cd5c47d150c4718199084e5764f968f1b560", "rev": "cceee0a31d2f01bcc98b2fbd591327c06a4ea4f9",
"type": "github" "type": "github"
}, },
"original": { "original": {
@ -821,11 +821,11 @@
] ]
}, },
"locked": { "locked": {
"lastModified": 1730453870, "lastModified": 1731682434,
"narHash": "sha256-d+kIgz4BvTXb7emjSFV3zjNydGmLUmuluQjdBb51R9o=", "narHash": "sha256-HnZFPB7akVIy0KuPq/tEkiB+Brt1qi0DUIDzR8z25qI=",
"owner": "nix-community", "owner": "nix-community",
"repo": "NixOS-WSL", "repo": "NixOS-WSL",
"rev": "adb6bc4b661a43328752b4575be4968a4990c033", "rev": "a6b9cf0b7805e2c50829020a73e7bde683fd36dd",
"type": "github" "type": "github"
}, },
"original": { "original": {
@ -852,14 +852,14 @@
}, },
"nixpkgs-lib": { "nixpkgs-lib": {
"locked": { "locked": {
"lastModified": 1730504152, "lastModified": 1733096140,
"narHash": "sha256-lXvH/vOfb4aGYyvFmZK/HlsNsr/0CVWlwYvo2rxJk3s=", "narHash": "sha256-1qRH7uAUsyQI7R1Uwl4T+XvdNv778H0Nb5njNrqvylY=",
"type": "tarball", "type": "tarball",
"url": "https://github.com/NixOS/nixpkgs/archive/cc2f28000298e1269cea6612cd06ec9979dd5d7f.tar.gz" "url": "https://github.com/NixOS/nixpkgs/archive/5487e69da40cbd611ab2cadee0b4637225f7cfae.tar.gz"
}, },
"original": { "original": {
"type": "tarball", "type": "tarball",
"url": "https://github.com/NixOS/nixpkgs/archive/cc2f28000298e1269cea6612cd06ec9979dd5d7f.tar.gz" "url": "https://github.com/NixOS/nixpkgs/archive/5487e69da40cbd611ab2cadee0b4637225f7cfae.tar.gz"
} }
}, },
"nixpkgs-lib_2": { "nixpkgs-lib_2": {
@ -879,11 +879,11 @@
}, },
"nixpkgs_2": { "nixpkgs_2": {
"locked": { "locked": {
"lastModified": 1730785428, "lastModified": 1733294704,
"narHash": "sha256-Zwl8YgTVJTEum+L+0zVAWvXAGbWAuXHax3KzuejaDyo=", "narHash": "sha256-XasABdKSz8ZRjGpE/oYTflw1F2FmI594GxIrbznHhCs=",
"owner": "nixos", "owner": "nixos",
"repo": "nixpkgs", "repo": "nixpkgs",
"rev": "4aa36568d413aca0ea84a1684d2d46f55dbabad7", "rev": "d18ef8212246b78339007d745738aa4ce5d34230",
"type": "github" "type": "github"
}, },
"original": { "original": {
@ -939,11 +939,11 @@
"treefmt-nix": "treefmt-nix" "treefmt-nix": "treefmt-nix"
}, },
"locked": { "locked": {
"lastModified": 1730731617, "lastModified": 1733220378,
"narHash": "sha256-W7FNEe+gewzTSx0lykzZ3XUKmJ8uKk/SpIPblZIfYc0=", "narHash": "sha256-tWCskBne7LigfeXRWnUFJKKTLOYmmdqiwdqom2Sml1s=",
"owner": "nix-community", "owner": "nix-community",
"repo": "nixvim", "repo": "nixvim",
"rev": "aa06b176e78c9ae9e779e605cab61c9d8681a54e", "rev": "78bfbf7b7eb7a1b6cf42e199547de55a55ba2cea",
"type": "github" "type": "github"
}, },
"original": { "original": {
@ -995,11 +995,11 @@
}, },
"nur": { "nur": {
"locked": { "locked": {
"lastModified": 1730779796, "lastModified": 1733294525,
"narHash": "sha256-5J3jgJ923OdtEjyt3xFLyLkxGqGdn6oYUiC+dDCDL44=", "narHash": "sha256-3EUU3tm+T3vUHmZdsLWisxHjWzn6RT2U2KMOaGho9Oo=",
"owner": "nix-community", "owner": "nix-community",
"repo": "NUR", "repo": "NUR",
"rev": "d17cb4d177a40e5cedc04719af56571e7ef643a7", "rev": "dda476d2da1f38f7a5391a60b563d520eb1ea4f9",
"type": "github" "type": "github"
}, },
"original": { "original": {
@ -1018,11 +1018,11 @@
] ]
}, },
"locked": { "locked": {
"lastModified": 1730515563, "lastModified": 1733006402,
"narHash": "sha256-8lklUZRV7nwkPLF3roxzi4C2oyLydDXyAzAnDvjkOms=", "narHash": "sha256-BC1CecAQISV5Q4LZK72Gx0+faemOwaChiD9rMVfDPoA=",
"owner": "NuschtOS", "owner": "NuschtOS",
"repo": "search", "repo": "search",
"rev": "9e22bd742480916ff5d0ab20ca2522eaa3fa061e", "rev": "16307548b7a1247291c84ae6a12c0aacb07dfba2",
"type": "github" "type": "github"
}, },
"original": { "original": {
@ -1176,11 +1176,11 @@
] ]
}, },
"locked": { "locked": {
"lastModified": 1730321837, "lastModified": 1732894027,
"narHash": "sha256-vK+a09qq19QNu2MlLcvN4qcRctJbqWkX7ahgPZ/+maI=", "narHash": "sha256-2qbdorpq0TXHBWbVXaTqKoikN4bqAtAplTwGuII+oAc=",
"owner": "numtide", "owner": "numtide",
"repo": "treefmt-nix", "repo": "treefmt-nix",
"rev": "746901bb8dba96d154b66492a29f5db0693dbfcc", "rev": "6209c381904cab55796c5d7350e89681d3b2a8ef",
"type": "github" "type": "github"
}, },
"original": { "original": {
@ -1205,15 +1205,15 @@
"vim-mcfunction": { "vim-mcfunction": {
"flake": false, "flake": false,
"locked": { "locked": {
"lastModified": 1675460606, "lastModified": 1675486345,
"narHash": "sha256-R2QKpuuT7BULM3tv2lBf5GCJysU8gNtKqyrQHDoOcMo=", "narHash": "sha256-8fe1/xPcDH7NtniWXVr6UIMYu7gxfihpQ92IPesevl8=",
"owner": "RubixTheSlime", "owner": "CrystalAlpha358",
"repo": "vim-mcfunction", "repo": "vim-mcfunction",
"rev": "f8ad1bfccb97f8f8e7ee0c52024eac3a8e491a85", "rev": "074aa25dd3128bb9de174e7e7039c3c76bbe5fb4",
"type": "github" "type": "github"
}, },
"original": { "original": {
"owner": "RubixTheSlime", "owner": "CrystalAlpha358",
"repo": "vim-mcfunction", "repo": "vim-mcfunction",
"type": "github" "type": "github"
} }

11
flake.nix
View File

@ -180,10 +180,6 @@
url = "github:ray-x/guihua.lua"; url = "github:ray-x/guihua.lua";
flake = false; flake = false;
}; };
vim-mcfunction = {
url = "github:RubixTheSlime/vim-mcfunction";
flake = false;
};
/* /*
neorg-overlay = { neorg-overlay = {
@ -214,6 +210,10 @@
url = "github:nvim-neorg/neorg-telescope"; url = "github:nvim-neorg/neorg-telescope";
flake = false; flake = false;
}; };
vim-mcfunction = {
url = "github:CrystalAlpha358/vim-mcfunction";
flake = false;
};
# Games # Games
nix-minecraft = { nix-minecraft = {
@ -223,7 +223,8 @@
}; };
}; };
minecraft-server-flake = { minecraft-server-flake = {
url = "git+ssh://git@git.gaja-group.com/gaja-group/minecraft-server-flake.git"; #url = "git+ssh://git@git.gaja-group.com/gaja-group/minecraft-server-flake.git";
url = "git+file:///home/odie/Code/nix/minecraft-server-flake";
inputs = { inputs = {
nixpkgs.follows = "nixpkgs"; nixpkgs.follows = "nixpkgs";
flake-utils.follows = "flake-utils"; flake-utils.follows = "flake-utils";

3
modules/home-manager/shell/default.nix
View File

@ -24,6 +24,9 @@
gdu gdu
jq jq
python3Packages.argcomplete python3Packages.argcomplete
zip
unzip
p7zip
]; ];
programs = { programs = {

48
modules/nixos/games/minecraft/default.nix
View File

@ -1,30 +1,56 @@
{ inputs, ... }: { { inputs, lib, ... }:
with lib;
let
whitelist = {
masterodie = "c0e67091-d6d0-4cf2-89d5-d0c6f2bd4f30";
Rooomi = "5c5b4a28-e292-46fa-bf92-3b21f577c30e";
};
in
{
imports = [ imports = [
inputs.minecraft-server-flake.nixosModules.minecraft-servers inputs.minecraft-server-flake.nixosModules.minecraft-servers
]; ];
services.minecraft-servers = { services.minecraft-servers = {
velocitySecret = "01KqxtMy3kEH";
openFirewall = true;
servers = { servers = {
vanilla-plus.enable = true; vanilla-plus = {
flat.enable = true; inherit whitelist;
enable = true;
autoStart = false;
openFirewall = true;
serverProperties = {
server-ip = mkForce "0.0.0.0";
#online-mode = false;
#enforce-secure-profile = true;
};
};
flat = {
inherit whitelist;
enable = false;
serverProperties = {
online-mode = false;
enforce-secure-profile = true;
};
};
velocity.enable = true;
}; };
extraOptions = { extraOptions = {
flat = { flat = {
port = 25567; port = 25567;
mapPort = 8101; mapPort = 8101;
voicePort = 24455; voicePort = 24455;
whitelist = {
masterodie = "c0e67091-d6d0-4cf2-89d5-d0c6f2bd4f30";
Rooomi = "5c5b4a28-e292-46fa-bf92-3b21f577c30e";
};
}; };
vanilla-plus = { vanilla-plus = {
memory = "2G";
port = 25566; port = 25566;
mapPort = 8100; mapPort = 8100;
voicePort = 24454; voicePort = 24454;
whitelist = { };
masterodie = "c0e67091-d6d0-4cf2-89d5-d0c6f2bd4f30"; velocity = {
Rooomi = "5c5b4a28-e292-46fa-bf92-3b21f577c30e"; port = 25565;
}; mapPort = 8100;
voicePort = 24454;
}; };
}; };
}; };

2
modules/nixvim/plugins/avante.nix
View File

@ -9,7 +9,7 @@
model = "gemma2:2b"; model = "gemma2:2b";
temperature = 0; temperature = 0;
max_tokens = 4096; max_tokens = 4096;
local = true; api_key_name = "";
parse_curl_args = lib.nixvim.mkRaw '' parse_curl_args = lib.nixvim.mkRaw ''
function(opts, code_opts) function(opts, code_opts)
return { return {

8
modules/nixvim/plugins/lsp/languages/default.nix
View File

@ -1,4 +1,4 @@
{ { pkgs, ... }: {
imports = [ imports = [
./emmet.nix ./emmet.nix
./go.nix ./go.nix
@ -15,12 +15,16 @@
jsonls.enable = true; jsonls.enable = true;
lua_ls.enable = true; lua_ls.enable = true;
phpactor.enable = true; phpactor.enable = true;
ruff_lsp.enable = true; ruff.enable = true;
pyright.enable = true; pyright.enable = true;
sqls.enable = true; sqls.enable = true;
tailwindcss.enable = true; tailwindcss.enable = true;
templ.enable = true; templ.enable = true;
ts_ls.enable = true; ts_ls.enable = true;
yamlls.enable = true; yamlls.enable = true;
spyglassmc_language_server = {
enable = true;
package = pkgs.callPackage ../../../../../pkgs/spyglass {};
};
}; };
} }

4
modules/nixvim/plugins/treesitter.nix
View File

@ -1,4 +1,4 @@
_: { {pkgs, ...}: {
plugins = { plugins = {
treesitter = { treesitter = {
enable = true; enable = true;
@ -7,7 +7,7 @@ _: {
highlight.enable = true; highlight.enable = true;
}; };
folding = true; folding = true;
nixGrammars = true; nixGrammars = false;
}; };
treesitter-context.enable = true; treesitter-context.enable = true;
ts-autotag.enable = true; ts-autotag.enable = true;

14
pkgs/spyglass/default.nix Normal file
View File

@ -0,0 +1,14 @@
{ buildNpmPackage, importNpmLock, lib, ... }: buildNpmPackage {
name = "spyglassmc-language-server";
version = "0.4.12";
src = ./.;
dontNpmBuild = true;
dontNpmPrune = true;
npmDeps = importNpmLock { npmRoot = ./.; };
inherit (importNpmLock) npmConfigHook;
meta = with lib; {
description = "An mcfunction language server";
homepage = "https://spyglassmc.com";
license = licenses.mit;
};
}

1171
pkgs/spyglass/package-lock.json generated Normal file
View File

File diff suppressed because it is too large Load Diff

12
pkgs/spyglass/package.json Normal file
View File

@ -0,0 +1,12 @@
{
"name": "spyglassmc-language-server",
"version": "0.4.12",
"description": "An mcfunction language server",
"type": "module",
"bin": {
"spyglassmc-language-server": "./src/main.js"
},
"dependencies": {
"@spyglassmc/language-server": "0.4.12"
}
}

1
pkgs/spyglass/src/main.js Normal file
View File

@ -0,0 +1 @@
import "@spyglassmc/language-server";