gerg-l/nixos
1
0
Fork 0
mirror of https://github.com/Gerg-L/nixos.git synced 2025-12-10 00:43:56 -05:00
Code Issues Projects Releases Packages Wiki Activity Actions

game-laptop -> game-desktop

Browse source
This commit is contained in:
Gerg-L 2023-10-12 20:35:39 -04:00
parent 849c21761f
commit d24efeba64
Signed by: gerg-l
SSH key fingerprint: SHA256:FPYDHIkvMocr4wdmZXpgpJjsb2Tw6rASs2ISPbOb0KI
15 changed files with 105 additions and 103 deletions
Download patch file Download diff file Expand all files Collapse all files

4
.sops.yaml
View file

@ -1,7 +1,7 @@
keys: keys:
- &gerg-desktop age180y8kdtdlqelayyz9mq2c7xv248rh4gdfr3amjzvdcjrz6wdaqmsj762pp - &gerg-desktop age180y8kdtdlqelayyz9mq2c7xv248rh4gdfr3amjzvdcjrz6wdaqmsj762pp
- &moms-laptop age1vxx3qdsucv2v2slag67c4f0kwd8jtta4tue6m8d9xfl4ryrqvyusxgwl68 - &moms-laptop age1vxx3qdsucv2v2slag67c4f0kwd8jtta4tue6m8d9xfl4ryrqvyusxgwl68
- &game-laptop age1egxes320renph0uevtmnsz4d5aw0z794c5nwrk2z6249wv2yevgqx9cf90 - &game-desktop age1egxes320renph0uevtmnsz4d5aw0z794c5nwrk2z6249wv2yevgqx9cf90
creation_rules: creation_rules:
- path_regex: hosts/gerg-desktop/secrets.yaml$ - path_regex: hosts/gerg-desktop/secrets.yaml$
key_groups: key_groups:
@ -15,6 +15,6 @@ creation_rules:
- path_regex: hosts/game-laptop/secrets.yaml$ - path_regex: hosts/game-laptop/secrets.yaml$
key_groups: key_groups:
- age: - age:
- *game-laptop - *game-desktop
- *gerg-desktop - *gerg-desktop

2
README.md
View file

@ -5,7 +5,7 @@ it currently has 3 hosts:
"gerg-desktop" my main computer [specs](https://pcpartpicker.com/list/DVkMk9) "gerg-desktop" my main computer [specs](https://pcpartpicker.com/list/DVkMk9)
which I run a windows KVM VFIO virtual machine on which I run a windows KVM VFIO virtual machine on
"game-laptop" a HP Pavilion Laptop [15-ec2121nr](https://support.hp.com/us-en/document/c07918617#AbT0) "game-desktop" a HP Pavilion Laptop [15-ec2121nr](https://support.hp.com/us-en/document/c07918617#AbT0)
which I've been testing linux game compatability on which I've been testing linux game compatability on
"moms-laptop" a TOSHIBA Satellite [L855-S5309](https://fo-stage-03.icecat.biz/us/p/toshiba/pskfuu-008049/satellite-notebooks-l855-s5309-18316794.html) "moms-laptop" a TOSHIBA Satellite [L855-S5309](https://fo-stage-03.icecat.biz/us/p/toshiba/pskfuu-008049/satellite-notebooks-l855-s5309-18316794.html)

4
flake.nix
View file

@ -56,7 +56,7 @@
inherit lib; inherit lib;
nixosConfigurations = lib.mkHosts "x86_64-linux" [ nixosConfigurations = lib.mkHosts "x86_64-linux" [
"gerg-desktop" "gerg-desktop"
"game-laptop" "game-desktop"
"moms-laptop" "moms-laptop"
"iso" "iso"
]; ];
@ -65,7 +65,7 @@
diskoConfigurations = lib.mkDisko [ diskoConfigurations = lib.mkDisko [
"gerg-desktop" "gerg-desktop"
"game-laptop" "game-desktop"
"moms-laptop" "moms-laptop"
]; ];
formatter.${system} = pkgs.writeShellApplication { formatter.${system} = pkgs.writeShellApplication {

0
hosts/game-laptop/disko.nix → hosts/game-desktop/disko.nix
View file

32
hosts/game-laptop/main.nix → hosts/game-desktop/main.nix
View file

@ -77,6 +77,28 @@ _:
}; };
}; };
}; };
hardware.nvidia = {
package = config.boot.kernelPackages.nvidiaPackages.latest;
nvidiaPersistenced = true;
nvidiaSettings = false;
modesetting.enable = true;
};
services.xserver = {
videoDrivers = [ "nvidia" ];
#disable DPMS
monitorSection = ''
Option "DPMS" "false"
'';
#disable screen blanking in total
serverFlagsSection = ''
Option "StandbyTime" "0"
Option "SuspendTime" "0"
Option "OffTime" "0"
Option "BlankTime" "0"
'';
};
hardware.bluetooth.enable = true; hardware.bluetooth.enable = true;
services.blueman.enable = true; services.blueman.enable = true;
boot = { boot = {
@ -88,10 +110,12 @@ _:
kernelModules = [ "kvm-amd" ]; kernelModules = [ "kvm-amd" ];
kernelPackages = pkgs.linuxPackages_latest; kernelPackages = pkgs.linuxPackages_latest;
}; };
swapDevices = [ { swapDevices = [
device = "/swapfile"; {
size = 16 * 1024; device = "/swapfile";
} ]; size = 16 * 1024;
}
];
system.stateVersion = "23.05"; system.stateVersion = "23.05";
_file = ./main.nix; _file = ./main.nix;

