โ„๏ธ My personnal NixOS configuration
nix-flake nixos-configuration linux dotfiles flake nix nix-config nixos nixos-flake linux-desktop

ใ€Œ๐Ÿ”€ใ€ merge(home.nix): fix rebase conflict

+10 -58
+3 -42
flake.lock
··· 321 321 "type": "github" 322 322 } 323 323 }, 324 - "libnbtplusplus": { 325 - "flake": false, 326 - "locked": { 327 - "lastModified": 1744811532, 328 - "narHash": "sha256-qhmjaRkt+O7A+gu6HjUkl7QzOEb4r8y8vWZMG2R/C6o=", 329 - "owner": "PrismLauncher", 330 - "repo": "libnbtplusplus", 331 - "rev": "531449ba1c930c98e0bcf5d332b237a8566f9d78", 332 - "type": "github" 333 - }, 334 - "original": { 335 - "owner": "PrismLauncher", 336 - "repo": "libnbtplusplus", 337 - "type": "github" 338 - } 339 - }, 340 324 "nixlib": { 341 325 "locked": { 342 326 "lastModified": 1736643958, ··· 630 614 "type": "github" 631 615 } 632 616 }, 633 - "prismlauncher": { 634 - "inputs": { 635 - "libnbtplusplus": "libnbtplusplus", 636 - "nixpkgs": [ 637 - "nixpkgs" 638 - ] 639 - }, 640 - "locked": { 641 - "lastModified": 1765804165, 642 - "narHash": "sha256-K8QpGnmo4lYg6VAoq/ZpQIhV7jfv2J7zbqRDBSehFMc=", 643 - "owner": "prismlauncher", 644 - "repo": "prismlauncher", 645 - "rev": "fc3c5cba30de2d38cf49e801103f62b79ab36f46", 646 - "type": "github" 647 - }, 648 - "original": { 649 - "owner": "prismlauncher", 650 - "ref": "10.0.0-pre1", 651 - "repo": "prismlauncher", 652 - "type": "github" 653 - } 654 - }, 655 617 "root": { 656 618 "inputs": { 657 619 "catppuccin": "catppuccin", ··· 665 627 "nixpkgs": "nixpkgs_3", 666 628 "nixvim": "nixvim", 667 629 "pogit": "pogit", 668 - "prismlauncher": "prismlauncher", 669 630 "rust-overlay": "rust-overlay", 670 631 "timmy": "timmy", 671 632 "treefmt-nix": "treefmt-nix", ··· 764 725 }, 765 726 "unstablepkgs": { 766 727 "locked": { 767 - "lastModified": 1765186076, 768 - "narHash": "sha256-hM20uyap1a0M9d344I692r+ik4gTMyj60cQWO+hAYP8=", 728 + "lastModified": 1767892417, 729 + "narHash": "sha256-dhhvQY67aboBk8b0/u0XB6vwHdgbROZT3fJAjyNh5Ww=", 769 730 "owner": "nixos", 770 731 "repo": "nixpkgs", 771 - "rev": "addf7cf5f383a3101ecfba091b98d0a1263dc9b8", 732 + "rev": "3497aa5c9457a9d88d71fa93a4a8368816fbeeba", 772 733 "type": "github" 773 734 }, 774 735 "original": {
-5
flake.nix
··· 303 303 }; 304 304 305 305 treefmt-nix.url = "github:numtide/treefmt-nix"; 306 - 307 - prismlauncher = { 308 - url = "github:prismlauncher/prismlauncher/10.0.0-pre1"; 309 - inputs.nixpkgs.follows = "nixpkgs"; 310 - }; 311 306 }; 312 307 }
+6 -6
home/DEV-BOYY/packages.nix
··· 10 10 feishin 11 11 mpv 12 12 13 - (inputs.prismlauncher.packages.${pkgs.stdenv.hostPlatform.system}.prismlauncher.override { 13 + (unstable.prismlauncher.override { 14 14 jdks = [ 15 - javaPackages.compiler.temurin-bin.jre-8 16 - javaPackages.compiler.temurin-bin.jre-11 17 - javaPackages.compiler.temurin-bin.jre-17 18 - javaPackages.compiler.temurin-bin.jre-21 19 - javaPackages.compiler.temurin-bin.jre-25 15 + jdk8 16 + jdk11 17 + jdk17 18 + jdk21 19 + jdk25 20 20 ]; 21 21 }) 22 22
+1 -1
home/LAPTOP-5530/packages.nix
··· 10 10 feishin 11 11 mpv 12 12 13 - (inputs.prismlauncher.packages.${pkgs.stdenv.hostPlatform.system}.prismlauncher.override { 13 + (unstable.prismlauncher.override { 14 14 jdks = [ 15 15 jdk8 16 16 jdk17
-4
hosts/home.nix
··· 32 32 programs.zsh.enable = true; 33 33 nix.settings = { 34 34 trusted-users = [ "@wheel" ]; 35 - trusted-substituters = [ "https://prismlauncher.cachix.org" ]; 36 - trusted-public-keys = [ 37 - "prismlauncher.cachix.org-1:9/n/FGyABA2jLUVfY+DEp4hKds/rwO+SCOtbOkDzd+c=" 38 - ]; 39 35 }; 40 36 nixpkgs.overlays = [ 41 37 (_final: prev: {