merge

nix/base/base_packages.nix

@@ -29,8 +29,8 @@
     seahorse
     upower
     (lib.mkIf config.conf.streamdeck.enable (callPackage
-      ../override/streamdeck.nix
+    ../override/streamdeck.nix
-      { }))
+    { }))
   ];
 
   gtk.iconCache.enable = false;

nix/base/common_hardware.nix

@@ -29,7 +29,9 @@ in
   # Enable CUPS to print documents.
   services.printing.enable = true;
   services.printing.browsing = true;
-  services.printing.drivers = [ pkgs.hplip ];
+  # fucking fun 
+  # TODO: https://github.com/NixOS/nixpkgs/pull/325825 ....
+  # services.printing.drivers = [ pkgs.hplip ];
   services.printing.startWhenNeeded = true; # optional
   services.avahi = {
     enable = true;

nix/flake.nix

@@ -45,45 +45,41 @@
         system = "x86_64-linux";
         overlays = [
           inputs.nur.overlay
+          # DUDE FOR FUCK SAKE
+          # https://github.com/NixOS/nixpkgs/pull/325825 ....
+          # fucking fun 
+          # TODO: https://github.com/NixOS/nixpkgs/pull/325825 ....
+          (_: prev: {
+            python312 = prev.python312.override { packageOverrides = _: pysuper: { nose = pysuper.pynose; }; };
+          })
         ];
         config = {
           allowUnfree = true;
         };
       };
-      base_imports = [
-        inputs.home-manager.nixosModules.home-manager
-        ./base/default.nix
-        ./programs
-      ];
     in
     {
-      nixosConfigurations."marmo" = inputs.nixpkgs.lib.nixosSystem {
+      nixosConfigurations = (builtins.listToAttrs (map
-        specialArgs = {
+        (name: {
-          inherit inputs pkgs;
+          name = name;
-          mod = ./hardware/marmo/base_config.nix;
+          value =
-        };
+            let
-        modules = [
+              mod = ./hardware/${name}/configuration.nix;
-          ./hardware/marmo/default.nix
+            in
-        ] ++ base_imports;
+            inputs.nixpkgs.lib.nixosSystem {
-      };
+              specialArgs = {
-      nixosConfigurations."overheating" = inputs.nixpkgs.lib.nixosSystem {
+                inherit inputs pkgs mod;
-        specialArgs = {
+              };
-          inherit inputs pkgs;
+              modules = [
-          mod = ./hardware/overheating/base_config.nix;
+                mod
-        };
+
-        modules = [
+                inputs.home-manager.nixosModules.home-manager
-          ./hardware/overheating/default.nix
+                ./base/default.nix
-        ] ++ base_imports;
+                ./programs
-      };
+              ] ++ inputs.nixpkgs.lib.optional (builtins.pathExists ./hardware/${name}/${name}.nix) ./hardware/${name}/${name}.nix
-      nixosConfigurations."spaceship" = inputs.nixpkgs.lib.nixosSystem {
+              ++ inputs.nixpkgs.lib.optional (builtins.pathExists mod) mod;
-        specialArgs = {
+            };
-          inherit inputs pkgs;
+        }) [ "marmo" "overheating" "spaceship" ]));
-          mod = ./hardware/spaceship/base_config.nix;
-        };
-        modules = [
-          ./hardware/spaceship/default.nix
-        ] ++ base_imports;
-      };
     };
 
   nixConfig = {

nix/hardware/marmo/base_config.nix

@@ -1,12 +0,0 @@
-{
-  imports = [
-    ../../modules
-  ];
-  wayland.windowManager.hyprland.settings.monitor = [
-    # default
-    "DP-1,1920x1080@144,0x0,1"
-    # all others
-    ",highrr,auto,1"
-  ];
-  conf.monitor = "DP-1";
-}

nix/hardware/marmo/configuration.nix

@@ -10,5 +10,11 @@
       device = 1;
     };
     hostname = "marmo";
+    hyprland.monitor = [
+      # default
+      "DP-1,1920x1080@144,0x0,1"
+      # all others
+      ",highrr,auto,1"
+    ];
   };
 }

nix/hardware/marmo/default.nix

@@ -1,6 +0,0 @@
-{
-  imports = [
-    ./marmo.nix
-    ./configuration.nix
-  ];
-}

nix/hardware/overheating/base_config.nix

