refactor overlays
This commit is contained in:
parent
8694c7d81f
commit
802074f233
9 changed files with 119 additions and 124 deletions
125
flake.lock
generated
125
flake.lock
generated
|
|
@ -28,11 +28,11 @@
|
||||||
"utils": "utils"
|
"utils": "utils"
|
||||||
},
|
},
|
||||||
"locked": {
|
"locked": {
|
||||||
"lastModified": 1766051518,
|
"lastModified": 1770019181,
|
||||||
"narHash": "sha256-znKOwPXQnt3o7lDb3hdf19oDo0BLP4MfBOYiWkEHoik=",
|
"narHash": "sha256-hwsYgDnby50JNVpTRYlF3UR/Rrpt01OrxVuryF40CFY=",
|
||||||
"owner": "serokell",
|
"owner": "serokell",
|
||||||
"repo": "deploy-rs",
|
"repo": "deploy-rs",
|
||||||
"rev": "d5eff7f948535b9c723d60cd8239f8f11ddc90fa",
|
"rev": "77c906c0ba56aabdbc72041bf9111b565cdd6171",
|
||||||
"type": "github"
|
"type": "github"
|
||||||
},
|
},
|
||||||
"original": {
|
"original": {
|
||||||
|
|
@ -50,12 +50,12 @@
|
||||||
"nixpkgs": "nixpkgs_2"
|
"nixpkgs": "nixpkgs_2"
|
||||||
},
|
},
|
||||||
"locked": {
|
"locked": {
|
||||||
"lastModified": 1766549083,
|
"lastModified": 1771014593,
|
||||||
"narHash": "sha256-G1Hljg7vIBt8n9cxO382YAZWtZU/mYfQcg3icdNG8RQ=",
|
"narHash": "sha256-NrCFwn20ewJwy/SZoREs+XylerizPCYP54n9qkr31/E=",
|
||||||
"rev": "ba8999fac986e70f52b4cba15047be7bbb7b6346",
|
"rev": "69b4ff80ae2bbdd1e3f02ccd76a5f2988b118ed2",
|
||||||
"revCount": 318,
|
"revCount": 397,
|
||||||
"type": "tarball",
|
"type": "tarball",
|
||||||
"url": "https://api.flakehub.com/f/pinned/DeterminateSystems/determinate/3.15.1/019b4e8a-dc22-75db-aef5-a447efbb1a13/source.tar.gz"
|
"url": "https://api.flakehub.com/f/pinned/DeterminateSystems/determinate/3.16.0/019c58b5-64dc-77f9-b913-8738b7d338cc/source.tar.gz"
|
||||||
},
|
},
|
||||||
"original": {
|
"original": {
|
||||||
"type": "tarball",
|
"type": "tarball",
|
||||||
|
|
@ -65,37 +65,37 @@
|
||||||
"determinate-nixd-aarch64-darwin": {
|
"determinate-nixd-aarch64-darwin": {
|
||||||
"flake": false,
|
"flake": false,
|
||||||
"locked": {
|
"locked": {
|
||||||
"narHash": "sha256-uWDS94cAYprGj+AwuT42nuuDDicRLj1S0JwalZGeBRU=",
|
"narHash": "sha256-PUo0u1iNMB8eTlBNFMCW8/UAn1sGKGqsIYlXaDRhx00=",
|
||||||
"type": "file",
|
"type": "file",
|
||||||
"url": "https://install.determinate.systems/determinate-nixd/tag/v3.15.1/macOS"
|
"url": "https://install.determinate.systems/determinate-nixd/tag/v3.16.0/macOS"
|
||||||
},
|
},
|
||||||
"original": {
|
"original": {
|
||||||
"type": "file",
|
"type": "file",
|
||||||
"url": "https://install.determinate.systems/determinate-nixd/tag/v3.15.1/macOS"
|
"url": "https://install.determinate.systems/determinate-nixd/tag/v3.16.0/macOS"
|
||||||
}
|
}
|
||||||
},
|
},
|
||||||
"determinate-nixd-aarch64-linux": {
|
"determinate-nixd-aarch64-linux": {
|
||||||
"flake": false,
|
"flake": false,
|
||||||
"locked": {
|
"locked": {
|
||||||
"narHash": "sha256-uHBcZCh2/Bj5/88TDihupA336tSQDk7s5lVP66IDAX0=",
|
"narHash": "sha256-jiIWiM88xkEpBQeohSxhl83fn2xoZY0nFkrW6CUAIAI=",
|
||||||
"type": "file",
|
"type": "file",
|
||||||
"url": "https://install.determinate.systems/determinate-nixd/tag/v3.15.1/aarch64-linux"
|
"url": "https://install.determinate.systems/determinate-nixd/tag/v3.16.0/aarch64-linux"
|
||||||
},
|
},
|
||||||
"original": {
|
"original": {
|
||||||
"type": "file",
|
"type": "file",
|
||||||
"url": "https://install.determinate.systems/determinate-nixd/tag/v3.15.1/aarch64-linux"
|
"url": "https://install.determinate.systems/determinate-nixd/tag/v3.16.0/aarch64-linux"
|
||||||
}
|
}
|
||||||
},
|
},
|
||||||
"determinate-nixd-x86_64-linux": {
|
"determinate-nixd-x86_64-linux": {
|
||||||
"flake": false,
|
"flake": false,
|
||||||
"locked": {
|
"locked": {
|
||||||
"narHash": "sha256-y+l05H6GNv/1WcrMztDYem8VBWqjc9gNg4WjeQ1PQxo=",
|
"narHash": "sha256-qF/NNdHwh3tAHrKIOz2FRq5Q8GcSMzJeEY/PFvGf5vo=",
|
||||||
"type": "file",
|
"type": "file",
|
||||||
"url": "https://install.determinate.systems/determinate-nixd/tag/v3.15.1/x86_64-linux"
|
"url": "https://install.determinate.systems/determinate-nixd/tag/v3.16.0/x86_64-linux"
|
||||||
},
|
},
|
||||||
"original": {
|
"original": {
|
||||||
"type": "file",
|
"type": "file",
|
||||||
"url": "https://install.determinate.systems/determinate-nixd/tag/v3.15.1/x86_64-linux"
|
"url": "https://install.determinate.systems/determinate-nixd/tag/v3.16.0/x86_64-linux"
|
||||||
}
|
}
|
||||||
},
|
},
|
||||||
"flake-compat": {
|
"flake-compat": {
|
||||||
|
|
@ -384,11 +384,11 @@
|
||||||
]
|
]
|
||||||
},
|
},
|
||||||
"locked": {
|
"locked": {
|
||||||
"lastModified": 1768749864,
|
"lastModified": 1771269455,
|
||||||
"narHash": "sha256-EKRMFBLBRCHrFZ5luX85RTnsN3b2q3FjZEi62vXwJBE=",
|
"narHash": "sha256-BZ31eN5F99YH6vkc4AhzKGE+tJgJ52kl8f01K7wCs8w=",
|
||||||
"owner": "nix-community",
|
"owner": "nix-community",
|
||||||
"repo": "home-manager",
|
"repo": "home-manager",
|
||||||
"rev": "5148e08046dc8c74c66b8aee4d302a47d6931b56",
|
"rev": "5f1d42a97b19803041434f66681d5c44c9ae62e3",
|
||||||
"type": "github"
|
"type": "github"
|
||||||
},
|
},
|
||||||
"original": {
|
"original": {
|
||||||
|
|
@ -414,6 +414,22 @@
|
||||||
"type": "github"
|
"type": "github"
|
||||||
}
|
}
|
||||||
},
|
},
|
||||||
|
"jj-vine": {
|
||||||
|
"flake": false,
|
||||||
|
"locked": {
|
||||||
|
"lastModified": 1771028028,
|
||||||
|
"narHash": "sha256-pnywIV4drXu13R+Zqh8HIJUcToXW75jdFvNaKhUjk5E=",
|
||||||
|
"owner": "abrenneke",
|
||||||
|
"repo": "jj-vine",
|
||||||
|
"rev": "7072ad1cba513e6b08758d83b9a03aefa78832c0",
|
||||||
|
"type": "github"
|
||||||
|
},
|
||||||
|
"original": {
|
||||||
|
"owner": "abrenneke",
|
||||||
|
"repo": "jj-vine",
|
||||||
|
"type": "github"
|
||||||
|
}
|
||||||
|
},
|
||||||
"luvit-meta": {
|
"luvit-meta": {
|
||||||
"flake": false,
|
"flake": false,
|
||||||
"locked": {
|
"locked": {
|
||||||
|
|
@ -438,11 +454,11 @@
|
||||||
"spectrum": "spectrum"
|
"spectrum": "spectrum"
|
||||||
},
|
},
|
||||||
"locked": {
|
"locked": {
|
||||||
"lastModified": 1768682386,
|
"lastModified": 1771365290,
|
||||||
"narHash": "sha256-mKrMf7eG9TM2AM3pTuhIiCGmZ/JwDegCQH3ThVqcTuc=",
|
"narHash": "sha256-1XJOslVyF7yzf6yd/yl1VjGLywsbtwmQh3X1LuJcLI4=",
|
||||||
"owner": "microvm-nix",
|
"owner": "microvm-nix",
|
||||||
"repo": "microvm.nix",
|
"repo": "microvm.nix",
|
||||||
"rev": "f469c1dfede623bbbf1ac605f6359316fd4002ef",
|
"rev": "789c90b164b55b4379e7a94af8b9c01489024c18",
|
||||||
"type": "github"
|
"type": "github"
|
||||||
},
|
},
|
||||||
"original": {
|
"original": {
|
||||||
|
|
@ -499,12 +515,12 @@
|
||||||
"nixpkgs-regression": "nixpkgs-regression"
|
"nixpkgs-regression": "nixpkgs-regression"
|
||||||
},
|
},
|
||||||
"locked": {
|
"locked": {
|
||||||
"lastModified": 1766546676,
|
"lastModified": 1771010067,
|
||||||
"narHash": "sha256-GsC52VFF9Gi2pgP/haQyPdQoF5Qe2myk1tsPcuJZI28=",
|
"narHash": "sha256-Itk88UC3CxjGjjAb20KI6KrM9tRoGEpbv996fXwAWGo=",
|
||||||
"rev": "51dacdd248e8071cd0243a8245c8c42ac1f33307",
|
"rev": "5c670e37e884c43e1da0405075c9b9c83d316a6c",
|
||||||
"revCount": 24299,
|
"revCount": 24629,
|
||||||
"type": "tarball",
|
"type": "tarball",
|
||||||
"url": "https://api.flakehub.com/f/pinned/DeterminateSystems/nix-src/3.15.1/019b4e84-d036-75db-b6c6-6bc2e2035c53/source.tar.gz"
|
"url": "https://api.flakehub.com/f/pinned/DeterminateSystems/nix-src/3.16.0/019c589d-45e9-7337-9ff0-a8d78fecf63f/source.tar.gz"
|
||||||
},
|
},
|
||||||
"original": {
|
"original": {
|
||||||
"type": "tarball",
|
"type": "tarball",
|
||||||
|
|
@ -518,11 +534,11 @@
|
||||||
]
|
]
|
||||||
},
|
},
|
||||||
"locked": {
|
"locked": {
|
||||||
"lastModified": 1765267181,
|
"lastModified": 1771130777,
|
||||||
"narHash": "sha256-d3NBA9zEtBu2JFMnTBqWj7Tmi7R5OikoU2ycrdhQEws=",
|
"narHash": "sha256-UIKOwG0D9XVIJfNWg6+gENAvQP+7LO46eO0Jpe+ItJ0=",
|
||||||
"owner": "nix-community",
|
"owner": "nix-community",
|
||||||
"repo": "nix-index-database",
|
"repo": "nix-index-database",
|
||||||
"rev": "82befcf7dc77c909b0f2a09f5da910ec95c5b78f",
|
"rev": "efec7aaad8d43f8e5194df46a007456093c40f88",
|
||||||
"type": "github"
|
"type": "github"
|
||||||
},
|
},
|
||||||
"original": {
|
"original": {
|
||||||
|
|
@ -533,11 +549,11 @@
|
||||||
},
|
},
|
||||||
"nixos-hardware": {
|
"nixos-hardware": {
|
||||||
"locked": {
|
"locked": {
|
||||||
"lastModified": 1768736227,
|
"lastModified": 1771257191,
|
||||||
"narHash": "sha256-qgGq7CfrYKc3IBYQ7qp0Z/ZXndQVC5Bj0N8HW9mS2rM=",
|
"narHash": "sha256-H1l+zHq+ZinWH7F1IidpJ2farmbfHXjaxAm1RKWE1KI=",
|
||||||
"owner": "NixOS",
|
"owner": "NixOS",
|
||||||
"repo": "nixos-hardware",
|
"repo": "nixos-hardware",
|
||||||
"rev": "d447553bcbc6a178618d37e61648b19e744370df",
|
"rev": "66e1a090ded57a0f88e2b381a7d4daf4a5722c3f",
|
||||||
"type": "github"
|
"type": "github"
|
||||||
},
|
},
|
||||||
"original": {
|
"original": {
|
||||||
|
|
@ -606,11 +622,11 @@
|
||||||
},
|
},
|
||||||
"nixpkgs-stable": {
|
"nixpkgs-stable": {
|
||||||
"locked": {
|
"locked": {
|
||||||
"lastModified": 1768621446,
|
"lastModified": 1771208521,
|
||||||
"narHash": "sha256-6YwHV1cjv6arXdF/PQc365h1j+Qje3Pydk501Rm4Q+4=",
|
"narHash": "sha256-X01Q3DgSpjeBpapoGA4rzKOn25qdKxbPnxHeMLNoHTU=",
|
||||||
"owner": "nixos",
|
"owner": "nixos",
|
||||||
"repo": "nixpkgs",
|
"repo": "nixpkgs",
|
||||||
"rev": "72ac591e737060deab2b86d6952babd1f896d7c5",
|
"rev": "fa56d7d6de78f5a7f997b0ea2bc6efd5868ad9e8",
|
||||||
"type": "github"
|
"type": "github"
|
||||||
},
|
},
|
||||||
"original": {
|
"original": {
|
||||||
|
|
@ -638,12 +654,12 @@
|
||||||
},
|
},
|
||||||
"nixpkgs_2": {
|
"nixpkgs_2": {
|
||||||
"locked": {
|
"locked": {
|
||||||
"lastModified": 1766314097,
|
"lastModified": 1770537093,
|
||||||
"narHash": "sha256-laJftWbghBehazn/zxVJ8NdENVgjccsWAdAqKXhErrM=",
|
"narHash": "sha256-pF1quXG5wsgtyuPOHcLfYg/ft/QMr8NnX0i6tW2187s=",
|
||||||
"rev": "306ea70f9eb0fb4e040f8540e2deab32ed7e2055",
|
"rev": "fef9403a3e4d31b0a23f0bacebbec52c248fbb51",
|
||||||
"revCount": 914780,
|
"revCount": 942631,
|
||||||
"type": "tarball",
|
"type": "tarball",
|
||||||
"url": "https://api.flakehub.com/f/pinned/DeterminateSystems/nixpkgs-weekly/0.1.914780%2Brev-306ea70f9eb0fb4e040f8540e2deab32ed7e2055/019b49b8-ed0f-724e-bdaf-5fd90cc1c590/source.tar.gz"
|
"url": "https://api.flakehub.com/f/pinned/DeterminateSystems/nixpkgs-weekly/0.1.942631%2Brev-fef9403a3e4d31b0a23f0bacebbec52c248fbb51/019c4621-ce4f-799f-82f6-b3b29f099b09/source.tar.gz"
|
||||||
},
|
},
|
||||||
"original": {
|
"original": {
|
||||||
"type": "tarball",
|
"type": "tarball",
|
||||||
|
|
@ -652,11 +668,11 @@
|
||||||
},
|
},
|
||||||
"nixpkgs_3": {
|
"nixpkgs_3": {
|
||||||
"locked": {
|
"locked": {
|
||||||
"lastModified": 1768564909,
|
"lastModified": 1771008912,
|
||||||
"narHash": "sha256-Kell/SpJYVkHWMvnhqJz/8DqQg2b6PguxVWOuadbHCc=",
|
"narHash": "sha256-gf2AmWVTs8lEq7z/3ZAsgnZDhWIckkb+ZnAo5RzSxJg=",
|
||||||
"owner": "nixos",
|
"owner": "nixos",
|
||||||
"repo": "nixpkgs",
|
"repo": "nixpkgs",
|
||||||
"rev": "e4bae1bd10c9c57b2cf517953ab70060a828ee6f",
|
"rev": "a82ccc39b39b621151d6732718e3e250109076fa",
|
||||||
"type": "github"
|
"type": "github"
|
||||||
},
|
},
|
||||||
"original": {
|
"original": {
|
||||||
|
|
@ -715,11 +731,11 @@
|
||||||
]
|
]
|
||||||
},
|
},
|
||||||
"locked": {
|
"locked": {
|
||||||
"lastModified": 1767281941,
|
"lastModified": 1770726378,
|
||||||
"narHash": "sha256-6MkqajPICgugsuZ92OMoQcgSHnD6sJHwk8AxvMcIgTE=",
|
"narHash": "sha256-kck+vIbGOaM/dHea7aTBxdFYpeUl/jHOy5W3eyRvVx8=",
|
||||||
"owner": "cachix",
|
"owner": "cachix",
|
||||||
"repo": "pre-commit-hooks.nix",
|
"repo": "pre-commit-hooks.nix",
|
||||||
"rev": "f0927703b7b1c8d97511c4116eb9b4ec6645a0fa",
|
"rev": "5eaaedde414f6eb1aea8b8525c466dc37bba95ae",
|
||||||
"type": "github"
|
"type": "github"
|
||||||
},
|
},
|
||||||
"original": {
|
"original": {
|
||||||
|
|
@ -733,6 +749,7 @@
|
||||||
"deploy-rs": "deploy-rs",
|
"deploy-rs": "deploy-rs",
|
||||||
"determinate": "determinate",
|
"determinate": "determinate",
|
||||||
"home-manager": "home-manager",
|
"home-manager": "home-manager",
|
||||||
|
"jj-vine": "jj-vine",
|
||||||
"microvm": "microvm",
|
"microvm": "microvm",
|
||||||
"nix-index-database": "nix-index-database",
|
"nix-index-database": "nix-index-database",
|
||||||
"nixos-hardware": "nixos-hardware",
|
"nixos-hardware": "nixos-hardware",
|
||||||
|
|
@ -752,11 +769,11 @@
|
||||||
]
|
]
|
||||||
},
|
},
|
||||||
"locked": {
|
"locked": {
|
||||||
"lastModified": 1768709255,
|
"lastModified": 1771166946,
|
||||||
"narHash": "sha256-aigyBfxI20FRtqajVMYXHtj5gHXENY2gLAXEhfJ8/WM=",
|
"narHash": "sha256-UFc4lfGBr+wJmwgDGJDn1cVD6DTr0/8TdronNUiyXlU=",
|
||||||
"owner": "Mic92",
|
"owner": "Mic92",
|
||||||
"repo": "sops-nix",
|
"repo": "sops-nix",
|
||||||
"rev": "5e8fae80726b66e9fec023d21cd3b3e638597aa9",
|
"rev": "2d0cf89b4404529778bc82de7e42b5754e0fe4fa",
|
||||||
"type": "github"
|
"type": "github"
|
||||||
},
|
},
|
||||||
"original": {
|
"original": {
|
||||||
|
|
@ -848,11 +865,11 @@
|
||||||
]
|
]
|
||||||
},
|
},
|
||||||
"locked": {
|
"locked": {
|
||||||
"lastModified": 1768158989,
|
"lastModified": 1770228511,
|
||||||
"narHash": "sha256-67vyT1+xClLldnumAzCTBvU0jLZ1YBcf4vANRWP3+Ak=",
|
"narHash": "sha256-wQ6NJSuFqAEmIg2VMnLdCnUc0b7vslUohqqGGD+Fyxk=",
|
||||||
"owner": "numtide",
|
"owner": "numtide",
|
||||||
"repo": "treefmt-nix",
|
"repo": "treefmt-nix",
|
||||||
"rev": "e96d59dff5c0d7fddb9d113ba108f03c3ef99eca",
|
"rev": "337a4fe074be1042a35086f15481d763b8ddc0e7",
|
||||||
"type": "github"
|
"type": "github"
|
||||||
},
|
},
|
||||||
"original": {
|
"original": {
|
||||||
|
|
|
||||||
17
flake.nix
17
flake.nix
|
|
@ -42,12 +42,15 @@
|
||||||
};
|
};
|
||||||
determinate.url = "https://flakehub.com/f/DeterminateSystems/determinate/*";
|
determinate.url = "https://flakehub.com/f/DeterminateSystems/determinate/*";
|
||||||
systems.url = "github:nix-systems/default";
|
systems.url = "github:nix-systems/default";
|
||||||
|
jj-vine = {
|
||||||
|
url = "github:abrenneke/jj-vine";
|
||||||
|
flake = false;
|
||||||
|
};
|
||||||
};
|
};
|
||||||
outputs =
|
outputs =
|
||||||
{
|
{
|
||||||
self,
|
self,
|
||||||
nixpkgs,
|
nixpkgs,
|
||||||
nixpkgs-stable,
|
|
||||||
systems,
|
systems,
|
||||||
...
|
...
|
||||||
}@inputs:
|
}@inputs:
|
||||||
|
|
@ -61,22 +64,21 @@
|
||||||
config.allowUnfree = true;
|
config.allowUnfree = true;
|
||||||
overlays = [
|
overlays = [
|
||||||
inputs.nvim.overlays.default
|
inputs.nvim.overlays.default
|
||||||
(import ./pkgs/overlay.nix)
|
inputs.self.overlays.stable-packages
|
||||||
|
(import ./overlays { inherit inputs; })
|
||||||
];
|
];
|
||||||
};
|
};
|
||||||
pkgs-stable = import nixpkgs-stable {
|
|
||||||
inherit system;
|
|
||||||
config.allowUnfree = true;
|
|
||||||
};
|
|
||||||
eachSystem = f: nixpkgs.lib.genAttrs (import systems) (system: f nixpkgs.legacyPackages.${system});
|
eachSystem = f: nixpkgs.lib.genAttrs (import systems) (system: f nixpkgs.legacyPackages.${system});
|
||||||
treefmtEval = eachSystem (pkgs: inputs.treefmt-nix.lib.evalModule pkgs ./treefmt.nix);
|
treefmtEval = eachSystem (pkgs: inputs.treefmt-nix.lib.evalModule pkgs ./treefmt.nix);
|
||||||
in
|
in
|
||||||
{
|
{
|
||||||
|
packages = eachSystem (pkgs: import ./pkgs { inherit inputs; });
|
||||||
|
overlays = import ./overlays { inherit inputs; };
|
||||||
|
formatter = eachSystem (pkgs: treefmtEval.${pkgs.system}.config.build.wrapper);
|
||||||
nixosConfigurations = import ./nixos {
|
nixosConfigurations = import ./nixos {
|
||||||
inherit
|
inherit
|
||||||
inputs
|
inputs
|
||||||
pkgs
|
pkgs
|
||||||
pkgs-stable
|
|
||||||
attrs
|
attrs
|
||||||
system
|
system
|
||||||
;
|
;
|
||||||
|
|
@ -92,7 +94,6 @@
|
||||||
};
|
};
|
||||||
};
|
};
|
||||||
deploy.nodes = import ./fleet.nix { inherit inputs self system; };
|
deploy.nodes = import ./fleet.nix { inherit inputs self system; };
|
||||||
formatter = eachSystem (pkgs: treefmtEval.${pkgs.system}.config.build.wrapper);
|
|
||||||
devShells.${system}.default = pkgs.mkShell {
|
devShells.${system}.default = pkgs.mkShell {
|
||||||
inherit (self.checks.pre-commit-check) shellHook;
|
inherit (self.checks.pre-commit-check) shellHook;
|
||||||
buildInputs = with pkgs; [
|
buildInputs = with pkgs; [
|
||||||
|
|
|
||||||
|
|
@ -30,6 +30,7 @@
|
||||||
};
|
};
|
||||||
|
|
||||||
# home.packages = [ pkgs.watchman ];
|
# home.packages = [ pkgs.watchman ];
|
||||||
|
home.packages = [ pkgs.jj-vine ];
|
||||||
programs.jujutsu = {
|
programs.jujutsu = {
|
||||||
enable = true;
|
enable = true;
|
||||||
settings = {
|
settings = {
|
||||||
|
|
|
||||||
|
|
@ -179,12 +179,8 @@
|
||||||
};
|
};
|
||||||
listener = [
|
listener = [
|
||||||
{
|
{
|
||||||
timeout = 900;
|
timeout = 1500;
|
||||||
on-timeout = "hyprlock";
|
on-timeout = "hyprlock; hyprctl dispatch dpms off";
|
||||||
}
|
|
||||||
{
|
|
||||||
timeout = 1200;
|
|
||||||
on-timeout = "hyprctl dispatch dpms off";
|
|
||||||
on-resume = "hyprctl dispatch dpms on";
|
on-resume = "hyprctl dispatch dpms on";
|
||||||
}
|
}
|
||||||
];
|
];
|
||||||
|
|
|
||||||
|
|
@ -14,7 +14,6 @@
|
||||||
prismlauncher
|
prismlauncher
|
||||||
runelite
|
runelite
|
||||||
jdk21
|
jdk21
|
||||||
august-rsps
|
|
||||||
|
|
||||||
# comms
|
# comms
|
||||||
signal-desktop
|
signal-desktop
|
||||||
|
|
|
||||||
|
|
@ -1,7 +1,6 @@
|
||||||
{
|
{
|
||||||
inputs,
|
inputs,
|
||||||
pkgs,
|
pkgs,
|
||||||
pkgs-stable,
|
|
||||||
attrs,
|
attrs,
|
||||||
system,
|
system,
|
||||||
...
|
...
|
||||||
|
|
@ -12,10 +11,10 @@ let
|
||||||
inputs.sops-nix.nixosModules.sops
|
inputs.sops-nix.nixosModules.sops
|
||||||
inputs.nix-index-database.nixosModules.nix-index
|
inputs.nix-index-database.nixosModules.nix-index
|
||||||
# inputs.determinate.nixosModules.default # https://github.com/serokell/deploy-rs/issues/340
|
# inputs.determinate.nixosModules.default # https://github.com/serokell/deploy-rs/issues/340
|
||||||
] ++ builtins.attrValues
|
]
|
||||||
(builtins.mapAttrs
|
++ builtins.attrValues (
|
||||||
(name: _: ./modules/${name})
|
builtins.mapAttrs (name: _: ./modules/${name}) (builtins.readDir ./modules)
|
||||||
(builtins.readDir ./modules));
|
);
|
||||||
in
|
in
|
||||||
{
|
{
|
||||||
t14 = inputs.nixpkgs.lib.nixosSystem {
|
t14 = inputs.nixpkgs.lib.nixosSystem {
|
||||||
|
|
@ -33,7 +32,7 @@ in
|
||||||
];
|
];
|
||||||
};
|
};
|
||||||
consensus = inputs.nixpkgs-stable.lib.nixosSystem {
|
consensus = inputs.nixpkgs-stable.lib.nixosSystem {
|
||||||
pkgs = pkgs-stable;
|
pkgs = pkgs.stable;
|
||||||
specialArgs = {
|
specialArgs = {
|
||||||
pkgs-unstable = pkgs;
|
pkgs-unstable = pkgs;
|
||||||
inherit inputs system attrs;
|
inherit inputs system attrs;
|
||||||
|
|
@ -47,7 +46,7 @@ in
|
||||||
];
|
];
|
||||||
};
|
};
|
||||||
zen = inputs.nixpkgs-stable.lib.nixosSystem {
|
zen = inputs.nixpkgs-stable.lib.nixosSystem {
|
||||||
pkgs = pkgs-stable;
|
pkgs = pkgs.stable;
|
||||||
specialArgs = {
|
specialArgs = {
|
||||||
inherit inputs system attrs;
|
inherit inputs system attrs;
|
||||||
host = {
|
host = {
|
||||||
|
|
@ -60,7 +59,7 @@ in
|
||||||
];
|
];
|
||||||
};
|
};
|
||||||
oracle1 = inputs.nixpkgs-stable.lib.nixosSystem {
|
oracle1 = inputs.nixpkgs-stable.lib.nixosSystem {
|
||||||
pkgs = pkgs-stable;
|
pkgs = pkgs.stable;
|
||||||
specialArgs = {
|
specialArgs = {
|
||||||
inherit inputs system attrs;
|
inherit inputs system attrs;
|
||||||
host = {
|
host = {
|
||||||
|
|
|
||||||
20
overlays/default.nix
Normal file
20
overlays/default.nix
Normal file
|
|
@ -0,0 +1,20 @@
|
||||||
|
# https://nixos.wiki/wiki/Overlays
|
||||||
|
{ inputs, ... }:
|
||||||
|
{
|
||||||
|
additions = final: _prev: import ../pkgs final.pkgs;
|
||||||
|
|
||||||
|
modifications = final: prev: {
|
||||||
|
# example = prev.example.overrideAttrs (oldAttrs: rec {
|
||||||
|
# ...
|
||||||
|
# });
|
||||||
|
};
|
||||||
|
|
||||||
|
# When applied, the unstable nixpkgs set (declared in the flake inputs) will
|
||||||
|
# be accessible through 'pkgs.unstable'
|
||||||
|
stable-packages = final: _prev: {
|
||||||
|
nixos-stable = import inputs.nixpkgs-stable {
|
||||||
|
system = final.system;
|
||||||
|
config.allowUnfree = true;
|
||||||
|
};
|
||||||
|
};
|
||||||
|
}
|
||||||
9
pkgs/default.nix
Normal file
9
pkgs/default.nix
Normal file
|
|
@ -0,0 +1,9 @@
|
||||||
|
{ inputs, ... }:
|
||||||
|
pkgs: {
|
||||||
|
jj-vine = pkgs.rustPlatform.buildRustPackage {
|
||||||
|
name = "jj-vine";
|
||||||
|
src = inputs.jj-vine;
|
||||||
|
cargoHash = "sha256-OU3WVLXGsMwpfzDM4sXa4KTGps63MTDvDAE/HREzPS8=";
|
||||||
|
nativeBuildInputs = [ pkgs.jj ];
|
||||||
|
};
|
||||||
|
}
|
||||||
|
|
@ -1,47 +0,0 @@
|
||||||
final: prev: {
|
|
||||||
august-rsps = prev.stdenv.mkDerivation rec {
|
|
||||||
pname = "august-rsps";
|
|
||||||
version = "0.0.1";
|
|
||||||
|
|
||||||
jar = prev.fetchurl {
|
|
||||||
url = "https://cdn.discordapp.com/attachments/1223340813317308580/1291311940165046302/AugustRSPS_Launcher.jar?ex=68cfb375&is=68ce61f5&hm=33c31fbfe089624dc8aced1ddf1e663dc5c6eccec3072e36b458d38bbca2edc8&";
|
|
||||||
hash = "sha256-RY191f/LjNaJiobwoSMNm1yWEBSV7dFRfqru/BNNhv4=";
|
|
||||||
};
|
|
||||||
|
|
||||||
jogl = prev.fetchurl {
|
|
||||||
url = "https://repo.runelite.net/net/runelite/jogl/jogl-all/2.4.0-rc-20200429/jogl-all-2.4.0-rc-20200429-natives-linux-amd64.jar";
|
|
||||||
hash = "sha512-OmJIbk5pKtvf1n1I5UHu6iaOKNrPgmaJTPhqC8yMjaRh/Hso1vV/+Eu+zKu7d5UiVggVUzJxqDKatmEnqFrzbg==";
|
|
||||||
};
|
|
||||||
gluegen = prev.fetchurl {
|
|
||||||
url = "https://repo.runelite.net/net/runelite/gluegen/gluegen-rt/2.4.0-rc-20220318/gluegen-rt-2.4.0-rc-20220318-natives-linux-amd64.jar";
|
|
||||||
hash = "sha512-kF+RdDzYEhBuZOJ6ZwMhaEVcjYLxiwR8tYAm08FXDML45iP4HBEfmqHOLJpIakK06aQFj99/296vx810eDFX5A==";
|
|
||||||
};
|
|
||||||
dontUnpack = true;
|
|
||||||
|
|
||||||
nativeBuildInputs = [
|
|
||||||
prev.makeWrapper
|
|
||||||
prev.unzip
|
|
||||||
];
|
|
||||||
installPhase = ''
|
|
||||||
mkdir -p $out/share/august-rsps
|
|
||||||
mkdir -p $out/natives
|
|
||||||
|
|
||||||
unzip ${jogl} 'natives/*' -d $out
|
|
||||||
unzip ${gluegen} 'natives/*' -d $out
|
|
||||||
|
|
||||||
ln -s ${jar} $out/share/august-rsps/AugustRSPS_Launcher.jar
|
|
||||||
|
|
||||||
makeWrapper ${prev.jre}/bin/java $out/bin/august-rsps \
|
|
||||||
--chdir "$out" \
|
|
||||||
--prefix LD_LIBRARY_PATH : "${prev.xorg.libXxf86vm}/lib" \
|
|
||||||
--prefix LD_LIBRARY_PATH : "/run/opengl-driver/lib:/run/opengl-driver-32/lib" \
|
|
||||||
--add-flags "-jar $out/share/august-rsps/AugustRSPS_Launcher.jar"
|
|
||||||
'';
|
|
||||||
|
|
||||||
meta = with prev.lib; {
|
|
||||||
description = "August RSPS Launcher";
|
|
||||||
maintainers = with maintainers; [iofq];
|
|
||||||
platforms = ["x86_64-linux"];
|
|
||||||
};
|
|
||||||
};
|
|
||||||
}
|
|
||||||
Loading…
Add table
Add a link
Reference in a new issue