diff --git a/flake.nix b/flake.nix index 7afb24a..b42005d 100644 --- a/flake.nix +++ b/flake.nix @@ -15,16 +15,16 @@ inputs.nixpkgs.follows = "nixpkgs"; }; - nixvim = { - url = "github:nix-community/nixvim"; - inputs.nixpkgs.follows = "nixpkgs"; - }; - automapaper = { url = "github:itepastra/automapaper"; inputs.nixpkgs.follows = "nixpkgs"; }; + mineflake = { + url = "github:nix-community/mineflake"; + inputs.nixpkgs.follows = "nixpkgs"; + }; + hyprland = { url = "git+https://github.com/hyprwm/Hyprland?submodules=1"; inputs.nixpkgs.follows = "nixpkgs"; @@ -47,7 +47,7 @@ }; - outputs = { self, nixpkgs, nix-colors, automapaper, disko, home-manager, hyprland, lazy, ... }@inputs: + outputs = { self, nixpkgs, nix-colors, automapaper, disko, home-manager, hyprland, lazy, mineflake, ... }@inputs: { nixosConfigurations = { lambdaOS = nixpkgs.lib.nixosSystem { @@ -65,6 +65,7 @@ specialArgs = { inherit inputs; inherit nix-colors; + inherit mineflake; }; modules = [ disko.nixosModules.disko diff --git a/hosts/default/home.nix b/hosts/default/home.nix index 8795aa8..050525d 100644 --- a/hosts/default/home.nix +++ b/hosts/default/home.nix @@ -3,7 +3,6 @@ { imports = [ - inputs.nixvim.homeManagerModules.nixvim ../../modules/hyprland.nix ../../modules/games ../../modules/applications @@ -67,6 +66,13 @@ nodejs opam localsend + (mineflake.buildMineflakeContainer { + package = mineflake.paper; + command = "${jre_headless}/bin/java -Xms 128M -Xmx1G -jar {} nogui"; + plugins = with mineflake; []; + configs = [ + ]; + }) ]; diff --git a/hosts/default/root.nix b/hosts/default/root.nix index 091d60c..267b7d5 100644 --- a/hosts/default/root.nix +++ b/hosts/default/root.nix @@ -1,10 +1,6 @@ { config, pkgs, inputs, ... }: { - imports = - [ - inputs.nixvim.homeManagerModules.nixvim - ]; # Home Manager needs a bit of information about you and the paths it should # manage. home.username = "root"; diff --git a/hosts/server/home.nix b/hosts/server/home.nix index 3335d4f..450a142 100644 --- a/hosts/server/home.nix +++ b/hosts/server/home.nix @@ -1,9 +1,8 @@ -{ config, pkgs, inputs, ... }: +{ config, pkgs, mineflake, inputs, ... }: { imports = [ - inputs.nixvim.homeManagerModules.nixvim ../../modules/applications ../../common/nvim/nvim.nix ]; @@ -41,6 +40,13 @@ # Programming langs go nodejs + (mineflake.buildMineflakeContainer { + package = mineflake.paper; + command = "${jre_headless}/bin/java -Xms 128M -Xmx1G -jar {} nogui"; + plugins = with mineflake; []; + configs = [ + ]; + }) ]; modules = { @@ -53,6 +59,10 @@ }; + + + + # Home Manager is pretty good at managing dotfiles. The primary way to manage # plain files is through 'home.file'. home.file = { diff --git a/hosts/server/root.nix b/hosts/server/root.nix index d3d671f..4ab83b4 100644 --- a/hosts/server/root.nix +++ b/hosts/server/root.nix @@ -3,7 +3,6 @@ { imports = [ - inputs.nixvim.homeManagerModules.nixvim ../../common/nvim/nvim.nix ]; # Home Manager needs a bit of information about you and the paths it should