diff --git a/flake.lock b/flake.lock
index 4a6c63d..02692a1 100644
--- a/flake.lock
+++ b/flake.lock
@@ -7,32 +7,31 @@
         ]
       },
       "locked": {
-        "lastModified": 1758463745,
-        "narHash": "sha256-uhzsV0Q0I9j2y/rfweWeGif5AWe0MGrgZ/3TjpDYdGA=",
+        "lastModified": 1762041416,
+        "narHash": "sha256-rmJKABRXnhFjjI6RB/MnEvLTQa569zu684Th9y6UlOI=",
         "owner": "nix-community",
         "repo": "home-manager",
-        "rev": "3b955f5f0a942f9f60cdc9cacb7844335d0f21c3",
+        "rev": "c0016dd14773f4ca0b467b74c7cdcc501570df4b",
         "type": "github"
       },
       "original": {
         "owner": "nix-community",
-        "ref": "release-25.05",
         "repo": "home-manager",
         "type": "github"
       }
     },
     "nixpkgs": {
       "locked": {
-        "lastModified": 1760139962,
-        "narHash": "sha256-4xggC56Rub3WInz5eD7EZWXuLXpNvJiUPahGtMkwtuc=",
+        "lastModified": 1761907660,
+        "narHash": "sha256-kJ8lIZsiPOmbkJypG+B5sReDXSD1KGu2VEPNqhRa/ew=",
         "owner": "NixOS",
         "repo": "nixpkgs",
-        "rev": "7e297ddff44a3cc93673bb38d0374df8d0ad73e4",
+        "rev": "2fb006b87f04c4d3bdf08cfdbc7fab9c13d94a15",
         "type": "github"
       },
       "original": {
         "owner": "NixOS",
-        "ref": "nixos-25.05",
+        "ref": "nixos-unstable",
         "repo": "nixpkgs",
         "type": "github"
       }
diff --git a/flake.nix b/flake.nix
index 00a43f0..a85af8b 100644
--- a/flake.nix
+++ b/flake.nix
@@ -2,10 +2,10 @@
   description = "NixOS + Home Manager config";
 
   inputs = {
-    nixpkgs.url = "github:NixOS/nixpkgs/nixos-25.05";
+    nixpkgs.url = "github:NixOS/nixpkgs/nixos-unstable";
 
     home-manager = {
-      url = "github:nix-community/home-manager/release-25.05";
+      url = "github:nix-community/home-manager";
       inputs.nixpkgs.follows = "nixpkgs";
     };
 
@@ -13,6 +13,7 @@
 
   outputs = inputs@{ self, nixpkgs, home-manager, ... }: {
 
+
     nixosConfigurations = {
       segfault-machine = nixpkgs.lib.nixosSystem {
         system = "x86_64-linux";
@@ -26,7 +27,7 @@
             home-manager.useUserPackages = true;
 
             home-manager.users.lukas.imports = [
-              ./home/lukas/default.nix
+              ./home/lukas/laptop/default.nix
             ];
 
             home-manager.extraSpecialArgs = { inherit inputs; };
@@ -34,6 +35,27 @@
           }
         ];
       };
+
+      segfault-tower = nixpkgs.lib.nixosSystem {
+        system = "x86_64-linux";
+        specialArgs = { inherit inputs; };
+        modules = [
+          ./hosts/segfault-tower/configuration.nix
+
+          home-manager.nixosModules.home-manager {
+            home-manager.backupFileExtension = "backup";
+            home-manager.useGlobalPkgs = true;
+            home-manager.useUserPackages = true;
+
+            home-manager.users.lukas.imports = [
+              ./home/lukas/tower/default.nix
+            ];
+
+            home-manager.extraSpecialArgs = { inherit inputs; };
+          }
+        ];
+      };
+
     };
   };
 }
