use mineflake, remove nixvim

This commit is contained in:
Noa Aarts 2024-05-11 19:10:35 +02:00
parent eaffd5ea6f
commit 46d8c24eee
5 changed files with 26 additions and 14 deletions

View file

@ -15,13 +15,13 @@
inputs.nixpkgs.follows = "nixpkgs"; inputs.nixpkgs.follows = "nixpkgs";
}; };
nixvim = { automapaper = {
url = "github:nix-community/nixvim"; url = "github:itepastra/automapaper";
inputs.nixpkgs.follows = "nixpkgs"; inputs.nixpkgs.follows = "nixpkgs";
}; };
automapaper = { mineflake = {
url = "github:itepastra/automapaper"; url = "github:nix-community/mineflake";
inputs.nixpkgs.follows = "nixpkgs"; 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 = { nixosConfigurations = {
lambdaOS = nixpkgs.lib.nixosSystem { lambdaOS = nixpkgs.lib.nixosSystem {
@ -65,6 +65,7 @@
specialArgs = { specialArgs = {
inherit inputs; inherit inputs;
inherit nix-colors; inherit nix-colors;
inherit mineflake;
}; };
modules = [ modules = [
disko.nixosModules.disko disko.nixosModules.disko

View file

@ -3,7 +3,6 @@
{ {
imports = imports =
[ [
inputs.nixvim.homeManagerModules.nixvim
../../modules/hyprland.nix ../../modules/hyprland.nix
../../modules/games ../../modules/games
../../modules/applications ../../modules/applications
@ -67,6 +66,13 @@
nodejs nodejs
opam opam
localsend localsend
(mineflake.buildMineflakeContainer {
package = mineflake.paper;
command = "${jre_headless}/bin/java -Xms 128M -Xmx1G -jar {} nogui";
plugins = with mineflake; [];
configs = [
];
})
]; ];

View file

@ -1,10 +1,6 @@
{ config, pkgs, inputs, ... }: { config, pkgs, inputs, ... }:
{ {
imports =
[
inputs.nixvim.homeManagerModules.nixvim
];
# Home Manager needs a bit of information about you and the paths it should # Home Manager needs a bit of information about you and the paths it should
# manage. # manage.
home.username = "root"; home.username = "root";

View file

@ -1,9 +1,8 @@
{ config, pkgs, inputs, ... }: { config, pkgs, mineflake, inputs, ... }:
{ {
imports = imports =
[ [
inputs.nixvim.homeManagerModules.nixvim
../../modules/applications ../../modules/applications
../../common/nvim/nvim.nix ../../common/nvim/nvim.nix
]; ];
@ -41,6 +40,13 @@
# Programming langs # Programming langs
go go
nodejs nodejs
(mineflake.buildMineflakeContainer {
package = mineflake.paper;
command = "${jre_headless}/bin/java -Xms 128M -Xmx1G -jar {} nogui";
plugins = with mineflake; [];
configs = [
];
})
]; ];
modules = { modules = {
@ -53,6 +59,10 @@
}; };
# Home Manager is pretty good at managing dotfiles. The primary way to manage # Home Manager is pretty good at managing dotfiles. The primary way to manage
# plain files is through 'home.file'. # plain files is through 'home.file'.
home.file = { home.file = {

View file

@ -3,7 +3,6 @@
{ {
imports = imports =
[ [
inputs.nixvim.homeManagerModules.nixvim
../../common/nvim/nvim.nix ../../common/nvim/nvim.nix
]; ];
# Home Manager needs a bit of information about you and the paths it should # Home Manager needs a bit of information about you and the paths it should