@@ -1,19 +0,0 @@
-{
-  imports = [
-    ../../modules
-  ];
-  wayland.windowManager.hyprland.settings.monitor = [
-    # default
-    "eDP-1,2944x1840@90,0x0,2"
-
-    # all others
-    ",highres,auto,1"
-  ];
-  conf = {
-    monitor = "eDP-1";
-    battery = [
-      { type = "upower"; class = "memory-usage"; }
-    ];
-  };
-  programs.hyprland.extra_autostart = [ "hyprdock --server" ];
-}

nix/hardware/overheating/configuration.nix

@@ -9,6 +9,19 @@
     scale = "2.0";
     hostname = "overheating";
     boot_params = [ "rtc_cmos.use_acpi_alarm=1" ];
+    ironbar.modules = [
+      { type = "upower"; class = "memory-usage"; }
+    ];
+    hyprland = {
+      monitor = [
+        # default
+        "eDP-1,2944x1840@90,0x0,2"
+
+        # all others
+        ",highres,auto,1"
+      ];
+      extra_autostart = [ "hyprdock --server" ];
+    };
   };
 
   hardware.bluetooth.enable = true;

nix/hardware/overheating/default.nix

@@ -1,6 +0,0 @@
-{
-  imports = [
-    ./overheating.nix
-    ./configuration.nix
-  ];
-}

nix/hardware/spaceship/base_config.nix

@@ -1,51 +0,0 @@
-{ config, ... }:
-let
-  username = config.conf.username;
-in
-{
-  imports = [
-    ../../modules
-  ];
-  wayland.windowManager.hyprland.settings.monitor = [
-    # default
-    "DP-2,2560x1440@165,0x0,1"
-    "DP-1,3440x1440@180,2560x0,1,vrr,1"
-    "HDMI-A-1,1920x1200@60,6000x0,1"
-    "HDMI-A-1,transform,1"
-
-    # all others
-    ",highrr,auto,1"
-  ];
-  wayland.windowManager.hyprland.settings.workspace = [
-    # workspaces
-    # monitor middle
-    "2,monitor:DP-1, default:true"
-    "4,monitor:DP-1"
-    "6,monitor:DP-1"
-    "8,monitor:DP-1"
-    "9,monitor:DP-1"
-    "10,monitor:DP-1"
-
-    # monitor left
-    "1,monitor:DP-2, default:true"
-    "5,monitor:DP-2"
-    "7,monitor:DP-2"
-
-    # monitor right
-    "3,monitor:HDMI-A-1, default:true"
-  ];
-  conf.monitor = "DP-1";
-  programs.hyprland.hyprpaper = ''
-    #load
-    preload = /home/${username}/Pictures/backgrounds/shinobu_2k.jpg
-    preload = /home/${username}/Pictures/backgrounds/shino_wide.png
-    preload = /home/${username}/Pictures/backgrounds/shinobu_1200.jpg
-
-    #set
-    wallpaper = DP-2,/home/${username}/Pictures/backgrounds/shinobu_2k.jpg
-    wallpaper = DP-1,/home/${username}/Pictures/backgrounds/shino_wide.png
-    wallpaper = HDMI-A-1,/home/${username}/Pictures/backgrounds/shinobu_1200.jpg
-    splash = true
-  '';
-  programs.hyprland.extra_autostart = [ "streamdeck -n" ];
-}

nix/hardware/spaceship/configuration.nix

@@ -1,4 +1,7 @@
-{ pkgs, lib, ... }:
+{ config, ... }:
+let
+  username = config.conf.username;
+in
 {
   imports = [
     ../../modules/conf.nix
@@ -12,28 +15,48 @@
     };
     streamdeck.enable = true;
     hostname = "spaceship";
-  };
+    hyprland = {
+      monitor = [
+        # default
+        "DP-2,2560x1440@165,0x0,1"
+        "DP-1,3440x1440@180,2560x0,1,vrr,1"
+        "HDMI-A-1,1920x1200@60,6000x0,1"
+        "HDMI-A-1,transform,1"
 
-  virtualisation.virtualbox.host.enable = true;
+        # all others
+        ",highrr,auto,1"
+      ];
+      workspace = [
+        # workspaces
+        # monitor middle
+        "2,monitor:DP-1, default:true"
+        "4,monitor:DP-1"
+        "6,monitor:DP-1"
+        "8,monitor:DP-1"
+        "9,monitor:DP-1"
+        "10,monitor:DP-1"
 
-  # enable hardware acceleration and rocm
+        # monitor left
-  hardware.xone.enable = true;
+        "1,monitor:DP-2, default:true"
-  hardware.graphics.extraPackages = with pkgs; [
+        "5,monitor:DP-2"
-    libvdpau-va-gl
+        "7,monitor:DP-2"
-    vaapiVdpau
+
-    rocmPackages.clr.icd
+        # monitor right
-    rocm-opencl-runtime
+        "3,monitor:HDMI-A-1, default:true"
-  ];
+      ];
-  hardware.graphics = {
+      hyprpaper = ''
-    enable = true;
+        #load
-    enable32Bit = lib.mkDefault true;
+        preload = /home/${username}/Pictures/backgrounds/shinobu_2k.jpg
-  };
+        preload = /home/${username}/Pictures/backgrounds/shino_wide.png
-  networking.firewall = {
+        preload = /home/${username}/Pictures/backgrounds/shinobu_1200.jpg
-    allowedTCPPortRanges = [
+
-      { from = 1714; to = 1764; } # KDE Connect
+        #set
-    ];
+        wallpaper = DP-2,/home/${username}/Pictures/backgrounds/shinobu_2k.jpg
-    allowedUDPPortRanges = [
+        wallpaper = DP-1,/home/${username}/Pictures/backgrounds/shino_wide.png
-      { from = 1714; to = 1764; } # KDE Connect
+        wallpaper = HDMI-A-1,/home/${username}/Pictures/backgrounds/shinobu_1200.jpg
-    ];
+        splash = true
+      '';
+      extra_autostart = [ "streamdeck -n" ];
+    };
   };
 }

