diff --git a/common.nix b/common.nix
deleted file mode 100644
index ffe19f6..0000000
--- a/common.nix
+++ /dev/null
@@ -1,44 +0,0 @@
-{ config, pkgs, ... }:
-let
-  colors = import ./colors.nix;
-in {
-  imports = [
-    ./vim
-    ./tmux.nix
-    ./zsh.nix
-    (import ./termite.nix {
-      config = config;
-      pkgs = pkgs;
-      colors = colors;
-    })
-    ./gpg.nix
-    ./ssh.nix
-    ./git.nix
-    ./gtk.nix
-    ./xdg.nix
-    (import ./mako.nix {
-      config = config;
-      pkgs = pkgs;
-      colors = colors;
-    })
-  ];
-
-  systemd.user.services = {
-    auto-source-volume = {
-      Unit = {
-        Description = "Revert setting volume of microphone";
-        Documentation = [ "man(1)pacmd" ];
-        BindsTo = "pulseaudio.service";
-      };
-
-      Service = {
-        ExecStart = "/bin/sh %h/bin/auto-source-volume.sh";
-        Type = "simple";
-      };
-
-      Install = {
-        WantedBy = [ "default.target" ];
-      };
-    };
-  };
-}
diff --git a/colors.nix b/modules/colors.nix
similarity index 100%
rename from colors.nix
rename to modules/colors.nix
diff --git a/modules/common.nix b/modules/common.nix
new file mode 100644
index 0000000..9044010
--- /dev/null
+++ b/modules/common.nix
@@ -0,0 +1,26 @@
+{ config, pkgs, ... }:
+let
+  colors = import ./colors.nix;
+in {
+  imports = [
+    ./vim
+    ./tmux.nix
+    ./zsh.nix
+    (import ./termite.nix {
+      config = config;
+      pkgs = pkgs;
+      colors = colors;
+    })
+    ./gpg.nix
+    ./ssh.nix
+    ./git.nix
+    ./gtk.nix
+    ./xdg.nix
+    (import ./mako.nix {
+      config = config;
+      pkgs = pkgs;
+      colors = colors;
+    })
+    ./keyring.nix
+  ];
+}
diff --git a/fish.nix b/modules/fish.nix
similarity index 100%
rename from fish.nix
rename to modules/fish.nix
diff --git a/git.nix b/modules/git.nix
similarity index 100%
rename from git.nix
rename to modules/git.nix
diff --git a/gpg.nix b/modules/gpg.nix
similarity index 100%
rename from gpg.nix
rename to modules/gpg.nix
diff --git a/gtk.nix b/modules/gtk.nix
similarity index 80%
rename from gtk.nix
rename to modules/gtk.nix
index 1a102c4..6bd417a 100644
--- a/gtk.nix
+++ b/modules/gtk.nix
@@ -9,9 +9,6 @@
     font.package = pkgs.cantarell-fonts;
     font.name = "Cantarell";
   };
