theming

MatthiasBenaets · Mar 11, 2024 · ad6f2bd · ad6f2bd
1 parent 72e7934
commit ad6f2bd
Show file tree

Hide file tree

Showing 11 changed files with 902 additions and 19 deletions.
diff --git a/hosts/default.nix b/hosts/default.nix
@@ -53,7 +53,7 @@ in
   work = lib.nixosSystem {                                  # Work Profile
     inherit system;
     specialArgs = {
-      inherit inputs system unstable hyprland vars;
+      inherit inputs system unstable hyprland hyprlock hypridle vars;
       host = {
         hostName = "work";
         mainMonitor = "eDP-1";
@@ -76,7 +76,7 @@ in
   xps = lib.nixosSystem {                                  # Work Profile
     inherit system;
     specialArgs = {
-      inherit inputs system unstable hyprland vars;
+      inherit inputs system unstable hyprland hyprlock hypridle vars;
       host = {
         hostName = "xps";
         mainMonitor = "eDP-1";
@@ -121,7 +121,7 @@ in
   h310m = lib.nixosSystem {                               # DEPRECATED Desktop Profile
     inherit system;
     specialArgs = {
-      inherit inputs system unstable hyprland vars;
+      inherit inputs system unstable hyprland hyprlock hypridle vars;
       host = {
         hostName = "h310m";
         mainMonitor = "HDMI-A-1";

diff --git a/modules/desktops/hyprland.nix b/modules/desktops/hyprland.nix
@@ -191,14 +191,15 @@ with host;
         settings = {
           general = {
             border_size = 2;
-            gaps_in = 0;
-            gaps_out = 0;
+            gaps_in = 3;
+            gaps_out = 6;
             "col.active_border" = "0x99${active}";
             "col.inactive_border" = "0x66${inactive}";
+            resize_on_border = true;
             layout = "dwindle";
           };
           decoration = {
-            rounding = 0;
+            rounding = 6;
             active_opacity = 1;
             inactive_opacity = 1;
             fullscreen_opacity = 1;
@@ -274,7 +275,7 @@ with host;
               tap-to-click = true;
             } else {};
           };
-          guestures = if hostName == "work"|| hostName == "xps" || hostName == "probook" then {
+          gestures = if hostName == "work"|| hostName == "xps" || hostName == "probook" then {
             workspace_swipe = true;
             workspace_swipe_fingers = 3;
             workspace_swipe_distance = 100;

diff --git a/modules/programs/flatpak.nix b/modules/programs/flatpak.nix
@@ -25,6 +25,7 @@ with lib;
   config = mkIf (config.flatpak.enable)
   {
     xdg.portal.enable = true;
+    xdg.portal.config.common.default = "*";
     xdg.portal.extraPortals = mkIf (config.wlwm.enable || config.x11wm.enable) [
       pkgs.xdg-desktop-portal-gtk
     ];

diff --git a/modules/programs/waybar.nix b/modules/programs/waybar.nix
@@ -19,7 +19,7 @@ let
     ] else [
       mainMonitor
     ];
-  modules-left = with config.programs;
+  modules-left = with config;
     if hyprland.enable == true then [
       "custom/menu" "hyprland/workspaces"
     ] else if sway.enable == true then [
@@ -66,7 +66,7 @@ in
             background-color: rgba(${rgb.active},0.4);
           }
           window#waybar {
-            background-color: #${hex.bg};
+            background-color: rgba(0, 0, 0 , 0.5);
             transition-property: background-color;
             transition-duration: .5s;
             border-bottom: 1px solid rgba(${rgb.active}, 0.99);
@@ -113,7 +113,7 @@ in
           /*#workspaces button.focused {*/
           #workspaces button.active {
             color: rgba(${rgb.fg},1);
-            background-color: rgba(${rgb.active}, 0.99);
+            background-color: rgba(${rgb.active}, 0.8);
           }
           #workspaces button.hidden {
             color: #${hex.text};
@@ -235,7 +235,7 @@ in
             backlight = {
               device = "intel_backlight";
               format= "{percent}% <span font='11'>{icon}</span>";
-              format-icons = ["" ""];
+              format-icons = ["" "󰖙"];
               on-scroll-down = "${pkgs.light}/bin/light -U 5";
               on-scroll-up = "${pkgs.light}/bin/light -A 5";
             };

diff --git a/modules/services/swaync.nix b/modules/services/swaync.nix
@@ -166,7 +166,7 @@ in
           }
 
           .close-button {
-            background: #${hex.red};
+            background: #${hex.active};
             color: @cc-bg;
             text-shadow: none;
             padding: 0;
@@ -316,7 +316,7 @@ in
           }
 
           .widget-title>button:hover {
-            background: #${hex.red};
+            background: #${hex.active};
             color: @cc-bg;
           }
 
@@ -335,8 +335,8 @@ in
           }
 
           .widget-dnd>switch:checked {
-            background: #${hex.red};
-            border: 1px solid #${hex.red};
+            background: #${hex.active};
+            border: 1px solid #${hex.active};
           }
 
           .widget-dnd>switch slider {
@@ -444,12 +444,19 @@ in
             color: @text-color;
           }
 
-          trough {
-            background: #${hex.fg};
+          scale trough highlight{
+            background: #${hex.active};
           }
 
-          highlight{
-            background: #${hex.active};
+          scale trough slider {
+            background: @text-color;
+            min-width: 2px;
+            min-height: 2px;
+            margin: -5px;
+          }
+
+          scale trough {
+            min-height: 2px;
           }
         '';
       };

diff --git a/modules/theming/colors.nix b/modules/theming/colors.nix
@@ -5,6 +5,48 @@
 {
   scheme = {
     default = {
+      scheme = "One Dark Pro";
+      hex = {
+        bg = "111111";
+        fg = "f7f7f7";
+        red = "e06c75";
+        orange = "d19a66";
+        yellow = "e5c07b";
+        green = "98c379";
+        cyan = "56b6c2";
+        blue = "61afef";
+        purple = "c678dd";
+        white = "abb2bf";
+        black = "282c34";
+        gray = "5c6370";
+        highlight = "e2be7d";
+        comment = "7f848e";
+        active = "f7870a";
+        inactive = "013864";
+        text = "999999";
+      };
+      rgb = {
+        bg = "17, 17, 17";
+        fg = "247, 247, 247";
+        red = "224, 108, 118";
+        orange = "209, 154, 102";
+        yellow = "229, 192, 123";
+        green = "152, 195, 121";
+        cyan = "86, 181, 194";
+        blue = "97, 175, 223";
+        purple = "197, 120, 221";
+        white = "171, 178, 191";
+        black = "40, 44, 52";
+        gray = "92, 99, 112";
+        highlight = "226, 191, 125";
+        comment = "127, 132, 142";
+        active = "247, 135, 10";
+        inactive = "1, 56, 100";
+        text = "153, 153, 153";
+      };
+    };
+
+    onedark = {
       scheme = "One Dark Pro";
       hex = {
         bg = "111111"; # 283c34

diff --git a/rsc/archive/hyprland.nix → rsc/archive/dwm/hyprland.nix b/rsc/archive/hyprland.nix → rsc/archive/dwm/hyprland.nix