diff --git a/flake.lock b/flake.lock index 4645db2..7900563 100644 --- a/flake.lock +++ b/flake.lock @@ -453,6 +453,42 @@ "type": "github" } }, + "flake-utils_3": { + "inputs": { + "systems": "systems_2" + }, + "locked": { + "lastModified": 1731533236, + "narHash": "sha256-l0KFg5HjrsfsO/JpG+r7fRrqm12kzFHyUHqHCVpMMbI=", + "owner": "numtide", + "repo": "flake-utils", + "rev": "11707dc2f618dd54ca8739b309ec4fc024de578b", + "type": "github" + }, + "original": { + "owner": "numtide", + "repo": "flake-utils", + "type": "github" + } + }, + "flake-utils_4": { + "inputs": { + "systems": "systems_3" + }, + "locked": { + "lastModified": 1731533236, + "narHash": "sha256-l0KFg5HjrsfsO/JpG+r7fRrqm12kzFHyUHqHCVpMMbI=", + "owner": "numtide", + "repo": "flake-utils", + "rev": "11707dc2f618dd54ca8739b309ec4fc024de578b", + "type": "github" + }, + "original": { + "owner": "numtide", + "repo": "flake-utils", + "type": "github" + } + }, "fromYaml": { "flake": false, "locked": { @@ -568,13 +604,74 @@ "type": "github" } }, + "minecraft": { + "inputs": { + "flake-utils": "flake-utils_3", + "metadata": [ + "minecraft-metadata" + ], + "nixpkgs": "nixpkgs_3" + }, + "locked": { + "lastModified": 1774233481, + "narHash": "sha256-Tnlkkd+2mjp+Yui1mjiqs/inQsvIdBhd0Tjf0ftDLyE=", + "owner": "Ninlives", + "repo": "minecraft.nix", + "rev": "aead7ec7962d1961ff3762d7001a9307a17cbb8e", + "type": "github" + }, + "original": { + "owner": "Ninlives", + "repo": "minecraft.nix", + "type": "github" + } + }, + "minecraft-metadata": { + "inputs": { + "flake-utils": "flake-utils_4", + "nixpkgs": "nixpkgs_4" + }, + "locked": { + "lastModified": 1774059698, + "narHash": "sha256-gRJaZ0RShc8dEGvR410WWYXucOePzT+m3pNllION/mo=", + "owner": "Ninlives", + "repo": "minecraft.json", + "rev": "4c4114c57766686c9ddbcd649907fb0326fd2d85", + "type": "github" + }, + "original": { + "owner": "Ninlives", + "repo": "minecraft.json", + "type": "github" + } + }, + "neu-nix": { + "inputs": { + "nixpkgs": [ + "nixpkgs" + ] + }, + "locked": { + "lastModified": 1774047654, + "narHash": "sha256-YFME/138SCI5+ETSwOvKRgwO9Q0Ir3ceEhBLgKmEjzE=", + "owner": "ricardomaps", + "repo": "neu-nix", + "rev": "fe9c0f995efbd263578618d5bd5426d9c5fcfa40", + "type": "github" + }, + "original": { + "owner": "ricardomaps", + "repo": "neu-nix", + "type": "github" + } + }, "nix-cachyos-kernel": { "inputs": { "cachyos-kernel": "cachyos-kernel", "cachyos-kernel-patches": "cachyos-kernel-patches", "flake-compat": "flake-compat", "flake-parts": "flake-parts_2", - "nixpkgs": "nixpkgs_3" + "nixpkgs": "nixpkgs_5" }, "locked": { "lastModified": 1773166308, @@ -598,8 +695,8 @@ "nix-gaming" ], "nix-github-actions": "nix-github-actions", - "nixpkgs": "nixpkgs_4", - "systems": "systems_2", + "nixpkgs": "nixpkgs_6", + "systems": "systems_4", "treefmt-nix": "treefmt-nix" }, "locked": { @@ -636,7 +733,7 @@ "inputs": { "flake-parts": "flake-parts_4", "git-hooks": "git-hooks", - "nixpkgs": "nixpkgs_5" + "nixpkgs": "nixpkgs_7" }, "locked": { "lastModified": 1772764431, @@ -677,7 +774,7 @@ "inputs": { "flake-compat": "flake-compat_3", "flake-parts": "flake-parts_5", - "nixpkgs": "nixpkgs_6" + "nixpkgs": "nixpkgs_8" }, "locked": { "lastModified": 1772641310, @@ -770,6 +867,36 @@ } }, "nixpkgs_3": { + "locked": { + "lastModified": 1774232173, + "narHash": "sha256-T3eZ0qmTBHf8/RDRcqjokzxRs7zNg4Jy6vqzL95RTmo=", + "owner": "NixOS", + "repo": "nixpkgs", + "rev": "609808cb49c288b0006dbefa69f788f09284799b", + "type": "github" + }, + "original": { + "owner": "NixOS", + "repo": "nixpkgs", + "type": "github" + } + }, + "nixpkgs_4": { + "locked": { + "lastModified": 1774053289, + "narHash": "sha256-U+wnCEgsGdRqXfUlt1yZffhLMGbUnkb4MYmisBI+KcU=", + "owner": "NixOS", + "repo": "nixpkgs", + "rev": "28afc93f3c091ae6cacfba64d8a486fab9c9af07", + "type": "github" + }, + "original": { + "owner": "NixOS", + "repo": "nixpkgs", + "type": "github" + } + }, + "nixpkgs_5": { "locked": { "lastModified": 1773148319, "narHash": "sha256-Yr9ej3uSDycQZHWB5HslVgryLkdSBN2fODAqURv/1wQ=", @@ -785,7 +912,7 @@ "type": "github" } }, - "nixpkgs_4": { + "nixpkgs_6": { "locked": { "lastModified": 1772624091, "narHash": "sha256-QKyJ0QGWBn6r0invrMAK8dmJoBYWoOWy7lN+UHzW1jc=", @@ -801,7 +928,7 @@ "type": "github" } }, - "nixpkgs_5": { + "nixpkgs_7": { "locked": { "lastModified": 1772173633, "narHash": "sha256-MOH58F4AIbCkh6qlQcwMycyk5SWvsqnS/TCfnqDlpj4=", @@ -817,7 +944,7 @@ "type": "github" } }, - "nixpkgs_6": { + "nixpkgs_8": { "locked": { "lastModified": 1772465433, "narHash": "sha256-ywy9troNEfpgh0Ee+zaV1UTgU8kYBVKtvPSxh6clYGU=", @@ -833,7 +960,7 @@ "type": "github" } }, - "nixpkgs_7": { + "nixpkgs_9": { "locked": { "lastModified": 1772615108, "narHash": "sha256-lC0KbklwgeSqS+sTkaYpnSYr/HDeVMzYUZqV/dT31Lo=", @@ -906,18 +1033,21 @@ "flake-parts": "flake-parts", "home-manager": "home-manager", "import-tree": "import-tree", + "minecraft": "minecraft", + "minecraft-metadata": "minecraft-metadata", + "neu-nix": "neu-nix", "nix-cachyos-kernel": "nix-cachyos-kernel", "nix-citizen": "nix-citizen", "nix-flatpak": "nix-flatpak", "nix-gaming": "nix-gaming", "nixcord": "nixcord", - "nixpkgs": "nixpkgs_7", + "nixpkgs": "nixpkgs_9", "nixpkgs-lib": [ "nixpkgs" ], "omnisearch": "omnisearch", "stylix": "stylix", - "systems": "systems_4" + "systems": "systems_6" } }, "stylix": { @@ -933,7 +1063,7 @@ "nixpkgs" ], "nur": "nur", - "systems": "systems_3", + "systems": "systems_5", "tinted-foot": "tinted-foot", "tinted-kitty": "tinted-kitty", "tinted-schemes": "tinted-schemes", @@ -1014,6 +1144,36 @@ "type": "github" } }, + "systems_5": { + "locked": { + "lastModified": 1681028828, + "narHash": "sha256-Vy1rq5AaRuLzOxct8nz4T6wlgyUR7zLU309k9mBC768=", + "owner": "nix-systems", + "repo": "default", + "rev": "da67096a3b9bf56a91d16901293e51ba5b49a27e", + "type": "github" + }, + "original": { + "owner": "nix-systems", + "repo": "default", + "type": "github" + } + }, + "systems_6": { + "locked": { + "lastModified": 1681028828, + "narHash": "sha256-Vy1rq5AaRuLzOxct8nz4T6wlgyUR7zLU309k9mBC768=", + "owner": "nix-systems", + "repo": "default", + "rev": "da67096a3b9bf56a91d16901293e51ba5b49a27e", + "type": "github" + }, + "original": { + "owner": "nix-systems", + "repo": "default", + "type": "github" + } + }, "tinted-foot": { "flake": false, "locked": { diff --git a/flake.nix b/flake.nix index d2a49fb..d8b3f2b 100644 --- a/flake.nix +++ b/flake.nix @@ -64,5 +64,10 @@ }; minecraft-metadata.url = "github:Ninlives/minecraft.json"; + + neu-nix = { + url = "github:ricardomaps/neu-nix"; + inputs.nixpkgs.follows = "nixpkgs"; + }; }; } diff --git a/modules/core/desktop/hevel.nix b/modules/core/desktop/hevel.nix deleted file mode 100644 index 0db3279..0000000 --- a/modules/core/desktop/hevel.nix +++ /dev/null @@ -1,3 +0,0 @@ -{ - -} diff --git a/modules/core/desktop/neu.nix b/modules/core/desktop/neu.nix new file mode 100644 index 0000000..3f3b541 --- /dev/null +++ b/modules/core/desktop/neu.nix @@ -0,0 +1,9 @@ +{ inputs, ... }: { + den.aspects.neu = { + nixos = { pkgs, ... }: { + nixpkgs.overlays = [ inputs.neu-nix.overlays.default ]; + + environment.systemPackages = [ pkgs.shko pkgs.neuswc pkgs.neumenu ]; + }; + }; +} diff --git a/modules/hosts/styx.nix b/modules/hosts/styx.nix index 2cc19fc..235345f 100644 --- a/modules/hosts/styx.nix +++ b/modules/hosts/styx.nix @@ -10,6 +10,8 @@ catppuccin janitor + + neu ]; nixos = { diff --git a/modules/software/gaming/gaming.nix b/modules/software/gaming/gaming.nix index 029a80d..8e7e317 100644 --- a/modules/software/gaming/gaming.nix +++ b/modules/software/gaming/gaming.nix @@ -1,5 +1,5 @@ { den, ... }: { den.aspects.gaming = { - includes = with den.aspects; [ steam roblox hytale polytoria game-tools emulators star-citizen ]; + includes = with den.aspects; [ steam roblox hytale polytoria game-tools emulators star-citizen minecraft ]; }; } diff --git a/modules/software/gaming/minecraft.nix b/modules/software/gaming/minecraft.nix index 5cc7d1a..b36b73f 100644 --- a/modules/software/gaming/minecraft.nix +++ b/modules/software/gaming/minecraft.nix @@ -1,12 +1,14 @@ { inputs, ... }: { den.aspects.minecraft = { - nixos = { - imports = [ - inputs.minecraft.nixosModules.default - inputs.minecraft-metadata.nixosModules.default + nixos = { pkgs, ... }: { + # imports = [ + # inputs.minecraft.nixosModules.default + # inputs.minecraft-metadata.nixosModules.default + # ]; + + users.users.bug.packages = with pkgs; [ + prismlauncher ]; - - }; }; }