-  dconf.settings."org/gnome/desktop/interface" = {
-    enable-animations = false;
-  };
   qt = {
     enable = true;
     platformTheme = "gtk";
diff --git a/modules/keyring.nix b/modules/keyring.nix
new file mode 100644
index 0000000..9fdb46e
--- /dev/null
+++ b/modules/keyring.nix
@@ -0,0 +1,7 @@
+{ config, ... }:
+{
+  services.gnome-keyring = {
+    enable = true;
+    components = [ "pkcs11" "secrets" "ssh" ];
+  };
+}
diff --git a/mako.nix b/modules/mako.nix
similarity index 100%
rename from mako.nix
rename to modules/mako.nix
diff --git a/metis.nix b/modules/metis.nix
similarity index 87%
rename from metis.nix
rename to modules/metis.nix
index 53f0699..5f98d2e 100644
--- a/metis.nix
+++ b/modules/metis.nix
@@ -1,22 +1,23 @@
 { config, pkgs, lib, ... }:
 let 
   userEnv = {
+    XDISPLAY=":0";
     TERMINAL="xterm-256color";
     EDITOR = "vim";
     PAGER = "less";
     MAILDIR = "\$HOME/.var/mail";
     MBLAZE = "\$HOME/.config/mblaze";
     NOTMUCH_CONFIG = "\$HOME/.config/notmuch/config";
-    GDK_BACKEND= "x11";
+    #GDK_BACKEND= "x11";
     MOZ_ENABLE_WAYLAND= "1";
     SSH_ASKPASS = "${pkgs.lxqt.lxqt-openssh-askpass}/bin/lxqt-openssh-askpass";
   };
   unstable = import <nixpkgs-unstable> {};
+
 in
 {
   imports = [
     ./common.nix
-    ./private/metis
   ];
 
   # Let Home Manager install and manage itself.
@@ -25,7 +26,12 @@ in
   home.sessionVariables = userEnv;
   systemd.user.sessionVariables = userEnv;
 
+
   home.packages = with pkgs; [
+    sqlite
+    clang
+    gitAndTools.git-bug
+    pypi2nix
     libnotify
     aspellDicts.en
     aspellDicts.de
@@ -50,7 +56,6 @@ in
     nfs-utils
     lsof
     samba
-    firefox-bin
     chromium
     bc
     brightnessctl
@@ -64,10 +69,10 @@ in
     ldns
     libreoffice
     mblaze
-    mpv
     nmap
     pass
     pavucontrol
+    clang-tools
     pinentry
     playerctl
     i3blocks
@@ -77,8 +82,7 @@ in
     sshfs-fuse
     tdesktop
     #texlive.combined.scheme-full
-    thunderbird-bin
-    tor-browser-bundle-bin
+    #tor-browser-bundle-bin
     virtmanager
     whois
     youtube-dl
@@ -100,13 +104,20 @@ in
     bemenu
     xss-lock
     htop
+    gnome3.nautilus
+    gnome3.eog
+    imagemagick
+    corefonts
+    mpv
+    firefox-bin
   ] ++ (with unstable; [
+    thunderbird-bin
     python38Packages.managesieve
     android-studio
     cachix
     keepassxc
     signal-desktop
-    libguestfs
+    minecraft
   ]);
 
   services.syncthing = {
@@ -120,18 +131,6 @@ in
     lockCmd = "~/bin/lock-session";
   };
 
-  xdg = {
-    enable = true;
-    userDirs = {
-      download ="\$HOME/tmp";
-      music = "\$HOME/lib/music";
-      videos ="\$HOME/lib/videos";
-      pictures = "\$HOME/lib/pictures";
-      documents = "\$HOME/lib";
-      desktop = "$HOME/tmp";
-    };
-  };
-
   # This value determines the Home Manager release that your
   # configuration is compatible with. This helps avoid breakage
   # when a new Home Manager release introduces backwards
diff --git a/modules/profile.nix b/modules/profile.nix
new file mode 100644
index 0000000..e8eb1eb
--- /dev/null
+++ b/modules/profile.nix
@@ -0,0 +1,25 @@
+{ config, pkgs, lib, ... }:
+{
+  programs.bash = {
+    enable = true;
+    profileExtra = ''
+        export TERM="xterm-256color"
+        export EDITOR="vim"
+        alias gst="git status"
+        alias gco="git commit";
+        alias glo="git log";
+        alias gad="git add";
+        alias ls="exa";
+        alias ll="exa -l";
+        alias la="exa -la";
+        alias mv="mv -i";
+        alias cp="cp -i";
+    '';
+  };
+
+  home.packages = [
+    pkgs.exa
+    pkgs.fzf
+  ];
+
+}
diff --git a/ssh.nix b/modules/ssh.nix
similarity index 54%
rename from ssh.nix
rename to modules/ssh.nix
index 436c87f..10e5e15 100644
--- a/ssh.nix
+++ b/modules/ssh.nix
@@ -2,8 +2,5 @@
 {
   programs.ssh = {
     enable = true;
-    extraConfig = ''
-      AddKeysToAgent yes
-    '';
   };
 }
diff --git a/sway/config b/modules/sway/config
similarity index 98%
rename from sway/config
rename to modules/sway/config
index 7182496..33cc60c 100644
--- a/sway/config
+++ b/modules/sway/config
@@ -162,10 +162,10 @@ bindsym $mod+m mode "$mode_move"
 mode "$mode_move" {
 
 	# move focused container
-	bindsym h move left
-	bindsym j move down
-	bindsym k move up
-	bindsym l move right
+	bindsym h move left ;mode "default"
+	bindsym j move down ;mode "default"
+	bindsym k move up   ;mode "default"
+	bindsym l move right;mode "default"
 	bindsym 1 move container to workspace number $1     ;mode "default"
 	bindsym 2 move container to workspace number $2     ;mode "default"
 	bindsym 3 move container to workspace number $3     ;mode "default"
diff --git a/sway/default.nix b/modules/sway/default.nix
similarity index 100%
rename from sway/default.nix
rename to modules/sway/default.nix
diff --git a/sway/wallpaper b/modules/sway/wallpaper
similarity index 100%
rename from sway/wallpaper
rename to modules/sway/wallpaper
diff --git a/termite.nix b/modules/termite.nix
similarity index 100%
rename from termite.nix
rename to modules/termite.nix
diff --git a/tmux.nix b/modules/tmux.nix
similarity index 100%
rename from tmux.nix
rename to modules/tmux.nix
diff --git a/vim/default.nix b/modules/vim/default.nix
similarity index 96%
rename from vim/default.nix
rename to modules/vim/default.nix
index 5e5004c..911f889 100644
--- a/vim/default.nix
+++ b/modules/vim/default.nix
@@ -35,6 +35,7 @@ in
       #pkgs.vimPlugins.vim-gnupg
       #pkgs.vimPlugins.vim-l9
       pkgs.vimPlugins.vim-ledger
+      #pkgs.vimPlugins.clang_complete
     ];
   };
 }
