From eed4ed3d4d42b1fe30fcac9c9c6d2c0c053015c3 Mon Sep 17 00:00:00 2001
From: Sijmen <me@sijman.nl>
Date: Sun, 7 Aug 2022 23:04:35 +0200
Subject: [PATCH] move things from common to thinkpad that didnt belong on nas

---
 common/configuration.nix       | 65 ----------------------------------
 common/home-manager.nix        |  2 --
 thinkpad/configuration.nix     | 59 +++++++++++++++++++++++++++++-
 {common => thinkpad}/dconf.nix |  0
 4 files changed, 58 insertions(+), 68 deletions(-)
 rename {common => thinkpad}/dconf.nix (100%)

diff --git a/common/configuration.nix b/common/configuration.nix
index 25ad6c2..1b4bc7f 100644
--- a/common/configuration.nix
+++ b/common/configuration.nix
@@ -6,26 +6,8 @@
   ];
 
   nixpkgs.config.allowUnfree = true;
-  sound.enable = true;
-  hardware.pulseaudio.enable = true;
   time.timeZone = "Europe/Amsterdam";
 
-  boot = {
-    loader.timeout = 0;
-
-    kernelPackages = pkgs.linuxPackages_latest;
-    kernelParams = [ 
-      "quiet"
-      "splash"
-      "vga=current"
-      "udev.log_level=3"
-    ];
-
-    initrd.verbose = false;
-    consoleLogLevel = 0;
-    plymouth.enable = true;
-  };
-
   console = {
     earlySetup = true;
     font = "${pkgs.terminus_font}/share/consolefonts/ter-132n.psf.gz";
@@ -38,7 +20,6 @@
     docker.enable = true;
   };
 
-
   i18n = {
     defaultLocale = "en_US.UTF-8";
     supportedLocales = [
@@ -53,43 +34,12 @@
     description = "Sijmen";
   };
 
-  environment = {
-    gnome.excludePackages = (with pkgs; [
-      gnome-photos
-      gnome-tour
-    ]) ++ (with pkgs.gnome; [
-      gnome-calendar
-      gnome-music
-      epiphany        # web browser
-      geary           # email reader
-      totem           # video player
-      tali            # poker game
-      iagno           # go game
-      hitori          # sudoku game
-      atomix          # puzzle game
-    ]);
-
-    systemPackages = with pkgs; [
-      gnome.adwaita-icon-theme
-      ifuse
-      libimobiledevice
-      libheif
-    ];
-  };
-
   services = {
     pipewire.enable = true;
     printing.enable = true;
-    throttled.enable = true;
     gvfs.enable = true;
     usbmuxd.enable = true;
 
-    xserver = {
-      enable = true;
-      displayManager.gdm.enable = true;
-      desktopManager.gnome.enable = true;
-    };
-
     openssh = {
       enable = true;
       passwordAuthentication = false;
@@ -99,14 +49,6 @@
       enable = true;
       user = "sijmen";
       dataDir = config.users.users.sijmen.home;
-      overrideFolders = true;
-
-      folders = {
-        "vhuse-qjbcl" = {
-          path = "${config.users.users.sijmen.home}/Sync";
-          devices = [ "nas" "desktop-fedora" ];
-        };
-      };
     };
   };
 
@@ -116,11 +58,4 @@
     noto-fonts-emoji
     nerdfonts
   ];
-
-  programs.steam = {
-    enable = true;
-    remotePlay.openFirewall = true;
-    dedicatedServer.openFirewall = true;
-  };
-
 }
diff --git a/common/home-manager.nix b/common/home-manager.nix
index 13cc22e..f976079 100644
--- a/common/home-manager.nix
+++ b/common/home-manager.nix
@@ -168,7 +168,5 @@
 
       notmuch.enable = true;
     };
-
-    imports = [ ./dconf.nix ];
   };
 }
diff --git a/thinkpad/configuration.nix b/thinkpad/configuration.nix
index 8c2ab75..74668e5 100644
--- a/thinkpad/configuration.nix
+++ b/thinkpad/configuration.nix
@@ -6,7 +6,12 @@
     ../common/configuration.nix
   ];
 
-  hardware.bluetooth.enable = true;
+  sound.enable = true;
+
+  hardware = {
+    bluetooth.enable = true;
+    pulseaudio.enable = true;
+  }
 
   boot = {
     loader = {
@@ -18,6 +23,7 @@
       };
     };
 
+    kernelPackages = pkgs.linuxPackages_latest;
     kernelParams = [ 
       "quiet"
       "splash"
@@ -26,7 +32,10 @@
       "udev.log_level=3"
     ];
 
+    loader.timeout = 0;
     initrd.verbose = false;
+    consoleLogLevel = 0;
+    plymouth.enable = true;
   };
 
   networking = {
@@ -48,15 +57,63 @@
   };
 
   services = {
+    throttled.enable = true;
+
+    xserver = {
+      enable = true;
+      displayManager.gdm.enable = true;
+      desktopManager.gnome.enable = true;
+    };
+
     syncthing = {
       overrideDevices = true;
+      overrideFolders = true;
 
       devices = {
         nas.id = "5XADATO-6ZKNZFK-YIX2TU3-RTUOAXR-OMWOAH6-OIUB7LE-TWM5B3C-W2I2FQU";
         desktop-fedora.id = "RE3BCEP-2FVDNPA-C72KDCX-5NRTLD4-DEJZAIX-PJAMJAN-LJDFHOY-WOXNPQW";
       };
+
+      folders = {
+        "vhuse-qjbcl" = {
+          path = "${config.users.users.sijmen.home}/Sync";
+          devices = [ "nas" "desktop-fedora" ];
+        };
+      };
     };
   };
 
+  environment = {
+    gnome.excludePackages = (with pkgs; [
+      gnome-photos
+      gnome-tour
+    ]) ++ (with pkgs.gnome; [
+      gnome-calendar
+      gnome-music
+      epiphany        # web browser
+      geary           # email reader
+      totem           # video player
+      tali            # poker game
+      iagno           # go game
+      hitori          # sudoku game
+      atomix          # puzzle game
+    ]);
+
+    systemPackages = with pkgs; [
+      gnome.adwaita-icon-theme
+      ifuse
+      libimobiledevice
+      libheif
+    ];
+  };
+
+  programs.steam = {
+    enable = true;
+    remotePlay.openFirewall = true;
+    dedicatedServer.openFirewall = true;
+  };
+
+  home-manager.users.sijmen.imports = [ ./dconf.nix ];
+
   system.stateVersion = "22.05";
 }
diff --git a/common/dconf.nix b/thinkpad/dconf.nix
similarity index 100%
rename from common/dconf.nix
rename to thinkpad/dconf.nix