0
hosts/game-laptop/secrets.yaml → hosts/game-desktop/secrets.yaml
View file

30
hosts/game-laptop/prime.nix
View file

@ -1,30 +0,0 @@
_:
{ config, ... }:
{
hardware.nvidia = {
package = config.boot.kernelPackages.nvidiaPackages.latest;
prime = {
sync.enable = true;
amdgpuBusId = "PCI:5:0:0";
nvidiaBusId = "PCI:1:0:0";
};
nvidiaPersistenced = true;
nvidiaSettings = false;
modesetting.enable = true;
};
services.xserver = {
videoDrivers = [ "nvidia" ];
#disable DPMS
monitorSection = ''
Option "DPMS" "false"
'';
#disable screen blanking in total
serverFlagsSection = ''
Option "StandbyTime" "0"
Option "SuspendTime" "0"
Option "OffTime" "0"
Option "BlankTime" "0"
'';
};
_file = ./prime.nix;
}

10
hosts/gerg-desktop/services/postgresql.nix
View file

@ -10,10 +10,12 @@ _:
"miniflux" "miniflux"
config.services.gitea.database.user config.services.gitea.database.user
]; ];
ensureUsers = [ { ensureUsers = [
name = "miniflux"; {
ensurePermissions."DATABASE miniflux" = "ALL PRIVILEGES"; name = "miniflux";
} ]; ensurePermissions."DATABASE miniflux" = "ALL PRIVILEGES";
}
];
settings.unix_socket_permissions = "0770"; settings.unix_socket_permissions = "0770";
}; };

10
hosts/moms-laptop/main.nix
View file

@ -91,9 +91,11 @@ _:
system.stateVersion = "23.05"; system.stateVersion = "23.05";
swapDevices = [ { swapDevices = [
device = "/swapfile"; {
size = 8 * 1024; device = "/swapfile";
} ]; size = 8 * 1024;
}
];
_file = ./main.nix; _file = ./main.nix;
} }

3
lib/default.nix
View file

@ -39,8 +39,7 @@ in
if config == { } then if config == { } then
unstable.legacyPackages.${system} unstable.legacyPackages.${system}
else else
import unstable { inherit system config; } import unstable { inherit system config; };
;
} }
) )
[ "x86_64-linux" ] [ "x86_64-linux" ]

38
modules/DE/dwm.nix
View file

