From 1cd29c7c7048d88b7b3218cdb8e367f27d46079a Mon Sep 17 00:00:00 2001
From: joy <mail@joygnu.org>
Date: Fri, 4 Oct 2024 15:19:23 +0200
Subject: [PATCH] lol

---
 flake.nix                                     | 42 +++++++++----------
 modules/{system => hardware}/boot/default.nix |  0
 modules/hardware/default.nix                  |  1 +
 modules/hypr/land/default.nix                 | 13 ++----
 modules/hypr/theme/stylix/default.nix         | 11 +++--
 modules/system/default.nix                    |  1 -
 modules/system/misc/default.nix               |  2 +-
 modules/system/xdg/default.nix                |  2 +-
 8 files changed, 34 insertions(+), 38 deletions(-)
 rename modules/{system => hardware}/boot/default.nix (100%)

diff --git a/flake.nix b/flake.nix
index 11d3107..868cf83 100644
--- a/flake.nix
+++ b/flake.nix
@@ -1,26 +1,4 @@
 {
-  inputs = {
-    nixpkgs.url = "github:NixOS/nixpkgs/nixos-unstable";
-
-    nix-on-droid = {
-      url = "github:nix-community/nix-on-droid/master";
-      inputs.nixpkgs.follows = "nixpkgs";
-    };
-
-    ags.url = "github:Aylur/ags";
-    stylix.url = "github:danth/stylix";
-
-    firefox-addons = {
-      url = "gitlab:rycee/nur-expressions?dir=pkgs/firefox-addons";
-      inputs.nixpkgs.follows = "nixpkgs";
-    };
-
-    home-manager = {
-      url = "github:nix-community/home-manager";
-      inputs.nixpkgs.follows = "nixpkgs";
-    };
-  };
-
   outputs = {
     self,
     nixpkgs,
@@ -50,4 +28,24 @@
       };
     };
   };
+  inputs = {
+    nixpkgs.url = "github:NixOS/nixpkgs/nixos-unstable";
+    ags.url = "github:Aylur/ags";
+
+    stylix.url = "github:danth/stylix";
+
+    firefox-addons = {
+      url = "gitlab:rycee/nur-expressions?dir=pkgs/firefox-addons";
+      inputs.nixpkgs.follows = "nixpkgs";
+    };
+
+    home-manager = {
+      url = "github:nix-community/home-manager";
+      inputs.nixpkgs.follows = "nixpkgs";
+    };
+    nix-on-droid = {
+      url = "github:nix-community/nix-on-droid/master";
+      inputs.nixpkgs.follows = "nixpkgs";
+    };
+  };
 }
diff --git a/modules/system/boot/default.nix b/modules/hardware/boot/default.nix
similarity index 100%
rename from modules/system/boot/default.nix
rename to modules/hardware/boot/default.nix
diff --git a/modules/hardware/default.nix b/modules/hardware/default.nix
index 5a9f7c7..f659e1d 100644
--- a/modules/hardware/default.nix
+++ b/modules/hardware/default.nix
@@ -2,6 +2,7 @@
   imports = [
     ./bluetooth
     ./sound
+    ./boot
     ./led
   ];
 }
diff --git a/modules/hypr/land/default.nix b/modules/hypr/land/default.nix
index 830f883..3149605 100644
--- a/modules/hypr/land/default.nix
+++ b/modules/hypr/land/default.nix
@@ -63,14 +63,9 @@
           kb_layout = "us,de";
           kb_variant = ",qwerty";
           kb_options = "grp:alt_shift_toggle,caps:swapescape";
+          repeat_rate = 50;
         };
-        device = {
-          name = [
-            "compx-2.4g-wireless-receiver"
-            "at-translated-set-2-keyboard"
-          ];
-          repeat_rate = "50";
-        };
+
         bind = [
           # launch Apps
           "$mod,TAB, exec, alacritty"
@@ -158,9 +153,9 @@
           ", XF86AudioMicMute, exec, sh $sciPath/volume.sh -t"
         ];
       };
-      plugins = with pkgs.hyprlandPlugins;  [
+      plugins = with pkgs.hyprlandPlugins;   [
         hyprexpo
-      ];
+      ];     
     };
   };
 }
diff --git a/modules/hypr/theme/stylix/default.nix b/modules/hypr/theme/stylix/default.nix
index c7bdcfe..8df1d25 100644
--- a/modules/hypr/theme/stylix/default.nix
+++ b/modules/hypr/theme/stylix/default.nix
@@ -1,8 +1,10 @@
-{pkgs, ...}: let
-  backgroundUrl = "https://wallpapers.joygnu.org/wallpapers/anime/ghibli-japanese-walled-garden.png";
+{ pkgs, ... }:
+let  backgroundUrl = "https://wallpapers.joygnu.org/wallpapers/anime/ghibli-japanese-walled-garden.png";
   backgroundSha256 = "sha256-10Lv25V0RG0mnw/O90DeVchCNWJbdktUADtuI+enEwM=";
-in {
-  stylix = {
+in 
+
+{
+ stylix = {
     enable = true;
 
     base16Scheme = {
@@ -48,4 +50,5 @@ in {
       };
     };
   };
+
 }
diff --git a/modules/system/default.nix b/modules/system/default.nix
index d345e0c..039a278 100644
--- a/modules/system/default.nix
+++ b/modules/system/default.nix
@@ -5,7 +5,6 @@
     ./xdg
     ./appimage
     ./networking
-    ./boot
     ./misc
   ];
 }
diff --git a/modules/system/misc/default.nix b/modules/system/misc/default.nix
index ec5292d..8bfbd61 100644
--- a/modules/system/misc/default.nix
+++ b/modules/system/misc/default.nix
@@ -2,5 +2,5 @@
   nix.settings.experimental-features = ["nix-command" "flakes"];
   time.timeZone = "Europe/Zurich";
   system.stateVersion = "23.11";
-  services.logind.powerKey = "ignore";
+  services.logind.powerKey = "suspend";
 }
diff --git a/modules/system/xdg/default.nix b/modules/system/xdg/default.nix
index efaa0e9..c7f8b2f 100644
--- a/modules/system/xdg/default.nix
+++ b/modules/system/xdg/default.nix
@@ -20,7 +20,7 @@
       };
     };
     userDirs = {
-      enable = true;
+      enable = false;
       desktop = "~/media/pic/screen";
       download = "~/dl";
     };