some changes

modules/applications/packages.nix

@@ -10,79 +10,71 @@ with deviceSpecific; {
   };
 
   home-manager.users.alukard.home.packages = with pkgs; [
-    # Utils
+    # cli
+    advance-touch
     curl
+    exa
+    fd
+    git-crypt
+    lm_sensors
+    lnav
+    neofetch
+    nix-prefetch-git
+    nomino
+    (p7zip.override { enableUnfree = true; })
+    pciutils
+    pinfo
+    ripgrep
+    tealdeer
+    unzip
+    usbutils
+    wg-conf
     wget
     xclip
-    pciutils
-    usbutils
-    nix-prefetch-git
-
-    system-config-printer
-    gnome3.simple-scan
-    # vdpauinfo
-    # libva-utils
-    lm_sensors
-    gparted
-    neofetch
-    # bashmount
-    zip
-    unzip
-    (p7zip.override { enableUnfree = true; })
-    feh
-
-    # new tools
-    tealdeer
-    pinfo
-    ncdu
-    fd
-    ripgrep
-    lnav
-    advance-touch # python3 pip
-    exa
-    nomino # 'heavy' rust build
-    bpytop
-    nnn
-    micro
-    # cli
-    ranger
     youtube-dl
-    # wpgtk
+    zip
-    # pywal
+    gptfdisk
-    # python27Packages.pygtk # pywal GTK2 reload
-    # python2  # pywal GTK2 reload
-    # ncmpcpp
 
-    youtube-to-mpv
+    # tui
-    wg-conf
+    bpytop
-    (vivaldi.override { proprietaryCodecs = true; })
+    micro
+    ncdu
+    nnn
+    ranger
 
-    xfce4-14.thunar
+    # gui
-    xfce4-14.xfce4-taskmanager
+    discord
-    git-crypt
+    feh
+    gnome3.simple-scan
+    gparted
     keepassxc
+    pinta
+    pulseeffects
     qbittorrent
+    spotifywm
+    system-config-printer
+    tdesktop
+    (vivaldi.override { proprietaryCodecs = true; })
     vscode
     xarchiver
-    tdesktop
+    xfce4-14.thunar
-    spotifywm
+    xfce4-14.xfce4-taskmanager
-    discord
+    youtube-to-mpv
-    pulseeffects
+    zathura
-    # quodlibet
-    zathura # pdf
-    pinta
     # audacity # fixit
+    # quodlibet
   ] ++ lib.optionals (!isVM) [
-    libreoffice
     # rust-stable
-    # steam
+    libreoffice
-    # steam-run
+  ] ++ lib.optionals isGaming [
-    # protontricks
     # lutris
+    # protontricks
     # retroarch
+    steam-run
+    (steam.override { withJava = true; })
   ] ++ lib.optionals isLaptop [
-    # blueman
     # acpi
+    # blueman
   ] ++ lib.optionals (device == "AMD-Workstation") [
     # xonar-fp
   ];

modules/devices.nix

@@ -20,6 +20,7 @@ with types; {
       cpu = devInfo.cpu.vendor;
       video = devInfo.video;
       enableVirtualisation = devInfo.enableVirtualisation;
+      isGaming = devInfo.gaming;
     };
 
     devices = {
@@ -37,6 +38,7 @@ with types; {
         ram = 16;
         isShared = false;
         enableVirtualisation = true;
+        gaming = true;
       };
       Dell-Laptop = {
         cpu = {
@@ -52,6 +54,7 @@ with types; {
         ram = 16;
         isShared = false;
         enableVirtualisation = false;
+        gaming = true;
       };
       NixOS-VM = {
         cpu = {
@@ -67,6 +70,7 @@ with types; {
         ram = 4;
         isShared = false;
         enableVirtualisation = false;
+        gaming = false;
       };
     };
   };

modules/services.nix

@@ -1,7 +1,5 @@
 { config, lib, pkgs, ... }:
-let
+with config.deviceSpecific; {
-  device = config.devices.${config.device};
-in {
 
   services.acpid.enable = true;
 
@@ -51,13 +49,15 @@ in {
 
   services.upower.enable = true;
 
-  virtualisation.docker.enable = device.enableVirtualisation;
+  virtualisation.docker.enable = enableVirtualisation;
-  environment.systemPackages = lib.mkIf (device.enableVirtualisation) [ pkgs.docker-compose ];
+  environment.systemPackages = lib.mkIf (enableVirtualisation) [ pkgs.docker-compose ];
 
   virtualisation.libvirtd = {
-    enable = device.enableVirtualisation;
+    enable = enableVirtualisation;
   };
 
+  # virtualisation.anbox.enable = isGaming; # broken
+
   # virtualisation.virtualbox.host = {
   #   enable = device.enableVirtualisation;
   #   # enableHardening = false;

modules/users.nix

@@ -1,4 +1,5 @@
-{ config, pkgs, lib, ... }: {
+{ config, pkgs, lib, ... }:
+with config.deviceSpecific; {
 
   security.apparmor.enable = true;
   programs.firejail.enable = true;
@@ -30,11 +31,11 @@
   };
   security.sudo = {
     enable = true;
-    # extraConfig = ''
+    extraConfig = lib.mkIf isLaptop ''
-    #   alukard ALL = (root) NOPASSWD: /run/current-system/sw/bin/lock
+      alukard ALL = (root) NOPASSWD: /run/current-system/sw/bin/tlp-stat
-    #   alukard ALL = (root) NOPASSWD: /run/current-system/sw/bin/lock this
+      alukard ALL = (root) NOPASSWD: /run/current-system/sw/bin/tlp ac
-    #   alukard ALL = (root) NOPASSWD: /run/current-system/sw/bin/nixos-rebuild switch
+      alukard ALL = (root) NOPASSWD: /run/current-system/sw/bin/tlp bat
-    # '';
+    '';
   };
   # nix.requireSignedBinaryCaches = false;
   home-manager.useUserPackages = true;

modules/workspace/picom.nix

@@ -7,7 +7,7 @@
       inactiveOpacity = "0.95";
       opacityRule = [
         "100:class_i ?= 'vivaldi-stable'"
-        "100:class_i = 'mpv'"
+        "100:class_g = 'mpv'"
         "90:class_g = 'URxvt' && focused"
         "70:class_g = 'URxvt' && !focused"
       ];