diff --git a/flake.lock b/flake.lock
index b9ffb5e..b253720 100644
--- a/flake.lock
+++ b/flake.lock
@@ -7,11 +7,11 @@
         ]
       },
       "locked": {
-        "lastModified": 1683762874,
-        "narHash": "sha256-EC7EDhzz/HjKppcaJFePlCOZqfVg8fooO/aWWUxwAJU=",
+        "lastModified": 1684157850,
+        "narHash": "sha256-xGHTCgvAxO5CgAL6IAgE/VGRX2wob2Y+DPyqpXJ32oQ=",
         "owner": "nix-community",
         "repo": "home-manager",
-        "rev": "010c26987729d6a2e0e19da6df7c3f0465ae03b3",
+        "rev": "c0deab0effd576e70343cb5df0c64428e0e0d010",
         "type": "github"
       },
       "original": {
@@ -22,16 +22,16 @@
     },
     "nixpkgs": {
       "locked": {
-        "lastModified": 1683627095,
-        "narHash": "sha256-8u9SejRpL2TrMuHBdhYh4FKc1OGPDLyWTpIbNTtoHsA=",
+        "lastModified": 1684139381,
+        "narHash": "sha256-YPLMeYE+UzxxP0qbkBzv3RBDvyGR5I4d7v2n8dI3+fY=",
         "owner": "NixOS",
         "repo": "nixpkgs",
-        "rev": "a08e061a4ee8329747d54ddf1566d34c55c895eb",
+        "rev": "17a689596b72d1906883484838eb1aaf51ab8001",
         "type": "github"
       },
       "original": {
         "owner": "NixOS",
-        "ref": "nixos-22.11",
+        "ref": "nixos-unstable",
         "repo": "nixpkgs",
         "type": "github"
       }
diff --git a/flake.nix b/flake.nix
index ae99685..9edefc3 100644
--- a/flake.nix
+++ b/flake.nix
@@ -2,7 +2,8 @@
   description = "First stab at a flake for my system config";
 
   inputs = {
-    nixpkgs.url = "github:NixOS/nixpkgs/nixos-22.11";
+    # nixpkgs.url = "github:NixOS/nixpkgs/nixos-22.11";
+    nixpkgs.url = "github:NixOS/nixpkgs/nixos-unstable";
     home-manager.url = "github:nix-community/home-manager";
     home-manager.inputs.nixpkgs.follows = "nixpkgs";
   };
diff --git a/home/default.nix b/home/default.nix
index b6b90eb..3745e31 100644
--- a/home/default.nix
+++ b/home/default.nix
@@ -21,33 +21,53 @@
   programs.home-manager.enable = true;
 
   home.packages = with pkgs; [
-    # texlive.combined.scheme-medium
+
+    # commandline
     exa
-    mattermost-desktop
     fzf
-    isync
-    jq
-    khal
-    khard
-    libsecret
     nnn
-    nodejs
-    notmuch
-    pandoc
-    qutebrowser
-    rstudio
-    ruby
+    jq
     silver-searcher
-    tdesktop
     tmux
     tree
-    vdirsyncer
-    keepassxc
-    zathura
-    zotero
-    openssl
-    w3m
+
+    # messenger
+    mattermost-desktop
+    signal-desktop
+    tdesktop
+    element-desktop
+    whatsapp-for-linux
+
+    # email
     msmtp
+    notmuch
+    isync
+    w3m
+    openssl
+    gnupg
+
+    # office
+    vdirsyncer
+    khal
+    khard
+    gnome.gnome-sound-recorder
+
+    # publishing
+    pandoc
+    libreoffice
+    zotero
+    zathura
+
+    # web
+    qutebrowser
+
+    # deveolopment
+    nodejs
+    ruby
+
+    # secrets
+    libsecret
+    keepassxc
   ];
 
   imports = [
@@ -56,6 +76,7 @@
     ./fish.nix
     ./neomutt.nix
     ./tex.nix
+    ./openconnect.nix
   ];
 
   home.shellAliases = {
diff --git a/home/openconnect.nix b/home/openconnect.nix
new file mode 100644
index 0000000..4d5500d
--- /dev/null
+++ b/home/openconnect.nix
@@ -0,0 +1,6 @@
+{ config, pkgs, ... }:
+
+{
+  home.packages = [ pkgs.openconnect ];
+  xdg.configFile."openconnect/config".text = "lol";
+}
diff --git a/home/tex.nix b/home/tex.nix
index 09fe814..c979013 100644
--- a/home/tex.nix
+++ b/home/tex.nix
@@ -2,8 +2,26 @@
 
 let
   tex = (pkgs.texlive.combine {
-    inherit (pkgs.texlive) scheme-medium
+    inherit (pkgs.texlive)
+      scheme-medium
+      arydshln
+      bbding
+      csquotes
+      environ
+      gensymb
+      lastpage
+      ly1
+      makecell
+      multirow
       sourcesanspro
+      tabu
+      tcolorbox
+      threeparttable
+      threeparttablex
+      was
+      wrapfig
+      xpatch
+      ;
   });
 in
 { # home-manager
diff --git a/system/default.nix b/system/default.nix
index 0611abd..1831cdf 100644
--- a/system/default.nix
+++ b/system/default.nix
@@ -29,6 +29,14 @@
   nixpkgs.config.allowUnfree = true;
   nixpkgs.config.joypixels.acceptLicense = true;
 
+  programs.gnupg.agent = {
+    enable = true;
+    pinentryFlavor = "curses";
+    # enableSSHSupport = true;
+  };
+
+  programs.fish.enable = true;
+
   environment.systemPackages = with pkgs; [
     neovim
     wget