From e4d52649134ded800f9d648af920cf152714df60 Mon Sep 17 00:00:00 2001
From: Dmitriy Kholkin <alukard.develop@gmail.com>
Date: Tue, 4 Aug 2020 01:51:37 +0400
Subject: [PATCH] changes

---
 modules/applications.nix          |  5 +++++
 modules/applications/packages.nix | 24 +++++++++++-------------
 modules/default.nix               |  2 +-
 modules/xserver.nix               |  7 ++++---
 4 files changed, 21 insertions(+), 17 deletions(-)
 mode change 100755 => 100644 modules/applications/packages.nix

diff --git a/modules/applications.nix b/modules/applications.nix
index 092363c..b850471 100644
--- a/modules/applications.nix
+++ b/modules/applications.nix
@@ -38,6 +38,10 @@ with import ../support.nix { inherit lib config; }; {
         cmd = "${pkgs.xarchiver}/bin/xarchiver";
         desktop = "xarchiver";
       };
+      pdf = {
+        cmd = "${pkgs.zathura}/bin/zathura";
+        desktop = "zathura";
+      };
       # archive = {
       #   cmd = "${pkgs.ark}/bin/ark";
       #   desktop = "org.kde.ark";
@@ -72,6 +76,7 @@ with import ../support.nix { inherit lib config; }; {
         "x-scheme-handler/about" = browser;
         "x-scheme-handler/unknown" = browser;
         # "x-scheme-handler/mailto" = mail;
+        "application/pdf" = pdf;
         # "application/pdf" = { desktop = "org.kde.okular"; };
         # "application/vnd.openxmlformats-officedocument.wordprocessingml.document" =
         # text_processor;
diff --git a/modules/applications/packages.nix b/modules/applications/packages.nix
old mode 100755
new mode 100644
index 2ab5c7d..3956759
--- a/modules/applications/packages.nix
+++ b/modules/applications/packages.nix
@@ -13,9 +13,9 @@ let
   };
 in {
   programs.adb.enable = true;
-  programs.java = lib.mkIf (device == "AMD-Workstation") {
+  programs.java = {
     enable = true;
-    package = pkgs.jre;
+    package = if (device == "AMD-Workstation") then pkgs.jdk13 else pkgs.jre;
   };
 
   environment.systemPackages = with pkgs; [
@@ -35,6 +35,7 @@ in {
     i3lock-fancy-rapid
 
     keepassxc
+    git-crypt
     # Samba support
     cifs-utils
     # Utils
@@ -49,23 +50,20 @@ in {
     tree
     iperf
 
+    # Other
     (youtube-to-mpv.override { isLaptop = isLaptop; })
     wg-conf
-    # Other
     (vivaldi.override { proprietaryCodecs = true; })
     wget
     gparted
     neofetch
     bashmount
-    p7zip
     zip
     ranger
     youtube-dl
-    speedcrunch
+    lua
     feh
-    setroot
     maim
-    mupdf
     ncmpcpp
 
     pywal
@@ -80,7 +78,7 @@ in {
     blueman
   ] ++ lib.optionals (!isVM) [
     libreoffice
-    rust-stable
+    # rust-stable
   ] ++ lib.optionals (device == "AMD-Workstation") [
     xonar-fp
   ];
@@ -92,15 +90,15 @@ in {
     tdesktop
     spotifywm
     spotify-tui
-    spicetify-cli
     discord
     pulseeffects
-    quodlibet
+    # quodlibet
+    zathura
   ] ++ lib.optionals (!isVM) [
-    steam
-    steam-run
+    # steam
+    # steam-run
     # protontricks
-    lutris
+    # lutris
     # retroarch
   ] ++ lib.optionals (enableVirtualisation) [
     docker-compose
diff --git a/modules/default.nix b/modules/default.nix
index 19e1bb5..dd02d23 100644
--- a/modules/default.nix
+++ b/modules/default.nix
@@ -32,7 +32,7 @@ device:
     ./workspace/mpv.nix
     ./workspace/pulseeffects
     ./workspace/rofi.nix
-    ./workspace/spotifyd.nix
+    # ./workspace/spotifyd.nix
     ./workspace/xresources.nix
     ./workspace/zsh.nix
   ];
diff --git a/modules/xserver.nix b/modules/xserver.nix
index 4dc4355..cde2c47 100644
--- a/modules/xserver.nix
+++ b/modules/xserver.nix
@@ -10,7 +10,7 @@ with deviceSpecific; with themes; {
     libinput = {
       enable = isLaptop;
       # sendEventsMode = "disabled-on-external-mouse";
-      # middleEmulation = false;
+      middleEmulation = true;
       accelProfile = lib.mkIf (!isLaptop) "flat";
       naturalScrolling = true;
     };
@@ -54,10 +54,11 @@ with deviceSpecific; with themes; {
       #       password-background-color = "${colors.bg}"
       #   '';
       # };
-      autoLogin.enable = !isShared;
-      autoLogin.user = "alukard";
     };
 
+    displayManager.autoLogin.enable = !isShared;
+    displayManager.autoLogin.user = "alukard";
+
     displayManager.defaultSession = "none+i3";
 
     desktopManager.xterm.enable = false;