iofq/nix
1
0
Fork 0
Code Issues 1 Pull requests Projects Releases Packages Wiki Activity Actions

Compare commits

base: iofq:58ae27d6d13b1b7a5ab32720742230ed5df9d462
Branches Tags
iofq:main
..
compare: iofq:8694c7d81f85ecdbcce8b66df9e7b54745648403
Branches Tags
iofq:main

No commits in common. "58ae27d6d13b1b7a5ab32720742230ed5df9d462" and "8694c7d81f85ecdbcce8b66df9e7b54745648403" have entirely different histories.
58ae27d6d1 ... 8694c7d81f

10 changed files with 131 additions and 233 deletions
Download patch file Download diff file Expand all files Collapse all files

234
flake.lock generated
View file

@ -1,31 +1,9 @@
{ {
"nodes": { "nodes": {
"blueprint": {
"inputs": {
"nixpkgs": [
"llm-agents",
"nixpkgs"
],
"systems": "systems_2"
},
"locked": {
"lastModified": 1771437256,
"narHash": "sha256-bLqwib+rtyBRRVBWhMuBXPCL/OThfokA+j6+uH7jDGU=",
"owner": "numtide",
"repo": "blueprint",
"rev": "06ee7190dc2620ea98af9eb225aa9627b68b0e33",
"type": "github"
},
"original": {
"owner": "numtide",
"repo": "blueprint",
"type": "github"
}
},
"dart": { "dart": {
"inputs": { "inputs": {
"flake-utils": "flake-utils", "flake-utils": "flake-utils",
"nixpkgs": "nixpkgs_5" "nixpkgs": "nixpkgs_4"
}, },
"locked": { "locked": {
"lastModified": 1771048667, "lastModified": 1771048667,
@ -50,11 +28,11 @@
"utils": "utils" "utils": "utils"
}, },
"locked": { "locked": {
"lastModified": 1770019181, "lastModified": 1766051518,
"narHash": "sha256-hwsYgDnby50JNVpTRYlF3UR/Rrpt01OrxVuryF40CFY=", "narHash": "sha256-znKOwPXQnt3o7lDb3hdf19oDo0BLP4MfBOYiWkEHoik=",
"owner": "serokell", "owner": "serokell",
"repo": "deploy-rs", "repo": "deploy-rs",
"rev": "77c906c0ba56aabdbc72041bf9111b565cdd6171", "rev": "d5eff7f948535b9c723d60cd8239f8f11ddc90fa",
"type": "github" "type": "github"
}, },
"original": { "original": {
@ -72,12 +50,12 @@
"nixpkgs": "nixpkgs_2" "nixpkgs": "nixpkgs_2"
}, },
"locked": { "locked": {
"lastModified": 1771014593, "lastModified": 1766549083,
"narHash": "sha256-NrCFwn20ewJwy/SZoREs+XylerizPCYP54n9qkr31/E=", "narHash": "sha256-G1Hljg7vIBt8n9cxO382YAZWtZU/mYfQcg3icdNG8RQ=",
"rev": "69b4ff80ae2bbdd1e3f02ccd76a5f2988b118ed2", "rev": "ba8999fac986e70f52b4cba15047be7bbb7b6346",
"revCount": 397, "revCount": 318,
"type": "tarball", "type": "tarball",
"url": "https://api.flakehub.com/f/pinned/DeterminateSystems/determinate/3.16.0/019c58b5-64dc-77f9-b913-8738b7d338cc/source.tar.gz" "url": "https://api.flakehub.com/f/pinned/DeterminateSystems/determinate/3.15.1/019b4e8a-dc22-75db-aef5-a447efbb1a13/source.tar.gz"
}, },
"original": { "original": {
"type": "tarball", "type": "tarball",
@ -87,37 +65,37 @@
"determinate-nixd-aarch64-darwin": { "determinate-nixd-aarch64-darwin": {
"flake": false, "flake": false,
"locked": { "locked": {
"narHash": "sha256-PUo0u1iNMB8eTlBNFMCW8/UAn1sGKGqsIYlXaDRhx00=", "narHash": "sha256-uWDS94cAYprGj+AwuT42nuuDDicRLj1S0JwalZGeBRU=",
"type": "file", "type": "file",
"url": "https://install.determinate.systems/determinate-nixd/tag/v3.16.0/macOS" "url": "https://install.determinate.systems/determinate-nixd/tag/v3.15.1/macOS"
}, },
"original": { "original": {
"type": "file", "type": "file",
"url": "https://install.determinate.systems/determinate-nixd/tag/v3.16.0/macOS" "url": "https://install.determinate.systems/determinate-nixd/tag/v3.15.1/macOS"
} }
}, },
"determinate-nixd-aarch64-linux": { "determinate-nixd-aarch64-linux": {
"flake": false, "flake": false,
"locked": { "locked": {
"narHash": "sha256-jiIWiM88xkEpBQeohSxhl83fn2xoZY0nFkrW6CUAIAI=", "narHash": "sha256-uHBcZCh2/Bj5/88TDihupA336tSQDk7s5lVP66IDAX0=",
"type": "file", "type": "file",
"url": "https://install.determinate.systems/determinate-nixd/tag/v3.16.0/aarch64-linux" "url": "https://install.determinate.systems/determinate-nixd/tag/v3.15.1/aarch64-linux"
}, },
"original": { "original": {
"type": "file", "type": "file",
"url": "https://install.determinate.systems/determinate-nixd/tag/v3.16.0/aarch64-linux" "url": "https://install.determinate.systems/determinate-nixd/tag/v3.15.1/aarch64-linux"
} }
}, },
"determinate-nixd-x86_64-linux": { "determinate-nixd-x86_64-linux": {
"flake": false, "flake": false,
"locked": { "locked": {
"narHash": "sha256-qF/NNdHwh3tAHrKIOz2FRq5Q8GcSMzJeEY/PFvGf5vo=", "narHash": "sha256-y+l05H6GNv/1WcrMztDYem8VBWqjc9gNg4WjeQ1PQxo=",
"type": "file", "type": "file",
"url": "https://install.determinate.systems/determinate-nixd/tag/v3.16.0/x86_64-linux" "url": "https://install.determinate.systems/determinate-nixd/tag/v3.15.1/x86_64-linux"
}, },
"original": { "original": {
"type": "file", "type": "file",
"url": "https://install.determinate.systems/determinate-nixd/tag/v3.16.0/x86_64-linux" "url": "https://install.determinate.systems/determinate-nixd/tag/v3.15.1/x86_64-linux"
} }
}, },
"flake-compat": { "flake-compat": {
@ -247,7 +225,7 @@
}, },
"flake-utils": { "flake-utils": {
"inputs": { "inputs": {
"systems": "systems_3" "systems": "systems_2"
}, },
"locked": { "locked": {
"lastModified": 1731533236, "lastModified": 1731533236,
@ -264,7 +242,7 @@
}, },
"flake-utils_2": { "flake-utils_2": {
"inputs": { "inputs": {
"systems": "systems_4" "systems": "systems_3"
}, },
"locked": { "locked": {
"lastModified": 1731533236, "lastModified": 1731533236,
@ -406,11 +384,11 @@
] ]
}, },
"locked": { "locked": {
"lastModified": 1771269455, "lastModified": 1768749864,
"narHash": "sha256-BZ31eN5F99YH6vkc4AhzKGE+tJgJ52kl8f01K7wCs8w=", "narHash": "sha256-EKRMFBLBRCHrFZ5luX85RTnsN3b2q3FjZEi62vXwJBE=",
"owner": "nix-community", "owner": "nix-community",
"repo": "home-manager", "repo": "home-manager",
"rev": "5f1d42a97b19803041434f66681d5c44c9ae62e3", "rev": "5148e08046dc8c74c66b8aee4d302a47d6931b56",
"type": "github" "type": "github"
}, },
"original": { "original": {
@ -436,42 +414,6 @@
"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"
}
},
"llm-agents": {
"inputs": {
"blueprint": "blueprint",
"nixpkgs": "nixpkgs_3",
"treefmt-nix": "treefmt-nix"
},
"locked": {
"lastModified": 1772162957,
"narHash": "sha256-CunGzQ1e2+bTgiLnuRSiwUsdN3RaRs1xy+ofYerwNVA=",
"owner": "numtide",
"repo": "llm-agents.nix",
"rev": "4167f8a37504786e80d1b32c907e403fe41ccd08",
"type": "github"
},
"original": {
"owner": "numtide",
"repo": "llm-agents.nix",
"type": "github"
}
},
"luvit-meta": { "luvit-meta": {
"flake": false, "flake": false,
"locked": { "locked": {
@ -496,11 +438,11 @@
"spectrum": "spectrum" "spectrum": "spectrum"
}, },
"locked": { "locked": {
"lastModified": 1771365290, "lastModified": 1768682386,
"narHash": "sha256-1XJOslVyF7yzf6yd/yl1VjGLywsbtwmQh3X1LuJcLI4=", "narHash": "sha256-mKrMf7eG9TM2AM3pTuhIiCGmZ/JwDegCQH3ThVqcTuc=",
"owner": "microvm-nix", "owner": "microvm-nix",
"repo": "microvm.nix", "repo": "microvm.nix",
"rev": "789c90b164b55b4379e7a94af8b9c01489024c18", "rev": "f469c1dfede623bbbf1ac605f6359316fd4002ef",
"type": "github" "type": "github"
}, },
"original": { "original": {
@ -557,12 +499,12 @@
"nixpkgs-regression": "nixpkgs-regression" "nixpkgs-regression": "nixpkgs-regression"
}, },
"locked": { "locked": {
"lastModified": 1771010067, "lastModified": 1766546676,
"narHash": "sha256-Itk88UC3CxjGjjAb20KI6KrM9tRoGEpbv996fXwAWGo=", "narHash": "sha256-GsC52VFF9Gi2pgP/haQyPdQoF5Qe2myk1tsPcuJZI28=",
"rev": "5c670e37e884c43e1da0405075c9b9c83d316a6c", "rev": "51dacdd248e8071cd0243a8245c8c42ac1f33307",
"revCount": 24629, "revCount": 24299,
"type": "tarball", "type": "tarball",
"url": "https://api.flakehub.com/f/pinned/DeterminateSystems/nix-src/3.16.0/019c589d-45e9-7337-9ff0-a8d78fecf63f/source.tar.gz" "url": "https://api.flakehub.com/f/pinned/DeterminateSystems/nix-src/3.15.1/019b4e84-d036-75db-b6c6-6bc2e2035c53/source.tar.gz"
}, },
"original": { "original": {
"type": "tarball", "type": "tarball",
@ -576,11 +518,11 @@
] ]
}, },
"locked": { "locked": {
"lastModified": 1771130777, "lastModified": 1765267181,
"narHash": "sha256-UIKOwG0D9XVIJfNWg6+gENAvQP+7LO46eO0Jpe+ItJ0=", "narHash": "sha256-d3NBA9zEtBu2JFMnTBqWj7Tmi7R5OikoU2ycrdhQEws=",
"owner": "nix-community", "owner": "nix-community",
"repo": "nix-index-database", "repo": "nix-index-database",
"rev": "efec7aaad8d43f8e5194df46a007456093c40f88", "rev": "82befcf7dc77c909b0f2a09f5da910ec95c5b78f",
"type": "github" "type": "github"
}, },
"original": { "original": {
@ -591,11 +533,11 @@
}, },
"nixos-hardware": { "nixos-hardware": {
"locked": { "locked": {
"lastModified": 1771257191, "lastModified": 1768736227,
"narHash": "sha256-H1l+zHq+ZinWH7F1IidpJ2farmbfHXjaxAm1RKWE1KI=", "narHash": "sha256-qgGq7CfrYKc3IBYQ7qp0Z/ZXndQVC5Bj0N8HW9mS2rM=",
"owner": "NixOS", "owner": "NixOS",
"repo": "nixos-hardware", "repo": "nixos-hardware",
"rev": "66e1a090ded57a0f88e2b381a7d4daf4a5722c3f", "rev": "d447553bcbc6a178618d37e61648b19e744370df",
"type": "github" "type": "github"
}, },
"original": { "original": {
@ -664,11 +606,11 @@
}, },
"nixpkgs-stable": { "nixpkgs-stable": {
"locked": { "locked": {
"lastModified": 1771208521, "lastModified": 1768621446,
"narHash": "sha256-X01Q3DgSpjeBpapoGA4rzKOn25qdKxbPnxHeMLNoHTU=", "narHash": "sha256-6YwHV1cjv6arXdF/PQc365h1j+Qje3Pydk501Rm4Q+4=",
"owner": "nixos", "owner": "nixos",
"repo": "nixpkgs", "repo": "nixpkgs",
"rev": "fa56d7d6de78f5a7f997b0ea2bc6efd5868ad9e8", "rev": "72ac591e737060deab2b86d6952babd1f896d7c5",
"type": "github" "type": "github"
}, },
"original": { "original": {
@ -696,12 +638,12 @@
}, },
"nixpkgs_2": { "nixpkgs_2": {
"locked": { "locked": {
"lastModified": 1770537093, "lastModified": 1766314097,
"narHash": "sha256-pF1quXG5wsgtyuPOHcLfYg/ft/QMr8NnX0i6tW2187s=", "narHash": "sha256-laJftWbghBehazn/zxVJ8NdENVgjccsWAdAqKXhErrM=",
"rev": "fef9403a3e4d31b0a23f0bacebbec52c248fbb51", "rev": "306ea70f9eb0fb4e040f8540e2deab32ed7e2055",
"revCount": 942631, "revCount": 914780,
"type": "tarball", "type": "tarball",
"url": "https://api.flakehub.com/f/pinned/DeterminateSystems/nixpkgs-weekly/0.1.942631%2Brev-fef9403a3e4d31b0a23f0bacebbec52c248fbb51/019c4621-ce4f-799f-82f6-b3b29f099b09/source.tar.gz" "url": "https://api.flakehub.com/f/pinned/DeterminateSystems/nixpkgs-weekly/0.1.914780%2Brev-306ea70f9eb0fb4e040f8540e2deab32ed7e2055/019b49b8-ed0f-724e-bdaf-5fd90cc1c590/source.tar.gz"
}, },
"original": { "original": {
"type": "tarball", "type": "tarball",
@ -710,27 +652,11 @@
}, },
"nixpkgs_3": { "nixpkgs_3": {
"locked": { "locked": {
"lastModified": 1771423170, "lastModified": 1768564909,
"narHash": "sha256-K7Dg9TQ0mOcAtWTO/FX/FaprtWQ8BmEXTpLIaNRhEwU=", "narHash": "sha256-Kell/SpJYVkHWMvnhqJz/8DqQg2b6PguxVWOuadbHCc=",
"owner": "NixOS",
"repo": "nixpkgs",
"rev": "bcc4a9d9533c033d806a46b37dc444f9b0da49dd",
"type": "github"
},
"original": {
"owner": "NixOS",
"ref": "nixpkgs-unstable",
"repo": "nixpkgs",
"type": "github"
}
},
"nixpkgs_4": {
"locked": {
"lastModified": 1771008912,
"narHash": "sha256-gf2AmWVTs8lEq7z/3ZAsgnZDhWIckkb+ZnAo5RzSxJg=",
"owner": "nixos", "owner": "nixos",
"repo": "nixpkgs", "repo": "nixpkgs",
"rev": "a82ccc39b39b621151d6732718e3e250109076fa", "rev": "e4bae1bd10c9c57b2cf517953ab70060a828ee6f",
"type": "github" "type": "github"
}, },
"original": { "original": {
@ -740,7 +666,7 @@
"type": "github" "type": "github"
} }
}, },
"nixpkgs_5": { "nixpkgs_4": {
"locked": { "locked": {
"lastModified": 1755660401, "lastModified": 1755660401,
"owner": "NixOS", "owner": "NixOS",
@ -789,11 +715,11 @@
] ]
}, },
"locked": { "locked": {
"lastModified": 1770726378, "lastModified": 1767281941,
"narHash": "sha256-kck+vIbGOaM/dHea7aTBxdFYpeUl/jHOy5W3eyRvVx8=", "narHash": "sha256-6MkqajPICgugsuZ92OMoQcgSHnD6sJHwk8AxvMcIgTE=",
"owner": "cachix", "owner": "cachix",
"repo": "pre-commit-hooks.nix", "repo": "pre-commit-hooks.nix",
"rev": "5eaaedde414f6eb1aea8b8525c466dc37bba95ae", "rev": "f0927703b7b1c8d97511c4116eb9b4ec6645a0fa",
"type": "github" "type": "github"
}, },
"original": { "original": {
@ -807,18 +733,16 @@
"deploy-rs": "deploy-rs", "deploy-rs": "deploy-rs",
"determinate": "determinate", "determinate": "determinate",
"home-manager": "home-manager", "home-manager": "home-manager",
"jj-vine": "jj-vine",
"llm-agents": "llm-agents",
"microvm": "microvm", "microvm": "microvm",
"nix-index-database": "nix-index-database", "nix-index-database": "nix-index-database",
"nixos-hardware": "nixos-hardware", "nixos-hardware": "nixos-hardware",
"nixpkgs": "nixpkgs_4", "nixpkgs": "nixpkgs_3",
"nixpkgs-stable": "nixpkgs-stable", "nixpkgs-stable": "nixpkgs-stable",
"nvim": "nvim", "nvim": "nvim",
"pre-commit-hooks": "pre-commit-hooks", "pre-commit-hooks": "pre-commit-hooks",
"sops-nix": "sops-nix", "sops-nix": "sops-nix",
"systems": "systems_5", "systems": "systems_4",
"treefmt-nix": "treefmt-nix_2" "treefmt-nix": "treefmt-nix"
} }
}, },
"sops-nix": { "sops-nix": {
@ -828,11 +752,11 @@
] ]
}, },
"locked": { "locked": {
"lastModified": 1771166946, "lastModified": 1768709255,
"narHash": "sha256-UFc4lfGBr+wJmwgDGJDn1cVD6DTr0/8TdronNUiyXlU=", "narHash": "sha256-aigyBfxI20FRtqajVMYXHtj5gHXENY2gLAXEhfJ8/WM=",
"owner": "Mic92", "owner": "Mic92",
"repo": "sops-nix", "repo": "sops-nix",
"rev": "2d0cf89b4404529778bc82de7e42b5754e0fe4fa", "rev": "5e8fae80726b66e9fec023d21cd3b3e638597aa9",
"type": "github" "type": "github"
}, },
"original": { "original": {
@ -917,54 +841,18 @@
"type": "github" "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"
}
},
"treefmt-nix": { "treefmt-nix": {
"inputs": { "inputs": {
"nixpkgs": [ "nixpkgs": [
"llm-agents",
"nixpkgs" "nixpkgs"
] ]
}, },
"locked": { "locked": {
"lastModified": 1770228511, "lastModified": 1768158989,
"narHash": "sha256-wQ6NJSuFqAEmIg2VMnLdCnUc0b7vslUohqqGGD+Fyxk=", "narHash": "sha256-67vyT1+xClLldnumAzCTBvU0jLZ1YBcf4vANRWP3+Ak=",
"owner": "numtide", "owner": "numtide",
"repo": "treefmt-nix", "repo": "treefmt-nix",
"rev": "337a4fe074be1042a35086f15481d763b8ddc0e7", "rev": "e96d59dff5c0d7fddb9d113ba108f03c3ef99eca",
"type": "github"
},
"original": {
"owner": "numtide",
"repo": "treefmt-nix",
"type": "github"
}
},
"treefmt-nix_2": {
"inputs": {
"nixpkgs": [
"nixpkgs"
]
},
"locked": {
"lastModified": 1770228511,
"narHash": "sha256-wQ6NJSuFqAEmIg2VMnLdCnUc0b7vslUohqqGGD+Fyxk=",
"owner": "numtide",
"repo": "treefmt-nix",
"rev": "337a4fe074be1042a35086f15481d763b8ddc0e7",
"type": "github" "type": "github"
}, },
"original": { "original": {

18
flake.nix
View file

@ -42,16 +42,12 @@
}; };
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;
};
llm-agents.url = "github:numtide/llm-agents.nix";
}; };
outputs = outputs =
{ {
self, self,
nixpkgs, nixpkgs,
nixpkgs-stable,
systems, systems,
... ...
}@inputs: }@inputs:
@ -65,21 +61,22 @@
config.allowUnfree = true; config.allowUnfree = true;
overlays = [ overlays = [
inputs.nvim.overlays.default inputs.nvim.overlays.default
inputs.llm-agents.overlays.default (import ./pkgs/overlay.nix)
inputs.self.overlays.stable-packages
]; ];
}; };
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 pkgs; });
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
; ;
@ -95,6 +92,7 @@
}; };
}; };
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; [

11
home-manager/shared/programs/pi.nix
View file

@ -1,11 +0,0 @@
{ config, pkgs, ... }:
{
home.packages = with pkgs; [
pi
];
home.file."${config.xdg.configHome}/.pi" = {
source = ./config;
recursive = true;
};
}

1
home-manager/shared/programs/shell/git.nix
View file

@ -30,7 +30,6 @@
}; };
# home.packages = [ pkgs.watchman ]; # home.packages = [ pkgs.watchman ];
home.packages = [ pkgs.jj-vine ];
programs.jujutsu = { programs.jujutsu = {
enable = true; enable = true;
settings = { settings = {

8
home-manager/shared/wayland/hyprland/default.nix
View file

@ -179,8 +179,12 @@
}; };
listener = [ listener = [
{ {
timeout = 1500; timeout = 900;
on-timeout = "hyprlock; hyprctl dispatch dpms off"; on-timeout = "hyprlock";
}
{
timeout = 1200;
on-timeout = "hyprctl dispatch dpms off";
on-resume = "hyprctl dispatch dpms on"; on-resume = "hyprctl dispatch dpms on";
} }
]; ];

1
home-manager/t14/home.nix
View file

@ -14,6 +14,7 @@
prismlauncher prismlauncher
runelite runelite
jdk21 jdk21
august-rsps
# comms # comms
signal-desktop signal-desktop

15
nixos/default.nix
View file

@ -1,6 +1,7 @@
{ {
inputs, inputs,
pkgs, pkgs,
pkgs-stable,
attrs, attrs,
system, system,
... ...
@ -11,10 +12,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.attrValues ( (builtins.mapAttrs
builtins.mapAttrs (name: _: ./modules/${name}) (builtins.readDir ./modules) (name: _: ./modules/${name})
); (builtins.readDir ./modules));
in in
{ {
t14 = inputs.nixpkgs.lib.nixosSystem { t14 = inputs.nixpkgs.lib.nixosSystem {
@ -32,7 +33,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;
@ -46,7 +47,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 = {
@ -59,7 +60,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
View file

@ -1,20 +0,0 @@
# 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
View file

@ -1,9 +0,0 @@
{ inputs, pkgs, ... }:
{
jj-vine = pkgs.rustPlatform.buildRustPackage {
name = "jj-vine";
src = inputs.jj-vine;
cargoHash = "sha256-OU3WVLXGsMwpfzDM4sXa4KTGps63MTDvDAE/HREzPS8=";
nativeBuildInputs = [ pkgs.jujutsu ];
};
}

47
pkgs/overlay.nix Normal file
View file

@ -0,0 +1,47 @@
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"];
};
};
}