split into tower and laptop config

home/lukas/catppuccin.nix

@@ -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;
-  };
-
-}

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 = {

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";

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";
     };
 
   };

home/lukas/common/xgd.nix

@@ -1,5 +1,3 @@
-{ pkgs, ... }:
-
 {
   xdg.enable = true;
   xdg.mimeApps = {

home/lukas/default.nix

@@ -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";
-}
-

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";
+}
+

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";
+}
+

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"];
+  };
+}

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 ]))
+  ];
+}
+