diff --git a/home-manager/users/default.nix b/home-manager/users/default.nix
deleted file mode 100644
index 26dd6aa..0000000
--- a/home-manager/users/default.nix
+++ /dev/null
@@ -1,28 +0,0 @@
-{ lib, ... }:
-
-{
-  options.jalr = {
-    git = {
-      user = {
-        name = lib.mkOption {
-          type = lib.types.str;
-          description = "name to use for git commits";
-        };
-        email = lib.mkOption {
-          type = lib.types.str;
-          description = "email to use for git commits";
-        };
-      };
-      signByDefault = lib.mkEnableOption "GPG sign commits per default";
-    };
-    gpg.defaultKey = lib.mkOption {
-      type = lib.types.str;
-      description = "default gpg key id";
-    };
-    terminalEmulator = lib.mkOption {
-      type = lib.types.str;
-      description = "default Terminal emulator name";
-      default = "alacritty";
-    };
-  };
-}
diff --git a/hosts/aluminium/configuration.nix b/hosts/aluminium/configuration.nix
index 5201eee..40cb8ef 100644
--- a/hosts/aluminium/configuration.nix
+++ b/hosts/aluminium/configuration.nix
@@ -7,7 +7,7 @@ in
 {
   imports = [
     ./hardware-configuration.nix
-    ../../home-manager/users/jalr.nix
+    ../../users/jalr
     ./services
   ];
 
diff --git a/hosts/cadmium/configuration.nix b/hosts/cadmium/configuration.nix
index f7e6ca2..55d51ab 100644
--- a/hosts/cadmium/configuration.nix
+++ b/hosts/cadmium/configuration.nix
@@ -3,7 +3,7 @@
 {
   imports = [
     ./hardware-configuration.nix
-    ../../home-manager/users/jalr.nix
+    ../../users/jalr
   ];
 
   networking = {
diff --git a/hosts/copper/configuration.nix b/hosts/copper/configuration.nix
index cc92b67..7c6ca88 100644
--- a/hosts/copper/configuration.nix
+++ b/hosts/copper/configuration.nix
@@ -1,7 +1,7 @@
 {
   imports = [
     ./hardware-configuration.nix
-    ../../home-manager/users/jalr.nix
+    ../../users/jalr
   ];
 
   networking = {
diff --git a/hosts/iron/configuration.nix b/hosts/iron/configuration.nix
index df0793e..398fd7a 100644
--- a/hosts/iron/configuration.nix
+++ b/hosts/iron/configuration.nix
@@ -33,7 +33,7 @@ let
 in
 with lib; {
   imports = [
-    ../../home-manager/users/jalr.nix
+    ../../users/jalr
     ./services
   ];
   config = {
diff --git a/hosts/jalr-t520/configuration.nix b/hosts/jalr-t520/configuration.nix
index 6f604d0..9cd08a5 100644
--- a/hosts/jalr-t520/configuration.nix
+++ b/hosts/jalr-t520/configuration.nix
@@ -3,7 +3,7 @@
 {
   imports = [
     ./hardware-configuration.nix
-    ../../home-manager/users/jalr.nix
+    ../../users/jalr
   ];
 
   networking = {
diff --git a/hosts/magnesium/configuration.nix b/hosts/magnesium/configuration.nix
index 1bbbf96..0529035 100644
--- a/hosts/magnesium/configuration.nix
+++ b/hosts/magnesium/configuration.nix
@@ -3,7 +3,7 @@
 {
   imports = [
     ./hardware-configuration.nix
-    ../../home-manager/users/jalr.nix
+    ../../users/jalr
     ./services
   ];
 
diff --git a/hosts/tin/configuration.nix b/hosts/tin/configuration.nix
index f9be603..03af0d7 100644
--- a/hosts/tin/configuration.nix
+++ b/hosts/tin/configuration.nix
@@ -7,7 +7,7 @@
 {
   imports = [
     ./hardware-configuration.nix
-    ../../home-manager/users/jalr.nix
+    ../../users/jalr
   ];
 
   networking = {
diff --git a/hosts/weinturm-pretix-prod/configuration.nix b/hosts/weinturm-pretix-prod/configuration.nix
index b4c9ba8..ee34075 100644
--- a/hosts/weinturm-pretix-prod/configuration.nix
+++ b/hosts/weinturm-pretix-prod/configuration.nix
@@ -1,7 +1,7 @@
 { ... }: {
   imports = [
     ./hardware-configuration.nix
-    ../../home-manager/users/jalr.nix
+    ../../users/jalr
     ./services
   ];
 
diff --git a/home-manager/README.md b/users/README.md
similarity index 100%
rename from home-manager/README.md
rename to users/README.md
diff --git a/home-manager/users/jalr.nix b/users/jalr/default.nix
similarity index 93%
rename from home-manager/users/jalr.nix
rename to users/jalr/default.nix
index 71f15cc..180bb00 100644
--- a/home-manager/users/jalr.nix
+++ b/users/jalr/default.nix
@@ -1,21 +1,6 @@
 { config, pkgs, ... }:
 
 {
-  imports = [
-    ./default.nix
-  ];
-
-  jalr = {
-    git = {
-      user = {
-        name = "Jakob Lechner";
-        email = "mail@jalr.de";
-      };
-      signByDefault = true;
-    };
-    gpg.defaultKey = "3044E71E3DEFF49B586CF5809BF4FCCB90854DA9";
-  };
-
   users.users.jalr = {
     isNormalUser = true;
     extraGroups = [
@@ -41,7 +26,7 @@
     useUserPackages = true;
     useGlobalPkgs = true;
     users.jalr = { lib, pkgs, ... }: {
-      imports = [ ../modules ];
+      imports = [ ./modules ];
       config = {
         home.stateVersion = config.system.stateVersion;
 
diff --git a/home-manager/modules/3d-printing.nix b/users/jalr/modules/3d-printing.nix
similarity index 100%
rename from home-manager/modules/3d-printing.nix
rename to users/jalr/modules/3d-printing.nix
diff --git a/home-manager/modules/alacritty.nix b/users/jalr/modules/alacritty.nix
similarity index 100%
rename from home-manager/modules/alacritty.nix
rename to users/jalr/modules/alacritty.nix
diff --git a/home-manager/modules/aws.nix b/users/jalr/modules/aws.nix
similarity index 100%
rename from home-manager/modules/aws.nix
rename to users/jalr/modules/aws.nix
diff --git a/home-manager/modules/claws-mail.nix b/users/jalr/modules/claws-mail.nix
similarity index 100%
rename from home-manager/modules/claws-mail.nix
rename to users/jalr/modules/claws-mail.nix
diff --git a/home-manager/modules/cli.nix b/users/jalr/modules/cli.nix
similarity index 100%
rename from home-manager/modules/cli.nix
rename to users/jalr/modules/cli.nix
diff --git a/home-manager/modules/communication/default.nix b/users/jalr/modules/communication/default.nix
similarity index 100%
rename from home-manager/modules/communication/default.nix
rename to users/jalr/modules/communication/default.nix
diff --git a/home-manager/modules/communication/element-desktop.nix b/users/jalr/modules/communication/element-desktop.nix
similarity index 100%
rename from home-manager/modules/communication/element-desktop.nix
rename to users/jalr/modules/communication/element-desktop.nix
diff --git a/home-manager/modules/communication/mumble.nix b/users/jalr/modules/communication/mumble.nix
similarity index 100%
rename from home-manager/modules/communication/mumble.nix
rename to users/jalr/modules/communication/mumble.nix
diff --git a/home-manager/modules/communication/qtox.nix b/users/jalr/modules/communication/qtox.nix
similarity index 100%
rename from home-manager/modules/communication/qtox.nix
rename to users/jalr/modules/communication/qtox.nix
diff --git a/home-manager/modules/communication/telegram-desktop.nix b/users/jalr/modules/communication/telegram-desktop.nix
similarity index 100%
rename from home-manager/modules/communication/telegram-desktop.nix
rename to users/jalr/modules/communication/telegram-desktop.nix
diff --git a/home-manager/modules/default.nix b/users/jalr/modules/default.nix
similarity index 93%
rename from home-manager/modules/default.nix
rename to users/jalr/modules/default.nix
index 151eafc..04a40c0 100644
--- a/home-manager/modules/default.nix
+++ b/users/jalr/modules/default.nix
@@ -2,8 +2,8 @@
 
 {
   imports = [
-    ./${nixosConfig.jalr.terminalEmulator}.nix
     ./3d-printing.nix
+    ./alacritty.nix
     ./aws.nix
     ./claws-mail.nix
     ./cli.nix
diff --git a/home-manager/modules/direnv.nix b/users/jalr/modules/direnv.nix
similarity index 100%
rename from home-manager/modules/direnv.nix
rename to users/jalr/modules/direnv.nix
diff --git a/home-manager/modules/dynamic-colors.nix b/users/jalr/modules/dynamic-colors.nix
similarity index 100%
rename from home-manager/modules/dynamic-colors.nix
rename to users/jalr/modules/dynamic-colors.nix
diff --git a/home-manager/modules/firefox/default.nix b/users/jalr/modules/firefox/default.nix
similarity index 100%
rename from home-manager/modules/firefox/default.nix
rename to users/jalr/modules/firefox/default.nix
diff --git a/home-manager/modules/firefox/userChrome.css b/users/jalr/modules/firefox/userChrome.css
similarity index 100%
rename from home-manager/modules/firefox/userChrome.css
rename to users/jalr/modules/firefox/userChrome.css
diff --git a/home-manager/modules/fish.nix b/users/jalr/modules/fish.nix
similarity index 100%
rename from home-manager/modules/fish.nix
rename to users/jalr/modules/fish.nix
diff --git a/home-manager/modules/fpv.nix b/users/jalr/modules/fpv.nix
similarity index 100%
rename from home-manager/modules/fpv.nix
rename to users/jalr/modules/fpv.nix
diff --git a/home-manager/modules/git.nix b/users/jalr/modules/git.nix
similarity index 96%
rename from home-manager/modules/git.nix
rename to users/jalr/modules/git.nix
index 2bdf690..2ff8657 100644
--- a/home-manager/modules/git.nix
+++ b/users/jalr/modules/git.nix
@@ -4,11 +4,11 @@
   programs = {
     git = {
       enable = true;
-      userName = nixosConfig.jalr.git.user.name;
-      userEmail = nixosConfig.jalr.git.user.email;
+      userName = "Jakob Lechner";
+      userEmail = "mail@jalr.de";
       signing = {
-        key = nixosConfig.jalr.gpg.defaultKey;
-        signByDefault = nixosConfig.jalr.git.signByDefault;
+        key = "3044E71E3DEFF49B586CF5809BF4FCCB90854DA9";
+        signByDefault = false;
       };
       extraConfig = {
         init.defaultBranch = "main";
diff --git a/home-manager/modules/gnuradio.nix b/users/jalr/modules/gnuradio.nix
similarity index 100%
rename from home-manager/modules/gnuradio.nix
rename to users/jalr/modules/gnuradio.nix
diff --git a/home-manager/modules/graphics/default.nix b/users/jalr/modules/graphics/default.nix
similarity index 100%
rename from home-manager/modules/graphics/default.nix
rename to users/jalr/modules/graphics/default.nix
diff --git a/home-manager/modules/graphics/gimp.nix b/users/jalr/modules/graphics/gimp.nix
similarity index 100%
rename from home-manager/modules/graphics/gimp.nix
rename to users/jalr/modules/graphics/gimp.nix
diff --git a/home-manager/modules/graphics/inkscape.nix b/users/jalr/modules/graphics/inkscape.nix
similarity index 100%
rename from home-manager/modules/graphics/inkscape.nix
rename to users/jalr/modules/graphics/inkscape.nix
diff --git a/home-manager/modules/graphics/krita.nix b/users/jalr/modules/graphics/krita.nix
similarity index 100%
rename from home-manager/modules/graphics/krita.nix
rename to users/jalr/modules/graphics/krita.nix
diff --git a/home-manager/modules/gui.nix b/users/jalr/modules/gui.nix
similarity index 100%
rename from home-manager/modules/gui.nix
rename to users/jalr/modules/gui.nix
diff --git a/home-manager/modules/jameica.nix b/users/jalr/modules/jameica.nix
similarity index 100%
rename from home-manager/modules/jameica.nix
rename to users/jalr/modules/jameica.nix
diff --git a/home-manager/modules/kicad.nix b/users/jalr/modules/kicad.nix
similarity index 100%
rename from home-manager/modules/kicad.nix
rename to users/jalr/modules/kicad.nix
diff --git a/home-manager/modules/mpv.nix b/users/jalr/modules/mpv.nix
similarity index 100%
rename from home-manager/modules/mpv.nix
rename to users/jalr/modules/mpv.nix
diff --git a/home-manager/modules/mute-indicator.nix b/users/jalr/modules/mute-indicator.nix
similarity index 100%
rename from home-manager/modules/mute-indicator.nix
rename to users/jalr/modules/mute-indicator.nix
diff --git a/home-manager/modules/neo.nix b/users/jalr/modules/neo.nix
similarity index 100%
rename from home-manager/modules/neo.nix
rename to users/jalr/modules/neo.nix
diff --git a/home-manager/modules/neovim.nix b/users/jalr/modules/neovim.nix
similarity index 100%
rename from home-manager/modules/neovim.nix
rename to users/jalr/modules/neovim.nix
diff --git a/home-manager/modules/obs-studio/default.nix b/users/jalr/modules/obs-studio/default.nix
similarity index 100%
rename from home-manager/modules/obs-studio/default.nix
rename to users/jalr/modules/obs-studio/default.nix
diff --git a/home-manager/modules/openscad.nix b/users/jalr/modules/openscad.nix
similarity index 100%
rename from home-manager/modules/openscad.nix
rename to users/jalr/modules/openscad.nix
diff --git a/home-manager/modules/pass.nix b/users/jalr/modules/pass.nix
similarity index 100%
rename from home-manager/modules/pass.nix
rename to users/jalr/modules/pass.nix
diff --git a/home-manager/modules/pcmanfm.nix b/users/jalr/modules/pcmanfm.nix
similarity index 100%
rename from home-manager/modules/pcmanfm.nix
rename to users/jalr/modules/pcmanfm.nix
diff --git a/home-manager/modules/python.nix b/users/jalr/modules/python.nix
similarity index 100%
rename from home-manager/modules/python.nix
rename to users/jalr/modules/python.nix
diff --git a/home-manager/modules/remarkable/default.nix b/users/jalr/modules/remarkable/default.nix
similarity index 100%
rename from home-manager/modules/remarkable/default.nix
rename to users/jalr/modules/remarkable/default.nix
diff --git a/home-manager/modules/remarkable/restream.nix b/users/jalr/modules/remarkable/restream.nix
similarity index 100%
rename from home-manager/modules/remarkable/restream.nix
rename to users/jalr/modules/remarkable/restream.nix
diff --git a/home-manager/modules/remarkable/rmview.nix b/users/jalr/modules/remarkable/rmview.nix
similarity index 100%
rename from home-manager/modules/remarkable/rmview.nix
rename to users/jalr/modules/remarkable/rmview.nix
diff --git a/home-manager/modules/solarized.nix b/users/jalr/modules/solarized.nix
similarity index 100%
rename from home-manager/modules/solarized.nix
rename to users/jalr/modules/solarized.nix
diff --git a/home-manager/modules/sound/audacity.nix b/users/jalr/modules/sound/audacity.nix
similarity index 100%
rename from home-manager/modules/sound/audacity.nix
rename to users/jalr/modules/sound/audacity.nix
diff --git a/home-manager/modules/sound/default.nix b/users/jalr/modules/sound/default.nix
similarity index 100%
rename from home-manager/modules/sound/default.nix
rename to users/jalr/modules/sound/default.nix
diff --git a/home-manager/modules/sound/easyeffects.nix b/users/jalr/modules/sound/easyeffects.nix
similarity index 100%
rename from home-manager/modules/sound/easyeffects.nix
rename to users/jalr/modules/sound/easyeffects.nix
diff --git a/home-manager/modules/sound/pipewire.nix b/users/jalr/modules/sound/pipewire.nix
similarity index 100%
rename from home-manager/modules/sound/pipewire.nix
rename to users/jalr/modules/sound/pipewire.nix
diff --git a/home-manager/modules/sway/default.nix b/users/jalr/modules/sway/default.nix
similarity index 93%
rename from home-manager/modules/sway/default.nix
rename to users/jalr/modules/sway/default.nix
index 2d4be5b..c89db64 100644
--- a/home-manager/modules/sway/default.nix
+++ b/users/jalr/modules/sway/default.nix
@@ -3,22 +3,19 @@
 let
   solarized = import ../solarized.nix;
   terminalEmulator =
-    if nixosConfig.jalr.terminalEmulator == "alacritty"
-    then
-      pkgs.writeShellScript "alacritty-sway-cwd" ''
-        this_alacritty_pid="$(${pkgs.sway}/bin/swaymsg -t get_tree | ${pkgs.jq}/bin/jq -e 'recurse(.nodes[]?) | select((.focused==true) and (.app_id=="Alacritty")).pid')"
+    pkgs.writeShellScript "alacritty-sway-cwd" ''
+      this_alacritty_pid="$(${pkgs.sway}/bin/swaymsg -t get_tree | ${pkgs.jq}/bin/jq -e 'recurse(.nodes[]?) | select((.focused==true) and (.app_id=="Alacritty")).pid')"
 
-        if [ "$this_alacritty_pid" ]; then
-            child_pid="$(pgrep -P "$this_alacritty_pid")"
-            cwd="$(readlink /proc/$child_pid/cwd)"
-        fi
-        if [ -e "$cwd" ]; then
-            exec ${pkgs.alacritty}/bin/alacritty --working-directory "$cwd"
-        fi
+      if [ "$this_alacritty_pid" ]; then
+          child_pid="$(pgrep -P "$this_alacritty_pid")"
+          cwd="$(readlink /proc/$child_pid/cwd)"
+      fi
+      if [ -e "$cwd" ]; then
+          exec ${pkgs.alacritty}/bin/alacritty --working-directory "$cwd"
+      fi
 
-        exec ${pkgs.alacritty}/bin/alacritty
-      ''
-    else nixosConfig.jalr.terminalEmulator;
+      exec ${pkgs.alacritty}/bin/alacritty
+    '';
   cfg = config.wayland.windowManager.sway.config;
   wallpaper = pkgs.fetchurl {
     url = "https://raw.githubusercontent.com/swaywm/sway/3b2bc894a5ebbcbbd6707d45a25d171779c2e874/assets/Sway_Wallpaper_Blue_1920x1080.png";
@@ -113,16 +110,6 @@ in
 
       output."*".bg = "${wallpaper} fill";
 
-      # FIXME
-      #input = {
-      #  #"type:keyboard" = {
-      #  #  xkb_layout = "neo";
-      #  #};
-      #} // (lib.optionalAttrs (nixosConfig.networking.hostName == "mayushii") {
-      #  "type:touchpad".events = "disabled";
-      #  "2:10:TPPS/2_Elan_TrackPoint".pointer_accel = "-0.15";
-      #});
-
       keybindings = {
         "${cfg.modifier}+Return" = "exec ${cfg.terminal}";
         "${cfg.modifier}+Backspace" = "exec ${cfg.terminal}";
diff --git a/home-manager/modules/sway/gammastep.nix b/users/jalr/modules/sway/gammastep.nix
similarity index 100%
rename from home-manager/modules/sway/gammastep.nix
rename to users/jalr/modules/sway/gammastep.nix
diff --git a/home-manager/modules/sway/move-to-output/default.nix b/users/jalr/modules/sway/move-to-output/default.nix
similarity index 100%
rename from home-manager/modules/sway/move-to-output/default.nix
rename to users/jalr/modules/sway/move-to-output/default.nix
diff --git a/home-manager/modules/sway/waybar.nix b/users/jalr/modules/sway/waybar.nix
similarity index 100%
rename from home-manager/modules/sway/waybar.nix
rename to users/jalr/modules/sway/waybar.nix
diff --git a/home-manager/modules/sway/wofi-bluetooth.nix b/users/jalr/modules/sway/wofi-bluetooth.nix
similarity index 100%
rename from home-manager/modules/sway/wofi-bluetooth.nix
rename to users/jalr/modules/sway/wofi-bluetooth.nix
diff --git a/home-manager/modules/sway/wofi.nix b/users/jalr/modules/sway/wofi.nix
similarity index 100%
rename from home-manager/modules/sway/wofi.nix
rename to users/jalr/modules/sway/wofi.nix
diff --git a/home-manager/modules/sway/yubikey-touch-detector.nix b/users/jalr/modules/sway/yubikey-touch-detector.nix
similarity index 100%
rename from home-manager/modules/sway/yubikey-touch-detector.nix
rename to users/jalr/modules/sway/yubikey-touch-detector.nix
diff --git a/home-manager/modules/thunderbird.nix b/users/jalr/modules/thunderbird.nix
similarity index 100%
rename from home-manager/modules/thunderbird.nix
rename to users/jalr/modules/thunderbird.nix
diff --git a/home-manager/modules/tmux.nix b/users/jalr/modules/tmux.nix
similarity index 100%
rename from home-manager/modules/tmux.nix
rename to users/jalr/modules/tmux.nix
diff --git a/home-manager/modules/tor-browser.nix b/users/jalr/modules/tor-browser.nix
similarity index 100%
rename from home-manager/modules/tor-browser.nix
rename to users/jalr/modules/tor-browser.nix
diff --git a/home-manager/modules/vdirsyncer.nix b/users/jalr/modules/vdirsyncer.nix
similarity index 100%
rename from home-manager/modules/vdirsyncer.nix
rename to users/jalr/modules/vdirsyncer.nix