diff options
| -rw-r--r-- | flake.lock | 159 | ||||
| -rw-r--r-- | flake.nix | 8 | ||||
| -rw-r--r-- | users/sils/packages/default.nix | 9 |
3 files changed, 134 insertions, 42 deletions
diff --git a/flake.lock b/flake.lock index 3eb1997..cfda4bb 100644 --- a/flake.lock +++ b/flake.lock @@ -32,7 +32,7 @@ "crane_2": { "inputs": { "flake-compat": "flake-compat_3", - "flake-utils": "flake-utils_2", + "flake-utils": "flake-utils_3", "nixpkgs": [ "yambar_memory", "nixpkgs" @@ -72,11 +72,11 @@ "flake-compat_2": { "flake": false, "locked": { - "lastModified": 1650374568, - "narHash": "sha256-Z+s0J8/r907g149rllvwhb4pKi8Wam5ij0st8PwAh+E=", + "lastModified": 1673956053, + "narHash": "sha256-4gtG9iQuiKITOjNQQeQIpoIB6b16fm+504Ch3sNKLd8=", "owner": "edolstra", "repo": "flake-compat", - "rev": "b4a34015c698c7793d592d66adbab377907a2be8", + "rev": "35bb57c0c8d8b62bbfd284272c928ceb64ddbde9", "type": "github" }, "original": { @@ -101,6 +101,24 @@ "type": "github" } }, + "flake-parts": { + "inputs": { + "nixpkgs-lib": "nixpkgs-lib" + }, + "locked": { + "lastModified": 1683560683, + "narHash": "sha256-XAygPMN5Xnk/W2c1aW0jyEa6lfMDZWlQgiNtmHXytPc=", + "owner": "hercules-ci", + "repo": "flake-parts", + "rev": "006c75898cf814ef9497252b022e91c946ba8e17", + "type": "github" + }, + "original": { + "owner": "hercules-ci", + "repo": "flake-parts", + "type": "github" + } + }, "flake-utils": { "inputs": { "systems": [ @@ -123,6 +141,21 @@ }, "flake-utils_2": { "locked": { + "lastModified": 1667395993, + "narHash": "sha256-nuEHfE/LcWyuSWnS8t12N1wc105Qtau+/OdUAjtQ0rA=", + "owner": "numtide", + "repo": "flake-utils", + "rev": "5aed5285a952e0b949eb3ba02c12fa4fcfef535f", + "type": "github" + }, + "original": { + "owner": "numtide", + "repo": "flake-utils", + "type": "github" + } + }, + "flake-utils_3": { + "locked": { "lastModified": 1676283394, "narHash": "sha256-XX2f9c3iySLCw54rJ/CZs+ZK6IQy7GXNY4nSOyu2QG4=", "owner": "numtide", @@ -165,6 +198,28 @@ "url": "https://codeberg.org/soispha/flake_version_update.git" } }, + "gitignore": { + "inputs": { + "nixpkgs": [ + "prismlauncher", + "pre-commit-hooks", + "nixpkgs" + ] + }, + "locked": { + "lastModified": 1660459072, + "narHash": "sha256-8DFJjXG8zqoONA1vXtgeKXy68KdJL5UaXR8NtVMUbx8=", + "owner": "hercules-ci", + "repo": "gitignore.nix", + "rev": "a20de23b925fd8264fd7fad6454652e142fd7f73", + "type": "github" + }, + "original": { + "owner": "hercules-ci", + "repo": "gitignore.nix", + "type": "github" + } + }, "home-manager": { "inputs": { "nixpkgs": [ @@ -191,13 +246,13 @@ "locked": { "lastModified": 1650031308, "narHash": "sha256-TvVOjkUobYJD9itQYueELJX3wmecvEdCbJ0FinW2mL4=", - "owner": "PolyMC", + "owner": "PrismLauncher", "repo": "libnbtplusplus", "rev": "2203af7eeb48c45398139b583615134efd8d407f", "type": "github" }, "original": { - "owner": "PolyMC", + "owner": "PrismLauncher", "repo": "libnbtplusplus", "type": "github" } @@ -218,13 +273,31 @@ "type": "github" } }, + "nixpkgs-lib": { + "locked": { + "dir": "lib", + "lastModified": 1682879489, + "narHash": "sha256-sASwo8gBt7JDnOOstnps90K1wxmVfyhsTPPNTGBPjjg=", + "owner": "NixOS", + "repo": "nixpkgs", + "rev": "da45bf6ec7bbcc5d1e14d3795c025199f28e0de0", + "type": "github" + }, + "original": { + "dir": "lib", + "owner": "NixOS", + "ref": "nixos-unstable", + "repo": "nixpkgs", + "type": "github" + } + }, "nixpkgs_2": { "locked": { - "lastModified": 1658119717, - "narHash": "sha256-4upOZIQQ7Bc4CprqnHsKnqYfw+arJeAuU+QcpjYBXW0=", + "lastModified": 1685012353, + "narHash": "sha256-U3oOge4cHnav8OLGdRVhL45xoRj4Ppd+It6nPC9nNIU=", "owner": "nixos", "repo": "nixpkgs", - "rev": "9eb60f25aff0d2218c848dd4574a0ab5e296cabe", + "rev": "aeb75dba965e790de427b73315d5addf91a54955", "type": "github" }, "original": { @@ -234,24 +307,56 @@ "type": "github" } }, - "polymc": { + "pre-commit-hooks": { + "inputs": { + "flake-compat": [ + "prismlauncher", + "flake-compat" + ], + "flake-utils": "flake-utils_2", + "gitignore": "gitignore", + "nixpkgs": [ + "prismlauncher", + "nixpkgs" + ], + "nixpkgs-stable": [ + "prismlauncher", + "nixpkgs" + ] + }, + "locked": { + "lastModified": 1684842236, + "narHash": "sha256-rYWsIXHvNhVQ15RQlBUv67W3YnM+Pd+DuXGMvCBq2IE=", + "owner": "cachix", + "repo": "pre-commit-hooks.nix", + "rev": "61e567d6497bc9556f391faebe5e410e6623217f", + "type": "github" + }, + "original": { + "owner": "cachix", + "repo": "pre-commit-hooks.nix", + "type": "github" + } + }, + "prismlauncher": { "inputs": { "flake-compat": "flake-compat_2", + "flake-parts": "flake-parts", "libnbtplusplus": "libnbtplusplus", "nixpkgs": "nixpkgs_2", - "tomlplusplus": "tomlplusplus" + "pre-commit-hooks": "pre-commit-hooks" }, "locked": { - "lastModified": 1685454243, - "narHash": "sha256-znGrtL2kM9IQta3mTihu+iZCC8Ez8Nq7v/RpnjHOwr8=", - "owner": "PolyMC", - "repo": "PolyMC", - "rev": "2358e6faa2b1204058c0d9d2bc1491c308f4e6d7", + "lastModified": 1687934873, + "narHash": "sha256-OHLevylVcrjDQPp3eMYS9uxWzgsIG5U7s4PfHbgTHbk=", + "owner": "PrismLauncher", + "repo": "PrismLauncher", + "rev": "faec21d572549793293bf41127e384811f8a66dc", "type": "github" }, "original": { - "owner": "PolyMC", - "repo": "PolyMC", + "owner": "PrismLauncher", + "repo": "PrismLauncher", "type": "github" } }, @@ -294,7 +399,7 @@ "flake-utils": "flake-utils", "home-manager": "home-manager", "nixpkgs": "nixpkgs", - "polymc": "polymc", + "prismlauncher": "prismlauncher", "river_init_lesser": "river_init_lesser", "rust-overlay": "rust-overlay", "shell_library": "shell_library", @@ -396,22 +501,6 @@ "type": "github" } }, - "tomlplusplus": { - "flake": false, - "locked": { - "lastModified": 1664034574, - "narHash": "sha256-EFMAl6tsTvkgK0DWC/pZfOIq06b2e5SnxJa1ngGRIQA=", - "owner": "marzer", - "repo": "tomlplusplus", - "rev": "8aa5c8b2a4ff2c440d4630addf64fa4f62146170", - "type": "github" - }, - "original": { - "owner": "marzer", - "repo": "tomlplusplus", - "type": "github" - } - }, "unstable": { "locked": { "lastModified": 1687502512, diff --git a/flake.nix b/flake.nix index 98b17de..4685562 100644 --- a/flake.nix +++ b/flake.nix @@ -82,8 +82,8 @@ # rust-overlay.follows = "rust-overlay"; # }; # }; - polymc = { - url = "github:PolyMC/PolyMC"; + prismlauncher = { + url = "github:PrismLauncher/PrismLauncher"; }; }; #}}} @@ -96,7 +96,7 @@ yambar_cpu, yambar_memory, #grades, - polymc, + prismlauncher, ... } @ attrs: let system = "x86_64-linux"; @@ -116,7 +116,7 @@ useGlobalPkgs = true; useUserPackages = true; users.sils = import ./users/sils; - extraSpecialArgs = {inherit pkgs system sysLib river_init_lesser yambar_cpu yambar_memory polymc;}; + extraSpecialArgs = {inherit pkgs system sysLib river_init_lesser yambar_cpu yambar_memory prismlauncher;}; }; } ]; diff --git a/users/sils/packages/default.nix b/users/sils/packages/default.nix index 50e6199..d45f61f 100644 --- a/users/sils/packages/default.nix +++ b/users/sils/packages/default.nix @@ -1,10 +1,9 @@ { system, pkgs, - polymc, + prismlauncher, ... }: { - nixpkgs.overlays = [ polymc.overlay ]; home.packages = with pkgs; [ # core tools neofetch # a must-have @@ -20,6 +19,10 @@ xdg-utils # mainly used for xdg-openA git-crypt # obscure git repos + + # Hardware + sbctl # secure boot management + # text production/office libreoffice # graphical office suite pdfarranger # gui for pdf arranging @@ -96,7 +99,7 @@ river yambar swaylock - polymc # minecraft-launcher + prismlauncher.packages.${pkgs.system}.prismlauncher # minecraft-launcher # soispha |