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 09:00:56 +01:00
parent f224468056
commit b7eb003adc
13 changed files with 438 additions and 1445 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

557
flake.lock
View File

@ -18,11 +18,11 @@
}, },
"catppuccin": { "catppuccin": {
"locked": { "locked": {
"lastModified": 1733001911, "lastModified": 1733900652,
"narHash": "sha256-uX/9m0TbdhEzuWA0muM5mI/AaWcLiDLjCCyu5Qr9MRk=", "narHash": "sha256-g2A9sNPPaumDzb2jNd2h8eiKzlwmlFzO1qymaq2GovU=",
"owner": "catppuccin", "owner": "catppuccin",
"repo": "nix", "repo": "nix",
"rev": "a817009ebfd2cca7f70a77884e5098d0a8c83f8e", "rev": "f47bf8bbec54f721b0b5282e6bcfa85888b822dd",
"type": "github" "type": "github"
}, },
"original": { "original": {
@ -79,13 +79,12 @@
} }
}, },
"flake-compat": { "flake-compat": {
"flake": false,
"locked": { "locked": {
"lastModified": 1732722421, "lastModified": 1733328505,
"narHash": "sha256-HRJ/18p+WoXpWJkcdsk9St5ZiukCqSDgbOGFa8Okehg=", "narHash": "sha256-NeCCThCEP3eCl2l/+27kNNK7QrwZB1IJCrXfrbv5oqU=",
"owner": "edolstra", "owner": "edolstra",
"repo": "flake-compat", "repo": "flake-compat",
"rev": "9ed2ac151eada2306ca8c418ebd97807bb08f6ac", "rev": "ff81ac966bb2cae68946d5ed5fc4994f96d0ffec",
"type": "github" "type": "github"
}, },
"original": { "original": {
@ -97,11 +96,11 @@
"flake-compat_2": { "flake-compat_2": {
"flake": false, "flake": false,
"locked": { "locked": {
"lastModified": 1696426674, "lastModified": 1641205782,
"narHash": "sha256-kvjfFW7WAETZlt09AgDn1MrtKzP7t90Vf7vypd3OL1U=", "narHash": "sha256-4jY7RCWUoZ9cKD8co0/4tFARpWB+57+r1bLLvXNJliY=",
"owner": "edolstra", "owner": "edolstra",
"repo": "flake-compat", "repo": "flake-compat",
"rev": "0f9255e01c2351cc7d116c072cb317785dd33b33", "rev": "b7547d3eed6f32d06102ead8991ec52ab0a4f1a7",
"type": "github" "type": "github"
}, },
"original": { "original": {
@ -113,11 +112,11 @@
"flake-compat_3": { "flake-compat_3": {
"flake": false, "flake": false,
"locked": { "locked": {
"lastModified": 1673956053, "lastModified": 1641205782,
"narHash": "sha256-4gtG9iQuiKITOjNQQeQIpoIB6b16fm+504Ch3sNKLd8=", "narHash": "sha256-4jY7RCWUoZ9cKD8co0/4tFARpWB+57+r1bLLvXNJliY=",
"owner": "edolstra", "owner": "edolstra",
"repo": "flake-compat", "repo": "flake-compat",
"rev": "35bb57c0c8d8b62bbfd284272c928ceb64ddbde9", "rev": "b7547d3eed6f32d06102ead8991ec52ab0a4f1a7",
"type": "github" "type": "github"
}, },
"original": { "original": {
@ -127,6 +126,22 @@
} }
}, },
"flake-compat_4": { "flake-compat_4": {
"flake": false,
"locked": {
"lastModified": 1733328505,
"narHash": "sha256-NeCCThCEP3eCl2l/+27kNNK7QrwZB1IJCrXfrbv5oqU=",
"owner": "edolstra",
"repo": "flake-compat",
"rev": "ff81ac966bb2cae68946d5ed5fc4994f96d0ffec",
"type": "github"
},
"original": {
"owner": "edolstra",
"repo": "flake-compat",
"type": "github"
}
},
"flake-compat_5": {
"flake": false, "flake": false,
"locked": { "locked": {
"lastModified": 1696426674, "lastModified": 1696426674,
@ -142,7 +157,7 @@
"type": "github" "type": "github"
} }
}, },
"flake-compat_5": { "flake-compat_6": {
"locked": { "locked": {
"lastModified": 1696426674, "lastModified": 1696426674,
"narHash": "sha256-kvjfFW7WAETZlt09AgDn1MrtKzP7t90Vf7vypd3OL1U=", "narHash": "sha256-kvjfFW7WAETZlt09AgDn1MrtKzP7t90Vf7vypd3OL1U=",
@ -156,48 +171,16 @@
"url": "https://flakehub.com/f/edolstra/flake-compat/1.tar.gz" "url": "https://flakehub.com/f/edolstra/flake-compat/1.tar.gz"
} }
}, },
"flake-compat_6": {
"flake": false,
"locked": {
"lastModified": 1641205782,
"narHash": "sha256-4jY7RCWUoZ9cKD8co0/4tFARpWB+57+r1bLLvXNJliY=",
"owner": "edolstra",
"repo": "flake-compat",
"rev": "b7547d3eed6f32d06102ead8991ec52ab0a4f1a7",
"type": "github"
},
"original": {
"owner": "edolstra",
"repo": "flake-compat",
"type": "github"
}
},
"flake-compat_7": {
"flake": false,
"locked": {
"lastModified": 1641205782,
"narHash": "sha256-4jY7RCWUoZ9cKD8co0/4tFARpWB+57+r1bLLvXNJliY=",
"owner": "edolstra",
"repo": "flake-compat",
"rev": "b7547d3eed6f32d06102ead8991ec52ab0a4f1a7",
"type": "github"
},
"original": {
"owner": "edolstra",
"repo": "flake-compat",
"type": "github"
}
},
"flake-parts": { "flake-parts": {
"inputs": { "inputs": {
"nixpkgs-lib": "nixpkgs-lib" "nixpkgs-lib": "nixpkgs-lib"
}, },
"locked": { "locked": {
"lastModified": 1733269028, "lastModified": 1733312601,
"narHash": "sha256-kVq/jAKKtbvWwbL9wf0SKDxtxsC5Gb+nlIYEFnyXhGA=", "narHash": "sha256-4pDvzqnegAfRkPwO3wmwBhVi/Sye1mzps0zHWYnP88c=",
"owner": "hercules-ci", "owner": "hercules-ci",
"repo": "flake-parts", "repo": "flake-parts",
"rev": "e37654df08605b510ad84eceaafcc7248495e843", "rev": "205b12d8b7cd4802fbcb8e8ef6a0f1408781a4f9",
"type": "github" "type": "github"
}, },
"original": { "original": {
@ -214,11 +197,11 @@
] ]
}, },
"locked": { "locked": {
"lastModified": 1730504689, "lastModified": 1733312601,
"narHash": "sha256-hgmguH29K2fvs9szpq2r3pz2/8cJd2LPS+b4tfNFCwE=", "narHash": "sha256-4pDvzqnegAfRkPwO3wmwBhVi/Sye1mzps0zHWYnP88c=",
"owner": "hercules-ci", "owner": "hercules-ci",
"repo": "flake-parts", "repo": "flake-parts",
"rev": "506278e768c2a08bec68eb62932193e341f55c90", "rev": "205b12d8b7cd4802fbcb8e8ef6a0f1408781a4f9",
"type": "github" "type": "github"
}, },
"original": { "original": {
@ -236,11 +219,11 @@
] ]
}, },
"locked": { "locked": {
"lastModified": 1712014858, "lastModified": 1733312601,
"narHash": "sha256-sB4SWl2lX95bExY2gMFG5HIzvva5AVMJd4Igm+GpZNw=", "narHash": "sha256-4pDvzqnegAfRkPwO3wmwBhVi/Sye1mzps0zHWYnP88c=",
"owner": "hercules-ci", "owner": "hercules-ci",
"repo": "flake-parts", "repo": "flake-parts",
"rev": "9126214d0a59633752a136528f5f3b9aa8565b7d", "rev": "205b12d8b7cd4802fbcb8e8ef6a0f1408781a4f9",
"type": "github" "type": "github"
}, },
"original": { "original": {
@ -256,11 +239,11 @@
] ]
}, },
"locked": { "locked": {
"lastModified": 1730504689, "lastModified": 1733312601,
"narHash": "sha256-hgmguH29K2fvs9szpq2r3pz2/8cJd2LPS+b4tfNFCwE=", "narHash": "sha256-4pDvzqnegAfRkPwO3wmwBhVi/Sye1mzps0zHWYnP88c=",
"owner": "hercules-ci", "owner": "hercules-ci",
"repo": "flake-parts", "repo": "flake-parts",
"rev": "506278e768c2a08bec68eb62932193e341f55c90", "rev": "205b12d8b7cd4802fbcb8e8ef6a0f1408781a4f9",
"type": "github" "type": "github"
}, },
"original": { "original": {
@ -291,11 +274,11 @@
}, },
"flake-utils_2": { "flake-utils_2": {
"locked": { "locked": {
"lastModified": 1659877975, "lastModified": 1644229661,
"narHash": "sha256-zllb8aq3YO3h8B/U0/J1WBgAL8EX5yWf5pMj3G0NAmc=", "narHash": "sha256-1YdnJAsNy69bpcjuoKdOYQX0YxZBiCYZo4Twxerqv7k=",
"owner": "numtide", "owner": "numtide",
"repo": "flake-utils", "repo": "flake-utils",
"rev": "c0e246b9b83f637f4681389ecabcb2681b4f3af0", "rev": "3cecb5b042f7f209c56ffd8371b2711a290ec797",
"type": "github" "type": "github"
}, },
"original": { "original": {
@ -305,15 +288,12 @@
} }
}, },
"flake-utils_3": { "flake-utils_3": {
"inputs": {
"systems": "systems"
},
"locked": { "locked": {
"lastModified": 1726560853, "lastModified": 1644229661,
"narHash": "sha256-X6rJYSESBVr3hBoH0WbKE5KvhPU5bloyZ2L4K60/fPQ=", "narHash": "sha256-1YdnJAsNy69bpcjuoKdOYQX0YxZBiCYZo4Twxerqv7k=",
"owner": "numtide", "owner": "numtide",
"repo": "flake-utils", "repo": "flake-utils",
"rev": "c1dfcf08411b08f6b8615f7d8971a2bfa81d5e8a", "rev": "3cecb5b042f7f209c56ffd8371b2711a290ec797",
"type": "github" "type": "github"
}, },
"original": { "original": {
@ -324,7 +304,7 @@
}, },
"flake-utils_4": { "flake-utils_4": {
"inputs": { "inputs": {
"systems": "systems_2" "systems": "systems"
}, },
"locked": { "locked": {
"lastModified": 1731533236, "lastModified": 1731533236,
@ -340,39 +320,9 @@
"type": "github" "type": "github"
} }
}, },
"flake-utils_5": {
"locked": {
"lastModified": 1644229661,
"narHash": "sha256-1YdnJAsNy69bpcjuoKdOYQX0YxZBiCYZo4Twxerqv7k=",
"owner": "numtide",
"repo": "flake-utils",
"rev": "3cecb5b042f7f209c56ffd8371b2711a290ec797",
"type": "github"
},
"original": {
"owner": "numtide",
"repo": "flake-utils",
"type": "github"
}
},
"flake-utils_6": {
"locked": {
"lastModified": 1644229661,
"narHash": "sha256-1YdnJAsNy69bpcjuoKdOYQX0YxZBiCYZo4Twxerqv7k=",
"owner": "numtide",
"repo": "flake-utils",
"rev": "3cecb5b042f7f209c56ffd8371b2711a290ec797",
"type": "github"
},
"original": {
"owner": "numtide",
"repo": "flake-utils",
"type": "github"
}
},
"git-hooks": { "git-hooks": {
"inputs": { "inputs": {
"flake-compat": "flake-compat_2", "flake-compat": "flake-compat_5",
"gitignore": "gitignore", "gitignore": "gitignore",
"nixpkgs": [ "nixpkgs": [
"neovim-nightly-overlay", "neovim-nightly-overlay",
@ -384,11 +334,11 @@
] ]
}, },
"locked": { "locked": {
"lastModified": 1732021966, "lastModified": 1733665616,
"narHash": "sha256-mnTbjpdqF0luOkou8ZFi2asa1N3AA2CchR/RqCNmsGE=", "narHash": "sha256-+XTFXYlFJBxohhMGLDpYdEnhUNdxN8dyTA8WAd+lh2A=",
"owner": "cachix", "owner": "cachix",
"repo": "git-hooks.nix", "repo": "git-hooks.nix",
"rev": "3308484d1a443fc5bc92012435d79e80458fe43c", "rev": "d8c02f0ffef0ef39f6063731fc539d8c71eb463a",
"type": "github" "type": "github"
}, },
"original": { "original": {
@ -414,11 +364,11 @@
] ]
}, },
"locked": { "locked": {
"lastModified": 1732021966, "lastModified": 1733318908,
"narHash": "sha256-mnTbjpdqF0luOkou8ZFi2asa1N3AA2CchR/RqCNmsGE=", "narHash": "sha256-SVQVsbafSM1dJ4fpgyBqLZ+Lft+jcQuMtEL3lQWx2Sk=",
"owner": "cachix", "owner": "cachix",
"repo": "git-hooks.nix", "repo": "git-hooks.nix",
"rev": "3308484d1a443fc5bc92012435d79e80458fe43c", "rev": "6f4e2a2112050951a314d2733a994fbab94864c6",
"type": "github" "type": "github"
}, },
"original": { "original": {
@ -496,11 +446,11 @@
] ]
}, },
"locked": { "locked": {
"lastModified": 1730903510, "lastModified": 1733333617,
"narHash": "sha256-mnynlrPeiW0nUQ8KGZHb3WyxAxA3Ye/BH8gMjdoKP6E=", "narHash": "sha256-nMMQXREGvLOLvUa0ByhYFdaL0Jov0t1wzLbKjr05P2w=",
"owner": "hercules-ci", "owner": "hercules-ci",
"repo": "hercules-ci-effects", "repo": "hercules-ci-effects",
"rev": "b89ac4d66d618b915b1f0a408e2775fe3821d141", "rev": "56f8ea8d502c87cf62444bec4ee04512e8ea24ea",
"type": "github" "type": "github"
}, },
"original": { "original": {
@ -511,16 +461,14 @@
}, },
"home-manager": { "home-manager": {
"inputs": { "inputs": {
"nixpkgs": [ "nixpkgs": "nixpkgs"
"nixpkgs"
]
}, },
"locked": { "locked": {
"lastModified": 1733175814, "lastModified": 1733873195,
"narHash": "sha256-zFOtOaqjzZfPMsm1mwu98syv3y+jziAq5DfWygaMtLg=", "narHash": "sha256-dTosiZ3sZ/NKoLKQ++v8nZdEHya0eTNEsaizNp+MUPM=",
"owner": "nix-community", "owner": "nix-community",
"repo": "home-manager", "repo": "home-manager",
"rev": "bf23fe41082aa0289c209169302afd3397092f22", "rev": "f26aa4b76fb7606127032d33ac73d7d507d82758",
"type": "github" "type": "github"
}, },
"original": { "original": {
@ -537,11 +485,11 @@
] ]
}, },
"locked": { "locked": {
"lastModified": 1733175814, "lastModified": 1734093295,
"narHash": "sha256-zFOtOaqjzZfPMsm1mwu98syv3y+jziAq5DfWygaMtLg=", "narHash": "sha256-hSwgGpcZtdDsk1dnzA0xj5cNaHgN9A99hRF/mxMtwS4=",
"owner": "nix-community", "owner": "nix-community",
"repo": "home-manager", "repo": "home-manager",
"rev": "bf23fe41082aa0289c209169302afd3397092f22", "rev": "66c5d8b62818ec4c1edb3e941f55ef78df8141a8",
"type": "github" "type": "github"
}, },
"original": { "original": {
@ -628,11 +576,11 @@
"vanillatweaks": "vanillatweaks" "vanillatweaks": "vanillatweaks"
}, },
"locked": { "locked": {
"lastModified": 1733897368, "lastModified": 1734433960,
"narHash": "sha256-1F+UsOHbNTWowKUk8boFyj+iViDJBZ8I8/CvOex9Ujg=", "narHash": "sha256-XwhuUQ/oc580bKJRCPOF4qrAvExz12xn17ORi+7Cfh4=",
"ref": "refs/heads/master", "ref": "refs/heads/master",
"rev": "44f9be4d690d5f0b4cc37e5ec695c0aaca79ad24", "rev": "a040645772b66ff6ad7ea5bdd62003ac6be57edc",
"revCount": 259, "revCount": 277,
"type": "git", "type": "git",
"url": "file:///home/odie/Code/nix/minecraft-server-flake" "url": "file:///home/odie/Code/nix/minecraft-server-flake"
}, },
@ -644,11 +592,11 @@
"neorg": { "neorg": {
"flake": false, "flake": false,
"locked": { "locked": {
"lastModified": 1733153752, "lastModified": 1733872345,
"narHash": "sha256-Aq7suvV1WnX5M1wlI2JDJ6UWzBcVO+OX4GbyiSdzXH8=", "narHash": "sha256-6pUwWfsJ0TmToGU7Bvaeobnj2vuIqwd4w3TDdTvQZSk=",
"owner": "nvim-neorg", "owner": "nvim-neorg",
"repo": "neorg", "repo": "neorg",
"rev": "c1bade17d313909031703c8587d6841fef457ebb", "rev": "62671a7b03a1f38a6e5e03b006a9b6f8d804be0e",
"type": "github" "type": "github"
}, },
"original": { "original": {
@ -657,6 +605,33 @@
"type": "github" "type": "github"
} }
}, },
"neorg-overlay": {
"inputs": {
"flake-utils": [
"flake-utils"
],
"neorg": "neorg_2",
"neorg-telescope": "neorg-telescope",
"nixpkgs": [
"nixpkgs"
],
"norg": "norg",
"norg-meta": "norg-meta"
},
"locked": {
"lastModified": 1734078148,
"narHash": "sha256-W3MlwXmWDMJoWwp6N+874Eh7ksq43yBXmm5HCTCLvjQ=",
"owner": "nvim-neorg",
"repo": "nixpkgs-neorg-overlay",
"rev": "1f1d248bd728946582a13e29de4638131af4f66b",
"type": "github"
},
"original": {
"owner": "nvim-neorg",
"repo": "nixpkgs-neorg-overlay",
"type": "github"
}
},
"neorg-telescope": { "neorg-telescope": {
"flake": false, "flake": false,
"locked": { "locked": {
@ -673,23 +648,54 @@
"type": "github" "type": "github"
} }
}, },
"neorg-telescope_2": {
"flake": false,
"locked": {
"lastModified": 1722358034,
"narHash": "sha256-ei4uUqpIQjGKzu5ryu0Hlmis9TS9FJsYnjt4J4QdWlw=",
"owner": "nvim-neorg",
"repo": "neorg-telescope",
"rev": "ddb2556644cae922699a239bbb0fe16e25b084b7",
"type": "github"
},
"original": {
"owner": "nvim-neorg",
"repo": "neorg-telescope",
"type": "github"
}
},
"neorg_2": {
"flake": false,
"locked": {
"lastModified": 1733872345,
"narHash": "sha256-6pUwWfsJ0TmToGU7Bvaeobnj2vuIqwd4w3TDdTvQZSk=",
"owner": "nvim-neorg",
"repo": "neorg",
"rev": "62671a7b03a1f38a6e5e03b006a9b6f8d804be0e",
"type": "github"
},
"original": {
"owner": "nvim-neorg",
"repo": "neorg",
"type": "github"
}
},
"neovim-nightly-overlay": { "neovim-nightly-overlay": {
"inputs": { "inputs": {
"flake-compat": "flake-compat", "flake-compat": "flake-compat_4",
"flake-parts": "flake-parts_2", "flake-parts": "flake-parts_2",
"git-hooks": "git-hooks", "git-hooks": "git-hooks",
"hercules-ci-effects": "hercules-ci-effects", "hercules-ci-effects": "hercules-ci-effects",
"neovim-src": "neovim-src", "neovim-src": "neovim-src",
"nixpkgs": [ "nixpkgs": "nixpkgs_4",
"nixpkgs" "treefmt-nix": "treefmt-nix"
]
}, },
"locked": { "locked": {
"lastModified": 1733211153, "lastModified": 1733903671,
"narHash": "sha256-Ml7GGmUsaDldssIVE189Sf+PMPRgkkGpj66EvZvy8MI=", "narHash": "sha256-pztctU+iwx4zh1TrGAmnrZOv9ud8/tRjlObXmZnbRbo=",
"owner": "nix-community", "owner": "nix-community",
"repo": "neovim-nightly-overlay", "repo": "neovim-nightly-overlay",
"rev": "90426479f3220aadcc01832db56ee8cfa3886671", "rev": "331e9c8200a2413f891b9dd762fc179ce6d335f9",
"type": "github" "type": "github"
}, },
"original": { "original": {
@ -701,11 +707,11 @@
"neovim-src": { "neovim-src": {
"flake": false, "flake": false,
"locked": { "locked": {
"lastModified": 1733163189, "lastModified": 1733850961,
"narHash": "sha256-0NlEbJgUYghWNgp2Iiak8N989Cvjoq87xkeRCagfCeU=", "narHash": "sha256-GpdTTQ1g7tERjY/rzGZtiWd5eAqKsTtPJN/LEBkTU0E=",
"owner": "neovim", "owner": "neovim",
"repo": "neovim", "repo": "neovim",
"rev": "49d6cd1da86cab49c7a5a8c79e59d48d016975fa", "rev": "3f1d09bc94d02266d6fa588a2ccd1be1ca084cf7",
"type": "github" "type": "github"
}, },
"original": { "original": {
@ -741,11 +747,11 @@
] ]
}, },
"locked": { "locked": {
"lastModified": 1733105089, "lastModified": 1733570843,
"narHash": "sha256-Qs3YmoLYUJ8g4RkFj2rMrzrP91e4ShAioC9s+vG6ENM=", "narHash": "sha256-sQJAxY1TYWD1UyibN/FnN97paTFuwBw3Vp3DNCyKsMk=",
"owner": "lnl7", "owner": "lnl7",
"repo": "nix-darwin", "repo": "nix-darwin",
"rev": "c6b65d946097baf3915dd51373251de98199280d", "rev": "a35b08d09efda83625bef267eb24347b446c80b8",
"type": "github" "type": "github"
}, },
"original": { "original": {
@ -756,18 +762,22 @@
}, },
"nix-minecraft": { "nix-minecraft": {
"inputs": { "inputs": {
"flake-compat": "flake-compat_3", "flake-compat": [
"flake-compat"
],
"flake-utils": [ "flake-utils": [
"flake-utils" "flake-utils"
], ],
"nixpkgs": "nixpkgs" "nixpkgs": [
"nixpkgs"
]
}, },
"locked": { "locked": {
"lastModified": 1733277378, "lastModified": 1733709556,
"narHash": "sha256-jPhKF6d2UXBr2nkJIFuUjVXdo6kEwLuIMK3RyJeA60s=", "narHash": "sha256-u0ll0DDrKlO7tiLGGtmphv3wFy5ReDuf0USo/OlfROU=",
"owner": "Infinidoge", "owner": "Infinidoge",
"repo": "nix-minecraft", "repo": "nix-minecraft",
"rev": "ea8246bb2a70d33b5d332667a57da75e95c89af9", "rev": "8d11f147df83fe137d3d94f6f3646e3a52bec855",
"type": "github" "type": "github"
}, },
"original": { "original": {
@ -778,7 +788,9 @@
}, },
"nixgl": { "nixgl": {
"inputs": { "inputs": {
"flake-utils": "flake-utils_2", "flake-utils": [
"flake-utils"
],
"nixpkgs": [ "nixpkgs": [
"nixpkgs" "nixpkgs"
] ]
@ -799,11 +811,11 @@
}, },
"nixos-hardware": { "nixos-hardware": {
"locked": { "locked": {
"lastModified": 1733217105, "lastModified": 1733861262,
"narHash": "sha256-fc6jTzIwCIVWTX50FtW6AZpuukuQWSEbPiyg6ZRGWFY=", "narHash": "sha256-+jjPup/ByS0LEVIrBbt7FnGugJgLeG9oc+ivFASYn2U=",
"owner": "nixos", "owner": "nixos",
"repo": "nixos-hardware", "repo": "nixos-hardware",
"rev": "cceee0a31d2f01bcc98b2fbd591327c06a4ea4f9", "rev": "cf737e2eba82b603f54f71b10cb8fd09d22ce3f5",
"type": "github" "type": "github"
}, },
"original": { "original": {
@ -814,18 +826,22 @@
}, },
"nixos-wsl": { "nixos-wsl": {
"inputs": { "inputs": {
"flake-compat": "flake-compat_4", "flake-compat": [
"flake-utils": "flake-utils_3", "flake-compat"
],
"flake-utils": [
"flake-utils"
],
"nixpkgs": [ "nixpkgs": [
"nixpkgs" "nixpkgs"
] ]
}, },
"locked": { "locked": {
"lastModified": 1731682434, "lastModified": 1733854371,
"narHash": "sha256-HnZFPB7akVIy0KuPq/tEkiB+Brt1qi0DUIDzR8z25qI=", "narHash": "sha256-K9qGHniYBbjqVcEiwXyiofj/IFf78L5F0/FCf+CKyr0=",
"owner": "nix-community", "owner": "nix-community",
"repo": "NixOS-WSL", "repo": "NixOS-WSL",
"rev": "a6b9cf0b7805e2c50829020a73e7bde683fd36dd", "rev": "dee4425dcee3149475ead0cb6a616b8a028c5888",
"type": "github" "type": "github"
}, },
"original": { "original": {
@ -836,15 +852,15 @@
}, },
"nixpkgs": { "nixpkgs": {
"locked": { "locked": {
"lastModified": 1715266358, "lastModified": 1733940404,
"narHash": "sha256-doPgfj+7FFe9rfzWo1siAV2mVCasW+Bh8I1cToAXEE4=", "narHash": "sha256-Pj39hSoUA86ZePPF/UXiYHHM7hMIkios8TYG29kQT4g=",
"owner": "nixos", "owner": "NixOS",
"repo": "nixpkgs", "repo": "nixpkgs",
"rev": "f1010e0469db743d14519a1efd37e23f8513d714", "rev": "5d67ea6b4b63378b9c13be21e2ec9d1afc921713",
"type": "github" "type": "github"
}, },
"original": { "original": {
"owner": "nixos", "owner": "NixOS",
"ref": "nixos-unstable", "ref": "nixos-unstable",
"repo": "nixpkgs", "repo": "nixpkgs",
"type": "github" "type": "github"
@ -879,15 +895,16 @@
}, },
"nixpkgs_2": { "nixpkgs_2": {
"locked": { "locked": {
"lastModified": 1733294704, "lastModified": 1644486793,
"narHash": "sha256-XasABdKSz8ZRjGpE/oYTflw1F2FmI594GxIrbznHhCs=", "narHash": "sha256-EeijR4guVHgVv+JpOX3cQO+1XdrkJfGmiJ9XVsVU530=",
"owner": "nixos", "owner": "NixOS",
"repo": "nixpkgs", "repo": "nixpkgs",
"rev": "d18ef8212246b78339007d745738aa4ce5d34230", "rev": "1882c6b7368fd284ad01b0a5b5601ef136321292",
"type": "github" "type": "github"
}, },
"original": { "original": {
"owner": "nixos", "owner": "NixOS",
"ref": "nixpkgs-unstable",
"repo": "nixpkgs", "repo": "nixpkgs",
"type": "github" "type": "github"
} }
@ -910,11 +927,11 @@
}, },
"nixpkgs_4": { "nixpkgs_4": {
"locked": { "locked": {
"lastModified": 1644486793, "lastModified": 1733935885,
"narHash": "sha256-EeijR4guVHgVv+JpOX3cQO+1XdrkJfGmiJ9XVsVU530=", "narHash": "sha256-xyiHLs6KJ1fxeGmcCxKjJE4yJknVJxbC8Y/ZRYyC8WE=",
"owner": "NixOS", "owner": "NixOS",
"repo": "nixpkgs", "repo": "nixpkgs",
"rev": "1882c6b7368fd284ad01b0a5b5601ef136321292", "rev": "5a48e3c2e435e95103d56590188cfed7b70e108c",
"type": "github" "type": "github"
}, },
"original": { "original": {
@ -924,26 +941,55 @@
"type": "github" "type": "github"
} }
}, },
"nixpkgs_5": {
"locked": {
"lastModified": 1734141057,
"narHash": "sha256-z8KMwCFX9W0KyUfIpdN9Qx9/JAsd6KyF4A96EuDW3S8=",
"owner": "nixos",
"repo": "nixpkgs",
"rev": "9a5c9fb07412bf180b6c91d12b4bfaa06596f92c",
"type": "github"
},
"original": {
"owner": "nixos",
"repo": "nixpkgs",
"type": "github"
}
},
"nixpkgs_6": {
"locked": {
"lastModified": 1733940404,
"narHash": "sha256-Pj39hSoUA86ZePPF/UXiYHHM7hMIkios8TYG29kQT4g=",
"owner": "NixOS",
"repo": "nixpkgs",
"rev": "5d67ea6b4b63378b9c13be21e2ec9d1afc921713",
"type": "github"
},
"original": {
"owner": "NixOS",
"ref": "nixos-unstable",
"repo": "nixpkgs",
"type": "github"
}
},
"nixvim": { "nixvim": {
"inputs": { "inputs": {
"devshell": "devshell", "devshell": "devshell",
"flake-compat": "flake-compat_5", "flake-compat": "flake-compat_6",
"flake-parts": "flake-parts_4", "flake-parts": "flake-parts_4",
"git-hooks": "git-hooks_2", "git-hooks": "git-hooks_2",
"home-manager": "home-manager_2", "home-manager": "home-manager_2",
"nix-darwin": "nix-darwin", "nix-darwin": "nix-darwin",
"nixpkgs": [ "nixpkgs": "nixpkgs_6",
"nixpkgs"
],
"nuschtosSearch": "nuschtosSearch", "nuschtosSearch": "nuschtosSearch",
"treefmt-nix": "treefmt-nix" "treefmt-nix": "treefmt-nix_2"
}, },
"locked": { "locked": {
"lastModified": 1733220378, "lastModified": 1734103614,
"narHash": "sha256-tWCskBne7LigfeXRWnUFJKKTLOYmmdqiwdqom2Sml1s=", "narHash": "sha256-H5JN0fajkKZLir/GN6QHmLsR3cW+/EIOR+W/VmwHKfI=",
"owner": "nix-community", "owner": "nix-community",
"repo": "nixvim", "repo": "nixvim",
"rev": "78bfbf7b7eb7a1b6cf42e199547de55a55ba2cea", "rev": "c181014422fa9261db06fc9b5ecbf67f42c30ec3",
"type": "github" "type": "github"
}, },
"original": { "original": {
@ -954,9 +1000,9 @@
}, },
"norg": { "norg": {
"inputs": { "inputs": {
"flake-compat": "flake-compat_6", "flake-compat": "flake-compat_2",
"flake-utils": "flake-utils_5", "flake-utils": "flake-utils_2",
"nixpkgs": "nixpkgs_3" "nixpkgs": "nixpkgs_2"
}, },
"locked": { "locked": {
"lastModified": 1672582520, "lastModified": 1672582520,
@ -975,9 +1021,9 @@
}, },
"norg-meta": { "norg-meta": {
"inputs": { "inputs": {
"flake-compat": "flake-compat_7", "flake-compat": "flake-compat_3",
"flake-utils": "flake-utils_6", "flake-utils": "flake-utils_3",
"nixpkgs": "nixpkgs_4" "nixpkgs": "nixpkgs_3"
}, },
"locked": { "locked": {
"lastModified": 1713028366, "lastModified": 1713028366,
@ -993,13 +1039,75 @@
"type": "github" "type": "github"
} }
}, },
"nur": { "norg-meta_2": {
"inputs": {
"flake-compat": [
"flake-compat"
],
"flake-utils": [
"flake-utils"
],
"nixpkgs": [
"nixpkgs"
]
},
"locked": { "locked": {
"lastModified": 1733294525, "lastModified": 1713028366,
"narHash": "sha256-3EUU3tm+T3vUHmZdsLWisxHjWzn6RT2U2KMOaGho9Oo=", "narHash": "sha256-8qSdwHlfnjFuQF4zNdLtU2/tzDRhDZbo9K54Xxgn5+8=",
"owner": "nvim-neorg",
"repo": "tree-sitter-norg-meta",
"rev": "6f0510cc516a3af3396a682fbd6655486c2c9d2d",
"type": "github"
},
"original": {
"owner": "nvim-neorg",
"repo": "tree-sitter-norg-meta",
"type": "github"
}
},
"norg_2": {
"inputs": {
"flake-compat": [
"flake-compat"
],
"flake-utils": [
"flake-utils"
],
"nixpkgs": [
"nixpkgs"
]
},
"locked": {
"lastModified": 1672582520,
"narHash": "sha256-kv3UiJUqMSF1qd3r4OCWomVTHTYjwX/EBRWm8mOSdwg=",
"owner": "nvim-neorg",
"repo": "tree-sitter-norg",
"rev": "d7a466e182a532065a559dbfc7a847271d5e9c29",
"type": "github"
},
"original": {
"owner": "nvim-neorg",
"ref": "dev",
"repo": "tree-sitter-norg",
"type": "github"
}
},
"nur": {
"inputs": {
"flake-parts": [
"flake-parts"
],
"nixpkgs": [
"nixpkgs"
],
"treefmt-nix": "treefmt-nix_3"
},
"locked": {
"lastModified": 1733903948,
"narHash": "sha256-baC/RU5e8DYqnLHOaujXtyR6CYH7zbBMNC2HDUN1evs=",
"owner": "nix-community", "owner": "nix-community",
"repo": "NUR", "repo": "NUR",
"rev": "dda476d2da1f38f7a5391a60b563d520eb1ea4f9", "rev": "40794120f4a3369d84c0b4862d49476f127e0f7b",
"type": "github" "type": "github"
}, },
"original": { "original": {
@ -1018,11 +1126,11 @@
] ]
}, },
"locked": { "locked": {
"lastModified": 1733006402, "lastModified": 1733411491,
"narHash": "sha256-BC1CecAQISV5Q4LZK72Gx0+faemOwaChiD9rMVfDPoA=", "narHash": "sha256-315rJ7O9cOllPDaFscnJhcMleORHbxon0Kq9LAKJ5p4=",
"owner": "NuschtOS", "owner": "NuschtOS",
"repo": "search", "repo": "search",
"rev": "16307548b7a1247291c84ae6a12c0aacb07dfba2", "rev": "68e9fad70d95d08156cf10a030bd39487bed8ffe",
"type": "github" "type": "github"
}, },
"original": { "original": {
@ -1036,11 +1144,11 @@
"locked": { "locked": {
"narHash": "sha256-YXCeVEU70SifuuyKnsK8KSm4Qpfb+O1gLd5OHHCsj+s=", "narHash": "sha256-YXCeVEU70SifuuyKnsK8KSm4Qpfb+O1gLd5OHHCsj+s=",
"type": "file", "type": "file",
"url": "http://ftp.vim.org/vim/runtime/spell/de.latin1.spl" "url": "https://ftp.uni-bayreuth.de/packages/editors/vim/runtime/spell/de.latin1.spl"
}, },
"original": { "original": {
"type": "file", "type": "file",
"url": "http://ftp.vim.org/vim/runtime/spell/de.latin1.spl" "url": "https://ftp.uni-bayreuth.de/packages/editors/vim/runtime/spell/de.latin1.spl"
} }
}, },
"nvim-spell-de-latin1-suggestions": { "nvim-spell-de-latin1-suggestions": {
@ -1048,11 +1156,11 @@
"locked": { "locked": {
"narHash": "sha256-OAeTO3xP3TDFWP3c9Qt2dHFBVjU/vsVFZAhzZyC2cI8=", "narHash": "sha256-OAeTO3xP3TDFWP3c9Qt2dHFBVjU/vsVFZAhzZyC2cI8=",
"type": "file", "type": "file",
"url": "http://ftp.vim.org/vim/runtime/spell/de.latin1.sug" "url": "https://ftp.uni-bayreuth.de/packages/editors/vim/runtime/spell/de.latin1.sug"
}, },
"original": { "original": {
"type": "file", "type": "file",
"url": "http://ftp.vim.org/vim/runtime/spell/de.latin1.sug" "url": "https://ftp.uni-bayreuth.de/packages/editors/vim/runtime/spell/de.latin1.sug"
} }
}, },
"nvim-spell-de-utf8-dictionary": { "nvim-spell-de-utf8-dictionary": {
@ -1060,11 +1168,11 @@
"locked": { "locked": {
"narHash": "sha256-Z0bzp9RSHYtFOHLiJi7pv/tCr9QSAIJFh6rV+AfOv10=", "narHash": "sha256-Z0bzp9RSHYtFOHLiJi7pv/tCr9QSAIJFh6rV+AfOv10=",
"type": "file", "type": "file",
"url": "http://ftp.vim.org/vim/runtime/spell/de.utf-8.spl" "url": "https://ftp.uni-bayreuth.de/packages/editors/vim/runtime/spell/de.utf-8.spl"
}, },
"original": { "original": {
"type": "file", "type": "file",
"url": "http://ftp.vim.org/vim/runtime/spell/de.utf-8.spl" "url": "https://ftp.uni-bayreuth.de/packages/editors/vim/runtime/spell/de.utf-8.spl"
} }
}, },
"nvim-spell-de-utf8-suggestions": { "nvim-spell-de-utf8-suggestions": {
@ -1072,11 +1180,11 @@
"locked": { "locked": {
"narHash": "sha256-P8y/g4mA+KBe4Sg7+GVwIRbTDjBZuSx71ZB66rnf+Y0=", "narHash": "sha256-P8y/g4mA+KBe4Sg7+GVwIRbTDjBZuSx71ZB66rnf+Y0=",
"type": "file", "type": "file",
"url": "http://ftp.vim.org/vim/runtime/spell/de.utf-8.sug" "url": "https://ftp.uni-bayreuth.de/packages/editors/vim/runtime/spell/de.utf-8.sug"
}, },
"original": { "original": {
"type": "file", "type": "file",
"url": "http://ftp.vim.org/vim/runtime/spell/de.utf-8.sug" "url": "https://ftp.uni-bayreuth.de/packages/editors/vim/runtime/spell/de.utf-8.sug"
} }
}, },
"placeholderapi-luckperms": { "placeholderapi-luckperms": {
@ -1095,6 +1203,7 @@
"inputs": { "inputs": {
"catppuccin": "catppuccin", "catppuccin": "catppuccin",
"csleeptimer": "csleeptimer", "csleeptimer": "csleeptimer",
"flake-compat": "flake-compat",
"flake-parts": "flake-parts", "flake-parts": "flake-parts",
"flake-utils": "flake-utils", "flake-utils": "flake-utils",
"guihua": "guihua", "guihua": "guihua",
@ -1103,23 +1212,24 @@
"luavit-meta": "luavit-meta", "luavit-meta": "luavit-meta",
"minecraft-server-flake": "minecraft-server-flake", "minecraft-server-flake": "minecraft-server-flake",
"neorg": "neorg", "neorg": "neorg",
"neorg-telescope": "neorg-telescope", "neorg-overlay": "neorg-overlay",
"neorg-telescope": "neorg-telescope_2",
"neovim-nightly-overlay": "neovim-nightly-overlay", "neovim-nightly-overlay": "neovim-nightly-overlay",
"nix-colors": "nix-colors", "nix-colors": "nix-colors",
"nix-minecraft": "nix-minecraft", "nix-minecraft": "nix-minecraft",
"nixgl": "nixgl", "nixgl": "nixgl",
"nixos-hardware": "nixos-hardware", "nixos-hardware": "nixos-hardware",
"nixos-wsl": "nixos-wsl", "nixos-wsl": "nixos-wsl",
"nixpkgs": "nixpkgs_2", "nixpkgs": "nixpkgs_5",
"nixvim": "nixvim", "nixvim": "nixvim",
"norg": "norg", "norg": "norg_2",
"norg-meta": "norg-meta", "norg-meta": "norg-meta_2",
"nur": "nur", "nur": "nur",
"nvim-spell-de-latin1-dictionary": "nvim-spell-de-latin1-dictionary", "nvim-spell-de-latin1-dictionary": "nvim-spell-de-latin1-dictionary",
"nvim-spell-de-latin1-suggestions": "nvim-spell-de-latin1-suggestions", "nvim-spell-de-latin1-suggestions": "nvim-spell-de-latin1-suggestions",
"nvim-spell-de-utf8-dictionary": "nvim-spell-de-utf8-dictionary", "nvim-spell-de-utf8-dictionary": "nvim-spell-de-utf8-dictionary",
"nvim-spell-de-utf8-suggestions": "nvim-spell-de-utf8-suggestions", "nvim-spell-de-utf8-suggestions": "nvim-spell-de-utf8-suggestions",
"systems": "systems_3", "systems": "systems_2",
"vim-mcfunction": "vim-mcfunction" "vim-mcfunction": "vim-mcfunction"
} }
}, },
@ -1153,22 +1263,28 @@
"type": "github" "type": "github"
} }
}, },
"systems_3": { "treefmt-nix": {
"inputs": {
"nixpkgs": [
"neovim-nightly-overlay",
"nixpkgs"
]
},
"locked": { "locked": {
"lastModified": 1681028828, "lastModified": 1733761991,
"narHash": "sha256-Vy1rq5AaRuLzOxct8nz4T6wlgyUR7zLU309k9mBC768=", "narHash": "sha256-s4DalCDepD22jtKL5Nw6f4LP5UwoMcPzPZgHWjAfqbQ=",
"owner": "nix-systems", "owner": "numtide",
"repo": "default", "repo": "treefmt-nix",
"rev": "da67096a3b9bf56a91d16901293e51ba5b49a27e", "rev": "0ce9d149d99bc383d1f2d85f31f6ebd146e46085",
"type": "github" "type": "github"
}, },
"original": { "original": {
"owner": "nix-systems", "owner": "numtide",
"repo": "default", "repo": "treefmt-nix",
"type": "github" "type": "github"
} }
}, },
"treefmt-nix": { "treefmt-nix_2": {
"inputs": { "inputs": {
"nixpkgs": [ "nixpkgs": [
"nixvim", "nixvim",
@ -1176,11 +1292,32 @@
] ]
}, },
"locked": { "locked": {
"lastModified": 1732894027, "lastModified": 1733440889,
"narHash": "sha256-2qbdorpq0TXHBWbVXaTqKoikN4bqAtAplTwGuII+oAc=", "narHash": "sha256-qKL3vjO+IXFQ0nTinFDqNq/sbbnnS5bMI1y0xX215fU=",
"owner": "numtide", "owner": "numtide",
"repo": "treefmt-nix", "repo": "treefmt-nix",
"rev": "6209c381904cab55796c5d7350e89681d3b2a8ef", "rev": "50862ba6a8a0255b87377b9d2d4565e96f29b410",
"type": "github"
},
"original": {
"owner": "numtide",
"repo": "treefmt-nix",
"type": "github"
}
},
"treefmt-nix_3": {
"inputs": {
"nixpkgs": [
"nur",
"nixpkgs"
]
},
"locked": {
"lastModified": 1733222881,
"narHash": "sha256-JIPcz1PrpXUCbaccEnrcUS8jjEb/1vJbZz5KkobyFdM=",
"owner": "numtide",
"repo": "treefmt-nix",
"rev": "49717b5af6f80172275d47a418c9719a31a78b53",
"type": "github" "type": "github"
}, },
"original": { "original": {

81
flake.nix
View File

@ -10,6 +10,7 @@
let let
inherit (self) inputs outputs; inherit (self) inputs outputs;
flakeLib = import ./lib; flakeLib = import ./lib;
neorgWorkspaces = [ "default" "general" "games" "btc" ]; neorgWorkspaces = [ "default" "general" "games" "btc" ];
@ -18,7 +19,7 @@
vars = rec { vars = rec {
name = "Patrick Neff"; name = "Patrick Neff";
username = "odie"; username = "odie";
extraGroups = []; extraGroups = [ ];
homeDirectory = "/home/${username}"; homeDirectory = "/home/${username}";
locale = "de_DE.UTF-8"; locale = "de_DE.UTF-8";
email = "odie86@gmail.com"; email = "odie86@gmail.com";
@ -31,6 +32,7 @@
domain = "odie.home.arpa"; domain = "odie.home.arpa";
neorg.workspaces = genNeorgWorkspaces "${homeDirectory}/Notes" neorgWorkspaces; neorg.workspaces = genNeorgWorkspaces "${homeDirectory}/Notes" neorgWorkspaces;
}; };
overlays = import ./overlays { inherit inputs; }; overlays = import ./overlays { inherit inputs; };
in in
{ {
@ -55,7 +57,7 @@
inherit inputs nixpkgs outputs flakeLib overlays; inherit inputs nixpkgs outputs flakeLib overlays;
vars = vars // { vars = vars // {
neorg.workspaces = genNeorgWorkspaces "/mnt/c/Users/odie/Sync/norg" neorgWorkspaces; neorg.workspaces = genNeorgWorkspaces "/mnt/c/Users/odie/Sync/norg" neorgWorkspaces;
extraGroups = ["minecraft"]; extraGroups = [ "minecraft" ];
}; };
system = "x86_64-linux"; system = "x86_64-linux";
hostName = "wsl-dev"; hostName = "wsl-dev";
@ -106,36 +108,43 @@
templates = { templates = {
empty = { empty = {
path = ./templates/empty; path = ./templates/empty;
description = "";
}; };
go = { go = {
path = ./templates/go; path = ./templates/go;
description = "";
}; };
rust = { rust = {
path = ./templates/rust; path = ./templates/rust;
description = "";
}; };
cpp = { cpp = {
path = ./templates/cpp; path = ./templates/cpp;
description = "";
}; };
}; };
} }
// flake-utils.lib.eachDefaultSystem (system: { // flake-utils.lib.eachDefaultSystem (system: { });
packages = {
neovim-ide = import ./pkgs/nixvim { inherit inputs system flakeLib nixpkgs vars overlays; };
};
});
inputs = { inputs = {
# System # System
nixpkgs.url = "github:nixos/nixpkgs"; # Use master nixpkgs.url = "github:nixos/nixpkgs"; # Use master
#nixpkgs.url = "github:nixos/nixpkgs/nixos-unstable"; # Use unstable #nixpkgs.url = "github:nixos/nixpkgs/nixos-unstable"; # Use unstable
nur.url = "github:nix-community/NUR"; nur = {
url = "github:nix-community/NUR";
inputs = {
nixpkgs.follows = "nixpkgs";
flake-parts.follows = "flake-parts";
};
};
nix-colors.url = "github:misterio77/nix-colors"; nix-colors.url = "github:misterio77/nix-colors";
systems.url = "github:nix-systems/default"; systems.url = "github:nix-systems/default";
flake-parts.url = "github:hercules-ci/flake-parts"; flake-parts.url = "github:hercules-ci/flake-parts";
flake-compat.url = "github:edolstra/flake-compat";
nixos-hardware.url = "github:nixos/nixos-hardware"; nixos-hardware.url = "github:nixos/nixos-hardware";
home-manager = { home-manager = {
url = "github:nix-community/home-manager"; url = "github:nix-community/home-manager";
inputs.nixpkgs.follows = "nixpkgs"; #inputs.nixpkgs.follows = "nixpkgs";
}; };
flake-utils = { flake-utils = {
url = "github:numtide/flake-utils"; url = "github:numtide/flake-utils";
@ -143,37 +152,51 @@
}; };
nixos-wsl = { nixos-wsl = {
url = "github:nix-community/NixOS-WSL"; url = "github:nix-community/NixOS-WSL";
inputs.nixpkgs.follows = "nixpkgs"; inputs = {
nixpkgs.follows = "nixpkgs";
flake-utils.follows = "flake-utils";
flake-compat.follows = "flake-compat";
};
}; };
nixgl = { nixgl = {
url = "github:nix-community/nixGL"; url = "github:nix-community/nixGL";
inputs.nixpkgs.follows = "nixpkgs"; inputs.nixpkgs.follows = "nixpkgs";
inputs.flake-utils.follows = "flake-utils";
}; };
catppuccin.url = "github:catppuccin/nix"; catppuccin.url = "github:catppuccin/nix";
# Neovim # Neovim
nixvim = { nixvim = {
url = "github:nix-community/nixvim"; url = "github:nix-community/nixvim";
inputs.nixpkgs.follows = "nixpkgs"; inputs = {
#nixpkgs.follows = "nixpkgs";
#home-manager.follows = "home-manager";
#flake-parts.follows = "flake-parts";
#flake-compat.follows = "flake-compat";
};
}; };
neovim-nightly-overlay = { neovim-nightly-overlay = {
url = "github:nix-community/neovim-nightly-overlay"; url = "github:nix-community/neovim-nightly-overlay";
inputs.nixpkgs.follows = "nixpkgs"; inputs = {
#nixpkgs.follows = "nixpkgs";
#flake-parts.follows = "flake-parts";
#flake-compat.follows = "flake-compat";
};
}; };
nvim-spell-de-utf8-dictionary = { nvim-spell-de-utf8-dictionary = {
url = "http://ftp.vim.org/vim/runtime/spell/de.utf-8.spl"; url = "https://ftp.uni-bayreuth.de/packages/editors/vim/runtime/spell/de.utf-8.spl";
flake = false; flake = false;
}; };
nvim-spell-de-utf8-suggestions = { nvim-spell-de-utf8-suggestions = {
url = "http://ftp.vim.org/vim/runtime/spell/de.utf-8.sug"; url = "https://ftp.uni-bayreuth.de/packages/editors/vim/runtime/spell/de.utf-8.sug";
flake = false; flake = false;
}; };
nvim-spell-de-latin1-dictionary = { nvim-spell-de-latin1-dictionary = {
url = "http://ftp.vim.org/vim/runtime/spell/de.latin1.spl"; url = "https://ftp.uni-bayreuth.de/packages/editors/vim/runtime/spell/de.latin1.spl";
flake = false; flake = false;
}; };
nvim-spell-de-latin1-suggestions = { nvim-spell-de-latin1-suggestions = {
url = "http://ftp.vim.org/vim/runtime/spell/de.latin1.sug"; url = "https://ftp.uni-bayreuth.de/packages/editors/vim/runtime/spell/de.latin1.sug";
flake = false; flake = false;
}; };
guihua = { guihua = {
@ -181,15 +204,13 @@
flake = false; flake = false;
}; };
/* neorg-overlay = {
neorg-overlay = {
url = "github:nvim-neorg/nixpkgs-neorg-overlay"; url = "github:nvim-neorg/nixpkgs-neorg-overlay";
inputs = { inputs = {
nixpkgs.follows = "nixpkgs"; nixpkgs.follows = "nixpkgs";
flake-utils.follows = "flake-utils"; flake-utils.follows = "flake-utils";
}; };
}; };
*/
lazydev = { lazydev = {
url = "github:folke/lazydev.nvim"; url = "github:folke/lazydev.nvim";
@ -200,8 +221,22 @@
flake = false; flake = false;
}; };
norg.url = "github:nvim-neorg/tree-sitter-norg/dev"; norg = {
norg-meta.url = "github:nvim-neorg/tree-sitter-norg-meta"; url = "github:nvim-neorg/tree-sitter-norg/dev";
inputs = {
nixpkgs.follows = "nixpkgs";
flake-utils.follows = "flake-utils";
flake-compat.follows = "flake-compat";
};
};
norg-meta = {
url = "github:nvim-neorg/tree-sitter-norg-meta";
inputs = {
nixpkgs.follows = "nixpkgs";
flake-utils.follows = "flake-utils";
flake-compat.follows = "flake-compat";
};
};
neorg = { neorg = {
url = "github:nvim-neorg/neorg"; url = "github:nvim-neorg/neorg";
flake = false; flake = false;
@ -219,7 +254,9 @@
nix-minecraft = { nix-minecraft = {
url = "github:Infinidoge/nix-minecraft"; url = "github:Infinidoge/nix-minecraft";
inputs = { inputs = {
nixpkgs.follows = "nixpkgs";
flake-utils.follows = "flake-utils"; flake-utils.follows = "flake-utils";
flake-compat.follows = "flake-compat";
}; };
}; };
minecraft-server-flake = { minecraft-server-flake = {

1
modules/nixos/base/nixos/default.nix
View File

@ -9,6 +9,7 @@
automatic = true; automatic = true;
}; };
settings = { settings = {
trusted-users = [ "root" "@wheel" ];
experimental-features = [ "nix-command" "flakes" ]; experimental-features = [ "nix-command" "flakes" ];
auto-optimise-store = true; auto-optimise-store = true;
}; };

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

@ -1,10 +1,16 @@
{ inputs, lib, ... }: { inputs, ... }:
with lib;
let let
whitelist = { whitelist = {
masterodie = "c0e67091-d6d0-4cf2-89d5-d0c6f2bd4f30"; masterodie = "c0e67091-d6d0-4cf2-89d5-d0c6f2bd4f30";
Rooomi = "5c5b4a28-e292-46fa-bf92-3b21f577c30e"; Rooomi = "5c5b4a28-e292-46fa-bf92-3b21f577c30e";
}; };
operators = {
masterodie = {
uuid = whitelist.masterodie;
level = 4;
bypassesPlayerLimit = true;
};
};
in in
{ {
imports = [ imports = [
@ -13,21 +19,22 @@ in
services.minecraft-servers = { services.minecraft-servers = {
velocitySecret = "01KqxtMy3kEH"; velocitySecret = "01KqxtMy3kEH";
openFirewall = true; openFirewall = true;
domain = "odie.home.arpa";
servers = { servers = {
vanilla-plus = { vanilla-plus = {
inherit whitelist; inherit whitelist operators;
enable = true; enable = true;
autoStart = false; autoStart = false;
openFirewall = true; openFirewall = true;
serverProperties = { serverProperties = {
server-ip = mkForce "0.0.0.0"; online-mode = false;
#online-mode = false; enforce-secure-profile = true;
#enforce-secure-profile = true;
}; };
}; };
flat = { flat = {
inherit whitelist; inherit whitelist operators;
enable = false; enable = true;
autoStart = false;
serverProperties = { serverProperties = {
online-mode = false; online-mode = false;
enforce-secure-profile = true; enforce-secure-profile = true;
@ -37,15 +44,20 @@ in
}; };
extraOptions = { extraOptions = {
flat = { flat = {
memory = "2G";
port = 25567; port = 25567;
mapPort = 8101; mapPort = 8101;
voicePort = 24455; voicePort = 24455;
blacklist = [ "Discord" "bluemap" "bmm-fabric" ];
whitelist = [ "worldedit" ];
}; };
vanilla-plus = { vanilla-plus = {
memory = "2G"; memory = "2G";
port = 25566; port = 25566;
mapPort = 8100; mapPort = 8100;
voicePort = 24454; voicePort = 24454;
blacklist = [ "Discord" "bluemap" "bmm-fabric" ];
whitelist = [ "worldedit" ];
}; };
velocity = { velocity = {
port = 25565; port = 25565;

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

@ -33,7 +33,7 @@
zen-mode.enable = true; zen-mode.enable = true;
web-devicons.enable = true; web-devicons.enable = true;
lazygit.enable = true; lazygit.enable = true;
nvim-colorizer.enable = true; colorizer.enable = true;
headlines.enable = true; headlines.enable = true;
cmake-tools = { cmake-tools = {

3
modules/nixvim/plugins/neorg.nix
View File

@ -1,7 +1,8 @@
{ vars, lib, ... }: { { vars, lib, ... }: {
plugins.neorg = { plugins.neorg = {
enable = true; enable = true;
modules = { telescopeIntegration.enable = true;
settings.load = {
"core.defaults" = lib.nixvim.emptyTable; "core.defaults" = lib.nixvim.emptyTable;
"core.dirman" = { "core.dirman" = {
config = { config = {

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

@ -1,4 +1,4 @@
{pkgs, ...}: { { pkgs, config, ... }: {
plugins = { plugins = {
treesitter = { treesitter = {
enable = true; enable = true;
@ -7,7 +7,9 @@
highlight.enable = true; highlight.enable = true;
}; };
folding = true; folding = true;
nixGrammars = false; nixGrammars = true;
grammarPackages = config.plugins.treesitter.package.passthru.allGrammars;
nixvimInjections = true;
}; };
treesitter-context.enable = true; treesitter-context.enable = true;
ts-autotag.enable = true; ts-autotag.enable = true;

5
overlays/default.nix
View File

@ -1,8 +1,9 @@
{ inputs, ... }: [ { inputs, ... }: [
(import ./neorg.nix { inherit inputs; }) #(import ./neorg.nix { inherit inputs; })
(import ./kodi.nix { }) (import ./kodi.nix { })
inputs.neovim-nightly-overlay.overlays.default inputs.neovim-nightly-overlay.overlays.default
inputs.neorg-overlay.overlays.default
inputs.nixvim.overlays.default inputs.nixvim.overlays.default
inputs.nur.overlay inputs.nur.overlays.default
inputs.nixgl.overlay inputs.nixgl.overlay
] ]

14
pkgs/spyglass/default.nix
View File

@ -1,14 +0,0 @@
{ 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
View File

File diff suppressed because it is too large Load Diff

12
pkgs/spyglass/package.json
View File

@ -1,12 +0,0 @@
{
"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
View File

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

2
profiles/nixos/wsl-dev/configuration.nix
View File

@ -22,7 +22,7 @@
services = { services = {
postgresql.enable = true; postgresql.enable = true;
open-webui = { open-webui = {
enable = true; enable = false;
host = "0.0.0.0"; host = "0.0.0.0";
environment = { environment = {
OLLAMA_API_BASE_URL = "http://10.0.20.10:11434"; OLLAMA_API_BASE_URL = "http://10.0.20.10:11434";