Compare commits

..

No commits in common. "2f483a214ab695622aac7250575fb42675c2e43f" and "1378fb08ed33868d3a680a73c562228b509eb3ee" have entirely different histories.

7 changed files with 12 additions and 52 deletions

View File

@ -51,7 +51,7 @@ with nLib; {
}; };
targets = mkOption { targets = mkOption {
description = "Targets to install desktop services to"; description = "Targets to install desktop services to";
default = [ "graphical-session.target" ]; default = [ "hyprland-session.target" ];
}; };
swaylock = { swaylock = {
package = mkOption { package = mkOption {

View File

@ -62,7 +62,6 @@ in {
obs-vaapi obs-vaapi
obs-gstreamer obs-gstreamer
input-overlay input-overlay
looking-glass-obs
]; ];
}; };
}) })

View File

@ -6,7 +6,6 @@ let
inherit system; inherit system;
}; };
in { in {
imports = [ ./passthrough.nix ];
# Sops setup for this machine # Sops setup for this machine
sops.secrets = { sops.secrets = {
"borg-ssh-key" = { "borg-ssh-key" = {
@ -59,7 +58,7 @@ in {
podman = true; podman = true;
}; };
windows = { windows = {
enable = false; enable = true;
mount = { mount = {
device = "/dev/nvme0n1p2"; device = "/dev/nvme0n1p2";
mountPoint = "/mnt/windows"; mountPoint = "/mnt/windows";
@ -80,6 +79,8 @@ in {
allowedUDPPorts = [ 61377 1701 9001 ]; allowedUDPPorts = [ 61377 1701 9001 ];
}; };
}; };
# GPU passthrough
boot.kernelParams = [ "amd_iommu=on" ];
# Setup home manager # Setup home manager
home-manager.users.nathan = import ./home.nix; home-manager.users.nathan = import ./home.nix;

View File

@ -19,12 +19,12 @@
# Hyprland outputs # Hyprland outputs
wayland.windowManager.hyprland.extraConfig = '' wayland.windowManager.hyprland.extraConfig = ''
# monitor=DP-3,preferred,auto,1.4,bitdepth,10 # monitor=DP-1,preferred,auto,1.4,bitdepth,10
# disable 10 bit output for now as this breaks screenshots # disable 10 bit output for now as this breaks screenshots
misc { misc {
vrr = 1 vrr = 1
} }
monitor=DP-3,preferred,auto,1.4 monitor=DP-1,preferred,auto,1.4
input { input {
sensitivity = -0.8 sensitivity = -0.8
# accel_profile = flat # accel_profile = flat
@ -40,7 +40,7 @@
xdg.configFile."hypr/hyprpaper.conf" = { xdg.configFile."hypr/hyprpaper.conf" = {
text = '' text = ''
preload = /home/nathan/Pictures/Backgrounds/IMG_20190518_195619.jpg preload = /home/nathan/Pictures/Backgrounds/IMG_20190518_195619.jpg
wallpaper = DP-3,/home/nathan/Pictures/Backgrounds/IMG_20190518_195619.jpg wallpaper = DP-1,/home/nathan/Pictures/Backgrounds/IMG_20190518_195619.jpg
''; '';
}; };
@ -90,4 +90,9 @@
}; };
}; };
# Mako output configuration
services.mako = {
# Lock mako notifs to main display
output = "DP-1";
};
} }

View File

@ -1,35 +0,0 @@
{ config, lib, pkgs, ... }:
let
gpuIDs = [
# 2080 super
"10de:1e81" # Graphics
"10de:10f8" # Audio
"10de:1ad8" # Usb ????
"10de:1ad9" # Usb ????
];
in {
boot = {
kernelParams = [
# enable iommu
"amd_iommu=on"
# Isolate the nvidia gpu
("vfio-pci.ids=" + lib.concatStringsSep "," gpuIDs)
];
# Modules needed
initrd.kernelModules = [ "vfio_pci" "vfio" "vfio_iommu_type1" ];
};
environment.systemPackages = with pkgs; [ looking-glass-client ];
virtualisation.spiceUSBRedirection.enable = true;
virtualisation.libvirtd = {
qemu = {
swtpm.enable = true;
ovmf = {
enable = true;
packages = [ pkgs.OVMFFull.fd ];
};
};
};
systemd.tmpfiles.rules =
[ "f /dev/shm/looking-glass 0660 nathan qemu-libvirtd -" ];
}

View File

@ -78,14 +78,5 @@ with lib; {
MaxRetentionSec=7day MaxRetentionSec=7day
''; '';
} }
# Partitioning tools
(mkIf config.nathan.config.isDesktop {
environment.systemPackages = with pkgs; [
parted
gparted
xorg.xhost
nvme-cli
];
})
]; ];
} }

View File

@ -6,7 +6,6 @@ in with lib; {
# Enable the kernel modules # Enable the kernel modules
boot.kernelModules = [ "kvm-amd" "kvm-intel" ]; boot.kernelModules = [ "kvm-amd" "kvm-intel" ];
# Enable libvirt # Enable libvirt
programs.dconf.enable = true;
virtualisation.libvirtd.enable = true; virtualisation.libvirtd.enable = true;
# Install virt-manager # Install virt-manager
environment.systemPackages = with pkgs; [ virtmanager virt-viewer ]; environment.systemPackages = with pkgs; [ virtmanager virt-viewer ];