From 3df309ac37ebbd11037aab11f40b2a30248c9a10 Mon Sep 17 00:00:00 2001 From: Dmitriy Kholkin Date: Wed, 15 Sep 2021 15:29:51 +0300 Subject: [PATCH] add corectrl --- modules/applications-setup.nix | 4 +++- modules/applications/packages.nix | 26 ++++++++------------------ modules/security.nix | 1 + 3 files changed, 12 insertions(+), 19 deletions(-) diff --git a/modules/applications-setup.nix b/modules/applications-setup.nix index 460a295..16b282a 100644 --- a/modules/applications-setup.nix +++ b/modules/applications-setup.nix @@ -1,4 +1,4 @@ -{ config, pkgs, ... }: { +{ config, pkgs, lib, ... }: { defaultApplications = { fm = { cmd = "${pkgs.xfce4-14.thunar}/bin/thunar"; @@ -38,6 +38,8 @@ messenger.cmd "${pkgs.keepassxc}/bin/keepassxc --keyfile=/home/alukard/.passwords.key /home/alukard/nixos-config/misc/Passwords.kdbx" "${term.cmd} spt" + ] ++ lib.optionals (config.deviceSpecific.devInfo.gpu.vendor == "amd") [ + "${pkgs.corectrl}/bin/corectrl" ]; environment.sessionVariables = { diff --git a/modules/applications/packages.nix b/modules/applications/packages.nix index 6c163af..f22c819 100644 --- a/modules/applications/packages.nix +++ b/modules/applications/packages.nix @@ -1,19 +1,7 @@ { pkgs, config, lib, ... }: with config.deviceSpecific; { programs.adb.enable = true; - - # programs.java = { - # enable = true; - # package = if (config.device == "AMD-Workstation") then pkgs.jdk13 else pkgs.jre; - # }; - - # Install cdemu for some gaming purposes - # programs.cdemu = { - # enable = true; - # image-analyzer = false; - # gui = false; - # group = "cdrom"; - # }; + programs.corectrl.enable = lib.mkIf (devInfo.gpu.vendor == "amd") true; home-manager.users.alukard.home.packages = with pkgs; [ # cli @@ -58,6 +46,7 @@ with config.deviceSpecific; { # gdu micro ncdu + nix-tree nnn procs ranger @@ -68,14 +57,16 @@ with config.deviceSpecific; { blueman bookworm discord + easyeffects feh gnome.eog gparted keepassxc + persepolis pinta - easyeffects qbittorrent quodlibet + scrcpy spotifywm system-config-printer tdesktop @@ -84,6 +75,7 @@ with config.deviceSpecific; { xfce4-14.xfce4-taskmanager youtube-to-mpv zathura + zoom-us # misc # i3status-rust @@ -93,10 +85,8 @@ with config.deviceSpecific; { libreoffice ] ++ lib.optionals isGaming [ lutris - protontricks - # retroarch - # (steam.override { withJava = true; }) - # steam-run + mangohud + obs-studio wine winetricks ] ++ lib.optionals isLaptop [ diff --git a/modules/security.nix b/modules/security.nix index fb66a66..0542d4d 100644 --- a/modules/security.nix +++ b/modules/security.nix @@ -26,6 +26,7 @@ with config.deviceSpecific; { "scanner" "lp" "dialout" + "corectrl" ]; description = "Дмитрий Холкин"; uid = 1000;