thor: Add deploy config, desktop stuff, enable GPU modesetting

This commit is contained in:
Erwin Boskma 2023-05-15 14:29:56 +02:00
parent 38d8b17918
commit 252126317a
Signed by: erwin
SSH key fingerprint: SHA256:9LmFDe1C6jSrEyqxxvX8NtJBmcbB105XoqyUZF092bg
3 changed files with 32 additions and 16 deletions

View file

@ -73,5 +73,11 @@ inputs: {
thor = { thor = {
system = "aarch64-linux"; system = "aarch64-linux";
config = import ./thor/configuration.nix inputs; config = import ./thor/configuration.nix inputs;
deploy = {
host = "10.0.0.198";
sshUser = "erwin";
buildOn = "local";
substituteOnTarget = true;
};
}; };
} }

View file

@ -15,14 +15,34 @@
users.erwin = { users.erwin = {
enable = true; enable = true;
}; };
base.kernel = pkgs.linuxKernel.packages.linux_rpi4; base = {
kernel = pkgs.linuxKernel.packages.linux_rpi4;
plymouth.enable = true;
};
desktop = {
enable = true;
wayland = true;
};
fonts.enable = true;
gnome.enable = true;
greetd = {
enable = true;
sway = true;
};
networking.enable = true; networking.enable = true;
nix-common.enable = true; nix-common = {
enable = true;
remote-builders = true;
};
systemd.enable = true; systemd.enable = true;
}; };
hardware = { hardware = {
enableAllFirmware = true; enableAllFirmware = true;
raspberry-pi."4".fkms-3d = {
enable = true;
cma = 256;
};
}; };
boot = { boot = {
@ -30,6 +50,7 @@
}; };
zramSwap.enable = true; zramSwap.enable = true;
sdImage.compressImage = false;
networking = { networking = {
hostName = "thor"; hostName = "thor";

View file

@ -26,18 +26,7 @@ in
emacs = { emacs = {
enable = true; enable = true;
# package = with pkgs; ((emacsPackagesFor emacsPgtk).emacsWithPackages (epkgs: [ epkgs.emacsql epkgs.emacsql-sqlite ])); # package = with pkgs; ((emacsPackagesFor emacsPgtk).emacsWithPackages (epkgs: [ epkgs.emacsql epkgs.emacsql-sqlite ]));
package = package = pkgs.emacsUnstablePgtk.override {
let
emacs29 = pkgs.emacsPgtk.overrideAttrs (_: {
version = "29.0.90+gitc0ab4e9ca932";
src = pkgs.fetchFromSavannah {
repo = "emacs";
rev = "c0ab4e9ca9326c472ff1d9d01a0e3966f20fda27";
sha256 = "HxwVIVPIPMpp551Uo2qzcSSk2cM1N4YDBH6p3V2P4Rg=";
};
});
in
emacs29.override {
treeSitterPlugins = builtins.attrValues (filterAttrs (_: isDerivation) pkgs.tree-sitter-grammars); treeSitterPlugins = builtins.attrValues (filterAttrs (_: isDerivation) pkgs.tree-sitter-grammars);
}; };