uhhh

uhhh the 2nd rendition

default.nix

@@ -2,16 +2,28 @@
 
 let
   inherit (builtins) toString;
-  inherit (lib.modules) mkDefault mkIf;
+  inherit (lib.modules) mkDefault mkIf mkAliasOptionModule;
   inherit (lib.my) mapModulesRec';
 in {
   imports =
     [ 
       inputs.home-manager.nixosModules.home-manager
       (mkAliasOptionModule ["hm"] ["home-manager" "users" config.user.name])
+      inputs.nix-colors.homeManagerModules.default
+      inputs.hyprland.nixosModules.default
     ]
     ++ (mapModulesRec' (toString ./modules) import);
 
+  hm.imports = [
+  	inputs.hyprlock.homeManagerModules.hyprlock
+  	inputs.hypridle.homeManagerModules.hypridle
+  	inputs.hyprland.homeManagerModules.default
+  ];
+
+  environment.variables = {
+    NIXPKGS_ALLOW_UNFREE = "1";
+  };
+
   nix = {
     package = pkgs.nix;
 
@@ -27,19 +39,36 @@ in {
       keep-derivations = true;
       substituters = [ 
         "https://nix-community.cachix.org" 
+        "https://nixpkgs-wayland.cachix.org"
+        "https://hyprland.cachix.org"
       ];
       trusted-public-keys = [
       	"nix-community.cachix.org-1:mB9FSh9qf2dCimDSUo8Zy7bkq5CX+/rkCWyvRCYg3Fs="
+      	"nixpkgs-wayland.cachix.org-1:3lwxaILxMRkVhehr5StQprHdEo4IrE8sRho9R9HOLYA="
+        "hyprland.cachix.org-1:a7pgxzMz7+chwVL3/pzj6jIBMioiJM7ypFP8PwtkuGc="
       ];
   	};
   };
 
-  # set our git revision inside `nixos-version`
+  system.stateVersion = mkDefault "23.11";
   system.configurationRevision = with inputs; mkIf (self ? rev) self.rev;
-
-  # set home stateversion to system stateversion. Just Makes Sense
   hm.home.stateVersion = config.system.stateVersion;
 
+  boot = {
+    kernelPackages = pkgs.linuxPackages_latest;
+    kernelParams=["pci_aspm.policy=performance"];
+  };
+
+  # configure keymap in x11
+  services.xserver.xkb = {
+    layout = "us";
+    # i need to learn this sometime
+    # variant = "workman";
+  };
+  console = {
+    useXkbConfig = mkDefault true;
+  };
+
   time.timeZone = mkDefault "America/Los_Angeles";
   
   i18n.defaultLocale = mkDefault "en_US.UTF-8";
@@ -50,10 +79,11 @@ in {
     unrar unzip
     micro
     curl wget
-    # im pretty sure removing this breaks nixos-rebuild
-    # have fun
+    desktop-file-utils
+    shared-mime-info
+    xdg-user-dirs
+    xdg-utils
     git
   ];
 
-  system.stateVersion = mkDefault "23.11";
 }