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

Migration to new CPU RAM and MOBO

Browse source
This commit is contained in:
ISnortPennies 2022-12-28 12:28:39 -05:00
parent d40d26761b
commit 782953b900
9 changed files with 80 additions and 48 deletions
Download patch file Download diff file Expand all files Collapse all files

17
home-manager/config/discord/settings.json
View file

@ -1,15 +1,16 @@
{
"debugLogging": false,
"IS_MAXIMIZED": false,
"IS_MINIMIZED": false,
"MIN_WIDTH": 0,
"MIN_HEIGHT": 0,
"OPEN_ON_STARTUP": false,
"MINIMIZE_TO_TRAY": false,
"openasar": {
"setup": true,
"noTyping": true,
"themeSync": true,
"quickstart": true,
"css": "@import url('https://mwittrien.github.io/BetterDiscordAddons/Themes/DiscordRecolor/DiscordRecolor.css');\n\n:root {\n --accentcolor: 121,218,200;\n --accentcolor2: 255,84,84;\n --linkcolor: 128,160,255;\n --mentioncolor: 227,199,138;\n --textbrightest: 255,255,255;\n --textbrighter: 222,222,222;\n --textbright: 185,185,185;\n --textdark: 140,140,140;\n --textdarker: 115,115,115;\n --textdarkest: 80,80,80;\n --font: Overpass;\n --backgroundaccent: 50,52,55;\n --backgroundprimary: 0,0,0;\n --backgroundsecondary: 0,0,0;\n --backgroundsecondaryalt: 0,0,0;\n --backgroundtertiary: 50,52,55;\n --backgroundfloating: 50,52,55;\n --settingsicons: 1;\n}"
}
},
"IS_MAXIMIZED": false,
"IS_MINIMIZED": false,
"SKIP_HOST_UPDATE": true,
"MIN_WIDTH": 0,
"MIN_HEIGHT": 0,
"OPEN_ON_STARTUP": false,
"MINIMIZE_TO_TRAY": false
}

13
home-manager/spicetify.nix
View file

