From bba9c8494e9134cd5a1e2fb4bdc797b65ecda723 Mon Sep 17 00:00:00 2001
From: k <markers711@gmail.com>
Date: Fri, 10 Jan 2025 18:10:17 -0500
Subject: [PATCH] move to hyprland

---
 hosts/home/home_common.nix     |  2 +-
 hosts/home/hyprland.nix        |  3 +-
 hosts/home/tile.nix            |  2 +-
 hosts/home/waybar.nix          |  8 +++---
 hosts/laptop/configuration.nix | 50 ++++++++++++++++++++--------------
 hosts/laptop/home.nix          |  5 ++--
 6 files changed, 40 insertions(+), 30 deletions(-)

diff --git a/hosts/home/home_common.nix b/hosts/home/home_common.nix
index b51a07d..e0707b3 100644
--- a/hosts/home/home_common.nix
+++ b/hosts/home/home_common.nix
@@ -16,7 +16,7 @@
       userName = "k";
       userEmail = "markers711@gmail.com";
     };
-    tmux = {enable = true;};
+    tmux.enable = true;
     starship.enable = true;
     zsh = {
       enable = true;
diff --git a/hosts/home/hyprland.nix b/hosts/home/hyprland.nix
index c61735c..692462a 100644
--- a/hosts/home/hyprland.nix
+++ b/hosts/home/hyprland.nix
@@ -37,7 +37,6 @@
           noise = 0.3;
           new_optimizations = true;
         };
-        drop_shadow = true;
       };
 
       misc = {
@@ -83,7 +82,7 @@
         "$mainMod, 0, workspace, 10"
 
         # same as above, but switch to the workspace
-        "$mainMod SHIFT, 1, movetoworkspacesilent, 1" # movetoworkspacesilent
+        "$mainMod SHIFT, 1, movetoworkspacesilent, 1"
         "$mainMod SHIFT, 2, movetoworkspacesilent, 2"
         "$mainMod SHIFT, 3, movetoworkspacesilent, 3"
         "$mainMod SHIFT, 4, movetoworkspacesilent, 4"
diff --git a/hosts/home/tile.nix b/hosts/home/tile.nix
index 2984ac4..038d735 100644
--- a/hosts/home/tile.nix
+++ b/hosts/home/tile.nix
@@ -7,9 +7,9 @@
   services = {mako = {enable = true;};};
   programs = {
     alacritty = {enable = true;};
-    swaylock = {enable = true;};
     wofi = {enable = true;};
     zathura = {enable = true;};
     mpv = {enable = true;};
   };
+  stylix.targets.wofi.enable = true; #this dosnt follow auto enable for some reson
 }
diff --git a/hosts/home/waybar.nix b/hosts/home/waybar.nix
index 269e0ce..3a9daef 100644
--- a/hosts/home/waybar.nix
+++ b/hosts/home/waybar.nix
@@ -44,16 +44,16 @@
             car = " ";
             default = [" " " "];
           };
-          scroll-step = 1;
-          on-click = "pavucontrol";
+          #scroll-step = 1;
+          #on-click = "pavucontrol";
         };
 
         backlight = {
           tooltip = false;
           format = " {}%";
           interval = 1;
-          on-scroll-up = "brightnessctl s 1515";
-          on-scroll-down = "brightnessctl s 1";
+          on-scroll-up = "${pkgs.brightnessctl}/bin/brightnessctl s 5%+";
+          on-scroll-down = "${pkgs.brightnessctl}/bin/brightnessctl s 5%+";
         };
 
         network = {
diff --git a/hosts/laptop/configuration.nix b/hosts/laptop/configuration.nix
index 4029385..58a258f 100644
--- a/hosts/laptop/configuration.nix
+++ b/hosts/laptop/configuration.nix
@@ -10,11 +10,16 @@
   system.autoUpgrade.enable = true;
   time.timeZone = "America/New_York";
   powerManagement.enable = true;
-  hardware.bluetooth.enable = true;
-  hardware.bluetooth.powerOnBoot = true;
-  hardware.bluetooth.settings = {
-    General = {
-      Enable = "Source,Sink,Media,Socket";
+
+  hardware = {
+    bluetooth = {
+      enable = true;
+      powerOnBoot = true;
+      settings = {
+        General = {
+          Enable = "Source,Sink,Media,Socket";
+        };
+      };
     };
   };
 
@@ -60,10 +65,17 @@
       enable = true;
       package = pkgs.ollama-intel;
     };
+    tlp = {
+      enable = true;
+      settings = {
+        CPU_SCALING_GOVERNOR_ON_AC = "performance";
+        CPU_SCALING_GOVERNOR_ON_BAT = "powersave";
+
+        CPU_ENERGY_PERF_POLICY_ON_BAT = "power";
+        CPU_ENERGY_PERF_POLICY_ON_AC = "performance";
+      };
+    };
     blueman.enable = true;
-    xserver.enable = true;
-    displayManager.sddm.enable = true;
-    desktopManager.plasma6.enable = true;
     fwupd.enable = true;
     printing.enable = true;
     fprintd.enable = true;
@@ -102,10 +114,10 @@
         name = "Iosevka NFM";
       };
 
-#      emoji = {
-#        package = pkgs.notofonts;
-#        name = "Noto Color Emoji";
-#      };
+      #      emoji = {
+      #        package = pkgs.notofonts;
+      #        name = "Noto Color Emoji";
+      #      };
     };
   };
 
@@ -126,6 +138,12 @@
 
   programs = {
     zsh.enable = true;
+    regreet.enable = true;
+    hyprlock.enable = true;
+    hyprland = {
+      enable = true;
+      withUWSM = true;
+    };
   };
 
   users.users.k = {
@@ -143,15 +161,7 @@
 
   environment = {
     sessionVariables = {MOZ_USE_XINPUT2 = "1";};
-    plasma6.excludePackages = with pkgs; [
-      kate
-      oxygen
-      xterm
-    ];
     systemPackages = with pkgs; [
-      maliit-keyboard
-      maliit-framework
-      alacritty
     ];
   };
 
diff --git a/hosts/laptop/home.nix b/hosts/laptop/home.nix
index 90212fc..b4d59e7 100644
--- a/hosts/laptop/home.nix
+++ b/hosts/laptop/home.nix
@@ -6,6 +6,7 @@
 }: {
   imports = [
     ../home/home_common.nix
+    ../home/hyprland.nix
   ];
 
   nixpkgs.config.allowUnfree = true;
@@ -21,7 +22,7 @@
 
       btop
       zip
-      emacs30-pgtk
+      emacs-gtk
 
       direnv
       texliveFull
@@ -48,7 +49,7 @@
     emacs = {
       enable = true;
       defaultEditor = true;
-      package = pkgs.emacs30-pgtk;
+      package = pkgs.emacs-gtk;
     };
   };
   stylix = {