From 5d993d62b161ec0ab4978827cfb4b391a78d02a8 Mon Sep 17 00:00:00 2001
From: larstvei <larstvei@ifi.uio.no>
Date: Fri, 12 Sep 2025 16:39:56 +0200
Subject: [PATCH] Move stuff from thinkpad to nixos

---
 machines/thinkpad/default.nix | 40 ----------------------------------
 modules/nixos/default.nix     | 41 ++++++++++++++++++++++++++++++++++-
 2 files changed, 40 insertions(+), 41 deletions(-)

diff --git a/machines/thinkpad/default.nix b/machines/thinkpad/default.nix
index b056bbd..94735eb 100644
--- a/machines/thinkpad/default.nix
+++ b/machines/thinkpad/default.nix
@@ -1,10 +1,3 @@
-{
-  pkgs,
-  nanostatus,
-  emacs-larstvei,
-  zen-browser,
-  ...
-}:
 {
   imports = [
     ./keyboard
@@ -13,39 +6,6 @@
     ../../modules/nixos
   ];
 
-  home-manager = {
-    useGlobalPkgs = true;
-    useUserPackages = true;
-    extraSpecialArgs = { inherit nanostatus emacs-larstvei zen-browser; };
-    users.larstvei.imports = [
-      ../../modules/home
-      ../../modules/desktop
-    ];
-  };
-
-  networking.hostName = "larstvei-think";
-
-  users.users.larstvei = {
-    isNormalUser = true;
-    description = "Lars Tveito";
-    home = "/home/larstvei";
-    shell = pkgs.fish;
-    extraGroups = [
-      "networkmanager"
-      "wheel"
-    ];
-  };
-
-  console.keyMap = "us";
-
-  services.greetd = {
-    enable = true;
-    settings.default_session = {
-      command = "hyprland";
-      user = "larstvei";
-    };
-  };
-
   # Bootloader.
   boot.loader.systemd-boot.enable = true;
   boot.loader.efi.canTouchEfiVariables = true;
diff --git a/modules/nixos/default.nix b/modules/nixos/default.nix
index 7914abc..60b377c 100644
--- a/modules/nixos/default.nix
+++ b/modules/nixos/default.nix
@@ -1,10 +1,49 @@
-{ pkgs, ... }:
+{
+  pkgs,
+  nanostatus,
+  emacs-larstvei,
+  zen-browser,
+  ...
+}:
 {
 
   imports = [
     ../fonts
   ];
 
+  home-manager = {
+    useGlobalPkgs = true;
+    useUserPackages = true;
+    extraSpecialArgs = { inherit nanostatus emacs-larstvei zen-browser; };
+    users.larstvei.imports = [
+      ../home
+      ../desktop
+    ];
+  };
+
+  networking.hostName = "larstvei-think";
+
+  users.users.larstvei = {
+    isNormalUser = true;
+    description = "Lars Tveito";
+    home = "/home/larstvei";
+    shell = pkgs.fish;
+    extraGroups = [
+      "networkmanager"
+      "wheel"
+    ];
+  };
+
+  console.keyMap = "us";
+
+  services.greetd = {
+    enable = true;
+    settings.default_session = {
+      command = "hyprland";
+      user = "larstvei";
+    };
+  };
+
   fonts = {
     fontconfig = {
       enable = true;