modularize config

nix/hardware/marmo/base_config.nix

@@ -8,5 +8,5 @@
     # all others
     ",highrr,auto,1"
   ];
-  programs.ironbar.monitor = "DP-1";
+  conf.monitor = "DP-1";
 }

nix/hardware/marmo/configuration.nix

@@ -1,17 +1,14 @@
-{ pkgs, ... }:
 {
   imports = [
-    ../../modules/gamemode.nix
-    ../../modules/boot_params.nix
-    ../../modules/ironbar_config.nix
+    ../../modules/conf.nix
   ];
-  boot.kernelPackages = pkgs.linuxPackages_zen;
-  programs.boot.boot_params = [
-    "amdgpu.ppfeaturemask=0xffffffff"
-  ];
-  networking.hostName = "marmo";
-  programs.ironbar.monitor = "DP-1";
-  programs.gamemode = {
-    device = 1;
+  # variables for system
+  conf = {
+    monitor = "DP-1";
+    gaming = {
+      enable = true;
+      device = 1;
+    };
+    hostname = "marmo";
   };
 }

nix/hardware/overheating/base_config.nix

@@ -9,9 +9,11 @@
     # all others
     ",highres,auto,1"
   ];
-  programs.ironbar.monitor = "eDP-1";
-  programs.ironbar.battery = [
-    { type = "upower"; class = "memory-usage"; }
-  ];
+  conf = {
+    monitor = "eDP-1";
+    battery = [
+      { type = "upower"; class = "memory-usage"; }
+    ];
+  };
   programs.hyprland.extra_autostart = [ "hyprdock --server" ];
 }

nix/hardware/overheating/configuration.nix

@@ -1,16 +1,16 @@
-{ pkgs, ... }:
 {
   imports = [
-    ../../modules/ironbar_config.nix
-    ../../modules/boot_params.nix
+    ../../modules/conf.nix
     ./dsdt.nix
     ./firmware.nix
   ];
-  boot.kernelPackages = pkgs.linuxPackages_latest;
-  networking.hostName = "overheating";
-  programs.ironbar.monitor = "eDP-1";
-  programs.ironbar.scale = "2.0";
-  programs.boot.boot_params = [ "rtc_cmos.use_acpi_alarm=1" ];
+  conf = {
+    monitor = "eDP-1";
+    scale = "2.0";
+    hostname = "overheating";
+    boot_params = [ "rtc_cmos.use_acpi_alarm=1" ];
+  };
+
   hardware.bluetooth.enable = true;
   hardware.bluetooth.powerOnBoot = true;
 

nix/hardware/overheating/overheating.nix

@@ -1,4 +1,4 @@
-{ pkgs, config, lib, modulesPath, ... }:
+{ config, lib, modulesPath, ... }:
 {
   imports =
     [

nix/hardware/spaceship/base_config.nix

@@ -1,4 +1,8 @@
-{ username, ... }: {
+{ config, ... }:
+let
+  username = config.conf.username;
+in
+{
   imports = [
     ../../modules
   ];
@@ -30,7 +34,7 @@
     # monitor right
     "3,monitor:HDMI-A-1, default:true"
   ];
-  programs.ironbar.monitor = "DP-1";
+  conf.monitor = "DP-1";
   programs.hyprland.hyprpaper = ''
     #load
     preload = /home/${username}/Pictures/backgrounds/shinobu_2k.jpg

nix/hardware/spaceship/configuration.nix

@@ -1,19 +1,19 @@
 { pkgs, lib, ... }:
 {
   imports = [
-    ../../modules/gamemode.nix
-    ../../modules/boot_params.nix
-    ../../modules/ironbar_config.nix
+    ../../modules/conf.nix
   ];
-  boot.kernelPackages = pkgs.linuxPackages_xanmod_latest;
-  programs.boot.boot_params = [
-    "amdgpu.ppfeaturemask=0xffffffff"
-  ];
-  networking.hostName = "spaceship";
 
-  programs.gamemode = {
-    device = 0;
+  # config variables
+  conf = {
+    monitor = "DP-1";
+    gaming = {
+      enable = true;
+    };
+    streamdeck.enable = true;
+    hostname = "spaceship";
   };
+
   virtualisation.virtualbox.host.enable = true;
 
   # enable hardware acceleration and rocm
@@ -28,6 +28,12 @@
     enable = true;
     enable32Bit = lib.mkDefault true;
   };
-  boot.initrd.kernelModules = [ "amdgpu" ];
-  programs.ironbar.monitor = "DP-1";
+  networking.firewall = {
+    allowedTCPPortRanges = [
+      { from = 1714; to = 1764; } # KDE Connect
+    ];
+    allowedUDPPortRanges = [
+      { from = 1714; to = 1764; } # KDE Connect
+    ];
+  };
 }

nix/hardware/streamdeck.nix

@@ -1,6 +0,0 @@
-{
-  #programs.streamdeck-ui = {
-  #  enable = true;
-  #  autoStart = false; # optional
-  #};
-}