nix #11

Manually merged
geoffrey merged 113 commits from nix into main 2023-12-09 21:43:01 +01:00
Showing only changes of commit dcb03fa895 - Show all commits

View file

@ -3,7 +3,6 @@
xsession = { xsession = {
enable = true; enable = true;
windowManager = { windowManager = {
command = "${config.xsession.windowManager.i3.package}/bin/i3";
i3 = { i3 = {
enable = true; enable = true;
config = config =
@ -439,11 +438,21 @@
}; };
home = { home = {
file = { file =
let
nixgl = import
(builtins.fetchGit {
url = "https://github.com/nix-community/nixGL";
rev = "489d6b095ab9d289fe11af0219a9ff00fe87c7c5";
})
{ };
in
{
".xinitrc" = { ".xinitrc" = {
# TODO Configurable
source = pkgs.writeShellScript "xinitrc" '' source = pkgs.writeShellScript "xinitrc" ''
${pkgs.xorg.xrdb}/bin/xrdb ${config.xresources.path} ${pkgs.xorg.xrdb}/bin/xrdb ${config.xresources.path}
${config.xsession.windowManager.command} ${nixgl.nixVulkanIntel}/bin/nixVulkanIntel ${nixgl.nixGLIntel}/bin/nixGLIntel ${config.xsession.windowManager.command}
''; '';
}; };
}; };