diff --git a/flake.nix b/flake.nix
index c1e1922..ae99685 100644
--- a/flake.nix
+++ b/flake.nix
@@ -14,10 +14,12 @@
         specialArgs = { inherit inputs; };
         modules = [
           {
+             networking.hostName = "nova";
+             boot.plymouth.enable = true;
              services.xserver.enable = true;
              services.xserver.displayManager.gdm.enable = true;
              services.xserver.desktopManager.gnome.enable = true;
-             networking.hostName = "nova";
+             services.gnome.gnome-browser-connector.enable = true;
            }
           ./system
           ./system/hardware-nova.nix
@@ -27,12 +29,19 @@
         specialArgs = { inherit inputs; };
         modules = [
           {
-             environment.systemPackages = [
-               nixpkgs.wl-clipboard
-             ];
-             programs.sway.enable = true;
-             networking.hostName = "romulus";
-           }
+            networking.hostName = "romulus";
+            environment.systemPackages = [
+              nixpkgs.wl-clipboard
+            ];
+            programs.sway.enable = true;
+            security.rtkit.enable = true;
+            services.pipewire = {
+              enable = true;
+              alsa.enable = true;
+              alsa.support32Bit = true;
+              pulse.enable = true;
+            };
+          }
           ./system
           ./system/hardware-romulus.nix
         ];
diff --git a/home/R.nix b/home/R.nix
index 0e8dc64..22ba143 100644
--- a/home/R.nix
+++ b/home/R.nix
@@ -2,16 +2,69 @@
 
 {
   home.packages = with pkgs;
-  let 
+  let
     R-packed = rWrapper.override {
-      packages = with rPackages; [
+      packages = with rPackages; let
+        lectuR = pkgs.rPackages.buildRPackage {
+          name = "lectuR";
+          src = builtins.fetchGit {
+            url = "ssh://git@ktiu.net/home/git/lectuR/";
+            ref = "main";
+            rev = "41c477a734c238db53b9ed2fe1e8d28117ffe59e";
+          };
+          propagatedBuildInputs = [ purrr magrittr knitr kableExtra tidyr stringr yaml ];
+          nativeBuildInputs = [ purrr magrittr knitr kableExtra tidyr stringr yaml ];
+        };
+        publishR = pkgs.rPackages.buildRPackage {
+          name = "publishR";
+          src = builtins.fetchGit {
+            url = "ssh://git@ktiu.net/home/git/publishR/";
+            ref = "main";
+            rev = "49838c6ad30d3970c595dc7759edb414f9f0b540";
+          };
+          propagatedBuildInputs = [];
+          nativeBuildInputs = [];
+        };
+        goethR = pkgs.rPackages.buildRPackage {
+          name = "goethR";
+          src = builtins.fetchGit {
+            url = "ssh://git@ktiu.net/home/git/goethR/";
+            ref = "main";
+            rev = "f92cd29ec696a79810082cb894de195e4e83023c";
+          };
+          propagatedBuildInputs = [];
+          nativeBuildInputs = [];
+        };
+      in [
+        bookdown
         jsonlite
+        DAAG
+        extrafont
+        revealjs
+        ggplot2
+        dplyr
         rlist
         rvest
+        rmarkdown
+        knitr
+        rnaturalearth
+        rnaturalearthdata
+        qrcode
+        mapproj
         sf
         tidyverse
         tmap
         languageserver
+        purrr
+        magrittr
+        knitr
+        kableExtra
+        tidyr
+        stringr
+        yaml
+        lectuR
+        publishR
+        goethR
       ];
     };
   in [
diff --git a/home/default.nix b/home/default.nix
index 8ed9f8d..b6b90eb 100644
--- a/home/default.nix
+++ b/home/default.nix
@@ -12,25 +12,42 @@
     };
   };
 
+  # xsession.pointerCursor = {
+  #   name = "Adwaita";
+  #   package = pkgs.gnome.adwaita-icon-theme;
+  #   size = 32;
+  # };
+
   programs.home-manager.enable = true;
 
   home.packages = with pkgs; [
+    # texlive.combined.scheme-medium
     exa
-    firefox
+    mattermost-desktop
     fzf
+    isync
     jq
     khal
     khard
+    libsecret
+    nnn
     nodejs
+    notmuch
+    pandoc
     qutebrowser
     rstudio
     ruby
     silver-searcher
+    tdesktop
     tmux
     tree
     vdirsyncer
-    tdesktop
-    nnn
+    keepassxc
+    zathura
+    zotero
+    openssl
+    w3m
+    msmtp
   ];
 
   imports = [
@@ -38,6 +55,7 @@
     ./nvim
     ./fish.nix
     ./neomutt.nix
+    ./tex.nix
   ];
 
   home.shellAliases = {
@@ -46,6 +64,10 @@
     v = "nvim";
   };
 
+  programs.nix-index = {
+    enable = true;
+    enableFishIntegration = true;
+  };
 
   programs.git = { 
     enable = true;
diff --git a/home/fish.nix b/home/fish.nix
index b22cdcc..428975d 100644
--- a/home/fish.nix
+++ b/home/fish.nix
@@ -29,13 +29,16 @@
     };
     shellInit = ''
       function fish_greeting; end
+
       function startrloft --description 'Starts R with custom environment'
         set -lx R_ENVIRON_USER "~/.config/rloft/RLoft_environ"
-        r -q
+        R -q
       end
+
       function vd --wraps vim --description 'vim with date in filename'
         nvim (ymd)_$argv.md
       end
+
       function note --description 'Create a new note'
         nvim -c "call CreateNote('$argv')"
       end
diff --git a/home/nvim/default.nix b/home/nvim/default.nix
index 3fb3a54..ddc25f0 100644
--- a/home/nvim/default.nix
+++ b/home/nvim/default.nix
@@ -27,6 +27,7 @@
 
       cmp-nvim-lsp
       cmp-buffer
+      cmp-emoji
       cmp-path
       cmp-cmdline
       cmp-nvim-ultisnips
diff --git a/home/nvim/ftplugin/markdown.vim b/home/nvim/ftplugin/markdown.vim
index 44096b3..b33dbd1 100644
--- a/home/nvim/ftplugin/markdown.vim
+++ b/home/nvim/ftplugin/markdown.vim
@@ -6,7 +6,7 @@ setlocal breakat-=@
 set makeprg=Rscript\ -e\ 'publishR::render(\\"%\\")'
 
 " nnoremap <localleader>oh :! xdg-open %:r.html<cr>
-nnoremap <localleader>oh :! chromium-browser %:r.html<cr>
+nnoremap <localleader>oh :! xdg-open %:r.html<cr>
 nnoremap <localleader>op :! xdg-open %:r.pdf<cr>
 nnoremap <localleader>ow :! xdg-open %:r.docx<cr>
 
diff --git a/home/nvim/lsp.vim b/home/nvim/lsp.vim
index 603e38c..5d299fc 100644
--- a/home/nvim/lsp.vim
+++ b/home/nvim/lsp.vim
@@ -1,6 +1,5 @@
 lua <<EOF
   local cmp = require'cmp'
-
   cmp.setup({
     snippet = {
       expand = function(args)
@@ -20,22 +19,21 @@ lua <<EOF
     }),
     sources = cmp.config.sources({
       { name = 'nvim_lsp' },
-      { name = 'ultisnips' }, -- For ultisnips users.
+      { name = 'ultisnips' },
+      { name = 'emoji' },
     }, {
       { name = 'buffer' },
     })
   })
 