diff --git a/home/lukas/catppuccin.nix b/home/lukas/catppuccin.nix
deleted file mode 100644
index 250f692..0000000
--- a/home/lukas/catppuccin.nix
+++ /dev/null
@@ -1,20 +0,0 @@
-{ inputs, ... }:
-{
-  imports = [ inputs.catppuccin.homeModules.catppuccin ];
-
-  catppuccin = {
-    accent = "mauve";
-    flavor = "mocha";
-    enable = true;
-
-    cursors = {
-      enable = true;
-      flavor = "mocha";
-      accent = "mauve";
-    };
-
-    waybar.enable = false;
-    rofi.enable = false;
-  };
-
-}
diff --git a/home/lukas/alacritty.nix b/home/lukas/common/alacritty.nix
similarity index 100%
rename from home/lukas/alacritty.nix
rename to home/lukas/common/alacritty.nix
diff --git a/home/lukas/brave.nix b/home/lukas/common/brave.nix
similarity index 100%
rename from home/lukas/brave.nix
rename to home/lukas/common/brave.nix
diff --git a/home/lukas/direnv.nix b/home/lukas/common/direnv.nix
similarity index 100%
rename from home/lukas/direnv.nix
rename to home/lukas/common/direnv.nix
diff --git a/home/lukas/emacs.nix b/home/lukas/common/emacs.nix
similarity index 83%
rename from home/lukas/emacs.nix
rename to home/lukas/common/emacs.nix
index e9ff71e..0b62f6e 100644
--- a/home/lukas/emacs.nix
+++ b/home/lukas/common/emacs.nix
@@ -1,7 +1,7 @@
 { pkgs, ... }:
 
 let
