From 726eace95c62aa231f3178de4f2671331a647f31 Mon Sep 17 00:00:00 2001
From: larstvei <larstvei@ifi.uio.no>
Date: Thu, 11 Sep 2025 23:48:52 +0200
Subject: [PATCH] Move some stuff around

---
 machines/thinkpad/default.nix     | 51 ++++++-------------------------
 modules/base/default.nix          |  6 ++++
 modules/darwin/default.nix        |  5 ---
 modules/desktop/theme/default.nix |  9 ------
 modules/nixos/default.nix         | 27 ++++++++++++++--
 5 files changed, 40 insertions(+), 58 deletions(-)

diff --git a/machines/thinkpad/default.nix b/machines/thinkpad/default.nix
index ac5bb66..b056bbd 100644
--- a/machines/thinkpad/default.nix
+++ b/machines/thinkpad/default.nix
@@ -16,26 +16,14 @@
   home-manager = {
     useGlobalPkgs = true;
     useUserPackages = true;
-    extraSpecialArgs = {
-      inherit nanostatus;
-      inherit emacs-larstvei;
-      inherit zen-browser;
-    };
+    extraSpecialArgs = { inherit nanostatus emacs-larstvei zen-browser; };
     users.larstvei.imports = [
       ../../modules/home
       ../../modules/desktop
     ];
   };
 
-  services.greetd = {
-    enable = true;
-    settings = {
-      default_session = {
-        command = "hyprland";
-        user = "larstvei";
-      };
-    };
-  };
+  networking.hostName = "larstvei-think";
 
   users.users.larstvei = {
     isNormalUser = true;
@@ -48,39 +36,20 @@
     ];
   };
 
-  networking.hostName = "larstvei-think";
-
   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;
 
-  # Enable networking
-  networking.networkmanager.enable = true;
-
-  # Set your time zone.
-  time.timeZone = "Europe/Oslo";
-
-  # Select internationalisation properties.
-  i18n.defaultLocale = "en_US.UTF-8";
-
-  # Enable CUPS to print documents.
-  services.printing.enable = true;
-
-  # Enable bluetooth.
-  hardware.bluetooth.enable = true;
-
-  # Enable sound with pipewire.
-  services.pulseaudio.enable = false;
-  security.rtkit.enable = true;
-  services.pipewire = {
-    enable = true;
-    alsa.enable = true;
-    alsa.support32Bit = true;
-    pulse.enable = true;
-  };
-
   # This value determines the NixOS release from which the default
   # settings for stateful data, like file locations and database versions
   # on your system were taken. It‘s perfectly fine and recommended to leave
diff --git a/modules/base/default.nix b/modules/base/default.nix
index 6d9441c..32aef49 100644
--- a/modules/base/default.nix
+++ b/modules/base/default.nix
@@ -1,5 +1,11 @@
 { pkgs, ... }:
 {
+  programs.fish.enable = true;
+  environment.shells = [ pkgs.fish ];
+
+  time.timeZone = "Europe/Oslo";
+  i18n.defaultLocale = "en_US.UTF-8";
+
   nix = {
     package = pkgs.nix;
 
diff --git a/modules/darwin/default.nix b/modules/darwin/default.nix
index d067044..5609f43 100644
--- a/modules/darwin/default.nix
+++ b/modules/darwin/default.nix
@@ -1,6 +1,4 @@
-{ pkgs, ... }:
 {
-
   imports = [
     ../fonts
     ../homebrew
@@ -8,9 +6,6 @@
 
   nix.linux-builder.enable = true;
 
-  programs.fish.enable = true;
-  environment.shells = [ pkgs.fish ];
-
   system = {
     stateVersion = 4;
 
diff --git a/modules/desktop/theme/default.nix b/modules/desktop/theme/default.nix
index 30dd6af..ece8aac 100644
--- a/modules/desktop/theme/default.nix
+++ b/modules/desktop/theme/default.nix
@@ -18,15 +18,6 @@ let
   };
 in
 {
-  xdg.portal = {
-    enable = true;
-    extraPortals = [
-      pkgs.xdg-desktop-portal-hyprland
-      pkgs.xdg-desktop-portal-gtk
-    ];
-    config.hyprland."org.freedesktop.impl.portal.Settings" = "darkman";
-  };
-
   services.darkman = {
     enable = true;
     settings.portal = true;
diff --git a/modules/nixos/default.nix b/modules/nixos/default.nix
index 331ab63..2a8b8b2 100644
--- a/modules/nixos/default.nix
+++ b/modules/nixos/default.nix
@@ -16,9 +16,6 @@
     };
   };
 
-  programs.fish.enable = true;
-  environment.shells = [ pkgs.fish ];
-
   nixpkgs.config.allowUnfree = true;
 
   programs._1password.enable = true;
@@ -30,4 +27,28 @@
     package = pkgs.hyprland;
     portalPackage = pkgs.xdg-desktop-portal-hyprland;
   };
+
+  xdg.portal = {
+    enable = true;
+    extraPortals = [
+      pkgs.xdg-desktop-portal-hyprland
+      pkgs.xdg-desktop-portal-gtk
+    ];
+    config.hyprland."org.freedesktop.impl.portal.Settings" = "darkman";
+  };
+
+  networking.networkmanager.enable = true;
+  hardware.bluetooth.enable = true;
+  services.printing.enable = true;
+
+  # Enable sound with pipewire.
+  services.pulseaudio.enable = false;
+  security.rtkit.enable = true;
+  services.pipewire = {
+    enable = true;
+    alsa.enable = true;
+    alsa.support32Bit = true;
+    pulse.enable = true;
+  };
+
 }