merge 2nd pc

nix/flake.nix

@@ -16,10 +16,10 @@
 
       sops-nix.url = "github:Mic92/sops-nix";
 
-      Hyprspace = {
-        url = "github:KZDKM/Hyprspace";
-        inputs.hyprland.follows = "hyprland";
-      };
+      # Hyprspace = {
+      #   url = "github:KZDKM/Hyprspace";
+      #   inputs.hyprland.follows = "nixpkgs";
+      # };
 
       nur.url = "github:nix-community/nur";
       hyprland.url = "git+https://github.com/hyprwm/Hyprland?submodules=1";

nix/hardware/marmo/configuration.nix

@@ -3,12 +3,14 @@
   imports = [
     ../../modules/gamemode.nix
     ../../modules/boot_params.nix
+    ../../modules/ironbar_config.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;
   };

nix/programs/common.nix

@@ -78,8 +78,6 @@ in
     };
   };
 
-  
-
   nixpkgs.config.allowUnfree = true;
 
   home.username = "dashie";