youthlic/nixos
1
0
Fork 0
Code Issues Pull requests Projects Releases Packages Wiki Activity Actions

Compare commits

base: youthlic:5de4c827d85f50320d10ddaec34a8bcecd36da9b
Branches Tags
youthlic:dev
..
compare: youthlic:3cc1197ad6e558a7d71be24821f7cec7ef52cb9f
Branches Tags
youthlic:dev

No commits in common. "5de4c827d85f50320d10ddaec34a8bcecd36da9b" and "3cc1197ad6e558a7d71be24821f7cec7ef52cb9f" have entirely different histories.
5de4c827d8 ... 3cc1197ad6

21 changed files with 322 additions and 207 deletions
Download patch file Download diff file Expand all files Collapse all files

8
.typos.toml
View file

@ -17,12 +17,6 @@ extend-ignore-re = [
# Line block with `(#|;;|//) spellchecker: (on|off)` # Line block with `(#|;;|//) spellchecker: (on|off)`
"(?s)(#|//|;;)\\s*typochecker: off.*?\\n\\s*(#|//|;;)\\s*typochecker: on", "(?s)(#|//|;;)\\s*typochecker: off.*?\\n\\s*(#|//|;;)\\s*typochecker: on",
] ]
extend-ignore-identifiers-re = [ extend-ignore-identifiers-re = ["als", "Paket", "ConfiguratioN", "StructurE"]
"als",
"Paket",
"ConfiguratioN",
"StructurE",
"lazer",
]
[default.extend-identifiers] [default.extend-identifiers]

418
flake.lock generated
View file

