BeiNacht/nixos-config
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

blabla

Browse Source
This commit is contained in:
Alexander Szczepanski
2021-10-26 20:11:16 +02:00
parent 9ed8216404
commit 5950e8d335
11 changed files with 373 additions and 351 deletions
Download Patch File Download Diff File Expand all files Collapse all files

18
machine/desktop.nix
View File

@ -2,7 +2,6 @@
let
secrets = import ../configs/secrets.nix;
secrets-wireguard = import ../configs/secrets-wireguard-publickeys.nix;
secrets-desktop = import ../configs/secrets-desktop.nix;
in
{
@ -16,6 +15,7 @@ in
../configs/user-gui-applications.nix
../configs/user-gui.nix
../configs/user.nix
../configs/bspwm.nix
];
# Use the systemd-boot EFI boot loader.
@ -42,8 +42,9 @@ in
initrd.kernelModules = [ "amdgpu" ];
plymouth.enable = true;
extraModulePackages = with pkgs.linuxPackages; [ it87 ];
extraModulePackages = with pkgs.linuxPackages_5_14; [ it87 ];
kernelModules = [ "it87" "v4l2loopback" ];
kernelPackages = pkgs.linuxPackages_5_14;
};
networking = {
@ -52,12 +53,12 @@ in
wireguard.interfaces = {
wg0 = {
ips = [ "10.100.0.2/24" ];
privateKey = secrets-desktop.wireguard-desktop-private;
privateKey = secrets-desktop.wireguard-private;
peers = [
{
publicKey = secrets-wireguard.wireguard-vps-public;
presharedKey = secrets-wireguard.wireguard-preshared;
publicKey = secrets.wireguard-vps-public;
presharedKey = secrets.wireguard-preshared;
allowedIPs = [ "10.100.0.0/24" ];
endpoint = "szczepan.ski:51820";
persistentKeepalive = 25;
@ -118,17 +119,20 @@ in
services = {
printing.enable = true;
xserver.videoDrivers = [ "amdgpu" ];
xserver.deviceSection = ''
Option "TearFree" "true"
'';
hardware.xow.enable = true;
borgbackup.jobs.home = rec {
compression = "auto,zstd";
encryption = {
mode = "repokey-blake2" ;
passphrase = secrets-desktop.borg-desktop-key;
passphrase = secrets-desktop.borg-key;
};
extraCreateArgs = "--checkpoint-interval 600 --exclude-caches";
environment.BORG_RSH = "ssh -i ~/.ssh/id_borg_rsa";
paths = "/home/alex";
repo = "ssh://u278697-sub2@u278697.your-storagebox.de:23/./borg";
repo = secrets-desktop.borg-repo;
startAt = "daily";
user = "alex";
prune.keep = {

4
machine/nixos-vm.nix
View File

@ -44,6 +44,10 @@ in
# networking.firewall.allowedUDPPorts = [ ... ];
# Or disable the firewall altogether.
# networking.firewall.enable = false;
services.xserver.enable = true;
services.xserver.desktopManager.pantheon.enable = true;
services.xserver.displayManager.lightdm.greeters.pantheon.enable = true;
services.xserver.displayManager.lightdm.enable = true;
system.stateVersion = "21.05";
}

59
machine/thinkpad.nix
View File

@ -11,7 +11,6 @@ let
export __VK_LAYER_NV_optimus=NVIDIA_only
exec -a "$0" "$@"
'';
secrets = import ../configs/secrets.nix;
secrets-thinkpad = import ../configs/secrets-thinkpad.nix;
in
{
@ -39,20 +38,20 @@ in
fileSystems."/".options = [ "noatime" "discard" ];
boot.loader.grub.enable = true;
boot.loader.grub.version = 2;
boot.loader.grub.device = "nodev";
boot.loader.grub.efiSupport = true;
boot.loader.efi.canTouchEfiVariables = true;
boot.loader.grub.gfxmodeEfi = "1024x768";
# boot.plymouth.enable = true;
# environment.etc."issue.d/ip.issue".text = "\\4\n";
boot = {
loader = {
grub.enable = true;
grub.version = 2;
grub.device = "nodev";
grub.efiSupport = true;
efi.canTouchEfiVariables = true;
grub.gfxmodeEfi = "1024x768";
};
kernelPackages = pkgs.linuxPackages_5_14;
boot.plymouth.enable = true;
};
networking.hostName = "thinkpad"; # Define your hostname.
# Set your time zone.
time.timeZone = "Europe/Berlin";
# The global useDHCP flag is deprecated, therefore explicitly set to false here.
@ -131,23 +130,25 @@ in
};
hardware.sane.enable = true;
#thinkfan
services.thinkfan = {
enable = true;
levels = [
[0 0 67]
[1 65 75]
[2 73 80]
[3 78 85]
[4 83 90]
[6 88 95]
[7 93 32767]
];
};
services = {
thinkfan = {
enable = true;
levels = [
[0 0 67]
[1 65 75]
[2 73 80]
[3 78 85]
[4 83 90]
[6 88 95]
[7 93 32767]
];
};
xserver = {
videoDrivers = [ "nvidia" ];
# deviceSection = ''BusID "PCI:0:2:0"'';
# deviceSection = ''
# Option "TearFree" "true"
# '';
};
power-profiles-daemon.enable = false;
tlp = {
@ -161,12 +162,12 @@ in
compression = "auto,zstd";
encryption = {
mode = "repokey-blake2" ;
passphrase = secrets-thinkpad.borg-thinkpad-key;
passphrase = secrets-thinkpad.borg-key;
};
extraCreateArgs = "--list --stats --verbose --checkpoint-interval 600 --exclude-caches";
environment.BORG_RSH = "ssh -i ~/.ssh/id_borg_rsa";
paths = "/home/alex";
repo = "ssh://u278697-sub1@u278697.your-storagebox.de:23/./borg";
repo = secrets-thinkpad.borg-thinkpad-key;
startAt = "daily";
user = "alex";
prune.keep = {
@ -202,7 +203,7 @@ in
environment.systemPackages = with pkgs; [
nvidia-offload
xorg.xf86videointel
# xorg.xf86videointel
intel-gpu-tools
gnome.simple-scan
];