diff --git a/modules/vim/plugins/myFtplugins/ftplugin/cpp.vim b/modules/vim/plugins/myFtplugins/ftplugin/cpp.vim
new file mode 100644
index 0000000..7cdc5a6
--- /dev/null
+++ b/modules/vim/plugins/myFtplugins/ftplugin/cpp.vim
@@ -0,0 +1,11 @@
+let b:ale_fixers = ['clang-format', 'remove_trailing_lines', 'trim_whitespace']
+let b:ale_linters = ['clangd']
+
+"setlocal tabstop=8 expandtab shiftwidth=2 smarttab
+" GNU Coding Standards
+setlocal cindent
+setlocal cinoptions=>4,n-2,{2,^-2,:2,=2,g0,h2,p5,t0,+2,(0,u0,w1,m1
+setlocal shiftwidth=2
+setlocal softtabstop=2
+setlocal textwidth=79
+setlocal fo-=ro fo+=cql
diff --git a/vim/plugins/myFtplugins/ftplugin/css.vim b/modules/vim/plugins/myFtplugins/ftplugin/css.vim
similarity index 100%
rename from vim/plugins/myFtplugins/ftplugin/css.vim
rename to modules/vim/plugins/myFtplugins/ftplugin/css.vim
diff --git a/vim/plugins/myFtplugins/ftplugin/fish.vim b/modules/vim/plugins/myFtplugins/ftplugin/fish.vim
similarity index 100%
rename from vim/plugins/myFtplugins/ftplugin/fish.vim
rename to modules/vim/plugins/myFtplugins/ftplugin/fish.vim
diff --git a/vim/plugins/myFtplugins/ftplugin/foo.kt b/modules/vim/plugins/myFtplugins/ftplugin/foo.kt
similarity index 100%
rename from vim/plugins/myFtplugins/ftplugin/foo.kt
rename to modules/vim/plugins/myFtplugins/ftplugin/foo.kt
diff --git a/vim/plugins/myFtplugins/ftplugin/html.vim b/modules/vim/plugins/myFtplugins/ftplugin/html.vim
similarity index 100%
rename from vim/plugins/myFtplugins/ftplugin/html.vim
rename to modules/vim/plugins/myFtplugins/ftplugin/html.vim
diff --git a/vim/plugins/myFtplugins/ftplugin/javascript.vim b/modules/vim/plugins/myFtplugins/ftplugin/javascript.vim
similarity index 100%
rename from vim/plugins/myFtplugins/ftplugin/javascript.vim
rename to modules/vim/plugins/myFtplugins/ftplugin/javascript.vim
diff --git a/vim/plugins/myFtplugins/ftplugin/kotlin.vim b/modules/vim/plugins/myFtplugins/ftplugin/kotlin.vim
similarity index 100%
rename from vim/plugins/myFtplugins/ftplugin/kotlin.vim
rename to modules/vim/plugins/myFtplugins/ftplugin/kotlin.vim
diff --git a/vim/plugins/myFtplugins/ftplugin/ledger.vim b/modules/vim/plugins/myFtplugins/ftplugin/ledger.vim
similarity index 100%
rename from vim/plugins/myFtplugins/ftplugin/ledger.vim
rename to modules/vim/plugins/myFtplugins/ftplugin/ledger.vim
diff --git a/vim/plugins/myFtplugins/ftplugin/nix.vim b/modules/vim/plugins/myFtplugins/ftplugin/nix.vim
similarity index 100%
rename from vim/plugins/myFtplugins/ftplugin/nix.vim
rename to modules/vim/plugins/myFtplugins/ftplugin/nix.vim
diff --git a/vim/plugins/myFtplugins/ftplugin/python.vim b/modules/vim/plugins/myFtplugins/ftplugin/python.vim
similarity index 100%
rename from vim/plugins/myFtplugins/ftplugin/python.vim
rename to modules/vim/plugins/myFtplugins/ftplugin/python.vim
diff --git a/vim/plugins/myFtplugins/ftplugin/rust.vim b/modules/vim/plugins/myFtplugins/ftplugin/rust.vim
similarity index 100%
rename from vim/plugins/myFtplugins/ftplugin/rust.vim
rename to modules/vim/plugins/myFtplugins/ftplugin/rust.vim
diff --git a/vim/plugins/myFtplugins/ftplugin/scss.vim b/modules/vim/plugins/myFtplugins/ftplugin/scss.vim
similarity index 100%
rename from vim/plugins/myFtplugins/ftplugin/scss.vim
rename to modules/vim/plugins/myFtplugins/ftplugin/scss.vim
diff --git a/vim/plugins/myFtplugins/ftplugin/typescript.vim b/modules/vim/plugins/myFtplugins/ftplugin/typescript.vim
similarity index 100%
rename from vim/plugins/myFtplugins/ftplugin/typescript.vim
rename to modules/vim/plugins/myFtplugins/ftplugin/typescript.vim
diff --git a/vim/plugins/myFtplugins/ftplugin/yaml.vim b/modules/vim/plugins/myFtplugins/ftplugin/yaml.vim
similarity index 100%
rename from vim/plugins/myFtplugins/ftplugin/yaml.vim
rename to modules/vim/plugins/myFtplugins/ftplugin/yaml.vim
diff --git a/vim/vimrc b/modules/vim/vimrc
similarity index 99%
rename from vim/vimrc
rename to modules/vim/vimrc
index 7848078..9d55fdc 100644
--- a/vim/vimrc
+++ b/modules/vim/vimrc
@@ -119,6 +119,8 @@ nmap <leader>?? :ALEHover<Enter>
 " This setting must be set before ALE is loaded.
 let g:ale_completion_enabled = 1
 
+let g:ale_fix_on_save = 1
+
 let g:ale_warn_about_trailing_whitespace = 1
 let g:ale_warn_about_trailing_lines = 1
 let g:ale_completion_tsserver_autoimport = 1
diff --git a/work.nix b/modules/work.nix
similarity index 100%
rename from work.nix
rename to modules/work.nix
diff --git a/xdg.nix b/modules/xdg.nix
similarity index 80%
rename from xdg.nix
rename to modules/xdg.nix
index 75b4698..34d1f9a 100644
--- a/xdg.nix
+++ b/modules/xdg.nix
@@ -21,10 +21,18 @@ in {
   xdg = {
     enable = true;
     mimeApps = {
-      enable = true;
+      enable = false;
       associations.added = apps;
       defaultApplications = apps;
     };
+    userDirs = {
+      download ="\$HOME/tmp";
+      music = "\$HOME/lib/music";
+      videos ="\$HOME/lib/videos";
+      pictures = "\$HOME/lib/pictures";
+      documents = "\$HOME/lib";
+      desktop = "$HOME/tmp";
+    };
   };
   home.packages = with pkgs; [
     firefox-bin
diff --git a/zsh.nix b/modules/zsh.nix
similarity index 86%
rename from zsh.nix
rename to modules/zsh.nix
index 6da7dfb..1bcccf1 100644
--- a/zsh.nix
+++ b/modules/zsh.nix
@@ -23,8 +23,12 @@
        source ~/.nix-profile/share/zsh-git-prompt/zshrc.sh
        source ~/.nix-profile/share/fzf/key-bindings.zsh
        source ~/.nix-profile/share/fzf/completion.zsh
-       PROMPT='%F{red}%?%f %F{green}%m%f:%F{blue}%~%f '
+
+       preexec() { echo -n -e "\033]0;$1\007" }
+
+       PROMPT="%F{red}%?%f %F{green}%m%f:%F{blue}%~%f "
        RPROMPT='$(git_super_status)'
+       #NIX_BUILD_SHELL="${pkgs.zsh}/bin/zsh"
     '';
     profileExtra = ''
       '';
diff --git a/nur-packages b/nur-packages
deleted file mode 160000
index b0e1f06..0000000
--- a/nur-packages
+++ /dev/null
@@ -1 +0,0 @@
-Subproject commit b0e1f068d07f5576d162b944f494fad542363422
diff --git a/overlays/dadada.nix b/overlays/dadada.nix
deleted file mode 120000
index 663bc1b..0000000
--- a/overlays/dadada.nix
+++ /dev/null
@@ -1 +0,0 @@
-../nur-packages/overlay.nix
\ No newline at end of file
diff --git a/overlays/texlive-tubslatex.nix b/overlays/texlive-tubslatex.nix
index 31e9235..ba8ff05 100644
--- a/overlays/texlive-tubslatex.nix
+++ b/overlays/texlive-tubslatex.nix
@@ -3,7 +3,7 @@ self: super:
   # Based on https://gist.github.com/clefru/9ed1186bf0b76d27e0ad20cbd9966b87
   texlive-tubslatex = super.lib.overrideDerivation (super.texlive.combine {
     inherit (super.texlive) scheme-full;
-    tubslatex.pkgs = [ super.tubslatex ];
+    tubslatex.pkgs = [ (super.callPackage ../pkgs/tubslatex.nix {}) ];
   }) (oldAttrs: {
     postBuild = ''
        # Save the udpmap.cfg because texlive.combine removes it.
@@ -14,10 +14,8 @@ self: super:
        cat $out/share/texmf/web2c/updmap.cfg.1 > $out/share/texmf/web2c/updmap.cfg
        rm $out/share/texmf/web2c/updmap.cfg.1
        perl `type -P mktexlsr.pl` $out/share/texmf
-
        yes | perl `type -P updmap.pl` --sys --syncwithtrees --force || true
        perl `type -P updmap.pl` --sys --enable Map=NexusProSerif.map --enable Map=NexusProSans.map
-
        # Regenerate .map files.
        perl `type -P updmap.pl` --sys
      '';
diff --git a/pkgs/tubslatex.nix b/pkgs/tubslatex.nix
new file mode 100644
index 0000000..0ad42f1
--- /dev/null
+++ b/pkgs/tubslatex.nix
@@ -0,0 +1,15 @@
+{ stdenv, fetchzip }:
+stdenv.mkDerivation rec {
+  src = fetchzip {
+    url = https://gitlab.ibr.cs.tu-bs.de/tubslatex/tubslatex/-/jobs/116760/artifacts/raw/builds/tubslatex.tds.zip;
+    sha256 = "0vvgwwkd8y7nk1lkda6zsnfnzmvgda1g59yawsknmw246y8nw8ln";
+    stripRoot = false;
+  };
+  installPhase = ''
+      mkdir -p $out
+      cp -r * $out/
+  '';
+  pname = "tubslatex";
+  name = pname;
+  tlType = "run";
+}
diff --git a/vim/plugins/myFtplugins/ftplugin/cpp.vim b/vim/plugins/myFtplugins/ftplugin/cpp.vim
deleted file mode 100644
index 50965d1..0000000
--- a/vim/plugins/myFtplugins/ftplugin/cpp.vim
+++ /dev/null
@@ -1 +0,0 @@
-let b:ale_fixers = ['clang-format', 'remove_trailing_lines', 'trim_whitespace']