@ -78,11 +78,11 @@
"systems": "systems" "systems": "systems"
}, },
"locked": { "locked": {
"lastModified": 1761562526, "lastModified": 1760925526,
"narHash": "sha256-+mYl7DCF3Jex2hescIWVPgNODQdlP1uKtLoWlmv8n0U=", "narHash": "sha256-gymGcDqUpPlbaPPvzxZrM2KTF0kPLodCHepSFtvxdEg=",
"owner": "HeitorAugustoLN", "owner": "HeitorAugustoLN",
"repo": "betterfox-nix", "repo": "betterfox-nix",
"rev": "ddcd4db899a98606f7714cb7b5b4eb916947478a", "rev": "05a3837b57f2d306cf43d4e901918f2d9187cfb2",
"type": "github" "type": "github"
}, },
"original": { "original": {
@ -100,11 +100,11 @@
"rust-overlay": "rust-overlay" "rust-overlay": "rust-overlay"
}, },
"locked": { "locked": {
"lastModified": 1762007588, "lastModified": 1760747305,
"narHash": "sha256-y/djCrAJaqwa+hQjA9xKdycmQ9WsIaxBhgjOEoI2O5k=", "narHash": "sha256-SsuuyaFp4TbJ+ofti9EXot9gIOk4vZqccat/zERVQN4=",
"owner": "chaotic-cx", "owner": "chaotic-cx",
"repo": "nyx", "repo": "nyx",
"rev": "423859d3450e95420d41ad8b5c6628e29c3f97d2", "rev": "9838e14b30857ac0a50dbe98a5ba2233d6ccb2de",
"type": "github" "type": "github"
}, },
"original": { "original": {
@ -128,6 +128,29 @@
"type": "github" "type": "github"
} }
}, },
"dae": {
"inputs": {
"flake-parts": [
"flake-parts"
],
"nixpkgs": [
"nixpkgs"
]
},
"locked": {
"lastModified": 1758615062,
"narHash": "sha256-fX71EN6uogg0fEu/j/iZVjzupMqtuv2DY7Xl/xJQNbo=",
"owner": "daeuniverse",
"repo": "flake.nix",
"rev": "4fa18dd45954f8d56147594029c14822faa8ff42",
"type": "github"
},
"original": {
"owner": "daeuniverse",
"repo": "flake.nix",
"type": "github"
}
},
"deploy-rs": { "deploy-rs": {
"inputs": { "inputs": {
"flake-compat": "flake-compat", "flake-compat": "flake-compat",
@ -159,11 +182,11 @@
] ]
}, },
"locked": { "locked": {
"lastModified": 1761899396, "lastModified": 1760701190,
"narHash": "sha256-XOpKBp6HLzzMCbzW50TEuXN35zN5WGQREC7n34DcNMM=", "narHash": "sha256-y7UhnWlER8r776JsySqsbTUh2Txf7K30smfHlqdaIQw=",
"owner": "nix-community", "owner": "nix-community",
"repo": "disko", "repo": "disko",
"rev": "6f4cf5abbe318e4cd1e879506f6eeafd83f7b998", "rev": "3a9450b26e69dcb6f8de6e2b07b3fc1c288d85f5",
"type": "github" "type": "github"
}, },
"original": { "original": {
@ -194,11 +217,11 @@
"nixpkgs-stable": "nixpkgs-stable" "nixpkgs-stable": "nixpkgs-stable"
}, },
"locked": { "locked": {
"lastModified": 1761985492, "lastModified": 1760951609,
"narHash": "sha256-h0d1DG0dp7mrrQoe+sUmtZvnYhbGAyI/pr9bgYfHb9M=", "narHash": "sha256-rWkUWKWcLin0+dKvinWC1IZVxJnIvXV3q/wlmmKkzo4=",
"owner": "nix-community", "owner": "nix-community",
"repo": "emacs-overlay", "repo": "emacs-overlay",
"rev": "11c52dbdbf5bacf57ce3fd7b0cbe359a3e23eb3c", "rev": "41bee8f6a80b36b0348a8e750e5db88fea528171",
"type": "github" "type": "github"
}, },
"original": { "original": {
@ -217,11 +240,11 @@
] ]
}, },
"locked": { "locked": {
"lastModified": 1761985492, "lastModified": 1760948693,
"narHash": "sha256-h0d1DG0dp7mrrQoe+sUmtZvnYhbGAyI/pr9bgYfHb9M=", "narHash": "sha256-6Yg+MuZjxpoHZkVyoDv+izjB2wFMG22wA7yNXaGLv1I=",
"owner": "nix-community", "owner": "nix-community",
"repo": "emacs-overlay", "repo": "emacs-overlay",
"rev": "11c52dbdbf5bacf57ce3fd7b0cbe359a3e23eb3c", "rev": "264e26504e789be07637ca74d1370fcd1cb0b716",
"type": "github" "type": "github"
}, },
"original": { "original": {
@ -278,6 +301,38 @@
"type": "github" "type": "github"
} }
}, },
"flake-compat_3": {
"flake": false,
"locked": {
"lastModified": 1747046372,
"narHash": "sha256-CIVLLkVgvHYbgI2UpXvIIBJ12HWgX+fjA8Xf8PUmqCY=",
"owner": "edolstra",
"repo": "flake-compat",
"rev": "9100a0f413b0c601e0533d1d94ffd501ce2e7885",
"type": "github"
},
"original": {
"owner": "edolstra",
"repo": "flake-compat",
"type": "github"
}
},
"flake-compat_4": {
"flake": false,
"locked": {
"lastModified": 1747046372,
"narHash": "sha256-CIVLLkVgvHYbgI2UpXvIIBJ12HWgX+fjA8Xf8PUmqCY=",
"owner": "edolstra",
"repo": "flake-compat",
"rev": "9100a0f413b0c601e0533d1d94ffd501ce2e7885",
"type": "github"
},
"original": {
"owner": "edolstra",
"repo": "flake-compat",
"type": "github"
}
},
"flake-parts": { "flake-parts": {
"inputs": { "inputs": {
"nixpkgs-lib": [ "nixpkgs-lib": [
@ -286,11 +341,11 @@
] ]
}, },
"locked": { "locked": {
"lastModified": 1760948891, "lastModified": 1760813311,
"narHash": "sha256-TmWcdiUUaWk8J4lpjzu4gCGxWY6/Ok7mOK4fIFfBuU4=", "narHash": "sha256-lbHQ7FXGzt6/IygWvJ1lCq+Txcut3xYYd6VIpF1ojkg=",
"owner": "hercules-ci", "owner": "hercules-ci",
"repo": "flake-parts", "repo": "flake-parts",
"rev": "864599284fc7c0ba6357ed89ed5e2cd5040f0c04", "rev": "4e627ac2e1b8f1de7f5090064242de9a259dbbc8",
"type": "github" "type": "github"
}, },
"original": { "original": {
@ -346,11 +401,11 @@
] ]
}, },
"locked": { "locked": {
"lastModified": 1760948891, "lastModified": 1760813311,
"narHash": "sha256-TmWcdiUUaWk8J4lpjzu4gCGxWY6/Ok7mOK4fIFfBuU4=", "narHash": "sha256-lbHQ7FXGzt6/IygWvJ1lCq+Txcut3xYYd6VIpF1ojkg=",
"owner": "hercules-ci", "owner": "hercules-ci",
"repo": "flake-parts", "repo": "flake-parts",
"rev": "864599284fc7c0ba6357ed89ed5e2cd5040f0c04", "rev": "4e627ac2e1b8f1de7f5090064242de9a259dbbc8",
"type": "github" "type": "github"
}, },
"original": { "original": {
@ -364,11 +419,11 @@
"nixpkgs-lib": "nixpkgs-lib_2" "nixpkgs-lib": "nixpkgs-lib_2"
}, },
"locked": { "locked": {
"lastModified": 1760948891, "lastModified": 1760813311,
"narHash": "sha256-TmWcdiUUaWk8J4lpjzu4gCGxWY6/Ok7mOK4fIFfBuU4=", "narHash": "sha256-lbHQ7FXGzt6/IygWvJ1lCq+Txcut3xYYd6VIpF1ojkg=",
"owner": "hercules-ci", "owner": "hercules-ci",
"repo": "flake-parts", "repo": "flake-parts",
"rev": "864599284fc7c0ba6357ed89ed5e2cd5040f0c04", "rev": "4e627ac2e1b8f1de7f5090064242de9a259dbbc8",
"type": "github" "type": "github"
}, },
"original": { "original": {
@ -385,11 +440,11 @@
] ]
}, },
"locked": { "locked": {
"lastModified": 1760948891, "lastModified": 1759362264,
"narHash": "sha256-TmWcdiUUaWk8J4lpjzu4gCGxWY6/Ok7mOK4fIFfBuU4=", "narHash": "sha256-wfG0S7pltlYyZTM+qqlhJ7GMw2fTF4mLKCIVhLii/4M=",
"owner": "hercules-ci", "owner": "hercules-ci",
"repo": "flake-parts", "repo": "flake-parts",
"rev": "864599284fc7c0ba6357ed89ed5e2cd5040f0c04", "rev": "758cf7296bee11f1706a574c77d072b8a7baa881",
"type": "github" "type": "github"
}, },
"original": { "original": {
@ -518,6 +573,29 @@
"type": "github" "type": "github"
} }
}, },
"git-hooks": {
"inputs": {
"flake-compat": "flake-compat_4",
"gitignore": "gitignore_2",
"nixpkgs": [
"neovim-nightly",
"nixpkgs"
]
},
"locked": {
"lastModified": 1760663237,
"narHash": "sha256-BflA6U4AM1bzuRMR8QqzPXqh8sWVCNDzOdsxXEguJIc=",
"owner": "cachix",
"repo": "git-hooks.nix",
"rev": "ca5b894d3e3e151ffc1db040b6ce4dcc75d31c37",
"type": "github"
},
"original": {
"owner": "cachix",
"repo": "git-hooks.nix",
"type": "github"
}
},
"gitignore": { "gitignore": {
"inputs": { "inputs": {
"nixpkgs": [ "nixpkgs": [
@ -540,6 +618,28 @@
"type": "github" "type": "github"
} }
}, },
"gitignore_2": {
"inputs": {
"nixpkgs": [
"neovim-nightly",
"git-hooks",
"nixpkgs"
]
},
"locked": {
"lastModified": 1709087332,
"narHash": "sha256-HG2cCnktfHsKV0s4XW83gU3F57gaTljL9KNSuG6bnQs=",
"owner": "hercules-ci",
"repo": "gitignore.nix",
"rev": "637db329424fd7e46cf4185293b9cc8c88c95394",
"type": "github"
},
"original": {
"owner": "hercules-ci",
"repo": "gitignore.nix",
"type": "github"
}
},
"gnome-shell": { "gnome-shell": {
"flake": false, "flake": false,
"locked": { "locked": {
@ -565,11 +665,11 @@
"rust-overlay": "rust-overlay_2" "rust-overlay": "rust-overlay_2"
}, },
"locked": { "locked": {
"lastModified": 1761920229, "lastModified": 1760832569,
"narHash": "sha256-KeTcNpj5UloRTq8fO43NKEFf9a7dpETQq9ynCSgUoxM=", "narHash": "sha256-wg925OdUZdhjJub5XfpBTWQ3EOJYH7JnaBWHfh849J4=",
"owner": "helix-editor", "owner": "helix-editor",
"repo": "helix", "repo": "helix",
"rev": "5a92474bf0453715e3139eccaaccf3264bfb2001", "rev": "97aee4950fd9a08a78415cd8992354ae5cf3aaf0",
"type": "github" "type": "github"
}, },
"original": { "original": {
@ -579,6 +679,31 @@
"type": "github" "type": "github"
} }
}, },
"hercules-ci-effects": {
"inputs": {
"flake-parts": [
"neovim-nightly",
"flake-parts"
],
"nixpkgs": [
"neovim-nightly",
"nixpkgs"
]
},
"locked": {
"lastModified": 1758022363,
"narHash": "sha256-ENUhCRWgSX4ni751HieNuQoq06dJvApV/Nm89kh+/A0=",
"owner": "hercules-ci",
"repo": "hercules-ci-effects",
"rev": "1a3667d33e247ad35ca250698d63f49a5453d824",
"type": "github"
},
"original": {
"owner": "hercules-ci",
"repo": "hercules-ci-effects",
"type": "github"
}
},
"home-manager": { "home-manager": {
"inputs": { "inputs": {
"nixpkgs": [ "nixpkgs": [
@ -587,11 +712,11 @@
] ]
}, },
"locked": { "locked": {
"lastModified": 1761770832, "lastModified": 1760662441,
"narHash": "sha256-IQIWG6kHxnUpx5KEb9r0BROL3/R6UQ/30aO2oHncBA8=", "narHash": "sha256-mlDqR1Ntgs9uYYEAUR1IhamKBO0lxoNS4zGLzEZaY0A=",
"owner": "nix-community", "owner": "nix-community",
"repo": "home-manager", "repo": "home-manager",
"rev": "124b99dbd1594dbebdd575ac7142752ee96a98a0", "rev": "722792af097dff5790f1a66d271a47759f477755",
"type": "github" "type": "github"
}, },
"original": { "original": {
@ -607,11 +732,11 @@
] ]
}, },
"locked": { "locked": {
"lastModified": 1761878381, "lastModified": 1760929667,
"narHash": "sha256-lCRaipHgszaFZ1Cs8fdGJguVycCisBAf2HEFgip5+xU=", "narHash": "sha256-nZh6uvc71nVNaf/y+wesnjwsmJ6IZZUnP2EzpZe48To=",
"owner": "nix-community", "owner": "nix-community",
"repo": "home-manager", "repo": "home-manager",
"rev": "4ac96eb21c101a3e5b77ba105febc5641a8959aa", "rev": "189c21cf879669008ccf06e78a553f17e88d8ef0",
"type": "github" "type": "github"
}, },
"original": { "original": {
@ -622,11 +747,11 @@
}, },
"import-tree": { "import-tree": {
"locked": { "locked": {
"lastModified": 1761120675, "lastModified": 1752730890,
"narHash": "sha256-TEbh9zISiQcU82VwVoEbmXHnSGlUxTwvjJA9g9ErSDA=", "narHash": "sha256-GES8fapSLGz36MMPRVNkSUWXUTtqvGQNXHjRmRLfJUY=",
"owner": "vic", "owner": "vic",
"repo": "import-tree", "repo": "import-tree",
"rev": "a037ed2a58fc0ebed9e93b9ef79b0646e648f719", "rev": "6ebb8cb87987b20264c09296166543fd3761d274",
"type": "github" "type": "github"
}, },
"original": { "original": {
@ -672,11 +797,11 @@
] ]
}, },
"locked": { "locked": {
"lastModified": 1761748321, "lastModified": 1760534924,
"narHash": "sha256-hD5mVzmUeyVppjArdy2uVdQe/CQUR9i3WgZB05onE7A=", "narHash": "sha256-OIOCC86DxTxp1VG7xAiM+YABtVqp6vTkYIoAiGQMqso=",
"owner": "Jovian-Experiments", "owner": "Jovian-Experiments",
"repo": "Jovian-NixOS", "repo": "Jovian-NixOS",
"rev": "533db5857c9e00ca352558a928417116ee08a824", "rev": "100b4e000032b865563a9754e5bca189bc544764",
"type": "github" "type": "github"
}, },
"original": { "original": {
@ -712,11 +837,11 @@
"lix": { "lix": {
"flake": false, "flake": false,
"locked": { "locked": {
"lastModified": 1761937274, "lastModified": 1755787066,
"narHash": "sha256-KlELhsSq3XbemrGyQhmGurFu7m8wOEBw+8M04L7hn7A=", "narHash": "sha256-X2UwkUEban08GRSPXRr+kz8fckHqebr3P77qSvjoeOw=",
"rev": "91867941fa73afea7869b7c71ede82e5ef8927da", "rev": "ac9721a92e8138d29707824dbedb484c76948493",
"type": "tarball", "type": "tarball",
"url": "https://git.lix.systems/api/v1/repos/lix-project/lix/archive/91867941fa73afea7869b7c71ede82e5ef8927da.tar.gz?rev=91867941fa73afea7869b7c71ede82e5ef8927da" "url": "https://git.lix.systems/api/v1/repos/lix-project/lix/archive/ac9721a92e8138d29707824dbedb484c76948493.tar.gz?rev=ac9721a92e8138d29707824dbedb484c76948493"
}, },
"original": { "original": {
"type": "tarball", "type": "tarball",
@ -735,11 +860,11 @@
] ]
}, },
"locked": { "locked": {
"lastModified": 1761960361, "lastModified": 1759851320,
"narHash": "sha256-FvuAw56NIVJpS3Kr8Wv9PpU4eehZMcdIVkxjStuYmqc=", "narHash": "sha256-n5dRAIC3/78drQtFxmQRrBLd6TKfotUnX7GWu0mAcSg=",
"ref": "refs/heads/main", "ref": "refs/heads/main",
"rev": "c47f62187601ea2991b79a9bacdbfdf76cd29fbe", "rev": "7c31a18259b8358ac196cf803a26967c0fa1d3e4",
"revCount": 167, "revCount": 163,
"type": "git", "type": "git",
"url": "https://git.lix.systems/lix-project/nixos-module" "url": "https://git.lix.systems/lix-project/nixos-module"
}, },
@ -750,16 +875,20 @@
}, },
"neovim-nightly": { "neovim-nightly": {
"inputs": { "inputs": {
"flake-compat": "flake-compat_3",
"flake-parts": "flake-parts_4", "flake-parts": "flake-parts_4",
"git-hooks": "git-hooks",
"hercules-ci-effects": "hercules-ci-effects",
"neovim-src": "neovim-src", "neovim-src": "neovim-src",
"nixpkgs": "nixpkgs_4" "nixpkgs": "nixpkgs_4",
"treefmt-nix": "treefmt-nix"
}, },
"locked": { "locked": {
"lastModified": 1761955453, "lastModified": 1760918504,
"narHash": "sha256-hQomzSbBiFsDXDMCjHmWXrAMgFlQlCiy7T37Eq7RvT4=", "narHash": "sha256-y4My1QhxERZ90sreOqeqxz6jt3x4SdkgQboaoZ7biBs=",
"owner": "nix-community", "owner": "nix-community",
"repo": "neovim-nightly-overlay", "repo": "neovim-nightly-overlay",
"rev": "c58076a0d9b24bf77fef4fa2e7c43950914edf71", "rev": "db23b8034bc0ad8272999f866d54023799a59073",
"type": "github" "type": "github"
}, },
"original": { "original": {
@ -771,11 +900,11 @@
"neovim-src": { "neovim-src": {
"flake": false, "flake": false,
"locked": { "locked": {
"lastModified": 1761949631, "lastModified": 1760810839,
"narHash": "sha256-YgMQaFD4L9+PEYSkUlBkqaKt+ALPHiVgzgRbjOSW4tE=", "narHash": "sha256-VYkZdjjMOYsugoSydDDWE/1l79swm4zc4NJl1Z0brjA=",
"owner": "neovim", "owner": "neovim",
"repo": "neovim", "repo": "neovim",
"rev": "1fddd74da7428e38b79ccb817dbd6952ff1d8ac6", "rev": "be73c35943f85e7835c3a0fc89bddaeba944db29",
"type": "github" "type": "github"
}, },
"original": { "original": {
@ -796,11 +925,11 @@
"xwayland-satellite-unstable": "xwayland-satellite-unstable" "xwayland-satellite-unstable": "xwayland-satellite-unstable"
}, },
"locked": { "locked": {
"lastModified": 1761724527, "lastModified": 1761623016,
"narHash": "sha256-nB500dSUaNBtOsu5JI1PDNmjuFD6Kdbkh648q0FoaIY=", "narHash": "sha256-C2+TErNmeHMCtodwVrMeA/uJg1GRdQbOntRI7DFullA=",
"owner": "sodiboo", "owner": "sodiboo",
"repo": "niri-flake", "repo": "niri-flake",
"rev": "1ff74954f559bb2da63e28b3fcffd3b09ec32842", "rev": "f0bfe0aaaa51378ace7492850290f8d2db6cc7f3",
"type": "github" "type": "github"
}, },
"original": { "original": {
@ -829,11 +958,11 @@
"niri-unstable": { "niri-unstable": {
"flake": false, "flake": false,
"locked": { "locked": {
"lastModified": 1761721311, "lastModified": 1761460429,
"narHash": "sha256-fXBALdA4CKAYslcuamjzQZLUTCNBIKWybj+/2rwe3Z0=", "narHash": "sha256-pJeM23DGMD5AK4gdNaDM1qsIv87NYQJgEh2E8tRd7es=",
"owner": "YaLTeR", "owner": "YaLTeR",
"repo": "niri", "repo": "niri",
"rev": "6e8fd153395036c2daa7c214695ed9baf2409a2e", "rev": "e6f3c538da0c646bda43fcde7ef7dc3b771e0c8b",
"type": "github" "type": "github"
}, },
"original": { "original": {
@ -852,11 +981,11 @@
"systems": "systems_3" "systems": "systems_3"
}, },
"locked": { "locked": {
"lastModified": 1761986295, "lastModified": 1760949743,
"narHash": "sha256-5hOj4fy3ido2V5U3ZQiS3Niv1tmWLrPFo68AKxJ44tI=", "narHash": "sha256-qp64mFniGiY9MEIySL74+OondOYnUqytlFxe8xGBzzs=",
"owner": "marienz", "owner": "marienz",
"repo": "nix-doom-emacs-unstraightened", "repo": "nix-doom-emacs-unstraightened",
"rev": "08edaaf11a6c110f22c96d87b11f7f884ac9918b", "rev": "257eddec1ad9b6e3ece37d02c51a3a7a3e74452b",
"type": "github" "type": "github"
}, },
"original": { "original": {
@ -871,11 +1000,11 @@
"nixpkgs": "nixpkgs_5" "nixpkgs": "nixpkgs_5"
}, },
"locked": { "locked": {
"lastModified": 1761962248, "lastModified": 1760942919,
"narHash": "sha256-tJROzIa21Ser5k12Hvd1W2M5ZQ4DiqROE3+c54zBbLk=", "narHash": "sha256-/CoMM0vhhihs5/9QLXgL/kkyALBa9XyVTSkN9Htxtjc=",
"owner": "fufexan", "owner": "fufexan",
"repo": "nix-gaming", "repo": "nix-gaming",
"rev": "537f1d446238a6bb490e1765d39938166f1fb446", "rev": "6fa7d37d878cceeaa3c88e2606dbadf15c8022ad",
"type": "github" "type": "github"
}, },
"original": { "original": {
@ -933,11 +1062,11 @@
}, },
"nixos-hardware": { "nixos-hardware": {
"locked": { "locked": {
"lastModified": 1761933221, "lastModified": 1760106635,
"narHash": "sha256-rNHeoG3ZrA94jczyLSjxCtu67YYPYIlXXr0uhG3wNxM=", "narHash": "sha256-2GoxVaKWTHBxRoeUYSjv0AfSOx4qw5CWSFz2b+VolKU=",
"owner": "NixOS", "owner": "NixOS",
"repo": "nixos-hardware", "repo": "nixos-hardware",
"rev": "7467f155fcba189eb088a7601f44fbef7688669b", "rev": "9ed85f8afebf2b7478f25db0a98d0e782c0ed903",
"type": "github" "type": "github"
}, },
"original": { "original": {
@ -949,11 +1078,11 @@
}, },
"nixpkgs": { "nixpkgs": {
"locked": { "locked": {
"lastModified": 1761672384, "lastModified": 1760703608,
"narHash": "sha256-o9KF3DJL7g7iYMZq9SWgfS1BFlNbsm6xplRjVlOCkXI=", "narHash": "sha256-MMIIShabm9KnYTmm0WbJ2h+jxI86gfE7NcByVOaBNNU=",
"owner": "NixOS", "owner": "PedroHLC",
"repo": "nixpkgs", "repo": "nixpkgs",
"rev": "08dacfca559e1d7da38f3cf05f1f45ee9bfd213c", "rev": "95d8e5f411dc2fcc7f73a72766aaabfab1a1c456",
"type": "github" "type": "github"
}, },
"original": { "original": {
@ -963,22 +1092,6 @@
"type": "github" "type": "github"
} }
}, },
"nixpkgs-455083": {
"locked": {
"lastModified": 1761759229,
"narHash": "sha256-8P72kOULqB36MKrNl5HToySTA6HbYnldR3CQohJxpxc=",
"owner": "NixOS",
"repo": "nixpkgs",
"rev": "9b6d78b4d933aed3785362dccc0bb3440b779d00",
"type": "github"
},
"original": {
"owner": "NixOS",
"ref": "pull/455083/head",
"repo": "nixpkgs",
"type": "github"
}
},
"nixpkgs-lib": { "nixpkgs-lib": {
"locked": { "locked": {
"lastModified": 1754788789, "lastModified": 1754788789,
@ -1011,11 +1124,11 @@
}, },
"nixpkgs-stable": { "nixpkgs-stable": {
"locked": { "locked": {
"lastModified": 1761597516, "lastModified": 1760862643,
"narHash": "sha256-wxX7u6D2rpkJLWkZ2E932SIvDJW8+ON/0Yy8+a5vsDU=", "narHash": "sha256-PXwG0TM7Ek87DNx4LbGWuD93PbFeKAJs4FfALtp7Wo0=",
"owner": "NixOS", "owner": "NixOS",
"repo": "nixpkgs", "repo": "nixpkgs",
"rev": "daf6dc47aa4b44791372d6139ab7b25269184d55", "rev": "33c6dca0c0cb31d6addcd34e90a63ad61826b28c",
"type": "github" "type": "github"
}, },
"original": { "original": {
@ -1059,11 +1172,11 @@
}, },
"nixpkgs_2": { "nixpkgs_2": {
"locked": { "locked": {
"lastModified": 1761907660, "lastModified": 1760878510,
"narHash": "sha256-kJ8lIZsiPOmbkJypG+B5sReDXSD1KGu2VEPNqhRa/ew=", "narHash": "sha256-K5Osef2qexezUfs0alLvZ7nQFTGS9DL2oTVsIXsqLgs=",
"owner": "NixOS", "owner": "NixOS",
"repo": "nixpkgs", "repo": "nixpkgs",
"rev": "2fb006b87f04c4d3bdf08cfdbc7fab9c13d94a15", "rev": "5e2a59a5b1a82f89f2c7e598302a9cacebb72a67",
"type": "github" "type": "github"
}, },
"original": { "original": {
@ -1091,11 +1204,11 @@
}, },
"nixpkgs_4": { "nixpkgs_4": {
"locked": { "locked": {
"lastModified": 1761880412, "lastModified": 1760872779,
"narHash": "sha256-QoJjGd4NstnyOG4mm4KXF+weBzA2AH/7gn1Pmpfcb0A=", "narHash": "sha256-c5C907Raf9eY8f1NUXYeju9aUDlm227s/V0OptEbypA=",
"owner": "NixOS", "owner": "NixOS",
"repo": "nixpkgs", "repo": "nixpkgs",
"rev": "a7fc11be66bdfb5cdde611ee5ce381c183da8386", "rev": "63bdb5d90fa2fa11c42f9716ad1e23565613b07c",
"type": "github" "type": "github"
}, },
"original": { "original": {
@ -1107,11 +1220,11 @@
}, },
"nixpkgs_5": { "nixpkgs_5": {
"locked": { "locked": {
"lastModified": 1761349956, "lastModified": 1760596604,
"narHash": "sha256-tH3wHnOJms+U4k/rK2Nn1RfBrhffX92jLP/2VndSn0w=", "narHash": "sha256-J/i5K6AAz/y5dBePHQOuzC7MbhyTOKsd/GLezSbEFiM=",
"owner": "NixOS", "owner": "NixOS",
"repo": "nixpkgs", "repo": "nixpkgs",
"rev": "02f2cb8e0feb4596d20cc52fda73ccee960e3538", "rev": "3cbe716e2346710d6e1f7c559363d14e11c32a43",
"type": "github" "type": "github"
}, },
"original": { "original": {
@ -1123,11 +1236,11 @@
}, },
"nixpkgs_6": { "nixpkgs_6": {
"locked": { "locked": {
"lastModified": 1761907660, "lastModified": 1760878510,
"narHash": "sha256-kJ8lIZsiPOmbkJypG+B5sReDXSD1KGu2VEPNqhRa/ew=", "narHash": "sha256-K5Osef2qexezUfs0alLvZ7nQFTGS9DL2oTVsIXsqLgs=",
"owner": "NixOS", "owner": "NixOS",
"repo": "nixpkgs", "repo": "nixpkgs",
"rev": "2fb006b87f04c4d3bdf08cfdbc7fab9c13d94a15", "rev": "5e2a59a5b1a82f89f2c7e598302a9cacebb72a67",
"type": "github" "type": "github"
}, },
"original": { "original": {
@ -1139,11 +1252,11 @@
}, },
"nixpkgs_7": { "nixpkgs_7": {
"locked": { "locked": {
"lastModified": 1761656231, "lastModified": 1759632233,
"narHash": "sha256-EiED5k6gXTWoAIS8yQqi5mAX6ojnzpHwAQTS3ykeYMg=", "narHash": "sha256-krgZxGAIIIKFJS+UB0l8do3sYUDWJc75M72tepmVMzE=",
"owner": "NixOS", "owner": "NixOS",
"repo": "nixpkgs", "repo": "nixpkgs",
"rev": "e99366c665bdd53b7b500ccdc5226675cfc51f45", "rev": "d7f52a7a640bc54c7bb414cca603835bf8dd4b10",
"type": "github" "type": "github"
}, },
"original": { "original": {
@ -1155,11 +1268,11 @@
}, },
"nixpkgs_8": { "nixpkgs_8": {
"locked": { "locked": {
"lastModified": 1761907660, "lastModified": 1760878510,
"narHash": "sha256-kJ8lIZsiPOmbkJypG+B5sReDXSD1KGu2VEPNqhRa/ew=", "narHash": "sha256-K5Osef2qexezUfs0alLvZ7nQFTGS9DL2oTVsIXsqLgs=",
"owner": "nixos", "owner": "nixos",
"repo": "nixpkgs", "repo": "nixpkgs",
"rev": "2fb006b87f04c4d3bdf08cfdbc7fab9c13d94a15", "rev": "5e2a59a5b1a82f89f2c7e598302a9cacebb72a67",
"type": "github" "type": "github"
}, },
"original": { "original": {
@ -1171,11 +1284,11 @@
}, },
"nixpkgs_9": { "nixpkgs_9": {
"locked": { "locked": {
"lastModified": 1761236834, "lastModified": 1760596604,
"narHash": "sha256-+pthv6hrL5VLW2UqPdISGuLiUZ6SnAXdd2DdUE+fV2Q=", "narHash": "sha256-J/i5K6AAz/y5dBePHQOuzC7MbhyTOKsd/GLezSbEFiM=",
"owner": "nixos", "owner": "nixos",
"repo": "nixpkgs", "repo": "nixpkgs",
"rev": "d5faa84122bc0a1fd5d378492efce4e289f8eac1", "rev": "3cbe716e2346710d6e1f7c559363d14e11c32a43",
"type": "github" "type": "github"
}, },
"original": { "original": {
@ -1193,11 +1306,11 @@
"systems": "systems_6" "systems": "systems_6"
}, },
"locked": { "locked": {
"lastModified": 1761947009, "lastModified": 1760906375,
"narHash": "sha256-yutWdFO7EkJGdQOquwHvyWZ+3KpPowzy+v1xb8IA/K4=", "narHash": "sha256-inbXtSqhaDOxvosjvt8hP/Az/wWwRCxjipH4x5DSD6A=",
"owner": "nix-community", "owner": "nix-community",
"repo": "nixvim", "repo": "nixvim",
"rev": "fedd0e287081c0e20a45fdf3bc0e1ecc6e9a0225", "rev": "5c1be58f6d938ff93516d00cc3d2c0def4d80198",
"type": "github" "type": "github"
}, },
"original": { "original": {
@ -1212,11 +1325,11 @@
"nixpkgs": "nixpkgs_8" "nixpkgs": "nixpkgs_8"
}, },
"locked": { "locked": {
"lastModified": 1762009359, "lastModified": 1760953705,
"narHash": "sha256-d6nVA9FRfgvLubgkRSut2OZHMC1dj+2oZPkEF65cPd8=", "narHash": "sha256-uo4U/eLQZ1SeCGnXO6oSf8GSzubxk8t9+bWomEAip14=",
"owner": "nix-community", "owner": "nix-community",
"repo": "NUR", "repo": "NUR",
"rev": "024437792c0750dfab885880a193e81b44997034", "rev": "d12d37fa661e688c7bdeee91abfcbfcddd018422",
"type": "github" "type": "github"
}, },
"original": { "original": {
@ -1260,11 +1373,11 @@
] ]
}, },
"locked": { "locked": {
"lastModified": 1761730856, "lastModified": 1758662783,
"narHash": "sha256-t1i5p/vSWwueZSC0Z2BImxx3BjoUDNKyC2mk24krcMY=", "narHash": "sha256-igrxT+/MnmcftPOHEb+XDwAMq3Xg1Xy7kVYQaHhPlAg=",
"owner": "NuschtOS", "owner": "NuschtOS",
"repo": "search", "repo": "search",
"rev": "e29de6db0cb3182e9aee75a3b1fd1919d995d85b", "rev": "7d4c0fc4ffe3bd64e5630417162e9e04e64b27a4",
"type": "github" "type": "github"
}, },
"original": { "original": {
@ -1317,6 +1430,7 @@
"inputs": { "inputs": {
"betterfox-nix": "betterfox-nix", "betterfox-nix": "betterfox-nix",
"chaotic": "chaotic", "chaotic": "chaotic",
"dae": "dae",
"deploy-rs": "deploy-rs", "deploy-rs": "deploy-rs",
"disko": "disko", "disko": "disko",
"emacs-overlay": "emacs-overlay", "emacs-overlay": "emacs-overlay",
@ -1333,14 +1447,13 @@
"nix4nvchad": "nix4nvchad", "nix4nvchad": "nix4nvchad",
"nixos-hardware": "nixos-hardware", "nixos-hardware": "nixos-hardware",
"nixpkgs": "nixpkgs_6", "nixpkgs": "nixpkgs_6",
"nixpkgs-455083": "nixpkgs-455083",
"nixvim": "nixvim", "nixvim": "nixvim",
"nur": "nur", "nur": "nur",
"nvchad-starter": "nvchad-starter", "nvchad-starter": "nvchad-starter",
"sops-nix": "sops-nix", "sops-nix": "sops-nix",
"spacemacs": "spacemacs", "spacemacs": "spacemacs",
"stylix": "stylix", "stylix": "stylix",
"treefmt-nix": "treefmt-nix" "treefmt-nix": "treefmt-nix_2"
} }
}, },
"rust-overlay": { "rust-overlay": {
@ -1351,11 +1464,11 @@
] ]
}, },
"locked": { "locked": {
"lastModified": 1761758177, "lastModified": 1760668505,
"narHash": "sha256-MsVJG2gQTm6n2jIGu2KDT87AMeMx1GExOaEQqNkQKVE=", "narHash": "sha256-Ed0cGwPZtLRiSvMx4KgPx8bhLYzn5jiJ7s5o5vj4oG0=",
"owner": "oxalica", "owner": "oxalica",
"repo": "rust-overlay", "repo": "rust-overlay",
"rev": "37f8f092415b444c3bed6eda6bcbee51cee22e5d", "rev": "18234d2c11b10eaec9ccc3a1089a5ea872ec8858",
"type": "github" "type": "github"
}, },
"original": { "original": {
@ -1413,11 +1526,11 @@
] ]
}, },
"locked": { "locked": {
"lastModified": 1760998189, "lastModified": 1760845571,
"narHash": "sha256-ee2e1/AeGL5X8oy/HXsZQvZnae6XfEVdstGopKucYLY=", "narHash": "sha256-PwGzU3EOU65Ef1VvuNnVLie+l+P0g/fzf/PGUG82KbM=",
"owner": "Mic92", "owner": "Mic92",
"repo": "sops-nix", "repo": "sops-nix",
"rev": "5a7d18b5c55642df5c432aadb757140edfeb70b3", "rev": "9c9a9798be331ed3f4b2902933d7677d0659ee61",
"type": "github" "type": "github"
}, },
"original": { "original": {
@ -1429,11 +1542,11 @@
"spacemacs": { "spacemacs": {
"flake": false, "flake": false,
"locked": { "locked": {
"lastModified": 1761993083, "lastModified": 1760813744,
"narHash": "sha256-PQLg9Mhx9Ud/SwlCKSicG1b9sE8aR97EnQ3//SCL6Uc=", "narHash": "sha256-NzHS3u++7pXh63T7BqPaHZM51X/3h1ZN2iRPT3P1cSY=",
"owner": "syl20bnr", "owner": "syl20bnr",
"repo": "spacemacs", "repo": "spacemacs",
"rev": "5451c1f15c43d9ec04a3fe5791c8714e89519d5a", "rev": "610d900767b35228b5a2eb79f2a8de9596a5a264",
"type": "github" "type": "github"
}, },
"original": { "original": {
@ -1465,11 +1578,11 @@
"tinted-zed": "tinted-zed" "tinted-zed": "tinted-zed"
}, },
"locked": { "locked": {
"lastModified": 1761840967, "lastModified": 1760472212,
"narHash": "sha256-alE8Vesztx3tPxXpJURtYWD8x1cXaU/x+10Q6hbgGBY=", "narHash": "sha256-4C3I/ssFsq8EgaUmZP0xv5V7RV0oCHgL/Rx+MUkuE+E=",
"owner": "nix-community", "owner": "nix-community",
"repo": "stylix", "repo": "stylix",
"rev": "c33226f205aeab42a170913cd1f8bc3428b7e6b1", "rev": "8d008296a1b3be9b57ad570f7acea00dd2fc92db",
"type": "github" "type": "github"
}, },
"original": { "original": {
@ -1665,15 +1778,36 @@
} }
}, },
"treefmt-nix": { "treefmt-nix": {
"inputs": {
"nixpkgs": [
"neovim-nightly",
"nixpkgs"
]
},
"locked": {
"lastModified": 1760889407,
"narHash": "sha256-ppIp04fmz+BaTpJs1nIOmPADg02asfQFrFbhb3SmxsE=",
"owner": "numtide",
"repo": "treefmt-nix",
"rev": "3f258dead9fed51f53862366d3a6bc1b622ee7cb",
"type": "github"
},
"original": {
"owner": "numtide",
"repo": "treefmt-nix",
"type": "github"
}
},
"treefmt-nix_2": {
"inputs": { "inputs": {
"nixpkgs": "nixpkgs_9" "nixpkgs": "nixpkgs_9"
}, },
"locked": { "locked": {
"lastModified": 1761311587, "lastModified": 1760945191,
"narHash": "sha256-Msq86cR5SjozQGCnC6H8C+0cD4rnx91BPltZ9KK613Y=", "narHash": "sha256-ZRVs8UqikBa4Ki3X4KCnMBtBW0ux1DaT35tgsnB1jM4=",
"owner": "numtide", "owner": "numtide",
"repo": "treefmt-nix", "repo": "treefmt-nix",
"rev": "2eddae033e4e74bf581c2d1dfa101f9033dbd2dc", "rev": "f56b1934f5f8fcab8deb5d38d42fd692632b47c2",
"type": "github" "type": "github"
}, },
"original": { "original": {

11
flake.nix
View file

@ -52,7 +52,6 @@
nixpkgs.url = "github:NixOS/nixpkgs/nixos-unstable"; nixpkgs.url = "github:NixOS/nixpkgs/nixos-unstable";
# nixpkgs.url = "github:NixOS/nixpkgs/nixos-unstable-small"; # nixpkgs.url = "github:NixOS/nixpkgs/nixos-unstable-small";
# nixpkgs.url = "github:NixOS/nixpkgs/master"; # nixpkgs.url = "github:NixOS/nixpkgs/master";
nixpkgs-455083.url = "github:NixOS/nixpkgs?ref=pull/455083/head";
lix-module = { lix-module = {
# url = "git+https://git.lix.systems/lix-project/nixos-module?ref=release-2.93"; # url = "git+https://git.lix.systems/lix-project/nixos-module?ref=release-2.93";
@ -107,6 +106,16 @@
ref = "master"; ref = "master";
}; };
dae = {
type = "github";
owner = "daeuniverse";
repo = "flake.nix";
inputs = {
nixpkgs.follows = "nixpkgs";
flake-parts.follows = "flake-parts";
};
};
flake-parts = { flake-parts = {
type = "github"; type = "github";
owner = "hercules-ci"; owner = "hercules-ci";

2
flake/perSystem.nix
View file

@ -61,7 +61,7 @@
path: value: path: value:
if lib.isDerivation value then if lib.isDerivation value then
{ {
${lib.concatStringsSep ":" path} = value; ${lib.concatStringsSep "/" path} = value;
} }
else if lib.isAttrs value then else if lib.isAttrs value then
lib.concatMapAttrs (name: flattenPkgs (path ++ [ name ])) value lib.concatMapAttrs (name: flattenPkgs (path ++ [ name ])) value

7
home/david/configurations/Tytonidae/niri.nix
View file

@ -1,9 +1,6 @@
{ config, lib, ... }: { config, ... }:
let
cfg = config.david.programs.niri;
in
{ {
david.programs.niri = lib.mkIf cfg.enable { david.programs.niri = {
waybar.settings = waybar.settings =
let let
cfg = config.david.programs.niri.waybar; cfg = config.david.programs.niri.waybar;

13
home/david/modules/programs/niri/default.nix
View file

@ -14,9 +14,7 @@ in
{ {
options = { options = {
david.programs.niri = { david.programs.niri = {
enable = (lib.mkEnableOption "niri") // { enable = lib.mkEnableOption "niri";
default = osConfig.youthlic.gui.enabled == "niri";
};
extraConfig = lib.mkOption { extraConfig = lib.mkOption {
type = inputs.niri-flake.lib.kdl.types.kdl-document; type = inputs.niri-flake.lib.kdl.types.kdl-document;
}; };
@ -41,6 +39,9 @@ in
}; };
}; };
config = lib.mkMerge [ config = lib.mkMerge [
{
david.programs.niri.enable = osConfig.youthlic.gui.enabled == "niri";
}
(lib.mkIf cfg.enable { (lib.mkIf cfg.enable {
home.packages = home.packages =
(with pkgs; [ (with pkgs; [
@ -101,11 +102,5 @@ in
package = niri; package = niri;
}; };
}) })
(lib.mkIf (!cfg.enable) {
programs.niri = {
settings = null;
config = null;
};
})
]; ];
} }

2
home/david/modules/programs/spacemacs/default.nix
View file

@ -32,7 +32,7 @@ in
enable = true; enable = true;
package = package =
with pkgs'; with pkgs';
(emacsPackagesFor emacs-pgtk).emacsWithPackages (_epkgs: [ (emacsPackagesFor emacs-pgtk).emacsWithPackages (epkgs: [
git git
gnutar gnutar
ripgrep ripgrep

2
home/modules/programs/gpg/default.nix
View file

@ -21,7 +21,7 @@
enable = true; enable = true;
enableSshSupport = true; enableSshSupport = true;
pinentry = { pinentry = {
package = outputs.packages."${pkgs.stdenv.hostPlatform.system}".pinentry-selector; package = outputs.packages."${pkgs.system}".pinentry-selector;
}; };
# sshKeys = [ # sshKeys = [
# "C817E333BF88F16EA0F7ADE27BDCCC16AD25E5A6" # "C817E333BF88F16EA0F7ADE27BDCCC16AD25E5A6"

2
nixos/configurations/Tytonidae/default.nix
View file

@ -77,7 +77,7 @@
vlc vlc
btop btop
handbrake handbrake
wechat-uos wechat
nvtopPackages.full nvtopPackages.full
spotify spotify
localsend localsend

2
nixos/configurations/Tytonidae/networking.nix
View file

@ -28,7 +28,7 @@
Name = "bond0"; Name = "bond0";
}; };
bondConfig = { bondConfig = {
Mode = "balance-alb"; Mode = "balance-rr";
MIIMonitorSec = "1s"; MIIMonitorSec = "1s";
PrimaryReselectPolicy = "better"; PrimaryReselectPolicy = "better";
}; };

15
nixos/modules/nix.nix
View file

@ -28,21 +28,6 @@
"immersive-translate" "immersive-translate"
]; ];
packageOverrides = p: { packageOverrides = p: {
kdePackages = p.kdePackages // {
inherit
((import inputs.nixpkgs-455083 {
localSystem = {
inherit (pkgs.stdenv.hostPlatform) system;
};
config = {
allowUnfree = true;
allowInsecurePredicate = p: builtins.elem (lib.getName p) [ "olm" ];
};
}).kdePackages
)
neochat
;
};
intel-vaapi-driver = p.intel-vaapi-driver.override { enableHybridCodec = true; }; intel-vaapi-driver = p.intel-vaapi-driver.override { enableHybridCodec = true; };
onnxruntime = p.onnxruntime.override { onnxruntime = p.onnxruntime.override {
cudaSupport = false; cudaSupport = false;

4
nixos/modules/programs/dae/config.dae
View file

@ -1,6 +1,6 @@
include { include {
proxy.d_*.dae proxy.d/*.dae
local.d_*.dae local.d/*.dae
} }
global { global {

9
nixos/modules/programs/dae/default.nix
View file

@ -18,12 +18,13 @@ in
(lib.mkIf cfg.enable { (lib.mkIf cfg.enable {
services.dae = { services.dae = {
enable = true; enable = true;
package = pkgs.dae;
openFirewall = { openFirewall = {
enable = true; enable = true;
port = 12345; port = 12345;
}; };
disableTxChecksumIpGeneric = false; disableTxChecksumIpGeneric = false;
configFile = toString ./config.dae; config = builtins.readFile ./config.dae;
}; };
sops.secrets.url = { sops.secrets.url = {
mode = "0444"; mode = "0444";
@ -124,12 +125,6 @@ in
]; ];
}; };
}; };
dae = {
serviceConfig.LoadCredential = [
"proxy.d:/etc/dae/proxy.d"
"local.d:/etc/dae/local.d"
];
};
}; };
}) })
(lib.mkIf (cfg.enable && config.youthlic.programs.juicity.client.enable) { (lib.mkIf (cfg.enable && config.youthlic.programs.juicity.client.enable) {

1
nixos/modules/programs/forgejo.nix
View file

@ -64,7 +64,6 @@ in
repository = { repository = {
DEFAULT_PRIVATE = "last"; DEFAULT_PRIVATE = "last";
DEFAULT_BRANCH = "master"; DEFAULT_BRANCH = "master";
DISABLE_DOWNLOAD_SOURCE_ARCHIVES = true;
}; };
service = { service = {
DISABLE_REGISTRATION = true; DISABLE_REGISTRATION = true;

1
nixos/modules/top-level/default.nix
View file

@ -7,6 +7,7 @@
{ {
imports = with inputs; [ imports = with inputs; [
home-manager.nixosModules.home-manager home-manager.nixosModules.home-manager
dae.nixosModules.dae
sops-nix.nixosModules.sops sops-nix.nixosModules.sops
stylix.nixosModules.stylix stylix.nixosModules.stylix
disko.nixosModules.disko disko.nixosModules.disko

8
overlays/modifications/dae.nix Normal file
View file

@ -0,0 +1,8 @@
{ inputs, ... }:
_final: prev:
let
inherit (prev.stdenv.hostPlatform) system;
in
{
dae = inputs.dae.packages."${system}".dae-unstable;
}

1
overlays/modifications/default.nix
View file

@ -5,6 +5,7 @@ let
in in
[ [
./niri.nix ./niri.nix
./dae.nix
./spotifyx.nix ./spotifyx.nix
./radicle-explorer.nix ./radicle-explorer.nix
./wshowkeys.nix ./wshowkeys.nix

8
pkgs/doom-emacs/package.nix
View file

@ -1,12 +1,11 @@
{ {
inputs, inputs,
stdenv, system,
editor-runtime, editor-runtime,
symlinkJoin, symlinkJoin,
makeWrapper, makeWrapper,
}: }:
let let
inherit (stdenv.hostPlatform) system;
inherit (inputs) nixpkgs emacs-overlay nix-doom; inherit (inputs) nixpkgs emacs-overlay nix-doom;
pkgs = import nixpkgs { pkgs = import nixpkgs {
localSystem = { inherit system; }; localSystem = { inherit system; };
@ -32,10 +31,9 @@ let
git git
ripgrep ripgrep
fd fd
imagemagick
]) ])
++ [ ++ [ editor-runtime ];
editor-runtime
];
}; };
in in
symlinkJoin { symlinkJoin {

3
pkgs/helix/package.nix
View file

@ -1,12 +1,11 @@
{ {
inputs, inputs,
stdenv, system,
callPackage, callPackage,
buildEnv, buildEnv,
lib, lib,
}: }:
let let
inherit (stdenv.hostPlatform) system;
inherit (inputs.helix.packages."${system}") helix; inherit (inputs.helix.packages."${system}") helix;
runtime = callPackage ./runtime.nix { }; runtime = callPackage ./runtime.nix { };
helix' = helix.overrideAttrs ( helix' = helix.overrideAttrs (

8
pkgs/helix/runtime.nix
View file

@ -2,7 +2,7 @@
lib, lib,
srcs, srcs,
stdenv, stdenv,
runCommandLocal, runCommandNoCCLocal,
}: }:
let let
buildGrammar = buildGrammar =
@ -80,18 +80,18 @@ let
} }
) )
|> lib.mapAttrsToList (_: value: "ln -s ${value.value}/${value.name}.so $out/${value.name}.so"); |> lib.mapAttrsToList (_: value: "ln -s ${value.value}/${value.name}.so $out/${value.name}.so");
grammarDir = runCommandLocal "helix-grammars" { } '' grammarDir = runCommandNoCCLocal "helix-grammars" { } ''
mkdir -p $out mkdir -p $out
${builtins.concatStringsSep "\n" grammarLinks} ${builtins.concatStringsSep "\n" grammarLinks}
''; '';
queryDir = runCommandLocal "helix-query" { } '' queryDir = runCommandNoCCLocal "helix-query" { } ''
mkdir -p $out mkdir -p $out
${builtins.concatStringsSep "\n" queries} ${builtins.concatStringsSep "\n" queries}
''; '';
in in
runCommandLocal "helix-runtime" { } '' runCommandNoCCLocal "helix-runtime" { } ''
mkdir -p $out mkdir -p $out
ln -s ${grammarDir} $out/grammars ln -s ${grammarDir} $out/grammars

4
pkgs/wallpapers.nix
View file

@ -1,6 +1,6 @@
{ {
srcs, srcs,
runCommandLocal, runCommandNoCCLocal,
rootPath, rootPath,
lib, lib,
}: }:
@ -11,7 +11,7 @@ let
|> filterAttrs (name: _value: hasPrefix "wallpaper" name) |> filterAttrs (name: _value: hasPrefix "wallpaper" name)
|> concatMapAttrsStringSep "\n" (name: value: "ln -s ${value.src} $out/${name}"); |> concatMapAttrsStringSep "\n" (name: value: "ln -s ${value.src} $out/${name}");
in in
runCommandLocal "wallpapers" { } '' runCommandNoCCLocal "wallpapers" { } ''
mkdir -p $out mkdir -p $out
${wallpapers} ${wallpapers}