-  grammars = pkgs.emacsPackages.treesit-grammars.with-all-grammars;
+  grammars = pkgs.emacs.pkgs.treesit-grammars.with-all-grammars;
 in
 {
   programs.emacs = {
diff --git a/home/lukas/git.nix b/home/lukas/common/git.nix
similarity index 83%
rename from home/lukas/git.nix
rename to home/lukas/common/git.nix
index 40a022b..2447e2e 100644
--- a/home/lukas/git.nix
+++ b/home/lukas/common/git.nix
@@ -5,9 +5,13 @@ in {
 
   programs.git = {
     enable = true;
-    userName  = "Lukas";
-    userEmail = "mail@lukas.contact";
-    extraConfig = {
+
+    settings = {
+      user = {
+        mail = "mail@lukas.contact";
+        name = "Lukas";
+      };
+
       commit.gpgsign = true;
       gpg.format = "ssh";
       gpg.ssh.allowedSignersFile = "~/.ssh/allowed_signers";
diff --git a/home/lukas/libreoffice.nix b/home/lukas/common/libreoffice.nix
similarity index 100%
rename from home/lukas/libreoffice.nix
rename to home/lukas/common/libreoffice.nix
diff --git a/home/lukas/p10k.zsh b/home/lukas/common/p10k.zsh
similarity index 100%
rename from home/lukas/p10k.zsh
rename to home/lukas/common/p10k.zsh
diff --git a/home/lukas/shell.nix b/home/lukas/common/shell.nix
similarity index 80%
rename from home/lukas/shell.nix
rename to home/lukas/common/shell.nix
index d0c5649..ca8dcfc 100644
--- a/home/lukas/shell.nix
+++ b/home/lukas/common/shell.nix
@@ -7,7 +7,7 @@
     syntaxHighlighting.enable = true;
     autosuggestion.enable = true;
 
-    initContent = "source /etc/nixos/home/lukas/p10k.zsh";
+    initContent = "source /etc/nixos/home/lukas/common/p10k.zsh";
     sessionVariables = {
       POWERLEVEL9K_DISABLE_CONFIGURATION_WIZARD = "true";
     };
@@ -28,13 +28,8 @@
       la = "eza --icons -a";                            # show all dot-files, short
       lt = "eza -T --icons --git-ignore --level=4";     # pretty tree, two levels deep
 
-      gs = "git status --short --branch";
-      gl = "git log --oneline --graph --decorate";
-
       cat  ="bat --style=plain --pager=cat";            # pretty ‘cat’
       less ="bat --style=plain --pager=less";           # pretty ‘less’
-
-      update = "sudo nixos-rebuild switch --flake /etc/nixos/#segfault-machine";
     };
 
   };
diff --git a/home/lukas/tmux.nix b/home/lukas/common/tmux.nix
similarity index 100%
rename from home/lukas/tmux.nix
rename to home/lukas/common/tmux.nix
diff --git a/home/lukas/xgd.nix b/home/lukas/common/xgd.nix
similarity index 96%
rename from home/lukas/xgd.nix
rename to home/lukas/common/xgd.nix
index a4d1bc6..36add83 100644
--- a/home/lukas/xgd.nix
+++ b/home/lukas/common/xgd.nix
@@ -1,5 +1,3 @@
-{ pkgs, ... }:
-
 {
   xdg.enable = true;
   xdg.mimeApps = {
diff --git a/home/lukas/default.nix b/home/lukas/default.nix
deleted file mode 100644
index a66f046..0000000
--- a/home/lukas/default.nix
+++ /dev/null
@@ -1,23 +0,0 @@
-{
-  imports = [
-    ./brave.nix
-    # ./catppuccin.nix
-    ./direnv.nix
-    ./emacs.nix
-    ./git.nix
-    ./packages.nix
-    ./shell.nix
-    ./alacritty.nix
-    ./tmux.nix
-    ./xgd.nix
-    ./hyprland.nix
-    ./waybar.nix
-    ./rofi.nix
-    ./libreoffice.nix
-  ];
-
-  home.username = "lukas";
-  home.homeDirectory = "/home/lukas";
-  home.stateVersion = "25.05";
-}
-
diff --git a/home/lukas/laptop/default.nix b/home/lukas/laptop/default.nix
new file mode 100644
index 0000000..8afb311
--- /dev/null
+++ b/home/lukas/laptop/default.nix
@@ -0,0 +1,22 @@
+{
+  imports = [
+    ../common/brave.nix
+    ../common/direnv.nix
+    ../common/emacs.nix
+    ../common/git.nix
+    ../common/shell.nix
+    ../common/alacritty.nix
+    ../common/tmux.nix
+    ../common/xgd.nix
+    ../common/libreoffice.nix
+    ./packages.nix
+    ./hyprland.nix
+    ./waybar.nix
+    ./rofi.nix
+  ];
+
+  home.username = "lukas";
+  home.homeDirectory = "/home/lukas";
+  home.stateVersion = "25.05";
+}
+
diff --git a/home/lukas/hyprland.nix b/home/lukas/laptop/hyprland.nix
similarity index 100%
rename from home/lukas/hyprland.nix
rename to home/lukas/laptop/hyprland.nix
diff --git a/home/lukas/packages.nix b/home/lukas/laptop/packages.nix
similarity index 100%
rename from home/lukas/packages.nix
rename to home/lukas/laptop/packages.nix
diff --git a/home/lukas/rofi.nix b/home/lukas/laptop/rofi.nix
similarity index 100%
rename from home/lukas/rofi.nix
rename to home/lukas/laptop/rofi.nix
diff --git a/home/lukas/waybar.nix b/home/lukas/laptop/waybar.nix
similarity index 100%
rename from home/lukas/waybar.nix
rename to home/lukas/laptop/waybar.nix
diff --git a/home/lukas/tower/default.nix b/home/lukas/tower/default.nix
new file mode 100644
index 0000000..1aa1036
--- /dev/null
+++ b/home/lukas/tower/default.nix
@@ -0,0 +1,20 @@
+{
+  imports = [
+    ./packages.nix
+    # ./ollama.nix
+    ../common/brave.nix
+    ../common/direnv.nix
+    ../common/emacs.nix
+    ../common/git.nix
+    ../common/shell.nix
+    ../common/alacritty.nix
+    ../common/tmux.nix
+    ../common/xgd.nix
+    ../common/libreoffice.nix
+  ];
+
+  home.username = "lukas";
+  home.homeDirectory = "/home/lukas";
+  home.stateVersion = "25.05";
+}
+
diff --git a/home/lukas/tower/ollama.nix b/home/lukas/tower/ollama.nix
new file mode 100644
index 0000000..f585010
--- /dev/null
+++ b/home/lukas/tower/ollama.nix
@@ -0,0 +1,8 @@
+{
+  services.ollama = {
+    enable = true;
+    acceleration = "cuda";
+    # Optional: preload models, see https://ollama.com/library
+    # loadModels = [ "qwen3:30b" "gpt-oss:20b" "deepseek-r1:32b" "gemma3:27b"];
+  };
+}
diff --git a/home/lukas/tower/packages.nix b/home/lukas/tower/packages.nix
new file mode 100644
index 0000000..5fbee14
--- /dev/null
+++ b/home/lukas/tower/packages.nix
@@ -0,0 +1,49 @@
+{ pkgs, ... }:
+
+{
+  fonts.fontconfig.enable = true;
+
+  home.packages = [
+    pkgs.thunderbird
+    pkgs.nextcloud-client
+    pkgs.keepassxc
+    pkgs.telegram-desktop
+    pkgs.element-desktop
+
+    pkgs.tree
+    pkgs.htop
+    pkgs.neovim
+    pkgs.wget
+    pkgs.unzip
+
+    pkgs.feather
+
+    pkgs.firefox
+
+    pkgs.ranger
+
+    pkgs.nerd-fonts.fira-code
+    pkgs.fira-code
+    pkgs.meslo-lgs-nf
+
+    pkgs.eza
+    pkgs.bat
+    pkgs.ripgrep
+
+    pkgs.seahorse
+
+    pkgs.binutils
+    pkgs.gcc
+
+    pkgs.scenebuilder
+
+    pkgs.nil
+
+    pkgs.zotero
+    pkgs.jabref
+
+    (pkgs.aspellWithDicts
+      (dicts: with dicts; [ de en en-computers ]))
+  ];
+}
+
diff --git a/hosts/segfault-tower/configuration.nix b/hosts/segfault-tower/configuration.nix
new file mode 100644
index 0000000..bd4f8f9
--- /dev/null
+++ b/hosts/segfault-tower/configuration.nix
@@ -0,0 +1,45 @@
+# Edit this configuration file to define what should be installed on
+# your system.  Help is available in the configuration.nix(5) man page
+# and in the NixOS manual (accessible by running ‘nixos-help’).
+
+{ pkgs, ... }:
+
+{
+  imports = [
+    ./hardware.nix
+    ../../users/lukas.nix
+    ../../modules/desktop/gnome.nix
+    ../../modules/input/katana.nix
+    ../../modules/networking/networkmanager.nix
+    ../../modules/networking/bluetooth.nix
+    ../../modules/system/locale.nix
+    ../../modules/system/suspend-and-hibernate.nix
+    ../../modules/system/nvidia.nix
+    ../../modules/system/audio.nix
+    ../../modules/system/printing.nix
+    ../../modules/system/docker.nix
+    ../../modules/system/gpg.nix
+    ../../modules/system/virtualbox.nix
+    ../../modules/system/mullvad.nix
+  ];
+
+  # Bootloader.
+  boot.loader.systemd-boot.enable = true;
+  boot.loader.efi.canTouchEfiVariables = true;
+
+  boot.kernelPackages = pkgs.linuxPackages_latest;
+
+  boot.initrd.luks.devices."luks-b10eb0c6-67b8-40b6-bba4-83d38267abad".device = "/dev/disk/by-uuid/b10eb0c6-67b8-40b6-bba4-83d38267abad";
+
+  boot.resumeDevice = "/dev/mapper/luks-b10eb0c6-67b8-40b6-bba4-83d38267abad";
+
+  hardware.enableAllFirmware = true;
+
+  networking.hostName = "segfault-tower";
+
+  nixpkgs.config.allowUnfree = true;
+
+  # Version festlegen
+  system.stateVersion = "25.11";
+  nix.settings.experimental-features = [ "nix-command" "flakes" ];
+}
diff --git a/hosts/segfault-tower/hardware.nix b/hosts/segfault-tower/hardware.nix
new file mode 100644
index 0000000..6df4200
--- /dev/null
+++ b/hosts/segfault-tower/hardware.nix
@@ -0,0 +1,38 @@
+# Do not modify this file!  It was generated by ‘nixos-generate-config’
+# and may be overwritten by future invocations.  Please make changes
+# to /etc/nixos/configuration.nix instead.
+{ config, lib, pkgs, modulesPath, ... }:
+
+{
+  imports =
+    [ (modulesPath + "/installer/scan/not-detected.nix")
+    ];
+
+  boot.initrd.availableKernelModules = [ "nvme" "xhci_pci" "ahci" "usbhid" "usb_storage" "sd_mod" ];
+  boot.initrd.kernelModules = [ ];
+  boot.kernelModules = [ "kvm-amd" ];
+  boot.extraModulePackages = [ ];
+
+  fileSystems."/" =
+    { device = "/dev/disk/by-uuid/70a079c3-a222-473d-ba56-2f9bc60de4b5";
+      fsType = "ext4";
+    };
+
+  boot.initrd.luks.devices."luks-947b9aa6-e5dc-4e1e-83a7-7a77a7fe84f5".device = "/dev/disk/by-uuid/947b9aa6-e5dc-4e1e-83a7-7a77a7fe84f5";
+
+  fileSystems."/boot" =
+    { device = "/dev/disk/by-uuid/E034-ADEC";
+      fsType = "vfat";
+      options = [ "fmask=0077" "dmask=0077" ];
+    };
+
+  swapDevices =
+    [ 
+      { device = "/dev/disk/by-uuid/9afed355-7650-43ae-9fae-1d6c1135f6ee"; }
+    ];
+
+  networking.useDHCP = lib.mkDefault true;
+
+  nixpkgs.hostPlatform = lib.mkDefault "x86_64-linux";
+  hardware.cpu.amd.updateMicrocode = lib.mkDefault config.hardware.enableRedistributableFirmware;
+}
diff --git a/modules/desktop/gnome.nix b/modules/desktop/gnome.nix
index d77cf31..58429c8 100644
--- a/modules/desktop/gnome.nix
+++ b/modules/desktop/gnome.nix
@@ -1,21 +1,13 @@
-{ config, pkgs, lib, ... }:
+{ config, pkgs, ... }:
 
 {
-  # --- GNOME on Wayland --------------------------------------------------
-  services.xserver.enable                      = true;
-  services.xserver.displayManager.gdm.enable   = true;
-  services.xserver.desktopManager.gnome.enable = true;
+  services.displayManager.gdm.enable = true;
+  services.desktopManager.gnome.enable = true;
 
-  # Electron/Chromium apps → Wayland
-  environment.sessionVariables.NIXOS_OZONE_WL  = "1";
-
-  # # --- dconf service & keyboard repeat ----------------------------------
-  # programs.dconf.enable = true;   # ← brings the `dconf` option into scope!
-
-  # dconf.settings = {
-  #   "org/gnome/desktop/peripherals/keyboard" = {
-  #     delay           = lib.gvariant.mkUint32 200; # ms before first repeat
-  #     repeat-interval = lib.gvariant.mkUint32 25;  # ms between repeats ≈40 cps
-  #   };
-  # };
+  # To disable installing GNOME's suite of applications
+  # and only be left with GNOME shell.
+  services.gnome.core-apps.enable = false;
+  services.gnome.core-developer-tools.enable = false;
+  services.gnome.games.enable = false;
+  environment.gnome.excludePackages = with pkgs; [ gnome-tour gnome-user-docs ];
 }
diff --git a/modules/system/locale.nix b/modules/system/locale.nix
index b51d0a8..91ea5d7 100644
--- a/modules/system/locale.nix
+++ b/modules/system/locale.nix
@@ -1,6 +1,13 @@
 { config, pkgs, ... }:
 
-{
+{ 
+  console = {
+    earlySetup = true;
+    useXkbConfig = true;
+  };
+
+  services.xserver.xkb.layout = "de";
+
   time.timeZone = "Europe/Berlin";
   i18n.defaultLocale = "de_DE.UTF-8";
   i18n.extraLocaleSettings = {
diff --git a/modules/system/nvidia.nix b/modules/system/nvidia.nix
new file mode 100644
index 0000000..969d86e
--- /dev/null
+++ b/modules/system/nvidia.nix
@@ -0,0 +1,31 @@
+{config, pkgs, ...}:
+{
+
+   nixpkgs.config.allowUnfree = true;
+
+   services.xserver.videoDrivers = ["nvidia"];
+   hardware.graphics = {
+     enable = true;
+     enable32Bit = true;
+   };
+
+   hardware.nvidia = {
+    modesetting.enable = true;
+
+    # Nvidia power management. Experimental, and can cause sleep/suspend to fail.
+    # Enable this if you have graphical corruption issues or application crashes after waking
+    # up from sleep. This fixes it by saving the entire VRAM memory to /tmp/ instead 
+    # of just the bare essentials.
+    powerManagement.enable = true;
+
+    # Fine-grained power management. Turns off GPU when not in use.
+    # Experimental and only works on modern Nvidia GPUs (Turing or newer).
+    # (requires offloading)
+    powerManagement.finegrained = false;
+
+    open = false;
+    nvidiaSettings = true;
+    package = config.boot.kernelPackages.nvidiaPackages.stable;
+  };
+
+}
diff --git a/modules/system/suspend-and-hibernate.nix b/modules/system/suspend-and-hibernate.nix
new file mode 100644
index 0000000..477aa90
--- /dev/null
+++ b/modules/system/suspend-and-hibernate.nix
@@ -0,0 +1,37 @@
+{ config, pkgs, ... }: let
+  hibernateEnvironment = {
+    HIBERNATE_SECONDS = "3600";
+    HIBERNATE_LOCK = "/var/run/autohibernate.lock";
+  };
+in {
+  systemd.services."awake-after-suspend-for-a-time" = {
+    description = "Sets up the suspend so that it'll wake for hibernation";
+    wantedBy = [ "suspend.target" ];
+    before = [ "systemd-suspend.service" ];
+    environment = hibernateEnvironment;
+    script = ''
+      curtime=$(date +%s)
+      echo "$curtime $1" >> /tmp/autohibernate.log
+      echo "$curtime" > $HIBERNATE_LOCK
+      ${pkgs.util-linux}/bin/rtcwake -m no -s $HIBERNATE_SECONDS
+    '';
+    serviceConfig.Type = "simple";
+  };
+  systemd.services."hibernate-after-recovery" = {
+    description = "Hibernates after a suspend recovery due to timeout";
+    wantedBy = [ "suspend.target" ];
+    after = [ "systemd-suspend.service" ];
+    environment = hibernateEnvironment;
+    script = ''
+      curtime=$(date +%s)
+      sustime=$(cat $HIBERNATE_LOCK)
+      rm $HIBERNATE_LOCK
+      if [ $(($curtime - $sustime)) -ge $HIBERNATE_SECONDS ] ; then
+        systemctl hibernate
+      else
+        ${pkgs.util-linux}/bin/rtcwake -m no -s 1
+      fi
+    '';
+    serviceConfig.Type = "simple";
+  };
+}