From 34e94621b888f45f60e88f7ed33f940875d024a9 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Micha=C5=82=C2=A0Czy=C5=BC?= <mike@c2yz.com>
Date: Mon, 4 Nov 2024 14:26:00 +0100
Subject: [PATCH] general theme applying

---
 home/programs/git.nix           |  7 +++++
 home/programs/vscode.nix        |  8 +++---
 home/system/hyprland.nix        | 45 +++++++++++++++++++++++----------
 home/system/waybar.nix          | 24 ++++++++++++++++++
 hosts/default.nix               |  2 +-
 hosts/modules/configuration.nix |  5 +++-
 hosts/modules/xserver.nix       |  2 +-
 7 files changed, 72 insertions(+), 21 deletions(-)

diff --git a/home/programs/git.nix b/home/programs/git.nix
index 88ff1da..ab7f439 100644
--- a/home/programs/git.nix
+++ b/home/programs/git.nix
@@ -8,6 +8,13 @@
     extraConfig = {
       init.defaultBranch = "main";
       push.autoSetupRemote = true;
+      user.signingkey = "9745B9E27E2B1ABB";
+      commit.gpgsign = true;
+      push.enabled = true;
+      column.ui = "auto";
+      branch.sort = "-committerdate";
+      pull.rebase = "false";
+      rerere.enabled = true;
     };
   };
 }
diff --git a/home/programs/vscode.nix b/home/programs/vscode.nix
index 0ac70fa..119baa7 100644
--- a/home/programs/vscode.nix
+++ b/home/programs/vscode.nix
@@ -48,10 +48,10 @@
 
       "symbols.hidesExplorerArrows" = false;
 
-      "workbench.iconTheme" = "vs-minimal";
-      "workbench.colorTheme" = "Rose Pine";
-      "workbench.preferredDarkColorTheme" = "Rose Pine";
-      "workbench.preferredHighContrastColorTheme" = "Rose Pine";
+      "workbench.iconTheme" = "rose-pine-icons";
+      "workbench.colorTheme" = "Rosé Pine";
+      "workbench.preferredDarkColorTheme" = "Rosé Pine";
+      "workbench.preferredHighContrastColorTheme" = "Rosé Pine";
 
     };
   };
diff --git a/home/system/hyprland.nix b/home/system/hyprland.nix
index 183deb3..18bfc96 100644
--- a/home/system/hyprland.nix
+++ b/home/system/hyprland.nix
@@ -655,27 +655,44 @@ windowrulev2 = noblur,class:^(xwaylandvideobridge)$
 
       listener = [
 
+        # {
+        #   timeout = 60;
+        #   on-timeout = "brightnessctl -sd asus::kbd_backlight set 0";
+        #   on-resume = "brightnessctl -rd asus::kbd_backlight";
+        # }
+
+        # {
+        #   timeout = 80;
+        #   on-timeout = "brightnessctl -s set 0";
+        #   on-resume = "brightnessctl -r";
+        # }
+
+        # {
+        #   timeout = 100;
+        #   on-timeout = "hyprctl dispatch dpms off ";
+        #   on-resume = "hyprctl dispatch dpms on";
+        # }
+
+        # {
+        #   timeout = 150;
+        #   on-timeout = "systemctl suspend";
+        # }
         {
-          timeout = 60;
-          on-timeout = "brightnessctl -sd asus::kbd_backlight set 0";
-          on-resume = "brightnessctl -rd asus::kbd_backlight";
+          timeout = 300;                                # 5min
+          on-timeout = "brightnessctl -s set 10";         # set monitor backlight to minimum, avoid 0 on OLED monitor.
+          on-resume = "brightnessctl -r";                 # monitor backlight restore.
         }
 
         {
-          timeout = 80;
-          on-timeout = "brightnessctl -s set 0";
-          on-resume = "brightnessctl -r";
+          timeout = 600;                                 # 10min
+          on-timeout = "loginctl lock-session";            # lock screen when timeout has passed
         }
 
         {
-          timeout = 100;
-          on-timeout = "hyprctl dispatch dpms off ";
-          on-resume = "hyprctl dispatch dpms on";
-        }
-
-        {
-          timeout = 150;
-          on-timeout = "systemctl suspend";
+          timeout = 1800;                                 # 30min
+          on-timeout = "systemctl hibernate";
+          # on-timeout = hyprctl dispatch dpms off        # screen off when timeout has passed
+          # on-resume = hyprctl dispatch dpms on          # screen on when activity is detected after timeout has fired.
         }
       ];
     };
diff --git a/home/system/waybar.nix b/home/system/waybar.nix
index e961e42..dbe8677 100644
--- a/home/system/waybar.nix
+++ b/home/system/waybar.nix
@@ -259,6 +259,30 @@
     # CSS Styling
     # ~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~
     style = ''
+        /*
+        * Variant: Rosé Pine
+        * Maintainer: DankChoir
+        */
+        
+        @define-color base            #191724;
+        @define-color surface         #1f1d2e;
+        @define-color overlay         #26233a;
+        
+        @define-color muted           #6e6a86;
+        @define-color subtle          #908caa;
+        @define-color text            #e0def4;
+        
+        @define-color love            #eb6f92;
+        @define-color gold            #f6c177;
+        @define-color rose            #ebbcba;
+        @define-color pine            #31748f;
+        @define-color foam            #9ccfd8;
+        @define-color iris            #c4a7e7;
+        
+        @define-color highlightLow    #21202e;
+        @define-color highlightMed    #403d52;
+        @define-color highlightHigh   #524f67;
+
         * {
             font-family: "JetBrainsMono Nerd Font", FontAwesome, Roboto, Helvetica,
             Arial, sans-serif;
diff --git a/hosts/default.nix b/hosts/default.nix
index 14e24d9..23dabb2 100644
--- a/hosts/default.nix
+++ b/hosts/default.nix
@@ -14,7 +14,7 @@
       ./modules/security.nix
       ./modules/pipewire.nix
       ./modules/gsettings.nix
-      ./modules/bluetooth.nix
+      # ./modules/bluetooth.nix
       ./modules/packages.nix
       # ./modules/lanzaboot.nix
       ./modules/configuration.nix
diff --git a/hosts/modules/configuration.nix b/hosts/modules/configuration.nix
index b3cc796..068eb9c 100644
--- a/hosts/modules/configuration.nix
+++ b/hosts/modules/configuration.nix
@@ -11,10 +11,13 @@
   services = {
     logind = {
       lidSwitch = "ignore";
-      lidSwitchExternalPower = if hostname == "server" then "ignore" else "suspend-then-hibernate";
+      # lidSwitchExternalPower = if hostname == "server" then "ignore" else "suspend-then-hibernate";
+      lidSwitchExternalPower = "ignore";
     };
   };
 
+  environment.sessionVariables.NIXOS_OZONE_WL = "1";
+
   system = {
     stateVersion = "24.05";
     switch = {
diff --git a/hosts/modules/xserver.nix b/hosts/modules/xserver.nix
index 5f44ec2..a35781b 100644
--- a/hosts/modules/xserver.nix
+++ b/hosts/modules/xserver.nix
@@ -2,7 +2,7 @@
 {
   services.xserver = {
     enable = true;
-    xkb.layout = "fr";
+    xkb.layout = "pl";
     xkb.variant = "";
     excludePackages = [ pkgs.xterm ];
   };