dotfiles

commit 0c248290d3a4146dc49834f615a4d3e349af0341
parent d89a477483e02f832a438cf6dafd544373708467
Author: maydayv7 <maydayv7@gmail.com>
Date:   Mon,  5 Feb 2024 11:59:38 +0530

feat(Hyprland): Minimize Windows

Also update to v0.35

Diffstat:

11 files changed, 72 insertions(+), 26 deletions(-)
diff --git a/README.md b/README.md
@@ -667,7 +667,7 @@ You can navigate to the `README`s present in the various directories to know mor
 
 </details>
 
-> Last Updated: **January** 2024
+> Last Updated: **February** 2024
 
 If you like this project, consider leaving a [star](https://github.com/maydayv7/dotfiles)
 
diff --git a/files/waybar/style.css b/files/waybar/style.css
@@ -2,6 +2,7 @@
   font-size: 16px;
   font-weight: 500;
   border-radius: 10px;
+  min-height: 0;
 }
 
 #waybar.empty #window {
@@ -12,6 +13,14 @@
   background: @base03;
 }
 
+#taskbar button.minimized {
+  border: 2px solid @base03;
+}
+
+#taskbar button.urgent {
+  border: 2px solid @base08;
+}
+
 @keyframes blink {
   to {
     background-color: #ffffff;
diff --git a/flake.lock b/flake.lock
@@ -540,6 +540,26 @@
         "type": "github"
       }
     },
