From 994e29e43a4339928b4b4fc3ac2de3bccac708e9 Mon Sep 17 00:00:00 2001 From: Patrick Neff Date: Fri, 15 Nov 2024 01:03:40 +0100 Subject: [PATCH] add minecraft --- flake.lock | 122 ++++++++++++--- flake.nix | 42 +++-- modules/home-manager/shell/default.nix | 1 + modules/home-manager/shell/tmux/default.nix | 30 +++- modules/nixos/base/user/default.nix | 7 +- modules/nixos/games/default.nix | 5 + modules/nixos/games/minecraft/default.nix | 165 ++++++++++++++++++++ modules/nixvim/plugins/default.nix | 1 + modules/nixvim/plugins/neorg.nix | 11 +- profiles/nixos/wsl-dev/configuration.nix | 2 + 10 files changed, 342 insertions(+), 44 deletions(-) create mode 100644 modules/nixos/games/default.nix create mode 100644 modules/nixos/games/minecraft/default.nix diff --git a/flake.lock b/flake.lock index 77de27f..de45fca 100644 --- a/flake.lock +++ b/flake.lock @@ -111,6 +111,22 @@ } }, "flake-compat_3": { + "flake": false, + "locked": { + "lastModified": 1673956053, + "narHash": "sha256-4gtG9iQuiKITOjNQQeQIpoIB6b16fm+504Ch3sNKLd8=", + "owner": "edolstra", + "repo": "flake-compat", + "rev": "35bb57c0c8d8b62bbfd284272c928ceb64ddbde9", + "type": "github" + }, + "original": { + "owner": "edolstra", + "repo": "flake-compat", + "type": "github" + } + }, + "flake-compat_4": { "flake": false, "locked": { "lastModified": 1696426674, @@ -126,7 +142,7 @@ "type": "github" } }, - "flake-compat_4": { + "flake-compat_5": { "locked": { "lastModified": 1696426674, "narHash": "sha256-kvjfFW7WAETZlt09AgDn1MrtKzP7t90Vf7vypd3OL1U=", @@ -140,7 +156,7 @@ "url": "https://flakehub.com/f/edolstra/flake-compat/1.tar.gz" } }, - "flake-compat_5": { + "flake-compat_6": { "flake": false, "locked": { "lastModified": 1641205782, @@ -156,7 +172,7 @@ "type": "github" } }, - "flake-compat_6": { + "flake-compat_7": { "flake": false, "locked": { "lastModified": 1641205782, @@ -594,6 +610,35 @@ "type": "github" } }, + "minecraft-server-flake": { + "inputs": { + "flake-utils": [ + "flake-utils" + ], + "nix-minecraft": [ + "nix-minecraft" + ], + "nixpkgs": [ + "nixpkgs" + ], + "systems": [ + "systems" + ] + }, + "locked": { + "lastModified": 1731718090, + "narHash": "sha256-t2yvuShb9HwFNkJ3xNB6eC9/itD7/XeXeafsk4li9lQ=", + "ref": "refs/heads/master", + "rev": "119c048af7940e09c501fd24dc84ee16ebfed4bc", + "revCount": 74, + "type": "git", + "url": "ssh://git@git.gaja-group.com/gaja-group/minecraft-server-flake.git" + }, + "original": { + "type": "git", + "url": "ssh://git@git.gaja-group.com/gaja-group/minecraft-server-flake.git" + } + }, "neorg": { "flake": false, "locked": { @@ -707,6 +752,28 @@ "type": "github" } }, + "nix-minecraft": { + "inputs": { + "flake-compat": "flake-compat_3", + "flake-utils": [ + "flake-utils" + ], + "nixpkgs": "nixpkgs" + }, + "locked": { + "lastModified": 1731375802, + "narHash": "sha256-CvWPEzrl2EA3xrtg9X6K8aqV7T5r0SaDz6PLpGA0yIY=", + "owner": "Infinidoge", + "repo": "nix-minecraft", + "rev": "b873a123366b9a62f9262414ada8d83b03f1f0bf", + "type": "github" + }, + "original": { + "owner": "Infinidoge", + "repo": "nix-minecraft", + "type": "github" + } + }, "nixgl": { "inputs": { "flake-utils": "flake-utils_2", @@ -745,7 +812,7 @@ }, "nixos-wsl": { "inputs": { - "flake-compat": "flake-compat_3", + "flake-compat": "flake-compat_4", "flake-utils": "flake-utils_3", "nixpkgs": [ "nixpkgs" @@ -767,11 +834,11 @@ }, "nixpkgs": { "locked": { - "lastModified": 1730531603, - "narHash": "sha256-Dqg6si5CqIzm87sp57j5nTaeBbWhHFaVyG7V6L8k3lY=", + "lastModified": 1715266358, + "narHash": "sha256-doPgfj+7FFe9rfzWo1siAV2mVCasW+Bh8I1cToAXEE4=", "owner": "nixos", "repo": "nixpkgs", - "rev": "7ffd9ae656aec493492b44d0ddfb28e79a1ea25d", + "rev": "f1010e0469db743d14519a1efd37e23f8513d714", "type": "github" }, "original": { @@ -810,16 +877,15 @@ }, "nixpkgs_2": { "locked": { - "lastModified": 1644486793, - "narHash": "sha256-EeijR4guVHgVv+JpOX3cQO+1XdrkJfGmiJ9XVsVU530=", - "owner": "NixOS", + "lastModified": 1730785428, + "narHash": "sha256-Zwl8YgTVJTEum+L+0zVAWvXAGbWAuXHax3KzuejaDyo=", + "owner": "nixos", "repo": "nixpkgs", - "rev": "1882c6b7368fd284ad01b0a5b5601ef136321292", + "rev": "4aa36568d413aca0ea84a1684d2d46f55dbabad7", "type": "github" }, "original": { - "owner": "NixOS", - "ref": "nixpkgs-unstable", + "owner": "nixos", "repo": "nixpkgs", "type": "github" } @@ -840,10 +906,26 @@ "type": "github" } }, + "nixpkgs_4": { + "locked": { + "lastModified": 1644486793, + "narHash": "sha256-EeijR4guVHgVv+JpOX3cQO+1XdrkJfGmiJ9XVsVU530=", + "owner": "NixOS", + "repo": "nixpkgs", + "rev": "1882c6b7368fd284ad01b0a5b5601ef136321292", + "type": "github" + }, + "original": { + "owner": "NixOS", + "ref": "nixpkgs-unstable", + "repo": "nixpkgs", + "type": "github" + } + }, "nixvim": { "inputs": { "devshell": "devshell", - "flake-compat": "flake-compat_4", + "flake-compat": "flake-compat_5", "flake-parts": "flake-parts_4", "git-hooks": "git-hooks_2", "home-manager": "home-manager_2", @@ -870,9 +952,9 @@ }, "norg": { "inputs": { - "flake-compat": "flake-compat_5", + "flake-compat": "flake-compat_6", "flake-utils": "flake-utils_5", - "nixpkgs": "nixpkgs_2" + "nixpkgs": "nixpkgs_3" }, "locked": { "lastModified": 1672582520, @@ -891,9 +973,9 @@ }, "norg-meta": { "inputs": { - "flake-compat": "flake-compat_6", + "flake-compat": "flake-compat_7", "flake-utils": "flake-utils_6", - "nixpkgs": "nixpkgs_3" + "nixpkgs": "nixpkgs_4" }, "locked": { "lastModified": 1713028366, @@ -1005,14 +1087,16 @@ "home-manager": "home-manager", "lazydev": "lazydev", "luavit-meta": "luavit-meta", + "minecraft-server-flake": "minecraft-server-flake", "neorg": "neorg", "neorg-telescope": "neorg-telescope", "neovim-nightly-overlay": "neovim-nightly-overlay", "nix-colors": "nix-colors", + "nix-minecraft": "nix-minecraft", "nixgl": "nixgl", "nixos-hardware": "nixos-hardware", "nixos-wsl": "nixos-wsl", - "nixpkgs": "nixpkgs", + "nixpkgs": "nixpkgs_2", "nixvim": "nixvim", "norg": "norg", "norg-meta": "norg-meta", diff --git a/flake.nix b/flake.nix index e3335f5..7ee14c9 100644 --- a/flake.nix +++ b/flake.nix @@ -12,9 +12,13 @@ flakeLib = import ./lib; + neorgWorkspaces = [ "default" "general" "games" "btc" ]; + genNeorgWorkspaces = root: workspaces: (builtins.listToAttrs (map (n: { name = n; value = "${root}/${n}"; }) workspaces)); + vars = rec { name = "Patrick Neff"; username = "odie"; + extraGroups = []; homeDirectory = "/home/${username}"; locale = "de_DE.UTF-8"; email = "odie86@gmail.com"; @@ -25,13 +29,7 @@ "ssh-ed25519 AAAAC3NzaC1lZDI1NTE5AAAAINs89u4Kvwlmq67eV+H/n+x9M8gsKDxQU+dCPSEb2vJe odie" ]; domain = "odie.home.arpa"; - notes = rec { - root = "${homeDirectory}/Notes"; - workspaces = { - general = "${root}/general"; - games = "${root}/games"; - }; - }; + neorg.workspaces = genNeorgWorkspaces "${homeDirectory}/Notes" neorgWorkspaces; }; overlays = import ./overlays { inherit inputs; }; in @@ -44,6 +42,7 @@ qemu = import ./modules/nixos/qemu; home-manager = import ./modules/nixos/home-manager; server = import ./modules/nixos/server; + games = import ./modules/nixos/games; }; nixosConfigurations = flakeLib.mkNixosConfiguration @@ -55,13 +54,8 @@ // flakeLib.mkNixosConfiguration { inherit inputs nixpkgs outputs flakeLib overlays; vars = vars // { - notes = rec { - root = "/mnt/c/Users/odie/Sync/norg"; - workspaces = { - general = "${root}/general"; - games = "${root}/games"; - }; - }; + neorg.workspaces = genNeorgWorkspaces "/mnt/c/Users/odie/Sync/norg" neorgWorkspaces; + extraGroups = ["minecraft"]; }; system = "x86_64-linux"; hostName = "wsl-dev"; @@ -132,7 +126,8 @@ inputs = { # System - nixpkgs.url = "github:nixos/nixpkgs/nixos-unstable"; + nixpkgs.url = "github:nixos/nixpkgs"; # Use master + #nixpkgs.url = "github:nixos/nixpkgs/nixos-unstable"; # Use unstable nur.url = "github:nix-community/NUR"; nix-colors.url = "github:misterio77/nix-colors"; systems.url = "github:nix-systems/default"; @@ -216,6 +211,23 @@ flake = false; }; + # Games + nix-minecraft = { + url = "github:Infinidoge/nix-minecraft"; + inputs = { + flake-utils.follows = "flake-utils"; + }; + }; + minecraft-server-flake = { + url = "git+ssh://git@git.gaja-group.com/gaja-group/minecraft-server-flake.git"; + inputs = { + nixpkgs.follows = "nixpkgs"; + flake-utils.follows = "flake-utils"; + systems.follows = "systems"; + nix-minecraft.follows = "nix-minecraft"; + }; + }; + # Misc csleeptimer = { url = "git+ssh://gitea@git.niederkassel.neff-steindesign.de/odie/csleeptimer.git"; diff --git a/modules/home-manager/shell/default.nix b/modules/home-manager/shell/default.nix index 991ac8d..0353742 100644 --- a/modules/home-manager/shell/default.nix +++ b/modules/home-manager/shell/default.nix @@ -22,6 +22,7 @@ ripgrep fd gdu + jq python3Packages.argcomplete ]; diff --git a/modules/home-manager/shell/tmux/default.nix b/modules/home-manager/shell/tmux/default.nix index 7067fd0..995deec 100644 --- a/modules/home-manager/shell/tmux/default.nix +++ b/modules/home-manager/shell/tmux/default.nix @@ -1,8 +1,6 @@ { pkgs, lib, config, ... }: { - options = { - - }; + options = { }; config = { programs.tmux = lib.mkIf config.programs.tmux.enable { newSession = false; @@ -22,10 +20,32 @@ { plugin = catppuccin; extraConfig = '' - set -g @catppuccin_window_default_text "#W" # use "#W" for application instead of directory - set -g @catppuccin_window_current_text "#W" # use "#W" for application instead of directory + set -g @catppuccin_flavour "mocha" + set -g @catppuccin_window_status_style "rounded" + set -g @catppuccin_window_default_text " #W" # use "#W" for application instead of directory + set -g @catppuccin_window_current_text " #W" # use "#W" for application instead of directory + set -g @catppuccin_window_status "icon" + set -g @catppuccin_window_separator "" + set -g @catppuccin_window_middle_separator "█" + set -g @catppuccin_window_left_separator "█" + set -g @catppuccin_window_right_separator "█" set -g @catppuccin_window_status_enable "yes" + set -g @catppuccin_icon_window_last "󰖰 " + set -g @catppuccin_icon_window_current "󰖯 " + set -g @catppuccin_icon_window_zoom "󰁌 " + set -g @catppuccin_icon_window_mark "󰃀 " + set -g @catppuccin_icon_window_silent "󰂛 " + set -g @catppuccin_icon_window_activity "󱅫 " + set -g @catppuccin_icon_window_bell "󰂞 " + #set -g @catppuccin_window_status_enable "yes" set -g @catppuccin_status_modules_right "directory user host date_time session" + set -g status-right-length 100 + #set -g status-right "#{E:@catppuccin_status_directory}" + #set -ag status-right "#{E:@catppuccin_status_user}" + #set -ag status-right "#{E:@catppuccin_status_host}" + #set -ag status-right "#{E:@catppuccin_status_date_time}" + #set -agF status-right "#{E:@catppuccin_status_session}" + set -g status-left "" ''; } better-mouse-mode diff --git a/modules/nixos/base/user/default.nix b/modules/nixos/base/user/default.nix index 54397df..4602102 100644 --- a/modules/nixos/base/user/default.nix +++ b/modules/nixos/base/user/default.nix @@ -5,7 +5,7 @@ vars, ... }: let - inherit (vars) username name locale hostname sshKeys; + inherit (vars) username name sshKeys extraGroups; baseGroups = [ "users" @@ -24,7 +24,7 @@ "spi" ] else []; - extraGroups = baseGroups ++ rpiGroups; + allExtraGroups = baseGroups ++ rpiGroups ++ extraGroups; basePackages = with pkgs; [home-manager]; wslPackages = @@ -45,7 +45,8 @@ in { groups.${username} = {}; users = { ${username} = { - inherit packages extraGroups; + inherit packages ; + extraGroups = allExtraGroups; name = username; uid = 1000; isNormalUser = true; diff --git a/modules/nixos/games/default.nix b/modules/nixos/games/default.nix new file mode 100644 index 0000000..639ea68 --- /dev/null +++ b/modules/nixos/games/default.nix @@ -0,0 +1,5 @@ +{ + imports = [ + ./minecraft + ]; +} diff --git a/modules/nixos/games/minecraft/default.nix b/modules/nixos/games/minecraft/default.nix new file mode 100644 index 0000000..c0bb86d --- /dev/null +++ b/modules/nixos/games/minecraft/default.nix @@ -0,0 +1,165 @@ +{ inputs +, ... +}: { + imports = [ + inputs.minecraft-server-flake.nixosModules.minecraft-servers + ]; + nixpkgs.overlays = [ + inputs.minecraft-server-flake.overlays.minecraft-servers + ]; +} +/* + { pkgs, lib, config, inputs, ... }: with lib; { + imports = [ + inputs.nix-minecraft.nixosModules.minecraft-servers + ]; + nixpkgs.overlays = [ + inputs.nix-minecraft.overlays.default + ]; + services.minecraft-servers = mkIf config.services.minecraft-servers.enable { + eula = true; + servers = { + default = { + enable = true; + package = pkgs.fabricServers.fabric-1_21_3.override { jre_headless = pkgs.jdk23_headless; }; + jvmOpts = "-Xms4092M -Xmx4092M -XX:+UseG1GC"; + serverProperties = { + difficulty = "hard"; + gamemode = "survival"; + max-players = 10; + motd = "NixOS Minecraft server!"; + white-list = true; + }; + whitelist = { + masterodie = "c0e67091-d6d0-4cf2-89d5-d0c6f2bd4f30"; + Rooomi = "5c5b4a28-e292-46fa-bf92-3b21f577c30e"; + }; + symlinks = { + ## Api Extensions + # Fabric API https://modrinth.com/mod/fabric-api + "mods/fabric-api.jar" = pkgs.fetchurl { + url = "https://cdn.modrinth.com/data/P7dR8mSH/versions/kwP1bhmH/fabric-api-0.108.0%2B1.21.3.jar"; + sha512 = "sha512-EGHf/3Iamg/MaXzQAsf3qyT+tH6WbdldhQJ4mNbcVH+cclvVZcWSnFRL3662MLUHP0vzwb+Tuqm78LDv9FquJw=="; + }; + # Cloth Config https://modrinth.com/mod/cloth-config + "mods/cloth-config.jar" = pkgs.fetchurl { + url = "https://cdn.modrinth.com/data/9s6osm5g/versions/JbVSQUVw/cloth-config-16.0.141-fabric.jar"; + sha512 = "sha512-+LD6Fv6AqLeKBZ6/HPNm1lEysd0YMNi2iez8cxaWUU4rPdc5A/uzfQpfPYU6pSGCe/ftb7XZ2yRcav1/+54mhw=="; + }; + # Fabric Language Kotlin https://modrinth.com/mod/fabric-language-kotlin + "mods/fabric-language-kotlin.jar" = pkgs.fetchurl { + url = "https://cdn.modrinth.com/data/Ha28R6CL/versions/B0fZidZi/fabric-language-kotlin-1.12.3%2Bkotlin.2.0.21.jar"; + sha512 = "sha512-qSeMCjKkkGmJ//F0Ma1cwT++2VqZoVu44QukJ3FOKOtIKPd5r/tOgHMdmKsU8j5NdZ6iCQvgWhDakIYIE55n5w=="; + }; + + # Performance + # Ferrite Core https://modrinth.com/mod/ferrite-core/ + "mods/ferritecore.jar" = pkgs.fetchurl { + url = "https://cdn.modrinth.com/data/uXXizFIs/versions/a3QXXGz2/ferritecore-7.1.0-hotfix-fabric.jar"; + sha512 = "sha512-rhqzC+tZOGQ88q57giB2nyyRfj9UQeRum8kAKVNIwKVBoyXDC438OAOSBWINhywngJrNxnQTUfCOTI7cNq4rzA=="; + }; + "mods/moonrise.jar" = pkgs.fetchurl { + url = "https://cdn.modrinth.com/data/KOHu7RCS/versions/S7ZBVFid/Moonrise-Fabric-0.2.0-beta.3%2Bbad5cae.jar"; + sha512 = "sha512-hIMd4/QCvS9p+6EylBIGT0h1cVJ/u0GCxFQz66PXFu9SwFfU8un3lIIaxRR9uud071yDd29ON2/BC6PYABXP3g=="; + }; + # Lithium https://modrinth.com/mod/lithium/ + "mods/lithium.jar" = pkgs.fetchurl { + url = "https://cdn.modrinth.com/data/gvQqBUqZ/versions/2Ea7RMWZ/lithium-fabric-0.14.1-snapshot%2Bmc1.21.3-build.89.jar"; + sha512 = "sha512-0SKyOlIMslc8LqupVWwHhGrl8vjumqvfXc6RQzTkQCeic8jPLvIkP+A8+GqIWOqy3cwkfZVmHe5AzXg89ESu/w=="; + }; + /* + # Krypton https://modrinth.com/mod/krypton + "mods/krypton.jar" = pkgs.fetchurl { + url = "https://cdn.modrinth.com/data/fQEb0iXm/versions/Acz3ttTp/krypton-0.2.8.jar"; + sha512 = "sha512-X4z5bHm/1NiT8dcNpYLmICa+02r0mn+nseAPtu+yjZrWoe7BRwIElrT+OGk9M/5r/NHuu9k0dWEu5EKQwkg3hA=="; + }; + # Noisium https://modrinth.com/mod/noisium + "mods/noisium.jar" = pkgs.fetchurl { + url = "https://cdn.modrinth.com/data/KuNKN7d2/versions/M4c8aGZ4/noisium-fabric-2.4.0%2Bmc1.21.2-1.21.3.jar"; + sha512 = "sha512-zASbN/znPqTRK0J1Ogq+zI8pEEuws5fjt5+rL2yVd5So5wTDOdh3ieMhfQNx4xxJ1x7/XKMdGgQuW1q4aayoRA=="; + }; + + #ViaVersion + "mods/vaifabric.jar" = pkgs.fetchurl { + url = "https://cdn.modrinth.com/data/YlKdE5VK/versions/CQ7NwggR/ViaFabric-0.4.16%2B88-main.jar"; + sha512 = "sha512-kxfAa/tP6cRd3Fx+fscoQwI/qZwxbRO+/uuS/94MQwPnSUCBrjOmY/jnDsY4GH/a4blPWHHVIUYGwtS29rC0Qw=="; + }; + + # Voice Chat + "mods/voicechat.jar" = pkgs.fetchurl { + url = "https://cdn.modrinth.com/data/9eGKb6K1/versions/4qhHM0lS/voicechat-fabric-1.21.3-2.5.25.jar"; + sha512 = "sha512-27XVOZ9/VUVCGFXBYKUWoxL7KqZLxJeO0sA9bbp1leOmIiYePU8kmhK7PfmpZncbCdXsuOIHLjsXu65wS8g7mA=="; + }; + + # Map + "mods/bluemap.jar" = pkgs.fetchurl { + url = "https://cdn.modrinth.com/data/swbUV1cr/versions/Ysj3eVYx/bluemap-5.4-fabric.jar"; + sha512 = "sha512-U0vKpejJHvpgWt544QJvxgicbLQN6/0aLkkR6I0/mgZ4pDcdiLQER51ZsKjDXKMn2b5Ad+SezZKQgU6ZQMGC/A=="; + }; + + "mods/jade.jar" = pkgs.fetchurl { + url = "https://cdn.modrinth.com/data/nvQzSEkH/versions/pGE7hUKk/Jade-1.21.3-Fabric-16.0.4.jar"; + sha512 = "sha512-9THM74NBealcS4RoR+2onN1aaYiQ8C3pHL6MrOcmFGlTw9u+q9VtSqYq/GQeRNRSmwY3WeC8wVLCDbwA25NRnw=="; + }; + + "mods/worldedit.jar" = pkgs.fetchurl { + url = "https://cdn.modrinth.com/data/1u6JkXh5/versions/HFvwhOTG/worldedit-mod-7.3.9-beta-01-dist.jar"; + sha512 = "sha512-SXqIS65rgIRgpgbdL47y0SasAWvESMbUSINUg6eJGdOPLRmOHmimS4ixpMRfDE9hdYxlUcOgsz7nFNCjhnO+0Q=="; + }; + + # Permission ? + "mods/luckperms.jar" = pkgs.fetchurl { + url = "https://download.luckperms.net/1561/fabric/LuckPerms-Fabric-5.4.146.jar"; + sha512 = "sha512-oA+/IbgyeVur/FPCdcAi3rmtmOokCp1K94GjwEA5/EgSwpLky0pJ13TAtSY7ZhzgqUGIULo8UnrPKgJcHR2bsg=="; + }; + "mods/luckperms-placeholderapi.jar" = pkgs.fetchurl { + url = "https://ci.lucko.me/job/LuckPermsPlaceholders/12/artifact/fabric-placeholderapi/build/libs/LuckPerms-Fabric-PlaceholderAPI-Hook.jar"; + sha512 = "sha512-yQIeNOfk0Ze2OEg5RyDK3xWTMyx9AmyKX6Kz7n+mwM4L0oOnRJXRyHqF/rRBzwPny3aNhhGxMPzpSPgc+3A5yg=="; + }; + "mods/text-placeholder-api.jar" = pkgs.fetchurl { + url = "https://cdn.modrinth.com/data/eXts2L7r/versions/ZGVganES/placeholder-api-2.5.0%2B1.21.2.jar"; + sha512 = "sha512-yJ6MOZkPq3sSrUVG2K6Ghb1o3aDJPPS+c6teIGqJ+d5W+8wAtXPHXKY+2A5b/0S0Com2qTLpckSM2/ZQ98dGRQ=="; + }; + "mods/permissions-api.jar" = pkgs.fetchurl { + url = "https://cdn.modrinth.com/data/lzVo0Dll/versions/nu0wDgUF/fabric-permissions-api-0.3.3.jar"; + sha512 = "sha512-drOsBNlEDhOkkxwPY9F09EiUIbjt4EthuKM20iTECmaQyliy4NlpldeIdJlkeaw2q0oOoGaZH/ugfWAwyvcQXw=="; + }; + "mods/minecraft-permissions.jar" = pkgs.fetchurl { + url = "https://cdn.modrinth.com/data/fdZkP5Bb/versions/7awQNHzw/vanilla-permissions-0.2.4%2B1.21.3.jar"; + sha512 = "sha512-bxgsP5dvs6XppUIJS8D896EgqlWjLlsO18FiA0okKH6h27XlE4xK9BwoSQC0oF2sprmYwtjJc+MxiIeYMtz/VQ=="; + }; + + "mods/styled-chat.jar" = pkgs.fetchurl { + url = "https://cdn.modrinth.com/data/doqSKB0e/versions/5jN44RUy/styled-chat-2.7.0%2B1.21.2.jar"; + sha512 = "sha512-/4rKdXmcQpaeZH6kpPIo7kot+gIu0BvuN71Bac79rUc92RUJI99OexBacDTJ5bgKRQWvAn3wmcHIk8phUHBieg=="; + }; + "mods/styled-player-list.jar" = pkgs.fetchurl { + url = "https://cdn.modrinth.com/data/DQIfKUHf/versions/gyvLcVPF/styledplayerlist-3.6.0%2B1.21.2.jar"; + sha512 = "sha512-qjwYZG0LNPVq4KPuJL+7YCbwxs6ZIXWGzqAqUhiUb8Rn193TiWDdJOezkq0FEfMLhcvu5XwA/k6LuIUPPVZY3A=="; + }; + + "mods/datapack-loader.jar" = pkgs.fetchurl { + url = "https://cdn.modrinth.com/data/gEUERjxK/versions/Du7xlu89/data-loader-1.1.6%2B1.21.jar"; + sha512 = "sha512-yc0Jy5UyXPJA1U4o9bojnxaQHFR9hyA+LAIPPHwWl5JpVcIBZ9U8DBr5G8xFvn3NqU84qMI+b0BpCyT+rOAg8w=="; + }; + + "mods/syncmatica.jar" = pkgs.fetchurl { + url = "https://github.com/sakura-ryoko/syncmatica/releases/download/1.21.3-sakura.10/syncmatica-fabric-1.21.3-0.3.12-sakura.10.jar"; + sha512 = "sha512-f6/rIWQxnM57RBiwlVMyd9UQ7DDv/40idfHwOIkgh7pgdDJL5sZ6US7WF1aikqw2+2ZJw8HcVODF4rE8cPCn+A=="; + }; + + }; + files = { + "config/styled-chat.json" = pkgs.writeText "styled-chat.json" (builtins.readFile ./config/styled-chat.json); + "config/styledplayerlist/config.json" = pkgs.writeText "config.json" (builtins.readFile ./config/styledplayerlist/config.json); + "config/styledplayerlist/styles/default.json" = pkgs.writeText "default.json" (builtins.readFile ./config/styledplayerlist/styles/default.json); + "config/voicechat/voicechat-server.properties" = pkgs.writeText "voicechat-server.properties" (builtins.readFile ./config/voicechat/voicechat-server.properties); + "config/ferritecore.mixin.properties" = pkgs.writeText "ferritecore.mixin.properties" (builtins.readFile ./config/ferritecore.mixin.properties); + "config/moonlight.yml" = pkgs.writeText "moonlight.yml" (builtins.readFile ./config/moonlight.yml); + "config/worldedit/worldedit.properties" = pkgs.writeText "worldedit.properties" (builtins.readFile ./config/worldedit/worldedit.properties); + }; + }; + }; + }; + } +*/ diff --git a/modules/nixvim/plugins/default.nix b/modules/nixvim/plugins/default.nix index 0e6c074..6cb4321 100644 --- a/modules/nixvim/plugins/default.nix +++ b/modules/nixvim/plugins/default.nix @@ -34,6 +34,7 @@ web-devicons.enable = true; lazygit.enable = true; nvim-colorizer.enable = true; + headlines.enable = true; cmake-tools = { enable = true; diff --git a/modules/nixvim/plugins/neorg.nix b/modules/nixvim/plugins/neorg.nix index 8b11118..4f061c8 100644 --- a/modules/nixvim/plugins/neorg.nix +++ b/modules/nixvim/plugins/neorg.nix @@ -5,8 +5,7 @@ "core.defaults" = lib.nixvim.emptyTable; "core.dirman" = { config = { - inherit (vars.notes) workspaces; - default_workspace = "general"; + inherit (vars.neorg) workspaces; }; }; "core.concealer" = { @@ -60,6 +59,14 @@ desc = "[neorg] Index"; }; } + { + key = "nl"; + action = ":Telescope neorg switch-workspace"; + options = { + silent = true; + desc = "[neorg] Switch workspace"; + }; + } { key = "nt"; action = ":Neorg toc"; diff --git a/profiles/nixos/wsl-dev/configuration.nix b/profiles/nixos/wsl-dev/configuration.nix index cf0ecf0..6801bf9 100644 --- a/profiles/nixos/wsl-dev/configuration.nix +++ b/profiles/nixos/wsl-dev/configuration.nix @@ -7,6 +7,7 @@ outputs.nixosModules.base outputs.nixosModules.wsl outputs.nixosModules.server + outputs.nixosModules.games ]; wsl.enable = true; @@ -30,6 +31,7 @@ searx = { enable = true; }; + minecraft-servers.enable = true; }; system.stateVersion = "23.11";