diff --git a/home/lukas/common/packages.nix b/home/lukas/common/packages.nix
index 910302e..9623bbb 100644
--- a/home/lukas/common/packages.nix
+++ b/home/lukas/common/packages.nix
@@ -1,8 +1,67 @@
-{ codex-cli-nix, pkgs, pkgs-unstable, ... }:
+{
+  codex-cli-nix,
+  pkgs,
+  pkgs-unstable,
+  ...
+}:
 
 {
+  fonts.fontconfig.enable = true;
+
   home.packages = [
     pkgs-unstable.rtk
     codex-cli-nix.packages.${pkgs.system}.default
+
+    pkgs.thunderbird
+    pkgs.nextcloud-client
+    pkgs.keepassxc
+    pkgs.telegram-desktop
+    pkgs.element-desktop
+    pkgs.tidal-hifi
+    pkgs.signal-desktop
+
+    pkgs.tree
+    pkgs.htop
+    pkgs.neovim
+    pkgs.wget
+    pkgs.unzip
+
+    pkgs.feather
+
+    pkgs.firefox
+
+    pkgs.zathura
+    pkgs.ranger
+
+    pkgs.nerd-fonts.fira-code
+    pkgs.fira-code
+    pkgs.fira-code-symbols
+    pkgs.meslo-lgs-nf
+
+    pkgs.eza
+    pkgs.bat
+    pkgs.ripgrep
+    pkgs.duf
+    pkgs.dust
+    pkgs.bottom
+    pkgs.gping
+    pkgs.sqlitebrowser
+
+    pkgs.seahorse
+
+    pkgs.binutils
+    pkgs.gcc
+
+    pkgs.nil
+
+    pkgs.zotero
+
+    (pkgs.aspellWithDicts (
+      dicts: with dicts; [
+        de
+        en
+        en-computers
+      ]
+    ))
   ];
 }
diff --git a/home/lukas/common/shell.nix b/home/lukas/common/shell.nix
index 4a6e60d..ca73713 100644
--- a/home/lukas/common/shell.nix
+++ b/home/lukas/common/shell.nix
@@ -63,6 +63,19 @@
 
       cat = "bat --style=plain --pager=cat"; # pretty ‘cat’
       less = "bat --style=plain --pager=less"; # pretty ‘less’
+
+      gs = "git status";
+      gl = "git log --graph --abbrev-commit --decorate --format=format:'%C(bold blue)%h%C(reset) - %C(bold green)(%ar)%C(reset) %C(white)%s%C(reset) %C(dim white)- %an%C(reset)%C(auto)%d%C(reset)' --all";
+      gc = "git commit -m ";
+      gaa = "git add .";
+
+      ping = "gping";
+
+      du = "dust";
+      df = "duf";
+
+      top = "btm";
+
     };
 
   };
diff --git a/home/lukas/laptop/packages.nix b/home/lukas/laptop/packages.nix
index 51561f1..ce56871 100644
--- a/home/lukas/laptop/packages.nix
+++ b/home/lukas/laptop/packages.nix
@@ -1,53 +1,7 @@
 { pkgs, ... }:
 
 {
-  fonts.fontconfig.enable = true;
-
   home.packages = [
-    pkgs.thunderbird
-    pkgs.nextcloud-client
-    pkgs.keepassxc
-    pkgs.telegram-desktop
-    pkgs.element-desktop
-    pkgs.tidal-hifi
-    pkgs.signal-desktop
-
-    pkgs.tree
-    pkgs.htop
-    pkgs.neovim
-    pkgs.wget
-    pkgs.unzip
-
-    pkgs.feather
-
-    pkgs.firefox
-
-    pkgs.zathura
-    pkgs.ranger
-
-    pkgs.nerd-fonts.fira-code
-    pkgs.fira-code
-    pkgs.fira-code-symbols
-    pkgs.meslo-lgs-nf
-
-    pkgs.eza
-    pkgs.bat
-    pkgs.ripgrep
-
-    pkgs.seahorse
-
-    pkgs.binutils
-    pkgs.gcc
-
-    # pkgs.scenebuilder
-
-    pkgs.nil
-
     pkgs.quickemu
-
-    pkgs.zotero
-
-    (pkgs.aspellWithDicts
-      (dicts: with dicts; [ de en en-computers ]))
   ];
 }
diff --git a/home/lukas/tower/packages.nix b/home/lukas/tower/packages.nix
index fa9ff78..22d5e3e 100644
--- a/home/lukas/tower/packages.nix
+++ b/home/lukas/tower/packages.nix
@@ -1,60 +1,10 @@
 { pkgs, ... }:
 
 {
-  fonts.fontconfig.enable = true;
-
   home.packages = [
-    pkgs.thunderbird
-    pkgs.nextcloud-client
-    pkgs.keepassxc
-    pkgs.telegram-desktop
-    pkgs.element-desktop
-    pkgs.tidal-hifi
-    pkgs.signal-desktop
-
     pkgs.solaar
 
-    pkgs.tree
-    pkgs.htop
-    pkgs.neovim
-    pkgs.wget
-    pkgs.unzip
-
-    pkgs.feather
-
-    pkgs.firefox
-
-    pkgs.ranger
-    pkgs.zathura
-
-    pkgs.nerd-fonts.fira-code
-    pkgs.fira-code
-    pkgs.fira-code-symbols
-    pkgs.meslo-lgs-nf
-
-    pkgs.eza
-    pkgs.bat
-    pkgs.ripgrep
-    pkgs.sqlitebrowser
-
-    pkgs.seahorse
-
-    pkgs.binutils
-    pkgs.gcc
-
     pkgs.scenebuilder
-
-    pkgs.nil
-
-    pkgs.zotero
     pkgs.audacious
-
-    (pkgs.aspellWithDicts (
-      dicts: with dicts; [
-        de
-        en
-        en-computers
-      ]
-    ))
   ];
 }