+    "hych": {
+      "inputs": {
+        "hyprland": [
+          "hyprland"
+        ]
+      },
+      "locked": {
+        "lastModified": 1707110314,
+        "narHash": "sha256-vRAlQmJi9uFxxfpPvj0P874wxoCrbm4hDHAyH5jCfLo=",
+        "owner": "maydayv7",
+        "repo": "hych",
+        "rev": "128f0c2469d4387602df01fe0185bbe5e4ae7b5f",
+        "type": "github"
+      },
+      "original": {
+        "owner": "maydayv7",
+        "repo": "hych",
+        "type": "github"
+      }
+    },
     "hycov": {
       "inputs": {
         "hyprland": [
@@ -547,11 +567,11 @@
         ]
       },
       "locked": {
-        "lastModified": 1706930481,
-        "narHash": "sha256-9r8ZBevwA3O6Ysgo/6hBLTninDgSykk9qPa6pW8bWeY=",
+        "lastModified": 1707093208,
+        "narHash": "sha256-IYsoBwEhWxmMfJdxqSLj9hrtBnIhSmaSXtxZutY9BpE=",
         "owner": "DreamMaoMao",
         "repo": "hycov",
-        "rev": "c778aedf0ab678ce7c2ba077caf148cc3c1cbfc5",
+        "rev": "27e8b2679d32c72b1ecf7501c994ff809161c828",
         "type": "github"
       },
       "original": {
@@ -571,11 +591,11 @@
         "xdph": "xdph"
       },
       "locked": {
-        "lastModified": 1706485369,
-        "narHash": "sha256-FHojTmzX3SrAC+VXu+xdmTPwZtlSQ8KzRfq89c7DrN0=",
+        "lastModified": 1707098342,
+        "narHash": "sha256-dU5m6Cd4+WQZal2ICDVf1kww/dNzo1YUWRxWeCctEig=",
         "owner": "hyprwm",
         "repo": "Hyprland",
-        "rev": "4b4bd90b1450cbfc01d9ac429363cc7cecd6be8b",
+        "rev": "84ab8d11e8951a6551d1e1bf87796a8589da6d47",
         "type": "github"
       },
       "original": {
@@ -829,6 +849,7 @@
         "generators": "generators",
         "hardware": "hardware",
         "home-manager": "home-manager",
+        "hych": "hych",
         "hycov": "hycov",
         "hyprland": "hyprland",
         "hyprland-plugins": "hyprland-plugins",
diff --git a/flake.nix b/flake.nix
@@ -164,6 +164,11 @@
       inputs.hyprland.follows = "hyprland";
     };
 
+    hych = {
+      url = "github:maydayv7/hych";
+      inputs.hyprland.follows = "hyprland";
+    };
+
     hycov = {
       url = "github:DreamMaoMao/hycov";
       inputs.hyprland.follows = "hyprland";
diff --git a/modules/README.md b/modules/README.md
@@ -41,13 +41,13 @@ Configuration [Builder](./configuration.nix)
   - `gtk` -
     - `enable`: Enable GTK Configuration - `true / false`
     - `theme` -
-    - `name`: GTK+ Application Theme
-    - `package`: GTK+ Theme Package
+      - `name`: GTK+ Application Theme
+      - `package`: GTK+ Theme Package
   - `qt` -
     - `enable`: Enable QT Configuration - `true / false`
     - `theme` -
-    - `name`: QT Application Theme
-    - `package`: QT Theme Package
+      - `name`: QT Application Theme
+      - `package`: QT Theme Package
   - `launcher` -
     - `enable`: Enable Application Launcher - `true / false`
     - `shadow`: Control Launcher Window Shadow - `true / false`
diff --git a/modules/gui/desktop/hyprland/apps/bar.nix b/modules/gui/desktop/hyprland/apps/bar.nix
@@ -55,11 +55,12 @@ in rec {
         layer = "top";
         position = "top";
 
+        height = 30;
         spacing = 3;
         margin-top = 3;
-        margin-left = 5;
         margin-right = 5;
         margin-bottom = 5;
+        margin-left = 5;
 
         modules-left = ["custom/logo" "user" "hyprland/workspaces" "hyprland/window"];
         modules-center = ["wlr/taskbar"];
@@ -133,7 +134,9 @@ in rec {
           icon-theme = theme.icons.name;
           tooltip-format = "{title}";
           on-click = "activate";
-          on-click-middle = "close";
+          on-click-middle = "fullscreen";
+          on-click-right = "close";
+          ignore-list = ["ulauncher"];
         };
 
         tray = {
diff --git a/modules/gui/desktop/hyprland/settings/default.nix b/modules/gui/desktop/hyprland/settings/default.nix
@@ -11,7 +11,7 @@
   dconf.settings."org/gnome/desktop/wm/preferences".button-layout = "appmenu";
   wayland.windowManager.hyprland = {
     inherit (sys.programs.hyprland) enable package;
-    plugins = with pkgs.hyprworld; [hycov];
+    plugins = with pkgs.hyprworld; [hych hycov];
 
     # Use 'nwg-displays' to configure monitors
     extraConfig =
@@ -102,6 +102,8 @@
       group.groupbar = with sys.lib.stylix.colors; {
         enabled = true;
         render_titles = false;
+        height = 7;
+        scrolling = true;
         "col.active" = "rgb(${base0A})";
         "col.locked_active" = "rgb(${base0D})";
       };
diff --git a/modules/gui/desktop/hyprland/settings/keybindings.nix b/modules/gui/desktop/hyprland/settings/keybindings.nix
@@ -46,6 +46,10 @@ _: {
         "ALT, up, hycov:movefocus, u"
         "ALT, down, hycov:movefocus, d"
 
+        # Window Minimize
+        "ALT, Q, hych:minimize"
+        "ALT SHIFT, Q, hych:toggle_restore_window"
+
         # Cycle Workspaces
         "$mod, period, workspace, m-1"
         "$mod, comma, workspace, m+1"
diff --git a/modules/gui/qt.nix b/modules/gui/qt.nix
@@ -6,10 +6,6 @@
 }: let
   inherit (lib) mkEnableOption mkIf mkOption types;
   cfg = config.gui.qt;
-  kvconfig = ''
-    [General]
-    theme=${cfg.theme.name}
-  '';
 in {
   options.gui.qt = {
     enable = mkEnableOption "Enable QT Configuration";
@@ -31,7 +27,10 @@ in {
     environment = {
       systemPackages = [pkgs.libsForQt5.qtstyleplugin-kvantum cfg.theme.package];
       variables."QT_STYLE_OVERRIDE" = "kvantum";
-      etc."xdg/Kvantum/kvantum.kvconfig".text = kvconfig;
+      etc."xdg/Kvantum/kvantum.kvconfig".text = ''
+        [General]
+        Theme=${cfg.theme.name}
+      '';
     };
 
     user.homeConfig = {
@@ -43,7 +42,10 @@ in {
 
       xdg.configFile = with cfg.theme; {
         "Kvantum/${name}".source = "${package}/share/Kvantum/${name}";
-        "Kvantum/kvantum.kvconfig".text = kvconfig;
+        "Kvantum/kvantum.kvconfig".text = ''
+          [General]
+          theme=${name}
+        '';
       };
     };
   };
diff --git a/packages/flake.nix b/packages/flake.nix
@@ -58,7 +58,8 @@ in {
             gaming = gaming.packages."${system}";
             wine = windows.packages."${system}";
             hyprworld =
-              hycov.packages."${system}"
+              hych.packages."${system}"
+              // hycov.packages."${system}"
               // hyprland-plugins.packages."${system}"
               // hyprland.packages."${system}";
           })
diff --git a/users/default.nix b/users/default.nix
@@ -6,7 +6,7 @@
   ...
 }: let
   inherit (builtins) attrValues map;
-  inherit (lib) mkIf mkOption types;
+  inherit (lib) mkBefore mkIf mkOption types;
   cfg = config.credentials.key;
 in {
   options.credentials = {
@@ -46,7 +46,7 @@ in {
       ".local/share/backgrounds".source = files.wallpapers.path;
 
       # GTK+ Bookmarks
-      ".config/gtk-3.0/bookmarks".text = lib.mkBefore ''
+      ".config/gtk-3.0/bookmarks".text = mkBefore ''
         file://${dir}/Downloads Downloads
         file://${dir}/Pictures Pictures
       '';
@@ -96,9 +96,8 @@ in {
 
         # Custom Directories
         extraConfig = {
-          XDG_TBD_DIR = "$HOME/Documents/TBD";
-          XDG_PROJECTS_DIR = "$HOME/Projects";
-          XDG_SCREENSHOTS_DIR = "$HOME/Pictures/Screenshots";
+          "XDG_PROJECTS_DIR" = "$HOME/Projects";
+          "XDG_SCREENSHOTS_DIR" = "$HOME/Pictures/Screenshots";
         };
       };
     };