flake.lock: Update

Flake lock file updates:

• Updated input 'minecraft-server-flake':
    'git+file:///home/odie/Code/nix/minecraft-server-flake?ref=refs/heads/master&rev=dfd55284e34bfdee2f223ca20b65f8c7d78fd3f7' (2024-12-23)
  → 'git+file:///home/odie/Code/nix/minecraft-server-flake?ref=refs/heads/master&rev=d77398c8dbd77ea3669f233aeb64ede12b25e75b' (2024-12-23)

flake.nix

@@ -10,6 +10,7 @@
     let
       inherit (self) inputs outputs;
 
+
       flakeLib = import ./lib;
 
       neorgWorkspaces = [ "default" "general" "games" "btc" ];
@@ -31,6 +32,7 @@
         domain = "odie.home.arpa";
         neorg.workspaces = genNeorgWorkspaces "${homeDirectory}/Notes" neorgWorkspaces;
       };
+
       overlays = import ./overlays { inherit inputs; };
     in
     {
@@ -106,36 +108,43 @@
       templates = {
         empty = {
           path = ./templates/empty;
+          description = "";
         };
         go = {
           path = ./templates/go;
+          description = "";
         };
         rust = {
           path = ./templates/rust;
+          description = "";
         };
         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 = {
     # System
     nixpkgs.url = "github:nixos/nixpkgs"; # Use master
     #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";
     systems.url = "github:nix-systems/default";
     flake-parts.url = "github:hercules-ci/flake-parts";
+    flake-compat.url = "github:edolstra/flake-compat";
     nixos-hardware.url = "github:nixos/nixos-hardware";
     home-manager = {
       url = "github:nix-community/home-manager";
-      inputs.nixpkgs.follows = "nixpkgs";
+      #inputs.nixpkgs.follows = "nixpkgs";
     };
     flake-utils = {
       url = "github:numtide/flake-utils";
@@ -143,49 +152,58 @@
     };
     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 = {
       url = "github:nix-community/nixGL";
       inputs.nixpkgs.follows = "nixpkgs";
+      inputs.flake-utils.follows = "flake-utils";
     };
     catppuccin.url = "github:catppuccin/nix";
 
     # Neovim
     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 = {
       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 = {
-      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;
     };
     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;
     };
     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;
     };
     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;
     };
     guihua = {
       url = "github:ray-x/guihua.lua";
       flake = false;
     };
-    vim-mcfunction = {
-      url = "github:RubixTheSlime/vim-mcfunction";
-      flake = false;
-    };
 
-    /*
     neorg-overlay = {
       url = "github:nvim-neorg/nixpkgs-neorg-overlay";
       inputs = {
@@ -193,7 +211,6 @@
         flake-utils.follows = "flake-utils";
       };
     };
-    */
 
     lazydev = {
       url = "github:folke/lazydev.nvim";
@@ -204,8 +221,22 @@
       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 = {
       url = "github:nvim-neorg/neorg";
       flake = false;
@@ -214,16 +245,23 @@
       url = "github:nvim-neorg/neorg-telescope";
       flake = false;
     };
+    vim-mcfunction = {
+      url = "github:CrystalAlpha358/vim-mcfunction";
+      flake = false;
+    };
 
     # Games
     nix-minecraft = {
       url = "github:Infinidoge/nix-minecraft";
       inputs = {
+        nixpkgs.follows = "nixpkgs";
         flake-utils.follows = "flake-utils";
+        flake-compat.follows = "flake-compat";
       };
     };
     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 = {
         nixpkgs.follows = "nixpkgs";
         flake-utils.follows = "flake-utils";

modules/home-manager/shell/default.nix

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

modules/nixos/base/nixos/default.nix

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

modules/nixos/games/minecraft/default.nix

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

modules/nixvim/plugins/avante.nix

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

modules/nixvim/plugins/default.nix

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

modules/nixvim/plugins/lsp/languages/default.nix

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

modules/nixvim/plugins/neorg.nix

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

modules/nixvim/plugins/treesitter.nix

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

overlays/default.nix

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

profiles/nixos/wsl-dev/configuration.nix

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