use modules

hosts/tartarus/configuration.nix

@@ -9,14 +9,7 @@
 }: {
   imports = [
     ./hardware-configuration.nix
-    ../../common/fonts.nix
+    ../../modules
-    ../../common/nix-settings.nix
-    ../../common/i18n.nix
-    ../../common/python.nix
-    ../../common/arduino.nix
-    ../../common/firefox.nix
-    ../../common/common-packages.nix
-    ../../common/concentration.nix
   ];
 
   blockYoutube = false;
@@ -96,7 +89,6 @@
       obs-studio
       audacity
       qbittorrent
-      arduino-ide
     ];
   };
 

hosts/ymir/configuration.nix

@@ -9,15 +9,7 @@
 }: {
   imports = [
     ./hardware-configuration.nix
-    ../../common/fonts.nix
+    ../../modules
-    ../../common/nix-settings.nix
-    ../../common/i18n.nix
-    ../../common/python.nix
-    ../../common/arduino.nix
-    ../../common/firefox.nix
-    ../../common/common-packages.nix
-    ../../common/concentration.nix
-    ../../common/secrets.nix
   ];
 
   # Bootloader.

modules/default.nix

@@ -0,0 +1,12 @@
+{
+  imports = [
+    ./arduino.nix
+    ./common-packages.nix
+    ./concentration.nix
+    ./firefox.nix
+    ./fonts.nix
+    ./i18n.nix
+    ./nix-settings.nix
+    ./secrets.nix
+  ];
+}

modules/home.nix

@@ -1,6 +1,7 @@
 {
   config,
   pkgs,
+  stateVersion
   ...
 }: {
   # Home Manager needs a bit of information about you and the
@@ -10,8 +11,6 @@
 
   # Packages that should be installed to the user profile.
   home.packages = [
-    pkgs.htop
-    pkgs.fortune
   ];
 
   programs.git = {
@@ -20,6 +19,7 @@
     userName = "osbm";
   };
 
+
   # This value determines the Home Manager release that your
   # configuration is compatible with. This helps avoid breakage
   # when a new Home Manager release introduces backwards
@@ -28,7 +28,7 @@
   # You can update Home Manager without changing this value. See
   # the Home Manager release notes for a list of state version
   # changes in each release.
-  home.stateVersion = "24.11";
+  home.stateVersion = stateVersion;
 
   # Let Home Manager install and manage itself.
   programs.home-manager.enable = true;

modules/nix-settings.nix

@@ -5,7 +5,7 @@
   ...
 }: {
   # Allow unfree packages
-  nixpkgs.config.allowUnfree = true;
+  nixpkgs.config.allowUnfree = true; # TODO: replace this with allowUnfreePredicate
 
   # enable nix flakes
   nix.settings.experimental-features = ["nix-command" "flakes"];