diff --git a/flake.lock b/flake.lock index 3b9b358..a05799c 100644 --- a/flake.lock +++ b/flake.lock @@ -183,6 +183,41 @@ "url": "https://git.lix.systems/lix-project/nixos-module/archive/2.91.1-1.tar.gz" } }, + "mcversions": { + "flake": false, + "locked": { + "lastModified": 1729738014, + "narHash": "sha256-pwtIkvOmGBj396oBlEOVce5Yie52ERR8v3FI3BNr/D4=", + "owner": "yushijinhun", + "repo": "minecraft-version-json-history", + "rev": "0aae0df5907d2274865e7dcc4204b51a7a0f59d0", + "type": "github" + }, + "original": { + "owner": "yushijinhun", + "repo": "minecraft-version-json-history", + "type": "github" + } + }, + "minecraft": { + "inputs": { + "mcversions": "mcversions", + "nixpkgs": "nixpkgs_2" + }, + "locked": { + "lastModified": 1727495560, + "narHash": "sha256-nkQDG7lvk6HZY2c2MzkA0PrWnlGvsMHEFWhDgFj7CTs=", + "owner": "sharpstormgames", + "repo": "minecraft-nix", + "rev": "facb4964916caac56ebfdd10ddc08cc4a1628a2a", + "type": "github" + }, + "original": { + "owner": "sharpstormgames", + "repo": "minecraft-nix", + "type": "github" + } + }, "nix-index-database": { "inputs": { "nixpkgs": [ @@ -251,15 +286,32 @@ "type": "github" } }, + "nixpkgs_3": { + "locked": { + "lastModified": 1729665710, + "narHash": "sha256-AlcmCXJZPIlO5dmFzV3V2XF6x/OpNWUV8Y/FMPGd8Z4=", + "owner": "nixos", + "repo": "nixpkgs", + "rev": "2768c7d042a37de65bb1b5b3268fc987e534c49d", + "type": "github" + }, + "original": { + "owner": "nixos", + "ref": "nixos-unstable", + "repo": "nixpkgs", + "type": "github" + } + }, "root": { "inputs": { "agenix": "agenix", "catppuccin": "catppuccin", "home-manager": "home-manager_2", "lix-module": "lix-module", + "minecraft": "minecraft", "nix-index-database": "nix-index-database", "nixos-hardware": "nixos-hardware", - "nixpkgs": "nixpkgs_2", + "nixpkgs": "nixpkgs_3", "spicetify-nix": "spicetify-nix" } }, diff --git a/flake.nix b/flake.nix index 9f215f8..006a323 100644 --- a/flake.nix +++ b/flake.nix @@ -30,6 +30,8 @@ url = "https://git.lix.systems/lix-project/nixos-module/archive/2.91.1-1.tar.gz"; inputs.nixpkgs.follows = "nixpkgs"; }; + + minecraft.url = "github:sharpstormgames/minecraft-nix"; }; outputs = { self, nixpkgs, nixos-hardware, agenix, spicetify-nix, nix-index-database, lix-module, ... } @ inputs: { diff --git a/home/default.nix b/home/default.nix index f4e61f1..be74436 100644 --- a/home/default.nix +++ b/home/default.nix @@ -20,7 +20,7 @@ /* The home.stateVersion option does not have a default and must be set */ home.stateVersion = "24.05"; /* Here goes the rest of your home-manager config, e.g. home.packages = [ pkgs.foo ]; */ - # inherit ./hyprland.nix; + home.username = "rhea"; home.homeDirectory = "/home/rhea"; programs.home-manager.enable = true; @@ -35,6 +35,7 @@ inputs.spicetify-nix.homeManagerModules.default inputs.nix-index-database.hmModules.nix-index inputs.agenix.homeManagerModules.age + inputs.minecraft.homeManagerModule ./hyprland.nix ./git.nix ./waybar @@ -52,6 +53,7 @@ ./ssh.nix ./blueman.nix ./direnv.nix + ./minecraft.nix ]; home.pointerCursor = { diff --git a/home/minecraft.nix b/home/minecraft.nix new file mode 100644 index 0000000..a41b3b5 --- /dev/null +++ b/home/minecraft.nix @@ -0,0 +1,9 @@ +{ + programs.minecraft = { + instances = { + "vanilla20" = { + minecraft.version = "1.20"; + }; + }; + }; +} \ No newline at end of file diff --git a/home/packages.nix b/home/packages.nix index 7fa81e0..a3344c7 100644 --- a/home/packages.nix +++ b/home/packages.nix @@ -1,4 +1,4 @@ -{ pkgs, agenix, ... }: +{ pkgs, agenix, ...}: { home.packages = with pkgs; [ # Desktop Applications @@ -28,6 +28,7 @@ nil nh agenix.packages.${system}.default + nixpkgs-fmt # Dev Things vscode @@ -36,5 +37,6 @@ jetbrains.jdk jetbrains.rust-rover ]; + nixpkgs.config.vesktop.commandLineArgs = "--enable-features=UseOzonePlatform --ozone-platform=wayland"; }