diff --git a/home-manager/config/discord/settings.json b/home-manager/config/discord/settings.json index 7bca743..8f9acae 100644 --- a/home-manager/config/discord/settings.json +++ b/home-manager/config/discord/settings.json @@ -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 } diff --git a/home-manager/spicetify.nix b/home-manager/spicetify.nix index b0743c0..846b3d0 100644 --- a/home-manager/spicetify.nix +++ b/home-manager/spicetify.nix @@ -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"; diff --git a/misc/Windows.xml b/misc/Windows.xml index 8933390..f8b7cd1 100644 --- a/misc/Windows.xml +++ b/misc/Windows.xml @@ -1,20 +1,30 @@ Windows - 60d8329e-8670-f8bb-4a7d-04d9f51eff76 + 035e02d8-04d3-05e5-4706-900700080009 16777216 16777216 - 6 + 16 - - - - - - - + + + + + + + + + + + + + + + + + - hvm + hvm /run/libvirt/nix-ovmf/OVMF_CODE.fd /var/lib/libvirt/qemu/nvram/Windows_VARS.fd @@ -46,7 +56,7 @@ - + @@ -177,20 +187,20 @@
-
+
-
+
-
+
-
+
diff --git a/modules/amd.nix b/modules/amd.nix new file mode 100644 index 0000000..9978706 --- /dev/null +++ b/modules/amd.nix @@ -0,0 +1,8 @@ +{ pkgs, ... }: +{ + boot.initrd.kernelModules = [ "amdgpu" ]; + hardware.opengl = { + driSupport = true; + driSupport32Bit = true; + }; +} diff --git a/modules/packages.nix b/modules/packages.nix index 663721c..56e232d 100644 --- a/modules/packages.nix +++ b/modules/packages.nix @@ -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 ]; } diff --git a/modules/vfio.nix b/modules/vfio.nix index 564970e..d696339 100644 --- a/modules/vfio.nix +++ b/modules/vfio.nix @@ -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 ''; diff --git a/modules/xserver.nix b/modules/xserver.nix index fdcf253..99b1f76 100644 --- a/modules/xserver.nix +++ b/modules/xserver.nix @@ -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; diff --git a/pkgs/parrot/default.nix b/pkgs/parrot/default.nix index b89ed2d..48aa443 100644 --- a/pkgs/parrot/default.nix +++ b/pkgs/parrot/default.nix @@ -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"; diff --git a/systems/desktop.nix b/systems/desktop.nix index b98b811..b34b98b 100644 --- a/systems/desktop.nix +++ b/systems/desktop.nix @@ -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];