nix/hardware/spaceship/default.nix

@@ -1,6 +0,0 @@
-{
-  imports = [
-    ./spaceship.nix
-    ./configuration.nix
-  ];
-}

nix/hardware/spaceship/spaceship.nix

@@ -1,4 +1,4 @@
-{ config, lib, modulesPath, ... }:
+{ pkgs, config, lib, modulesPath, ... }:
 {
   imports =
     [
@@ -32,4 +32,29 @@
   hardware.cpu.amd.updateMicrocode = lib.mkDefault config.hardware.enableRedistributableFirmware;
   services.fstrim.enable = lib.mkDefault true;
   nix.settings.auto-optimise-store = true;
+
+  virtualisation.virtualbox.host.enable = true;
+
+  # enable hardware acceleration and rocm
+  hardware.xone.enable = true;
+  hardware.graphics.extraPackages = with pkgs; [
+    libvdpau-va-gl
+    vaapiVdpau
+    # DUDE FOR FUCK SAKE
+    # TODO:
+    # rocmPackages.clr.icd
+    # rocm-opencl-runtime
+  ];
+  hardware.graphics = {
+    enable = true;
+    enable32Bit = lib.mkDefault true;
+  };
+  networking.firewall = {
+    allowedTCPPortRanges = [
+      { from = 1714; to = 1764; } # KDE Connect
+    ];
+    allowedUDPPortRanges = [
+      { from = 1714; to = 1764; } # KDE Connect
+    ];
+  };
 }

nix/modules/conf.nix

@@ -8,6 +8,7 @@
         main monitor
       '';
     };
+
     scale = lib.mkOption {
       default = "1.0";
       example = "1.0";
@@ -16,9 +17,18 @@
         Scale for the monitor
       '';
     };