-  -- Set configuration for specific filetype.
   cmp.setup.filetype('gitcommit', {
     sources = cmp.config.sources({
-      { name = 'cmp_git' }, -- You can specify the `cmp_git` source if you were installed it.
+      { name = 'cmp_git' },
     }, {
       { name = 'buffer' },
     })
   })
 
-  -- Use buffer source for `/` and `?` (if you enabled `native_menu`, this won't work anymore).
   cmp.setup.cmdline({ '/', '?' }, {
     mapping = cmp.mapping.preset.cmdline(),
     sources = {
diff --git a/system/default.nix b/system/default.nix
index 3f46714..0611abd 100644
--- a/system/default.nix
+++ b/system/default.nix
@@ -15,11 +15,9 @@
 
   time.timeZone = "Europe/Berlin";
 
-  sound.enable = true;
-  hardware.pulseaudio.enable = true;
-
   users.users.till = {
     isNormalUser = true;
+    description = "Till";
     extraGroups = [
       "wheel"
       "networkmanager"
@@ -28,17 +26,20 @@
     shell = pkgs.fish;
   };
 
+  nixpkgs.config.allowUnfree = true;
+  nixpkgs.config.joypixels.acceptLicense = true;
+
   environment.systemPackages = with pkgs; [
     neovim
     wget
     git
+    firefox
     foot
-    wofi
-    pipewire
   ];
 
   fonts.fonts = with pkgs; [
     jetbrains-mono
+    joypixels
   ];
 
   services = {
@@ -47,6 +48,5 @@
     printing.enable = true;
   };
 
-
   system.stateVersion = "22.11";
 }
diff --git a/tex.nix b/tex.nix
new file mode 100644
index 0000000..09fe814
--- /dev/null
+++ b/tex.nix
@@ -0,0 +1,13 @@
+{ config, pkgs, ... }:
+
+let
+  tex = (pkgs.texlive.combine {
+    inherit (pkgs.texlive) scheme-medium
+      sourcesanspro
+  });
+in
+{ # home-manager
+  home.packages = with pkgs; [
+    tex
+  ];
+}
diff --git a/texput.log b/texput.log
new file mode 100644
index 0000000..92b9854
--- /dev/null
+++ b/texput.log
@@ -0,0 +1,9 @@
+This is TeX, Version 3.141592653 (TeX Live 2021/nixos.org) (preloaded format=tex 1980.1.1)  16 MAY 2023 14:34
+**sourcesanspro.sty
+
+! Emergency stop.
+<*> sourcesanspro.sty
+                     
+End of file on the terminal!
+
+No pages of output.