@ -22,26 +22,28 @@
''; '';
defaultSession = "none+dwm"; defaultSession = "none+dwm";
}; };
windowManager.session = [ { windowManager.session = [
name = "dwm"; {
start = '' name = "dwm";
update_time () { start = ''
while : update_time () {
do while :
sleep 1 do
xsetroot -name "$(date +"%I:%M %p")" sleep 1
done xsetroot -name "$(date +"%I:%M %p")"
} done
}
dont_stop() { dont_stop() {
while type dwm >/dev/null ; do dwm && continue || break ; done while type dwm >/dev/null ; do dwm && continue || break ; done
} }
update_time & update_time &
dont_stop & dont_stop &
waitPID=$! waitPID=$!
''; '';
} ]; }
];
}; };
environment.systemPackages = builtins.attrValues { environment.systemPackages = builtins.attrValues {
inherit (suckless.packages.${pkgs.system}) dmenu dwm st; inherit (suckless.packages.${pkgs.system}) dmenu dwm st;

40
modules/builders.nix
View file

@ -19,24 +19,26 @@ _:
]; ];
}; };
distributedBuilds = true; distributedBuilds = true;
buildMachines = [ { buildMachines = [
hostName = "gerg-desktop"; {
protocol = "ssh-ng"; hostName = "gerg-desktop";
maxJobs = 32; protocol = "ssh-ng";
systems = [ maxJobs = 32;
"x86_64-linux" systems = [
"i686-linux" "x86_64-linux"
]; "i686-linux"
supportedFeatures = [ ];
"big-parallel" supportedFeatures = [
"nixos-test" "big-parallel"
"kvm" "nixos-test"
"benchmark" "kvm"
]; "benchmark"
sshUser = "builder"; ];
sshKey = "/etc/ssh/ssh_host_ed25519_key"; sshUser = "builder";
publicHostKey = config.local.keys.gerg-desktop_fingerprint; sshKey = "/etc/ssh/ssh_host_ed25519_key";
} ]; publicHostKey = config.local.keys.gerg-desktop_fingerprint;
}
];
}; };
programs.ssh.knownHosts = { programs.ssh.knownHosts = {
gerg-desktop = { gerg-desktop = {
@ -50,7 +52,7 @@ _:
let let
keys = [ keys = [
config.local.keys.root_moms-laptop config.local.keys.root_moms-laptop
config.local.keys.root_game-laptop config.local.keys.root_game-desktop
]; ];
in in
lib.mkIf config.local.remoteBuild.isBuilder { lib.mkIf config.local.remoteBuild.isBuilder {

2
modules/keys.nix
View file

@ -7,7 +7,7 @@ _:
gerg_gerg-phone = "ssh-ed25519 AAAAC3NzaC1lZDI1NTE5AAAAIDU6BnoHIgMLgZVGuvi03J9l5Z1yP1P5Q8QPyjRHyi77"; gerg_gerg-phone = "ssh-ed25519 AAAAC3NzaC1lZDI1NTE5AAAAIDU6BnoHIgMLgZVGuvi03J9l5Z1yP1P5Q8QPyjRHyi77";
gerg_gerg-windows = "ssh-ed25519 AAAAC3NzaC1lZDI1NTE5AAAAILpYY2uw0OH1Re+3BkYFlxn0O/D8ryqByJB/ljefooNc"; gerg_gerg-windows = "ssh-ed25519 AAAAC3NzaC1lZDI1NTE5AAAAILpYY2uw0OH1Re+3BkYFlxn0O/D8ryqByJB/ljefooNc";
root_moms-laptop = "ssh-ed25519 AAAAC3NzaC1lZDI1NTE5AAAAIIq9YTf4jlVCKBKn44m4yJvj94C7pTOyaa4VjZFohNqD"; 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"; root_gerg-desktop = "ssh-ed25519 AAAAC3NzaC1lZDI1NTE5AAAAIIeHsGcmOdIMzV+SNe4WFcA3CPHCNb1aqxThkXtm7G/1";
gerg-desktop_fingerprint = "BQxvBOWsTw1gdNDR0KzrSRmbVhDrJdG05vYXkVmw8yA"; gerg-desktop_fingerprint = "BQxvBOWsTw1gdNDR0KzrSRmbVhDrJdG05vYXkVmw8yA";
gerg_gerg-desktop = "ssh-ed25519 AAAAC3NzaC1lZDI1NTE5AAAAIJWbwkFJmRBgyWyWU+w3ksZ+KuFw9uXJN3PwqqE7Z/i8"; gerg_gerg-desktop = "ssh-ed25519 AAAAC3NzaC1lZDI1NTE5AAAAIJWbwkFJmRBgyWyWU+w3ksZ+KuFw9uXJN3PwqqE7Z/i8";

23
modules/systemd-boot/default.nix
View file

@ -101,8 +101,7 @@ let
if cfg.mirroredBoots != [ ] then if cfg.mirroredBoots != [ ] then
cfg.mirroredBoots cfg.mirroredBoots
else else
[ efi.efiSysMountPoint ] [ efi.efiSysMountPoint ];
;
in in
pkgs.writeShellScript "install-systemd-boot.sh" ( pkgs.writeShellScript "install-systemd-boot.sh" (
lib.concatMapStrings lib.concatMapStrings
@ -111,8 +110,7 @@ let
'') '')
installDirs installDirs
) )
+ cfg.extraInstallCommands + cfg.extraInstallCommands;
;
in in
{ {
disabledModules = [ disabledModules = [
@ -324,12 +322,14 @@ in
config = mkIf cfg.enable { config = mkIf cfg.enable {
assertions = assertions =
[ { [
assertion = {
(config.boot.kernelPackages.kernel.features or { efiBootStub = true; }) assertion =
? efiBootStub; (config.boot.kernelPackages.kernel.features or { efiBootStub = true; })
message = "This kernel does not support the EFI boot stub"; ? efiBootStub;
} ] message = "This kernel does not support the EFI boot stub";
}
]
++ concatMap ++ concatMap
(filename: [ (filename: [
{ {
@ -368,8 +368,7 @@ in
} is invalid: files cannot be placed in the nixos/.extra-files directory"; } 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; boot.loader.grub.enable = mkDefault false;

10
modules/theming.nix
View file

@ -82,10 +82,12 @@ in
extraConfig = '' extraConfig = ''
font-size=10 font-size=10
''; '';
fonts = [ { fonts = [
name = "OverpassMono"; {
package = pkgs.nerdfonts.override { fonts = [ "Overpass" ]; }; name = "OverpassMono";
} ]; package = pkgs.nerdfonts.override { fonts = [ "Overpass" ]; };
}
];
}; };
systemd.services = { systemd.services = {
"autovt@tty1".enable = false; "autovt@tty1".enable = false;