-    battery = lib.mkOption {
+
-      default = [ ];
+    ironbar = {
-      example = [ ];
+      modules = lib.mkOption {
+        default = [ ];
+        example = [
+          { type = "upower"; class = "memory-usage"; }
+        ];
+        type = with lib.types; listOf attrs;
+        description = ''
+          Adds modules to ironbar.
+        '';
+      };
     };
 
     amdGpu = lib.mkOption {
@@ -33,6 +43,7 @@
     boot_params = lib.mkOption {
       default = [ ];
       example = [ "resume=something" ];
+      type = with lib.types; listOf str;
       description = ''
         Boot params
       '';
@@ -51,6 +62,7 @@
       device = lib.mkOption {
         default = 0;
         example = 0;
+        type = lib.types.int;
         description = ''
           GPU device number
         '';
@@ -71,7 +83,7 @@
     kernel = lib.mkOption {
       default = pkgs.linuxPackages_latest;
       example = pkgs.linuxPackages_xanmod_latest;
-      # type = lib.types.package;
+      type = with lib.types; nullOr attrs;
       description = ''
         kernel to be used
       '';
@@ -87,13 +99,54 @@
     };
 
     username = lib.mkOption {
-        default = "dashie";
+      default = "dashie";
-        example = "pingpang";
+      example = "pingpang";
-        type = lib.types.str;
+      type = lib.types.str;
+      description = ''
+        The username.
+      '';
+    };
+
+    hyprland = {
+      monitor = lib.mkOption {
+        default = [ ];
+        example = [
+          "DP-1,3440x1440@180,2560x0,1,vrr,1"
+        ];
+        type = with lib.types; listOf str;
         description = ''
-          The username.
+          The monitor configuration for hyprland.
         '';
       };
+      workspace = lib.mkOption {
+        default = [ ];
+        example = [
+          "2,monitor:DP-1, default:true"
+        ];
+        type = with lib.types; listOf str;
+        description = ''
+          The workspace configuration for hyprland.
+        '';
+      };
+      hyprpaper = lib.mkOption {
+        default = '''';
+        example = ''
+          hyprpaper stuff
+        '';
+        type = lib.types.lines;
+        description = ''
+          hyprpaper
+        '';
+      };
+      extra_autostart = lib.mkOption {
+        default = [ ];
+        example = [ "your application" ];
+        type = lib.types.listOf lib.types.str;
+        description = ''
+          Extra exec_once.
+        '';
+      };
+    };
   };
 
   config = {

nix/modules/default.nix

@@ -1,6 +0,0 @@
-{
-  imports = [
-    ./hyprpaper_config.nix
-    ./conf.nix
-  ];
-}

nix/modules/hyprpaper_config.nix

@@ -1,22 +0,0 @@
-{ lib, ... }: {
-  options.programs.hyprland = {
-    hyprpaper = lib.mkOption {
-      default = '''';
-      example = ''
-        hyprpaper stuff
-      '';
-      type = lib.types.lines;
-      description = ''
-        hyprpaper
-      '';
-    };
-    extra_autostart = lib.mkOption {
-      default = [ ];
-      example = [ "your application" ];
-      type = lib.types.listOf lib.types.str;
-      description = ''
-        Extra exec_once.
-      '';
-    };
-  };
-}

nix/programs/common.nix

@@ -48,7 +48,6 @@ in
     playerctl
     ncspot
     poppler_utils
-    neofetch
     brave
     greetd.regreet
     sops

nix/programs/default.nix

@@ -1,4 +1,4 @@
-{ inputs, pkgs, mod, config, ... }:
+{ inputs, pkgs, config, lib, mod, ... }:
 let
   base_imports = [
     inputs.anyrun.homeManagerModules.default
@@ -14,7 +14,6 @@ let
     inputs.nix-flatpak.homeManagerModules.nix-flatpak
     inputs.sops-nix.homeManagerModules.sops
   ];
-  username = config.conf.username;
 in
 {
   xdg.portal.config.common.default = "*";
@@ -26,12 +25,13 @@ in
   };
   home-manager.useGlobalPkgs = true;
   home-manager.useUserPackages = true;
+  home-manager.extraSpecialArgs = {
+    inherit inputs;
+  };
 
-  home-manager.users.${username} = {
+  home-manager.users.${config.conf.username} = {
     imports = [
-      {
+
-        _module = { args = { inherit inputs username; }; };
-      }
       ./hyprland/default.nix
       ./flatpak.nix
       ./common.nix
@@ -42,7 +42,7 @@ in
       ./oxi/default.nix
       ./themes/default.nix
       ./individual_configs/default.nix
-      mod
+    ] ++ base_imports
-    ] ++ base_imports;
+    ++ lib.optional (builtins.pathExists mod) mod;
   };
 }

nix/programs/hyprland/config.nix

@@ -178,6 +178,9 @@
       workspace_swipe = true;
     };
 
+    monitor = config.conf.hyprland.monitor;
+    workspace = config.conf.hyprland.workspace;
+
     env = [
       "GTK_CSD,0"
       "TERM,\"kitty /bin/fish\""
@@ -243,7 +246,7 @@
       "oxipaste_daemon"
       "nextcloud --background"
       "oxinoti"
-    ] ++ config.programs.hyprland.extra_autostart;
+    ] ++ config.conf.hyprland.extra_autostart;
 
     # plugin = {
     #   hyprspace = {

nix/programs/hyprland/hyprpaper.nix

@@ -1,5 +1,5 @@
 { config, ... }: {
   xdg.configFile."hypr/hyprpaper.conf" = {
-    text = config.programs.hyprland.hyprpaper;
+    text = config.conf.hyprland.hyprpaper;
   };
 }

nix/programs/hyprland/ironbar.nix

@@ -146,7 +146,7 @@ in
       ];
       config = {
         monitors."${config.conf.monitor}" = {
-          end = config.conf.battery ++ [
+          end = config.conf.ironbar.modules ++ [
             {
               type = "sys_info";
               format = [