diff --git a/flake.lock b/flake.lock
index a717329..4ed5a2c 100644
--- a/flake.lock
+++ b/flake.lock
@@ -1,5 +1,44 @@
 {
   "nodes": {
+    "antigravity-nix": {
+      "inputs": {
+        "flake-utils": "flake-utils",
+        "nixpkgs": [
+          "nixpkgs"
+        ]
+      },
+      "locked": {
+        "lastModified": 1770196631,
+        "narHash": "sha256-neRXwIILc8BUFHeT0UM2Mj8Wt1oo4UPpmm4NkfBwQOY=",
+        "owner": "jacopone",
+        "repo": "antigravity-nix",
+        "rev": "acc9baf089a67ef7456117ef31285e34c3294984",
+        "type": "github"
+      },
+      "original": {
+        "owner": "jacopone",
+        "repo": "antigravity-nix",
+        "type": "github"
+      }
+    },
+    "flake-utils": {
+      "inputs": {
+        "systems": "systems"
+      },
+      "locked": {
+        "lastModified": 1731533236,
+        "narHash": "sha256-l0KFg5HjrsfsO/JpG+r7fRrqm12kzFHyUHqHCVpMMbI=",
+        "owner": "numtide",
+        "repo": "flake-utils",
+        "rev": "11707dc2f618dd54ca8739b309ec4fc024de578b",
+        "type": "github"
+      },
+      "original": {
+        "owner": "numtide",
+        "repo": "flake-utils",
+        "type": "github"
+      }
+    },
     "home-manager": {
       "inputs": {
         "nixpkgs": [
@@ -7,11 +46,11 @@
         ]
       },
       "locked": {
-        "lastModified": 1766553861,
-        "narHash": "sha256-ZbnG01yA3O8Yr1vUm3+NQ2qk9iRhS5bloAnuXHHy7+c=",
+        "lastModified": 1769580047,
+        "narHash": "sha256-tNqCP/+2+peAXXQ2V8RwsBkenlfWMERb+Uy6xmevyhM=",
         "owner": "nix-community",
         "repo": "home-manager",
-        "rev": "0999ed8f965bbbd991437ad9c5ed3434cecbc30e",
+        "rev": "366d78c2856de6ab3411c15c1cb4fb4c2bf5c826",
         "type": "github"
       },
       "original": {
@@ -23,11 +62,11 @@
     },
     "nixpkgs": {
       "locked": {
-        "lastModified": 1766473571,
-        "narHash": "sha256-5G1NDO2PulBx1RoaA6U1YoUDX0qZslpPxv+n5GX6Qto=",
+        "lastModified": 1770056022,
+        "narHash": "sha256-yvCz+Qmci1bVucXEyac3TdoSPMtjqVJmVy5wro6j/70=",
         "owner": "NixOS",
         "repo": "nixpkgs",
-        "rev": "76701a179d3a98b07653e2b0409847499b2a07d3",
+        "rev": "d04d8548aed39902419f14a8537006426dc1e4fa",
         "type": "github"
       },
       "original": {
@@ -39,11 +78,11 @@
     },
     "nixpkgs-unstable": {
       "locked": {
-        "lastModified": 1766624085,
-        "narHash": "sha256-ruzNOGQR0HKynAarKRhAYwIZc79IkDqui4ovQmkZPQI=",
+        "lastModified": 1770073757,
+        "narHash": "sha256-Vy+G+F+3E/Tl+GMNgiHl9Pah2DgShmIUBJXmbiQPHbI=",
         "owner": "nixos",
         "repo": "nixpkgs",
-        "rev": "b72f284b1be41575c3e36cd777a191c29a7adf6a",
+        "rev": "47472570b1e607482890801aeaf29bfb749884f6",
         "type": "github"
       },
       "original": {
@@ -55,10 +94,26 @@
     },
     "root": {
       "inputs": {
+        "antigravity-nix": "antigravity-nix",
         "home-manager": "home-manager",
         "nixpkgs": "nixpkgs",
         "nixpkgs-unstable": "nixpkgs-unstable"
       }
+    },
+    "systems": {
+      "locked": {
+        "lastModified": 1681028828,
+        "narHash": "sha256-Vy1rq5AaRuLzOxct8nz4T6wlgyUR7zLU309k9mBC768=",
+        "owner": "nix-systems",
+        "repo": "default",
+        "rev": "da67096a3b9bf56a91d16901293e51ba5b49a27e",
+        "type": "github"
+      },
+      "original": {
+        "owner": "nix-systems",
+        "repo": "default",
+        "type": "github"
+      }
     }
   },
   "root": "root",
diff --git a/flake.nix b/flake.nix
index b82fc34..6d4ee9b 100644
--- a/flake.nix
+++ b/flake.nix
@@ -4,6 +4,10 @@
   inputs = {
     nixpkgs.url = "github:NixOS/nixpkgs/nixos-25.11";
     nixpkgs-unstable.url = "github:nixos/nixpkgs/nixpkgs-unstable";
+    antigravity-nix = {
+      url = "github:jacopone/antigravity-nix";
+      inputs.nixpkgs.follows = "nixpkgs";
+    };
 
     home-manager = {
       url = "github:nix-community/home-manager/release-25.11";
@@ -12,19 +16,28 @@
 
   };
 
-  outputs = inputs@{ self, nixpkgs, home-manager, ... }:
+  outputs =
+    inputs@{
+      self,
+      nixpkgs,
+      antigravity-nix,
+      home-manager,
+      ...
+    }:
     let
       system = "x86_64-linux";
       lib = nixpkgs.lib;
       pkgs-unstable = import inputs.nixpkgs-unstable {
         system = system;
         config.allowUnfree = true;
-        config.allowUnfreePredicate = pkg: builtins.elem (lib.getName pkg) [
-          "steam"
-          "steam-original"
-          "steam-unwrapped"
-          "steam-run"
-        ];
+        config.allowUnfreePredicate =
+          pkg:
+          builtins.elem (lib.getName pkg) [
+            "steam"
+            "steam-original"
+            "steam-unwrapped"
+            "steam-run"
+          ];
       };
     in
     {
@@ -37,19 +50,19 @@
           modules = [
             ./hosts/segfault-machine/configuration.nix
 
-            home-manager.nixosModules.home-manager {
+            home-manager.nixosModules.home-manager
+            {
               home-manager.backupFileExtension = "backup";
               home-manager.useGlobalPkgs = true;
               home-manager.useUserPackages = true;
 
-
-
               home-manager.users.lukas.imports = [
                 ./home/lukas/laptop/default.nix
               ];
 
-              home-manager.extraSpecialArgs = { inherit inputs; };
-
+              home-manager.extraSpecialArgs = {
+                inherit inputs antigravity-nix;
+              };
             }
           ];
         };
@@ -60,8 +73,7 @@
           modules = [
             ./hosts/segfault-tower/configuration.nix
 
-
-            home-manager.nixosModules.home-manager {
+            {
               home-manager.backupFileExtension = "backup";
               home-manager.useGlobalPkgs = true;
               home-manager.useUserPackages = true;
@@ -70,13 +82,13 @@
                 ./home/lukas/tower/default.nix
               ];
 
-              home-manager.extraSpecialArgs = { inherit inputs; };
+              home-manager.extraSpecialArgs = {
+                inherit inputs antigravity-nix;
+              };
             }
           ];
         };
 
       };
-  };
+    };
 }
-
-
diff --git a/home/lukas/laptop/default.nix b/home/lukas/laptop/default.nix
index 8afb311..2129558 100644
--- a/home/lukas/laptop/default.nix
+++ b/home/lukas/laptop/default.nix
@@ -1,5 +1,6 @@
 {
   imports = [
+    ./packages.nix
     ../common/brave.nix
     ../common/direnv.nix
     ../common/emacs.nix
@@ -9,10 +10,6 @@
     ../common/tmux.nix
     ../common/xgd.nix
     ../common/libreoffice.nix
-    ./packages.nix
-    ./hyprland.nix
-    ./waybar.nix
-    ./rofi.nix
   ];
 
   home.username = "lukas";
diff --git a/home/lukas/laptop/packages.nix b/home/lukas/laptop/packages.nix
index 81dc6ce..38da7e3 100644
--- a/home/lukas/laptop/packages.nix
+++ b/home/lukas/laptop/packages.nix
@@ -1,4 +1,4 @@
-{ pkgs, ... }:
+{ pkgs, antigravity-nix, ... }:
 
 {
   fonts.fontconfig.enable = true;
@@ -9,6 +9,7 @@
     pkgs.keepassxc
     pkgs.telegram-desktop
     pkgs.element-desktop
+    pkgs.tidal-hifi
 
     pkgs.tree
     pkgs.htop
@@ -17,12 +18,10 @@
     pkgs.unzip
 
     pkgs.feather
-    pkgs.electrum
 
     pkgs.firefox
 
     pkgs.zathura
-    pkgs.xfce.thunar
     pkgs.ranger
 
     pkgs.nerd-fonts.fira-code
@@ -38,25 +37,18 @@
     pkgs.binutils
     pkgs.gcc
 
-    pkgs.scenebuilder
+    # pkgs.scenebuilder
 
     pkgs.nil
 
     pkgs.quickemu
 
     pkgs.zotero
-    pkgs.jabref
 
     (pkgs.aspellWithDicts
       (dicts: with dicts; [ de en en-computers ]))
 
-    # stuff for the waybar
-    pkgs.nerd-fonts.jetbrains-mono
-    pkgs.brightnessctl
-    pkgs.bluez
-    pkgs.bluetui
-    pkgs.jq
-    pkgs.lm_sensors
+    antigravity-nix.packages.x86_64-linux.default
   ];
 }
 
diff --git a/hosts/segfault-machine/configuration.nix b/hosts/segfault-machine/configuration.nix
index d1cda11..813a847 100644
--- a/hosts/segfault-machine/configuration.nix
+++ b/hosts/segfault-machine/configuration.nix
@@ -3,8 +3,9 @@
   imports = [
     ./hardware.nix
     ../../users/lukas.nix
-    ../../modules/desktop/hyprland.nix
+    ../../modules/desktop/gnome.nix
     ../../modules/input/katana.nix
+    ../../modules/input/qmk.nix
     ../../modules/networking/networkmanager.nix
     ../../modules/networking/bluetooth.nix
     ../../modules/system/locale.nix