From 7f52e693a6dfefef1458bc069c965917d957999b Mon Sep 17 00:00:00 2001
From: Daniel Langbein <daniel@systemli.org>
Date: Tue, 21 Nov 2023 12:07:43 +0100
Subject: [PATCH] refactor

---
 hosts/yodaTab/configuration.nix | 51 +++++++++++++------------
 hosts/yodaTux/configuration.nix | 67 +++++++++++++++++----------------
 2 files changed, 62 insertions(+), 56 deletions(-)

diff --git a/hosts/yodaTab/configuration.nix b/hosts/yodaTab/configuration.nix
index 36d523b..36f4ef8 100644
--- a/hosts/yodaTab/configuration.nix
+++ b/hosts/yodaTab/configuration.nix
@@ -6,39 +6,42 @@
       ../../modules/home-manager.nix
       ../../modules/nur-and-unstable.nix
       ../../modules/base.nix
-
-      ../../modules/gnome-base.nix
-      ../../modules/gnome-config.nix
-      ../../modules/gnome-extensions.nix
-      #../../modules/gnome-fractional-scaling.nix
-
-      ../../modules/programs.nix
-      ../../modules/freetube.nix
-      ../../modules/jetbrains-ide.nix
-      ../../modules/signal-desktop.nix
-      ../../modules/element-desktop.nix
-      ../../modules/joplin-desktop.nix
-      ../../modules/tor-browser.nix
-      ../../modules/autostart.nix
-      ../../modules/wallpaper.nix
-      ../../modules/fwupd-gnome.nix
-      ../../modules/print-and-scan.nix
-      ../../modules/nextcloud-integration.nix
+      ../../modules/ntfs.nix
       ../../modules/git.nix
       ../../modules/zsh.nix
       ../../modules/nitrokey-gpg-smartcard.nix
       ../../modules/ssh-client.nix
       ../../modules/ssh-server.nix
-      ../../modules/firefox.nix
-      ../../modules/thunderbird.nix
-      #../../modules/digikam-rawtherapee.nix
-      ../../modules/ghostwriter.nix
-
       ../../modules/lid-switch-handling.nix
-      ../../modules/ntfs.nix
 
       ../../modules/btrfs-scrub.nix
       ../../modules/btrfs-mount-options.nix
+
+      ../../modules/gnome-base.nix
+      ../../modules/gnome-config.nix
+      ../../modules/gnome-extensions.nix
+      # Not required as display scale is set 2.0 (multiple of 1).
+      #../../modules/gnome-fractional-scaling.nix
+      ../../modules/fwupd-gnome.nix
+      ../../modules/wallpaper.nix
+
+      ../../modules/programs.nix
+      ../../modules/nextcloud-integration.nix
+      ../../modules/signal-desktop.nix
+      ../../modules/element-desktop.nix
+      ../../modules/joplin-desktop.nix
+      ../../modules/firefox.nix
+      ../../modules/thunderbird.nix
+      ../../modules/tor-browser.nix
+      #../../modules/digikam-rawtherapee.nix
+      ../../modules/freetube.nix
+      ../../modules/ghostwriter.nix
+      ../../modules/print-and-scan.nix
+      #../../modules/waydroid.nix
+
+      ../../modules/autostart.nix
+
+      ../../modules/jetbrains-ide.nix
     ];
 
   networking.hostName = "yodaTab";
diff --git a/hosts/yodaTux/configuration.nix b/hosts/yodaTux/configuration.nix
index e794110..8b23fd0 100644
--- a/hosts/yodaTux/configuration.nix
+++ b/hosts/yodaTux/configuration.nix
@@ -6,47 +6,50 @@
       ../../modules/home-manager.nix
       ../../modules/nur-and-unstable.nix
       ../../modules/base.nix
-
-      ../../modules/gnome-base.nix
-      ../../modules/gnome-config.nix
-      ../../modules/gnome-extensions.nix
-      ../../modules/gnome-fractional-scaling.nix
-
-      ../../modules/programs.nix
-      #../../modules/games.nix
-      ../../modules/boxes.nix
-      ../../modules/freetube.nix
-      ../../modules/jetbrains-ide.nix
-      ../../modules/vscodium.nix
-      ../../modules/signal-desktop.nix
-      ../../modules/element-desktop.nix
-      ../../modules/joplin-desktop.nix
-      ../../modules/tor-browser.nix
-      ../../modules/autostart.nix
-      ../../modules/wallpaper.nix
-      ../../modules/fwupd-gnome.nix
-      ../../modules/print-and-scan.nix
-      ../../modules/nextcloud-integration.nix
+      ../../modules/ntfs.nix
       ../../modules/git.nix
       ../../modules/zsh.nix
       ../../modules/nitrokey-gpg-smartcard.nix
       ../../modules/ssh-client.nix
       ../../modules/ssh-server.nix
-      ../../modules/firefox.nix
-      ../../modules/thunderbird.nix
-      ../../modules/digikam-rawtherapee.nix
-      ../../modules/ghostwriter.nix
-      ../../modules/android.nix
-      ../../modules/pmbootstrap.nix
-      #../../modules/podman.nix
-      ../../modules/docker.nix
-      ../../modules/docker-pushrm.nix
       ../../modules/lid-switch-handling.nix
-      #../../modules/waydroid.nix
-      ../../modules/ntfs.nix
 
       ../../modules/btrfs-scrub.nix
       ../../modules/btrfs-mount-options.nix
+
+      ../../modules/gnome-base.nix
+      ../../modules/gnome-config.nix
+      ../../modules/gnome-extensions.nix
+      ../../modules/gnome-fractional-scaling.nix
+      ../../modules/fwupd-gnome.nix
+      ../../modules/wallpaper.nix
+
+      ../../modules/programs.nix
+      ../../modules/nextcloud-integration.nix
+      ../../modules/signal-desktop.nix
+      ../../modules/element-desktop.nix
+      ../../modules/joplin-desktop.nix
+      ../../modules/firefox.nix
+      ../../modules/thunderbird.nix
+      ../../modules/tor-browser.nix
+      ../../modules/digikam-rawtherapee.nix
+      ../../modules/freetube.nix
+      ../../modules/ghostwriter.nix
+      ../../modules/print-and-scan.nix
+      ../../modules/waydroid.nix
+      #../../modules/games.nix
+
+      ../../modules/autostart.nix
+
+      ../../modules/boxes.nix
+      ../../modules/jetbrains-ide.nix
+      ../../modules/vscodium.nix
+      ../../modules/android.nix
+      ../../modules/pmbootstrap.nix
+
+      #../../modules/podman.nix
+      ../../modules/docker.nix
+      ../../modules/docker-pushrm.nix
     ];
 
   networking.hostName = "yodaTux";