Compare commits

...

2 Commits

Author SHA1 Message Date
Nathan McCarty 2b8848eff9
Update vm hardware 2023-06-18 04:40:14 -04:00
Nathan McCarty ddca756838
Clean up uneeded bits 2023-06-18 04:25:53 -04:00
4 changed files with 16 additions and 90 deletions

View File

@ -17,24 +17,6 @@
home.packages = with pkgs; [ gammastep fido2luks ]; home.packages = with pkgs; [ gammastep fido2luks ];
# Sway outputs
wayland.windowManager.sway.config = {
output = {
DP-1 = {
scale = "1.4";
subpixel = "rgb";
max_render_time = "6";
adaptive_sync = "on";
render_bit_depth = "10";
};
};
input = { "type:pointer" = { pointer_accel = "-0.3"; }; };
startup = [
# Up the mouse dpi
{ command = "solaar config 1 dpi 4000"; }
];
};
# Hyprland outputs # Hyprland outputs
wayland.windowManager.hyprland.extraConfig = '' wayland.windowManager.hyprland.extraConfig = ''
# monitor=DP-1,preferred,auto,1.4,bitdepth,10 # monitor=DP-1,preferred,auto,1.4,bitdepth,10

View File

@ -33,17 +33,7 @@
nathan = { nathan = {
programs = { games = false; }; programs = { games = false; };
services = { services = {
borg = { borg = { enable = false; };
# TODO: Enable
enable = false;
extraExcludes = [
"/home/${config.nathan.config.user}/Music"
"/var/lib/docker"
"/var/log"
];
passwordFile = config.sops.secrets."borg-password".path;
sshKey = config.sops.secrets."borg-ssh-key".path;
};
kubo = { enable = false; }; kubo = { enable = false; };
}; };
config = { config = {
@ -59,11 +49,6 @@
useDHCP = false; useDHCP = false;
interfaces.ens33.useDHCP = true; interfaces.ens33.useDHCP = true;
nat.externalInterface = "ens33"; nat.externalInterface = "ens33";
# Open ports for soulseek
firewall = {
allowedTCPPorts = [ 61377 ];
allowedUDPPorts = [ 61377 ];
};
}; };
# Setup home manager # Setup home manager

View File

@ -7,33 +7,18 @@
imports = [ ]; imports = [ ];
boot.initrd.availableKernelModules = boot.initrd.availableKernelModules =
[ "ata_piix" "mptspi" "uhci_hcd" "ehci_pci" "sd_mod" "sr_mod" ]; [ "ata_piix" "mptspi" "uhci_hcd" "sd_mod" "sr_mod" ];
boot.initrd.kernelModules = [ ]; boot.initrd.kernelModules = [ ];
boot.kernelModules = boot.kernelModules = [ ];
[ "vmw_ballon" "vmw_pvscsi" "vmw_vmci" "vmwgfx" "vmxnet3" ];
boot.extraModulePackages = [ ]; boot.extraModulePackages = [ ];
fileSystems = { fileSystems."/" = {
"/" = { device = "/dev/disk/by-uuid/09b33aea-1ba4-45de-9973-bded8dad8ac9";
device = "/dev/disk/by-uuid/af524dfe-a89e-4527-908d-eabdb09a3c71";
fsType = "ext4"; fsType = "ext4";
}; };
"/mnt/hgfs" = {
device = ".host:/";
fsType = "fuse./run/current-system/sw/bin/vmhgfs-fuse";
options = [
"umask=22"
"uid=1000"
"gid=1000"
"allow_other"
"defaults"
"auto_unmount"
];
};
};
swapDevices = swapDevices =
[{ device = "/dev/disk/by-uuid/6d1d7bfa-676a-4b81-ba92-5ba110375814"; }]; [{ device = "/dev/disk/by-uuid/62754f77-dc2f-49f0-9d86-c1f9c9b8fe8f"; }];
# Enables DHCP on each ethernet and wireless interface. In case of scripted networking # Enables DHCP on each ethernet and wireless interface. In case of scripted networking
# (the default) this is the recommended approach. When using systemd-networkd it's # (the default) this is the recommended approach. When using systemd-networkd it's
@ -43,6 +28,4 @@
# networking.interfaces.ens33.useDHCP = lib.mkDefault true; # networking.interfaces.ens33.useDHCP = lib.mkDefault true;
nixpkgs.hostPlatform = lib.mkDefault "x86_64-linux"; nixpkgs.hostPlatform = lib.mkDefault "x86_64-linux";
hardware.cpu.amd.updateMicrocode =
lib.mkDefault config.hardware.enableRedistributableFirmware;
} }

View File

@ -25,41 +25,17 @@
"WLR_NO_HARDWARE_CURSORS" = "1"; "WLR_NO_HARDWARE_CURSORS" = "1";
"WLR_RENDERER" = "gles2"; "WLR_RENDERER" = "gles2";
"WLR_RENDER_DRM_DEVICE" = "/dev/dri/renderD128"; "WLR_RENDER_DRM_DEVICE" = "/dev/dri/renderD128";
}; "WLR_RENDERER_ALLOW_SOFTWARE" = "1";
wayland.windowManager.sway.config = {
output = {
Virtual-1 = {
scale = "1.25";
subpixel = "rgb";
# max_render_time = "6";
# adaptive_sync = "on";
# render_bit_depth = "10";
};
};
input = { "type:pointer" = { pointer_accel = "-0.3"; }; };
startup = [ ];
}; };
# Sway background wayland.windowManager.hyprland.extraConfig = ''
monitor=Virtual-1,preferred,auto,1.5
# Spin up glpaper as a user service so we can have it restart on failure (liable due to kvm switch input {
# disconnecting input) # sensitivity = -0.8
systemd.user.services.glpaper-dp1 = { # accel_profile = flat
Unit = {
Description = "glpaper (Virtual-1)";
After = [ "graphical-session.target" ];
};
Service = {
Type = "simple";
ExecStart = ''
/etc/profiles/per-user/nathan/bin/glpaper Virtual-1 ${
../../custom-files/sway/selen.frag
} }
exec-once=hyprpaper
''; '';
Restart = "always";
};
Install = { WantedBy = [ "graphical-session.target" ]; };
};
# System specific autoruns # System specific autoruns
systemd.user.services = { }; systemd.user.services = { };