From f3bed529494e47d26b15ab34b616a6cc41eb3cdb Mon Sep 17 00:00:00 2001
From: Dmitriy Kholkin <alukard.develop@gmail.com>
Date: Wed, 17 Feb 2021 01:05:44 +0300
Subject: [PATCH] some fixes and refactoring

---
 modules/applications.nix          |  1 +
 modules/applications/packages.nix | 32 ++++++++-----
 modules/devices.nix               | 79 -------------------------------
 modules/overlay.nix               | 14 ------
 4 files changed, 20 insertions(+), 106 deletions(-)

diff --git a/modules/applications.nix b/modules/applications.nix
index eaf96a7..1e68eaa 100644
--- a/modules/applications.nix
+++ b/modules/applications.nix
@@ -95,6 +95,7 @@ with config.deviceSpecific;
             # "text/csv" = spreadsheet;
             # "application/vnd.oasis.opendocument.spreadsheet" = spreadsheet;
             "text/plain" = editor;
+            "inode/directory" = fm;
           };
     };
   };
diff --git a/modules/applications/packages.nix b/modules/applications/packages.nix
index c4c1f86..69f5533 100644
--- a/modules/applications/packages.nix
+++ b/modules/applications/packages.nix
@@ -2,10 +2,10 @@
 with config.deviceSpecific; {
   programs.adb.enable = true;
 
-  programs.java = {
-    enable = true;
-    package = if (config.device == "AMD-Workstation") then pkgs.jdk13 else pkgs.jre;
-  };
+  # programs.java = {
+  #   enable = true;
+  #   package = if (config.device == "AMD-Workstation") then pkgs.jdk13 else pkgs.jre;
+  # };
 
   # Install cdemu for some gaming purposes
   # programs.cdemu = {
@@ -21,16 +21,19 @@ with config.deviceSpecific; {
     curl
     ddgr
     exa
+    exfat-utils
     fd
     git-crypt
+    glib.bin # gio
+    gptfdisk
     lm_sensors
     lnav
     neofetch
     nix-prefetch-git
     nix-prefetch-github
     nomino
-    # (p7zip.override { enableUnfree = true; })
     p7zip
+    # (p7zip.override { enableUnfree = true; })
     pciutils
     pinfo
     ripgrep
@@ -42,7 +45,6 @@ with config.deviceSpecific; {
     xclip
     youtube-dl
     zip
-    gptfdisk
 
     # tui
     bpytop
@@ -53,6 +55,7 @@ with config.deviceSpecific; {
     spotify-tui
 
     # gui
+    # audacity # fixit
     discord
     feh
     gnome3.simple-scan
@@ -61,6 +64,7 @@ with config.deviceSpecific; {
     pinta
     pulseeffects-legacy
     qbittorrent
+    quodlibet
     spotifywm
     system-config-printer
     tdesktop
@@ -71,27 +75,29 @@ with config.deviceSpecific; {
     xfce4-14.xfce4-taskmanager
     youtube-to-mpv
     zathura
-    # audacity # fixit
-    # quodlibet
-    spicetify-cli
+
+    # misc
+    i3status-rust
+    papirus-icon-theme
   ] ++ lib.optionals (!isVM) [
     # rust-stable
     libreoffice
-    # Android dev
-    androidenv.androidPkgs_9_0.androidsdk
-    android-studio
-    # scrcpy
   ] ++ lib.optionals isGaming [
     # lutris
     # protontricks
     # retroarch
     steam-run
     (steam.override { withJava = true; })
+    multimc
   ] ++ lib.optionals isLaptop [
     # acpi
     # blueman
   ] ++ lib.optionals (config.device == "AMD-Workstation") [
     # xonar-fp
+    # Android dev
+    # androidenv.androidPkgs_9_0.androidsdk
+    # android-studio
+    # scrcpy
   ] ++ lib.optionals (enableVirtualisation) [
     virt-manager
   ];
diff --git a/modules/devices.nix b/modules/devices.nix
index ba3b828..f523e8c 100644
--- a/modules/devices.nix
+++ b/modules/devices.nix
@@ -59,82 +59,3 @@ with types; {
     };
   };
 }
-
-# { pkgs, lib, config, ... }:
-# with lib;
-# with types; {
-#   options = {
-#     device = mkOption { type = strMatching "[A-z|0-9]*-(Laptop|Workstation|VM)"; };
-#     devices = mkOption { type = attrs; };
-#     deviceSpecific = mkOption { type = attrs; };
-#   };
-#   config = {
-#     deviceSpecific = let
-#       device = config.device;
-#       devInfo = config.devices.${config.device};
-#     in rec {
-#       isLaptop = (!isNull (builtins.match ".*Laptop" device));
-#       isVM = (!isNull (builtins.match ".*VM" device));
-#       isHost = (device == "AMD-Workstation");
-#       isShared = devInfo.isShared;
-#       isSSD = devInfo.drive.type == "ssd";
-#       smallScreen = (device == "Dell-Laptop");
-#       cpu = devInfo.cpu.vendor;
-#       gpu = devInfo.gpu;
-#       ram = devInfo.ram;
-#       enableVirtualisation = devInfo.enableVirtualisation;
-#       isGaming = devInfo.gaming;
-#     };
-
-#     devices = {
-#       AMD-Workstation = {
-#         cpu = {
-#           vendor = "amd";
-#           clock = 3700;
-#           threads = 12;
-#         };
-#         drive = {
-#           type = "ssd";
-#           size = 250;
-#         };
-#         gpu = "amd";
-#         ram = 16;
-#         isShared = false;
-#         enableVirtualisation = true;
-#         gaming = true;
-#       };
-#       Dell-Laptop = {
-#         cpu = {
-#           vendor = "intel";
-#           clock = 1600;
-#           threads = 8;
-#         };
-#         drive = {
-#           type = "ssd";
-#           size = 250;
-#         };
-#         gpu = "intel";
-#         ram = 16;
-#         isShared = false;
-#         enableVirtualisation = true;
-#         gaming = true;
-#       };
-#       NixOS-VM = {
-#         cpu = {
-#           vendor = "amd";
-#           clock = 3700;
-#           threads = 4;
-#         };
-#         drive = {
-#           type = "ssd";
-#           size = 20;
-#         };
-#         gpu = "virtualbox";
-#         ram = 4;
-#         isShared = false;
-#         enableVirtualisation = false;
-#         gaming = false;
-#       };
-#     };
-#   };
-# }
diff --git a/modules/overlay.nix b/modules/overlay.nix
index f9844ac..263de1a 100644
--- a/modules/overlay.nix
+++ b/modules/overlay.nix
@@ -1,6 +1,5 @@
 { pkgs, config, lib, inputs, ... }:
 let
-  # mozilla_overlay = import inputs.nixpkgs-mozilla;
   system = "x86_64-linux";
   old = import inputs.nixpkgs-old ({
     config = config.nixpkgs.config;
@@ -33,25 +32,12 @@ in
         });
 
         # material-icons = pkgs.callPackage ./packages/material-icons-inline.nix { };
-        # rust-stable = pkgs.latest.rustChannels.stable.rust.override {
-        #   extensions = [
-        #     "rls-preview"
-        #     "clippy-preview"
-        #     "rustfmt-preview"
-        #   ];
-        # };
         # wpgtk = super.wpgtk.overrideAttrs (old: rec {
         # 	propagatedBuildInputs = with pkgs; [
         #     python2 python27Packages.pygtk
         #     python3Packages.pygobject3 python3Packages.pillow python3Packages.pywal
         #   ];
         # });
-        # spotifyd = super.spotifyd.override { withPulseAudio = true; };
-        # spotify-tui = naersk.buildPackage {
-        #   name = "spotify-tui";
-        #   src = pkgs.imports.spotify-tui;
-        #   buildInputs = [ pkgs.pkgconf pkgs.openssl ];
-        # };
       }
     )
   ];