Switch to new hardware config on desktop due to PC reset, switch to lighter android studio package, fix compilation issues with mpdcron on new flake
This commit is contained in:
parent
dda77b47a4
commit
7ea6338ae8
|
|
@ -133,13 +133,13 @@
|
|||
#};
|
||||
|
||||
# Single GPU Passthru Configuration
|
||||
cspark-single-gpu-passthru.enable = true;
|
||||
cspark-single-gpu-passthru.vmName = "win11";
|
||||
cspark-single-gpu-passthru.gpuPCI = "0000:08:00.0";
|
||||
cspark-single-gpu-passthru.gpuAudioPCI = "0000:08:00.1";
|
||||
#cspark-single-gpu-passthru.enable = true;
|
||||
#cspark-single-gpu-passthru.vmName = "win11";
|
||||
#cspark-single-gpu-passthru.gpuPCI = "0000:08:00.0";
|
||||
#cspark-single-gpu-passthru.gpuAudioPCI = "0000:08:00.1";
|
||||
|
||||
# Waydroid Android Emulation
|
||||
virtualisation.waydroid.enable = true;
|
||||
#virtualisation.waydroid.enable = true;
|
||||
|
||||
# Docker for development
|
||||
virtualisation.docker.enable = true;
|
||||
|
|
@ -150,7 +150,7 @@
|
|||
nvtopPackages.amd
|
||||
|
||||
# Use the android-studio-full attribute for a very complete Android SDK, including system images
|
||||
# android-studio-full
|
||||
android-studio
|
||||
];
|
||||
|
||||
#environment.variables = {
|
||||
|
|
|
|||
|
|
@ -8,27 +8,24 @@
|
|||
[ (modulesPath + "/installer/scan/not-detected.nix")
|
||||
];
|
||||
|
||||
boot.initrd.availableKernelModules = [ "xhci_pci" "ahci" "usb_storage" "uas" "usbhid" "sd_mod" ];
|
||||
boot.initrd.availableKernelModules = [ "xhci_pci" "ahci" "uas" "usb_storage" "usbhid" "sd_mod" ];
|
||||
boot.initrd.kernelModules = [ ];
|
||||
#boot.kernelModules = [ "kvm-amd" "vendor-reset" ];
|
||||
boot.kernelModules = [ "kvm-amd" ];
|
||||
boot.extraModulePackages = [ ];
|
||||
|
||||
fileSystems."/" =
|
||||
{ device = "/dev/disk/by-uuid/f25f2830-a778-4ecd-ad9b-93331ec13ff0";
|
||||
{ device = "/dev/disk/by-uuid/3dcedddf-8ab5-42cf-a2f7-a7ed7efc3ec4";
|
||||
fsType = "ext4";
|
||||
};
|
||||
|
||||
boot.initrd.luks.devices."luks-542de15a-e6a5-4c6d-8c6a-62f916805da8".device = "/dev/disk/by-uuid/542de15a-e6a5-4c6d-8c6a-62f916805da8";
|
||||
boot.initrd.luks.devices."luks-9658340a-9d7d-4dbd-be1c-c8c7393ddfc3".device = "/dev/disk/by-uuid/9658340a-9d7d-4dbd-be1c-c8c7393ddfc3";
|
||||
|
||||
fileSystems."/boot" =
|
||||
{ device = "/dev/disk/by-uuid/386A-F58F";
|
||||
{ device = "/dev/disk/by-uuid/0A25-5D7D";
|
||||
fsType = "vfat";
|
||||
options = [ "fmask=0077" "dmask=0077" ];
|
||||
};
|
||||
|
||||
swapDevices =
|
||||
[ { device = "/dev/disk/by-uuid/6a8760a6-b720-455d-8ff6-af76365374bf"; }
|
||||
[ { device = "/dev/disk/by-uuid/52eb83d8-cf41-4657-a3af-c54a37476a55"; }
|
||||
];
|
||||
|
||||
# Enables DHCP on each ethernet and wireless interface. In case of scripted networking
|
||||
|
|
@ -36,7 +33,7 @@
|
|||
# still possible to use this option, but it's recommended to use it in conjunction
|
||||
# with explicit per-interface declarations with `networking.interfaces.<interface>.useDHCP`.
|
||||
networking.useDHCP = lib.mkDefault true;
|
||||
# networking.interfaces.enp7s0.useDHCP = lib.mkDefault true;
|
||||
# networking.interfaces.enp34s0.useDHCP = lib.mkDefault true;
|
||||
|
||||
nixpkgs.hostPlatform = lib.mkDefault "x86_64-linux";
|
||||
hardware.cpu.amd.updateMicrocode = lib.mkDefault config.hardware.enableRedistributableFirmware;
|
||||
|
|
|
|||
|
|
@ -1,4 +1,4 @@
|
|||
{ config, pkgs, ... }:
|
||||
{ config, pkgs, inputs, ... }:
|
||||
|
||||
let
|
||||
homedir = "/home/cspark";
|
||||
|
|
@ -218,7 +218,7 @@ fi
|
|||
};
|
||||
Service = {
|
||||
ExecStart = "${script}";
|
||||
Environment = "PATH=${pkgs.mpdcron}/bin:${pkgs.systemd}/bin";
|
||||
Environment = "PATH=${inputs.nixpkgs-stable.legacyPackages.x86_64-linux.mpdcron}/bin:${pkgs.systemd}/bin";
|
||||
};
|
||||
Install = {
|
||||
WantedBy = [ "default.target" ];
|
||||
|
|
|
|||
19
global.nix
19
global.nix
|
|
@ -17,6 +17,7 @@
|
|||
# You can specify here if you want to add any packages from the stable branch onto your system
|
||||
stablePackages = with inputs.nixpkgs-stable.legacyPackages.x86_64-linux; [
|
||||
gtk-pipe-viewer
|
||||
mpdcron
|
||||
];
|
||||
|
||||
# Enable OpenGL/Vulkan hardware acceleration etc
|
||||
|
|
@ -123,7 +124,7 @@
|
|||
lua-language-server
|
||||
yaml-language-server
|
||||
ansible-language-server
|
||||
ansible-lint
|
||||
#ansible-lint
|
||||
nginx-language-server
|
||||
emmet-language-server
|
||||
vscode-langservers-extracted
|
||||
|
|
@ -212,16 +213,18 @@
|
|||
protonup-qt
|
||||
qpwgraph
|
||||
|
||||
ardour
|
||||
rnnoise-plugin
|
||||
lsp-plugins
|
||||
(yabridge.override { wine = wineWowPackages.waylandFull; })
|
||||
(yabridgectl.override { wine = wineWowPackages.waylandFull; })
|
||||
#ardour
|
||||
#rnnoise-plugin
|
||||
#lsp-plugins
|
||||
#(yabridge.override { wine = wineWowPackages.waylandFull; })
|
||||
#(yabridgectl.override { wine = wineWowPackages.waylandFull; })
|
||||
(yabridge.override { wine = wineWowPackages.full; })
|
||||
(yabridgectl.override { wine = wineWowPackages.full; })
|
||||
|
||||
MIDIVisualizer
|
||||
kdenlive
|
||||
vlc
|
||||
unityhub
|
||||
# unityhub
|
||||
veracrypt
|
||||
boxbuddy
|
||||
distrobox
|
||||
|
|
@ -237,8 +240,6 @@
|
|||
gimp
|
||||
obs-studio
|
||||
|
||||
mpdcron
|
||||
|
||||
pass-wayland
|
||||
thunderbird
|
||||
protonmail-desktop
|
||||
|
|
|
|||
Loading…
Reference in New Issue