From ed71d6459cac1d06dfda0e07891aa948e304c7dc Mon Sep 17 00:00:00 2001
From: Amneesh Singh <natto@weirdnatto.in>
Date: Sun, 25 Feb 2024 17:16:10 +0530
Subject: [PATCH] fmt

Signed-off-by: Amneesh Singh <natto@weirdnatto.in>
---
 hosts/marisa/networking.nix       |  8 ++++----
 hosts/marisa/services/default.nix |  2 +-
 hosts/modules/wayland.nix         |  1 +
 hosts/modules/xorg.nix            | 11 ++---------
 lib/default.nix                   | 22 +++++++++-------------
 5 files changed, 17 insertions(+), 27 deletions(-)

diff --git a/hosts/marisa/networking.nix b/hosts/marisa/networking.nix
index d292e0c..864d4b3 100644
--- a/hosts/marisa/networking.nix
+++ b/hosts/marisa/networking.nix
@@ -6,13 +6,13 @@
       allowedTCPPorts = [
         22 # ssh
         80 # http
-      #  5454
+        #  5454
         5001 #gitea
         4646 #nomad
-      #  8500 #vault nomad consul
+        #  8500 #vault nomad consul
         8000 #simpler-filehost
-      #  6666 #concourse
-      #  202 #gitea-ssh
+        #  6666 #concourse
+        #  202 #gitea-ssh
       ];
       allowedUDPPorts = [ 17840 ];
       trustedInterfaces = [ "docker0" ];
diff --git a/hosts/marisa/services/default.nix b/hosts/marisa/services/default.nix
index b6a6740..f431e1c 100644
--- a/hosts/marisa/services/default.nix
+++ b/hosts/marisa/services/default.nix
@@ -17,7 +17,7 @@
   services = {
     openssh = {
       enable = true;
-      ports = [22 22001];
+      ports = [ 22 22001 ];
     };
     postgresql = {
       enable = true;
diff --git a/hosts/modules/wayland.nix b/hosts/modules/wayland.nix
index 761c9ae..63180c1 100644
--- a/hosts/modules/wayland.nix
+++ b/hosts/modules/wayland.nix
@@ -6,5 +6,6 @@
     extraPortals = [
       inputs.hyprland.packages.${pkgs.system}.xdg-desktop-portal-hyprland
     ];
+    config.common.default = "*";
   };
 }
diff --git a/hosts/modules/xorg.nix b/hosts/modules/xorg.nix
index 658b20a..901f85f 100644
--- a/hosts/modules/xorg.nix
+++ b/hosts/modules/xorg.nix
@@ -27,15 +27,8 @@
           enable = true;
         };
       };
-      extraLayouts = {
-        colemak = {
-          description = "Colemak Layouts";
-          languages = [ "eng" ];
-          symbolsFile = ./colemak;
-        };
-      };
-      layout = "us";
-      xkbVariant = "colemak_dh"; # trying to ditch DHz now
+      xkb.layout = "us";
+      xkb.variant = "colemak_dh"; # trying to ditch DHz now
       autoRepeatDelay = 320;
       autoRepeatInterval = 30;
     };
diff --git a/lib/default.nix b/lib/default.nix
index 6f46472..7d957ce 100644
--- a/lib/default.nix
+++ b/lib/default.nix
@@ -1,17 +1,13 @@
 { inputs, self, ... }:
 {
-  imports = [
-    {
-      config._module.args.globalArgs = {
-        _module.args = {
-          inherit inputs self;
-          flake = self;
-          lib' = {
-            colors = import ./colors.nix;
-            network = import ./network.nix;
-          };
-        };
+  config._module.args.globalArgs = {
+    _module.args = {
+      inherit inputs self;
+      flake = self;
+      lib' = {
+        colors = import ./colors.nix;
+        network = import ./network.nix;
       };
-    }
-  ];
+    };
+  };
 }