mirror of
https://github.com/Gerg-L/nixos.git
synced 2025-12-10 00:43:56 -05:00
game-laptop -> game-desktop
This commit is contained in:
parent
849c21761f
commit
d24efeba64
15 changed files with 105 additions and 103 deletions
|
|
@ -22,26 +22,28 @@
|
|||
'';
|
||||
defaultSession = "none+dwm";
|
||||
};
|
||||
windowManager.session = [ {
|
||||
name = "dwm";
|
||||
start = ''
|
||||
update_time () {
|
||||
while :
|
||||
do
|
||||
sleep 1
|
||||
xsetroot -name "$(date +"%I:%M %p")"
|
||||
done
|
||||
}
|
||||
windowManager.session = [
|
||||
{
|
||||
name = "dwm";
|
||||
start = ''
|
||||
update_time () {
|
||||
while :
|
||||
do
|
||||
sleep 1
|
||||
xsetroot -name "$(date +"%I:%M %p")"
|
||||
done
|
||||
}
|
||||
|
||||
dont_stop() {
|
||||
while type dwm >/dev/null ; do dwm && continue || break ; done
|
||||
}
|
||||
dont_stop() {
|
||||
while type dwm >/dev/null ; do dwm && continue || break ; done
|
||||
}
|
||||
|
||||
update_time &
|
||||
dont_stop &
|
||||
waitPID=$!
|
||||
'';
|
||||
} ];
|
||||
update_time &
|
||||
dont_stop &
|
||||
waitPID=$!
|
||||
'';
|
||||
}
|
||||
];
|
||||
};
|
||||
environment.systemPackages = builtins.attrValues {
|
||||
inherit (suckless.packages.${pkgs.system}) dmenu dwm st;
|
||||
|
|
|
|||
|
|
@ -19,24 +19,26 @@ _:
|
|||
];
|
||||
};
|
||||
distributedBuilds = true;
|
||||
buildMachines = [ {
|
||||
hostName = "gerg-desktop";
|
||||
protocol = "ssh-ng";
|
||||
maxJobs = 32;
|
||||
systems = [
|
||||
"x86_64-linux"
|
||||
"i686-linux"
|
||||
];
|
||||
supportedFeatures = [
|
||||
"big-parallel"
|
||||
"nixos-test"
|
||||
"kvm"
|
||||
"benchmark"
|
||||
];
|
||||
sshUser = "builder";
|
||||
sshKey = "/etc/ssh/ssh_host_ed25519_key";
|
||||
publicHostKey = config.local.keys.gerg-desktop_fingerprint;
|
||||
} ];
|
||||
buildMachines = [
|
||||
{
|
||||
hostName = "gerg-desktop";
|
||||
protocol = "ssh-ng";
|
||||
maxJobs = 32;
|
||||
systems = [
|
||||
"x86_64-linux"
|
||||
"i686-linux"
|
||||
];
|
||||
supportedFeatures = [
|
||||
"big-parallel"
|
||||
"nixos-test"
|
||||
"kvm"
|
||||
"benchmark"
|
||||
];
|
||||
sshUser = "builder";
|
||||
sshKey = "/etc/ssh/ssh_host_ed25519_key";
|
||||
publicHostKey = config.local.keys.gerg-desktop_fingerprint;
|
||||
}
|
||||
];
|
||||
};
|
||||
programs.ssh.knownHosts = {
|
||||
gerg-desktop = {
|
||||
|
|
@ -50,7 +52,7 @@ _:
|
|||
let
|
||||
keys = [
|
||||
config.local.keys.root_moms-laptop
|
||||
config.local.keys.root_game-laptop
|
||||
config.local.keys.root_game-desktop
|
||||
];
|
||||
in
|
||||
lib.mkIf config.local.remoteBuild.isBuilder {
|
||||
|
|
|
|||
|
|
@ -7,7 +7,7 @@ _:
|
|||
gerg_gerg-phone = "ssh-ed25519 AAAAC3NzaC1lZDI1NTE5AAAAIDU6BnoHIgMLgZVGuvi03J9l5Z1yP1P5Q8QPyjRHyi77";
|
||||
gerg_gerg-windows = "ssh-ed25519 AAAAC3NzaC1lZDI1NTE5AAAAILpYY2uw0OH1Re+3BkYFlxn0O/D8ryqByJB/ljefooNc";
|
||||
root_moms-laptop = "ssh-ed25519 AAAAC3NzaC1lZDI1NTE5AAAAIIq9YTf4jlVCKBKn44m4yJvj94C7pTOyaa4VjZFohNqD";
|
||||
root_game-laptop = "ssh-ed25519 AAAAC3NzaC1lZDI1NTE5AAAAIJUKHZasYQUAmRBiqtx1drDxfq18/N4rKydCtPHx461I";
|
||||
root_game-desktop = "ssh-ed25519 AAAAC3NzaC1lZDI1NTE5AAAAIJUKHZasYQUAmRBiqtx1drDxfq18/N4rKydCtPHx461I";
|
||||
root_gerg-desktop = "ssh-ed25519 AAAAC3NzaC1lZDI1NTE5AAAAIIeHsGcmOdIMzV+SNe4WFcA3CPHCNb1aqxThkXtm7G/1";
|
||||
gerg-desktop_fingerprint = "BQxvBOWsTw1gdNDR0KzrSRmbVhDrJdG05vYXkVmw8yA";
|
||||
gerg_gerg-desktop = "ssh-ed25519 AAAAC3NzaC1lZDI1NTE5AAAAIJWbwkFJmRBgyWyWU+w3ksZ+KuFw9uXJN3PwqqE7Z/i8";
|
||||
|
|
|
|||
|
|
@ -101,8 +101,7 @@ let
|
|||
if cfg.mirroredBoots != [ ] then
|
||||
cfg.mirroredBoots
|
||||
else
|
||||
[ efi.efiSysMountPoint ]
|
||||
;
|
||||
[ efi.efiSysMountPoint ];
|
||||
in
|
||||
pkgs.writeShellScript "install-systemd-boot.sh" (
|
||||
lib.concatMapStrings
|
||||
|
|
@ -111,8 +110,7 @@ let
|
|||
'')
|
||||
installDirs
|
||||
)
|
||||
+ cfg.extraInstallCommands
|
||||
;
|
||||
+ cfg.extraInstallCommands;
|
||||
in
|
||||
{
|
||||
disabledModules = [
|
||||
|
|
@ -324,12 +322,14 @@ in
|
|||
|
||||
config = mkIf cfg.enable {
|
||||
assertions =
|
||||
[ {
|
||||
assertion =
|
||||
(config.boot.kernelPackages.kernel.features or { efiBootStub = true; })
|
||||
? efiBootStub;
|
||||
message = "This kernel does not support the EFI boot stub";
|
||||
} ]
|
||||
[
|
||||
{
|
||||
assertion =
|
||||
(config.boot.kernelPackages.kernel.features or { efiBootStub = true; })
|
||||
? efiBootStub;
|
||||
message = "This kernel does not support the EFI boot stub";
|
||||
}
|
||||
]
|
||||
++ concatMap
|
||||
(filename: [
|
||||
{
|
||||
|
|
@ -368,8 +368,7 @@ in
|
|||
} is invalid: files cannot be placed in the nixos/.extra-files directory";
|
||||
}
|
||||
])
|
||||
(builtins.attrNames cfg.extraFiles)
|
||||
;
|
||||
(builtins.attrNames cfg.extraFiles);
|
||||
|
||||
boot.loader.grub.enable = mkDefault false;
|
||||
|
||||
|
|
|
|||
|
|
@ -82,10 +82,12 @@ in
|
|||
extraConfig = ''
|
||||
font-size=10
|
||||
'';
|
||||
fonts = [ {
|
||||
name = "OverpassMono";
|
||||
package = pkgs.nerdfonts.override { fonts = [ "Overpass" ]; };
|
||||
} ];
|
||||
fonts = [
|
||||
{
|
||||
name = "OverpassMono";
|
||||
package = pkgs.nerdfonts.override { fonts = [ "Overpass" ]; };
|
||||
}
|
||||
];
|
||||
};
|
||||
systemd.services = {
|
||||
"autovt@tty1".enable = false;
|
||||
|
|
|
|||
Loading…
Add table
Add a link
Reference in a new issue