From c9a68e62c7f0b62c282b92a3eb23edfefe0a12ee Mon Sep 17 00:00:00 2001
From: dadada <dadada@dadada.li>
Date: Fri, 25 Sep 2020 16:25:31 +0200
Subject: [PATCH] Update :/

---
 modules/keyring.nix |  4 ++--
 modules/mako.nix    |  4 ++--
 modules/metis.nix   | 25 +++++++++++++++++--------
 modules/profile.nix |  1 -
 modules/zsh.nix     |  1 -
 5 files changed, 21 insertions(+), 14 deletions(-)

diff --git a/modules/keyring.nix b/modules/keyring.nix
index 9fdb46e..82aba74 100644
--- a/modules/keyring.nix
+++ b/modules/keyring.nix
@@ -1,7 +1,7 @@
 { config, ... }:
 {
   services.gnome-keyring = {
-    enable = true;
-    components = [ "pkcs11" "secrets" "ssh" ];
+    enable = false;
+    components = [ "pkcs11" "secrets" ];
   };
 }
diff --git a/modules/mako.nix b/modules/mako.nix
index 949fe40..eacc975 100644
--- a/modules/mako.nix
+++ b/modules/mako.nix
@@ -5,8 +5,8 @@
     anchor = "bottom-right";
     backgroundColor = colors.color8;
     borderColor = colors.color0;
-    defaultTimeout = -1;
-    font = "Source Code Pro 8";
+    #defaultTimeout = -1;
+    font = "Source Code Pro 10";
     format = ''<b>%a</b> %s\n%b'';
     height = 100;
     #groupBy = "app-name";
diff --git a/modules/metis.nix b/modules/metis.nix
index 8fee52a..83a4b31 100644
--- a/modules/metis.nix
+++ b/modules/metis.nix
@@ -1,8 +1,6 @@
 { config, pkgs, lib, ... }:
 let 
   userEnv = {
-    XDISPLAY=":0";
-    TERMINAL="xterm-256color";
     EDITOR = "vim";
     PAGER = "less";
     MAILDIR = "\$HOME/.var/mail";
@@ -10,10 +8,8 @@ let
     NOTMUCH_CONFIG = "\$HOME/.config/notmuch/config";
     #GDK_BACKEND= "x11";
     MOZ_ENABLE_WAYLAND= "1";
-    SSH_ASKPASS = "${pkgs.lxqt.lxqt-openssh-askpass}/bin/lxqt-openssh-askpass";
   };
   unstable = import <nixpkgs-unstable> {};
-
 in
 {
   imports = [
@@ -28,11 +24,11 @@ in
 
 
   home.packages = with pkgs; [
+    tcpdump
     sqlite
     clang
     gitAndTools.git-bug
     pypi2nix
-    libnotify
     aspellDicts.en
     aspellDicts.de
     aspellDicts.en-science
@@ -46,7 +42,6 @@ in
     slurp
     grim
     jq
-    lxqt.lxqt-openssh-askpass
     xdg_utils
     pwgen
     mkpasswd
@@ -90,7 +85,7 @@ in
     unzip
     anki
     bluez-tools
-    texlive-tubslatex
+    #texlive-tubslatex
     openssl
     audio-recorder
     qt5.qttools
@@ -108,14 +103,28 @@ in
     corefonts
     mpv
     firefox-bin
+    libvirt
+    qprint
+    apacheHttpd
+    netanim
+    ns-3
+    kitty
+    git-lfs
+    kcachegrind
+    wf-recorder
+    ffmpeg
   ] ++ (with unstable; [
+    wireshark
+    valgrind
+    gnuplot
     thunderbird-bin
+    keepassxc
     python38Packages.managesieve
     android-studio
     cachix
-    keepassxc
     signal-desktop
     minecraft
+    plantuml
   ]);
 
   services.syncthing = {
diff --git a/modules/profile.nix b/modules/profile.nix
index e8eb1eb..6d63e66 100644
--- a/modules/profile.nix
+++ b/modules/profile.nix
@@ -3,7 +3,6 @@
   programs.bash = {
     enable = true;
     profileExtra = ''
-        export TERM="xterm-256color"
         export EDITOR="vim"
         alias gst="git status"
         alias gco="git commit";
diff --git a/modules/zsh.nix b/modules/zsh.nix
index 1bcccf1..319cc0c 100644
--- a/modules/zsh.nix
+++ b/modules/zsh.nix
@@ -7,7 +7,6 @@
     enableCompletion = true;
     autocd = true;
     sessionVariables = {
-      TERM = "xterm-256color";
       EDITOR = "vim";
     };
     history = {