diff --git a/flake.nix b/flake.nix
index 2e579dc..a146bb0 100644
--- a/flake.nix
+++ b/flake.nix
@@ -2,7 +2,6 @@
   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-unstable";
     home-manager.url = "github:nix-community/home-manager";
     home-manager.inputs.nixpkgs.follows = "nixpkgs";
@@ -15,10 +14,10 @@
         specialArgs = { inherit inputs; };
         modules = [
           {
-             networking.hostName = "nova";
-           }
-          ./system/gnome.nix
+            networking.hostName = "nova";
+          }
           ./system
+          ./system/gnome.nix
           ./system/hardware-nova.nix
         ];
       };
@@ -32,12 +31,6 @@
             ];
             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/default.nix b/home/default.nix
index 3745e31..985407a 100644
--- a/home/default.nix
+++ b/home/default.nix
@@ -5,6 +5,12 @@
   home.homeDirectory = "/home/till";
   home.stateVersion = "22.11";
 
+  home.pointerCursor = {
+    name = "Adwaita";
+    package = pkgs.gnome.adwaita-icon-theme;
+    size = 32;
+  };
+
   nixpkgs = {
     config = {
       allowUnfree = true;
@@ -12,12 +18,6 @@
     };
   };
 
-  # xsession.pointerCursor = {
-  #   name = "Adwaita";
-  #   package = pkgs.gnome.adwaita-icon-theme;
-  #   size = 32;
-  # };
-
   programs.home-manager.enable = true;
 
   home.packages = with pkgs; [
@@ -45,12 +45,14 @@
     w3m
     openssl
     gnupg
+    urlscan
 
     # office
     vdirsyncer
     khal
     khard
     gnome.gnome-sound-recorder
+    zoom-us
 
     # publishing
     pandoc
@@ -58,8 +60,13 @@
     zotero
     zathura
 
+    # graphics
+    inkscape
+    gimp
+
     # web
     qutebrowser
+    nyxt
 
     # deveolopment
     nodejs
diff --git a/home/neomutt.nix b/home/neomutt.nix
index 954a095..0e93337 100644
--- a/home/neomutt.nix
+++ b/home/neomutt.nix
@@ -1,10 +1,28 @@
 { config, pkgs, ... }:
 
 {
+  accounts.email = {
+    accounts.ktiu = {
+      primary = true;
+      address = "till@ktiu.net";
+      realName = "Till Straube";
+      imap.host = "shorbut.ktiu.net";
+      smtp.host = "shorbut.ktiu.net";
+      userName = "till";
+      neomutt.enable = true;
+      passwordCommand = "echo 'hi'";
+    };
+  };
   programs.neomutt = {
     # extraConfig = builtins.readFile ./config.vim;
     enable = true;
     vimKeys = true;
+    binds = [
+      { key = "V"; action = "noop"; map = ["index" "pager"]; }
+    ];
+    macros = [
+      { key = "c"; action = "<enter-command>set signature=$my_signature<enter><mail>"; map = ["index" "pager"]; }
+    ];
     # xdg.configFile."nvim/autocommmands.vim".source = ./autocommands.vim;
     # xdg.configFile."nvim/ftplugin/markdown.vim".source = ./ftplugin/markdown.vim;
     # xdg.configFile."nvim/ftplugin/r.vim".source = ./ftplugin/r.vim;
diff --git a/system/default.nix b/system/default.nix
index 010e2f4..160e604 100644
--- a/system/default.nix
+++ b/system/default.nix
@@ -30,6 +30,15 @@
     enable = true;
   };
 
+  sound.enable = false;
+  hardware.pulseaudio.enable = false;
+  services.pipewire = {
+    enable = true;
+    alsa.enable = true;
+    alsa.support32Bit = true;
+    pulse.enable = true;
+  };
+
   nixpkgs.config.allowUnfree = true;
   nixpkgs.config.joypixels.acceptLicense = true;
 
diff --git a/system/gnome.nix b/system/gnome.nix
index 12d1e94..9e2ee1a 100644
--- a/system/gnome.nix
+++ b/system/gnome.nix
@@ -5,7 +5,7 @@
    services.xserver.displayManager.gdm.enable = true;
    services.xserver.desktopManager.gnome.enable = true;
    services.gnome.gnome-browser-connector.enable = true;
-   nixpkgs.environment.extraPackages = [
+   environment.systemPackages = [
      pkgs.gnome.gnome-tweaks
    ];
 }