@ -1,16 +1,19 @@
{ pkgs, lib, spicetify-nix, ... }:
let
spicePkgs = spicetify-nix.packages.${pkgs.system}.default;
in
{
imports = [ spicetify-nix.homeManagerModule ];
programs.spicetify = {
spotifyPackage = pkgs.spotify-unwrapped;
spicetifyPackage = pkgs.spicetify-cli;
enable = true;
enabledExtensions = with spicetify-nix.pkgs.extensions; [
"adblock.js"
"hidePodcasts.js"
"shuffle+.js"
enabledExtensions = with spicePkgs.extensions; [
adblock
hidePodcasts
shuffle
];
theme = spicetify-nix.pkgs.themes.Dribbblish;
theme = spicePkgs.themes.Dribbblish;
colorScheme = "custom";
customColorScheme = {
text = "f8f8f8";

44
misc/Windows.xml
View file

@ -1,20 +1,30 @@
<domain xmlns:qemu="http://libvirt.org/schemas/domain/qemu/1.0" type="kvm">
<name>Windows</name>
<uuid>60d8329e-8670-f8bb-4a7d-04d9f51eff76</uuid>
<uuid>035e02d8-04d3-05e5-4706-900700080009</uuid>
<memory unit="KiB">16777216</memory>
<currentMemory unit="KiB">16777216</currentMemory>
<vcpu placement="static" cpuset="3-5,9-11">6</vcpu>
<vcpu placement="static" cpuset="8-15,24-31">16</vcpu>
<cputune>
<vcpupin vcpu="0" cpuset="3"/>
<vcpupin vcpu="1" cpuset="9"/>
<vcpupin vcpu="2" cpuset="4"/>
<vcpupin vcpu="3" cpuset="10"/>
<vcpupin vcpu="4" cpuset="5"/>
<vcpupin vcpu="5" cpuset="11"/>
<emulatorpin cpuset="0-2,6-8"/>
<vcpupin vcpu="0" cpuset="8"/>
<vcpupin vcpu="1" cpuset="24"/>
<vcpupin vcpu="2" cpuset="9"/>
<vcpupin vcpu="3" cpuset="25"/>
<vcpupin vcpu="4" cpuset="10"/>
<vcpupin vcpu="5" cpuset="26"/>
<vcpupin vcpu="6" cpuset="11"/>
<vcpupin vcpu="7" cpuset="27"/>
<vcpupin vcpu="8" cpuset="12"/>
<vcpupin vcpu="9" cpuset="28"/>
<vcpupin vcpu="10" cpuset="13"/>
<vcpupin vcpu="11" cpuset="29"/>
<vcpupin vcpu="12" cpuset="14"/>
<vcpupin vcpu="13" cpuset="30"/>
<vcpupin vcpu="14" cpuset="15"/>
<vcpupin vcpu="15" cpuset="31"/>
<emulatorpin cpuset="0-7,16-23"/>
</cputune>
<os>
<type arch="x86_64" machine="pc-q35-7.1">hvm</type>
<type arch="x86_64" machine="pc-q35-7.2">hvm</type>
<loader readonly="yes" type="pflash">/run/libvirt/nix-ovmf/OVMF_CODE.fd</loader>
<nvram>/var/lib/libvirt/qemu/nvram/Windows_VARS.fd</nvram>
<boot dev="hd"/>
@ -46,7 +56,7 @@
<ioapic driver="kvm"/>
</features>
<cpu mode="host-passthrough" check="none" migratable="off">
<topology sockets="1" dies="1" cores="3" threads="2"/>
<topology sockets="1" dies="1" cores="8" threads="2"/>
<cache mode="passthrough"/>
</cpu>
<clock offset="localtime">
@ -177,20 +187,20 @@
<address type="pci" domain="0x0000" bus="0x00" slot="0x1b" function="0x0"/>
</sound>
<audio id="1" type="jack">
<input clientName="win10" connectPorts="Starship/Matisse HD Audio Controller Analog Stereo:capture_F[LR]"/>
<output clientName="win10" connectPorts="Starship/Matisse HD Audio Controller Analog Stereo:playback_F[LR]"/>
<input clientName="win10" connectPorts="Family 17h/19h HD Audio Controller Analog Stereo:capture_F[LR]"/>
<output clientName="win10" connectPorts="Family 17h/19h HD Audio Controller Analog Stereo:playback_F[LR]"/>
</audio>
<hostdev mode="subsystem" type="pci" managed="yes">
<source>
<address domain="0x0000" bus="0x10" slot="0x00" function="0x0"/>
<address domain="0x0000" bus="0x01" slot="0x00" function="0x0"/>
</source>
<address type="pci" domain="0x0000" bus="0x04" slot="0x00" function="0x0"/>
<address type="pci" domain="0x0000" bus="0x03" slot="0x00" function="0x0"/>
</hostdev>
<hostdev mode="subsystem" type="pci" managed="yes">
<source>
<address domain="0x0000" bus="0x10" slot="0x00" function="0x1"/>
<address domain="0x0000" bus="0x01" slot="0x00" function="0x1"/>
</source>
<address type="pci" domain="0x0000" bus="0x05" slot="0x00" function="0x0"/>
<address type="pci" domain="0x0000" bus="0x04" slot="0x00" function="0x0"/>
</hostdev>
<memballoon model="none"/>
</devices>

8
modules/amd.nix Normal file
View file

@ -0,0 +1,8 @@
{ pkgs, ... }:
{
boot.initrd.kernelModules = [ "amdgpu" ];
hardware.opengl = {
driSupport = true;
driSupport32Bit = true;
};
}

2
modules/packages.nix
View file

@ -12,7 +12,6 @@
gimp #edit stuff
qbittorrent #steal stuff
discord # talk to people (gross)
spotify-tray # tray icons are nice
feh #for wallpaper
xfce.mousepad
brightnessctl #brightness control for laptop
@ -30,6 +29,7 @@
pcmanfm #file manager
haskellPackages.squeeze #file compression
nix-tree #view packages
docker
];
}

12
modules/vfio.nix
View file

@ -33,15 +33,15 @@
if [ "$GUEST_NAME" == "Windows" ]; then
if [ "$OPERATION" == "start" ]; then
systemctl set-property --runtime -- user.slice AllowedCPUs=0,1,2,6,7,8
systemctl set-property --runtime -- system.slice AllowedCPUs=0,1,2,6,7,8
systemctl set-property --runtime -- init.scope AllowedCPUs=0,1,2,6,7,8
systemctl set-property --runtime -- user.slice AllowedCPUs=0-7,16-23
systemctl set-property --runtime -- system.slice AllowedCPUs=0-7,16-23
systemctl set-property --runtime -- init.scope AllowedCPUs=0-7,16-23
fi
if [ "$OPERATION" == "stopped" ]; then
systemctl set-property --runtime -- user.slice AllowedCPUs=0-11
systemctl set-property --runtime -- system.slice AllowedCPUs=0-11
systemctl set-property --runtime -- init.scope AllowedCPUs=0-11
systemctl set-property --runtime -- user.slice AllowedCPUs=0-31
systemctl set-property --runtime -- system.slice AllowedCPUs=0-31
systemctl set-property --runtime -- init.scope AllowedCPUs=0-31
fi
fi
'';

2
modules/xserver.nix
View file

@ -5,7 +5,7 @@
videoDrivers =
if (config.networking.hostName == "gerg-laptop")
then ["modesetting" "nvidia"]
else [ "nvidia" ];
else [ "amdgpu" ];
layout = "us";
libinput.enable = true;
xautolock.enable = false;

24
pkgs/parrot/default.nix
View file

@ -1,26 +1,34 @@
{ lib
, rustPlatform
, fetchFromGitHub
, yt-dlp
, pkg-config
, openssl
, cmake
}:
rustPlatform.buildRustPackage rec {
pname = "parrot";
version= "v1.4.2";
version= "1.4.2";
# buildFeatures = ["let_else"];
src = fetchFromGitHub {
owner = aquelemiguel;
repo = parrot;
owner = "aquelemiguel";
repo = "parrot";
rev = "28d7db3c5b50c7ba01eec71a3177875feae44bcc";
sha256 = "";
sha256 = "sha256-G9SfaiR/KIt+Xm7vLs/EGaImZeSaUbpgAArfK6oVJeM=";
};
buildInputs = [
yt-dlp
openssl
];
nativeBuildInputs = [
pkg-config
cmake
];
cargoSha256 = "";
cargoSha256 = "sha256-ScwyPTq9da0hst/b2FX89SP03OX3HrJT3oUKGsHEjgs=";
RUSTC_BOOTSTRAP = 1;
meta = with lib; {
homepage = "https://github.com/aquelemiguel/parrot";

6
systems/desktop.nix
View file

@ -3,9 +3,9 @@
#important stuff first
imports =
[
../modules/boot.nix
../modules/amd.nix
../modules/packages.nix
../modules/nvidia.nix
../modules/boot.nix
../modules/fonts.nix
../modules/scripts.nix
../modules/vfio.nix
@ -47,6 +47,8 @@
fsType = "vfat";
};
};
virtualisation.docker.enable = true;
#mining stuff
systemd.services.mining = {
enable = false;
path = with pkgs; [t-rex-miner afk-cmds st zsh dbus xmrig];