dotfiles

commit 7fdb741778f3a1d850955eea246968addb67e999
parent 2c179f3112a3eea3f4580b7607f6e64571f3f51e
Author: maydayv7 <maydayv7@gmail.com>
Date:   Thu, 25 Apr 2024 09:06:29 +0530

feat: Change Shell utilites

Some modules are available after 24.05 release

Diffstat:

8 files changed, 36 insertions(+), 26 deletions(-)
diff --git a/files/hyprland/binds.pango b/files/hyprland/binds.pango
@@ -13,7 +13,7 @@
 <tt>$mod Space</tt>						Change window split direction
 <tt>$mod SHIFT Space</tt>			Toggle application grouping
 
-<tt>$mod CTRL Tab</tt>					Show workspace expose view
+<tt>$mod `</tt>							Show workspace expose view
 <tt>$mod [SHIFT] Tab</tt>			Show workspace overview [for all monitors]
 <tt>ALT [SHIFT] Tab</tt>				Show application overview [for all workspaces]
 <tt>ALT <i>ARROW</i></tt>						Switch to window in desired direction (in overview)
@@ -21,11 +21,11 @@
 <tt>ALT CTRL Tab</tt>					Activate urgent/last window
 <tt>ALT [SHIFT] `</tt>					Cycle [backwards] through grouped applications
 
-<tt>$mod <i>NUM</i></tt>						Create workspace '<i>NUM</i>'
-<tt>$mod SHIFT <i>NUM</i></tt>				Move window to workspace '<i>NUM</i>'
+<tt>$mod <i>NUM</i></tt>						Create workspace '<i>NUM</i>' {1 to 9}
+<tt>$mod SHIFT <i>NUM</i></tt>				Move window to workspace '<i>NUM</i>' {1 to 9}
 <tt>$mod ,<i> or </i>.</tt>					Move to previous/next non-empty workspace
-<tt>$mod `</tt>							Toggle special workspace to stash windows
-<tt>$mod SHIFT `</tt>					Move window to/from special workspace stash
+<tt>$mod 0</tt>							Toggle special workspace to stash windows
+<tt>$mod SHIFT 0</tt>					Move window to/from special workspace stash
 <tt>$mod SHIFT ,<i> or </i>.</tt>			Move window to previous/next workspace
 <tt>$mod ALT ,<i> or </i>.</tt>				Move focus to left/right monitor
 <tt>$mod SHIFT ALT ,<i> or </i>.</tt>		Move window to left/right monitor
diff --git a/flake.lock b/flake.lock
@@ -470,11 +470,11 @@
         ]
       },
       "locked": {
-        "lastModified": 1713576964,
-        "narHash": "sha256-qn/SED9lGPRkbgjbAm0Q8TG8Eo9PldAcLAVwZXsKVJs=",
+        "lastModified": 1713936041,
+        "narHash": "sha256-T/tp+edWXTQ5LUG/uy2a+o4MUOPkGL69TWvRMyxSwJk=",
         "owner": "DreamMaoMao",
         "repo": "hycov",
-        "rev": "df22a0cafc4ea1d2074231f5d1c906d819b1d660",
+        "rev": "d4216ca70e4b651f5fc95caafc4a0f03c0ae3b34",
         "type": "github"
       },
       "original": {
@@ -621,11 +621,11 @@
         ]
       },
       "locked": {
-        "lastModified": 1713738762,
-        "narHash": "sha256-wXMqOQosjblsdV3x0DzpH7qSBUs5hT5Ca6eZ2Xp8TOA=",
+        "lastModified": 1713989021,
+        "narHash": "sha256-oIpcibtKHP8e7yhYilK9+TaiOTApS4TqXQbdKqJpyWQ=",
         "owner": "KZDKM",
         "repo": "Hyprspace",
-        "rev": "de3b1ccbf30498b6fcd42b36418e33a2c8c1405a",
+        "rev": "a44d834af279f233a269d065d2e14fe4101d6f41",
         "type": "github"
       },
       "original": {
diff --git a/modules/gui/desktop/hyprland/apps/default.nix b/modules/gui/desktop/hyprland/apps/default.nix
@@ -145,10 +145,8 @@ in {
       services.poweralertd.enable = true;
 
       # Terminal
-      wayland.windowManager.hyprland.settings.misc.swallow_regex = "^(kitty)$";
       programs.kitty = {
         enable = true;
-        font = with config.stylix.fonts; monospace // {size = sizes.terminal;};
         theme = with theme; "${name-alt}-${variant-alt}";
         keybindings = {
           "ctrl+c" = "copy_or_interrupt";
@@ -157,7 +155,6 @@ in {
 
         settings = {
           kitty_mod = "ctrl+shift";
-          background_opacity = "0.9";
           placement_strategy = "center";
 
           copy_on_select = "clipboard";
@@ -168,6 +165,12 @@ in {
         };
       };
 
+      wayland.windowManager.hyprland.settings.misc.swallow_regex = "^(kitty)$";
+      stylix.targets.kitty = {
+        enable = true;
+        variant256Colors = true;
+      };
+
       # Web Browser
       programs.firefox = {
         policies.ExtensionSettings = {
diff --git a/modules/gui/desktop/hyprland/apps/security.nix b/modules/gui/desktop/hyprland/apps/security.nix
@@ -17,7 +17,6 @@ in {
       clock = true;
       indicator = true;
       font = fonts.sansSerif.name;
-      grace = 10;
       fade-in = 1;
       effect-vignette = "0.3:1";
     };
@@ -39,11 +38,11 @@ in {
     in [
       {
         event = "before-sleep";
-        command = lock "--grace 0";
+        command = lock "";
       }
       {
         event = "lock";
-        command = lock "";
+        command = lock "--grace 10";
       }
     ];
     timeouts = [
diff --git a/modules/gui/desktop/hyprland/settings/keybindings.nix b/modules/gui/desktop/hyprland/settings/keybindings.nix
@@ -48,8 +48,8 @@
           "$mod, period, split:workspace, m+1"
 
           # Special Workspace
-          "$mod, grave, togglespecialworkspace, stash"
-          "$mod SHIFT, grave, exec, pypr toggle_special stash"
+          "$mod, 0, togglespecialworkspace, stash"
+          "$mod SHIFT, 0, exec, pypr toggle_special stash"
 
           # Move Window to Workspace
           "$mod SHIFT, comma, split:movetoworkspace, r-1"
diff --git a/modules/gui/desktop/hyprland/settings/plugins.nix b/modules/gui/desktop/hyprland/settings/plugins.nix
@@ -72,7 +72,7 @@
       exec-once = ["pypr"];
       bind = [
         # Expose
-        "$mod CTRL, TAB, hyprexpo:expo, toggle"
+        "$mod, grave, hyprexpo:expo, toggle"
 
         # Application Overview
         "ALT, Tab, hycov:toggleoverview"
diff --git a/modules/gui/theme.nix b/modules/gui/theme.nix
@@ -10,6 +10,7 @@
   cfg = config.gui;
   enable = !(cfg.desktop == "" || hasSuffix "-minimal" cfg.desktop);
   exists = app: builtins.elem app config.apps.list;
+  shell = config.shell.utilities;
 in {
   imports = [inputs.stylix.nixosModules.stylix];
 
@@ -74,8 +75,12 @@ in {
         }
         else {
           homeManagerIntegration.autoImport = true;
-          opacity.popups = 0.9;
           polarity = "dark";
+          opacity = {
+            popups = 0.9;
+            terminal = 0.9;
+          };
+
           targets = {
             console.enable = true;
             kmscon.enable = true;
@@ -85,7 +90,9 @@ in {
       );
 
     user.homeConfig.stylix.targets = {
-      bat.enable = true;
+      bat.enable = mkIf shell true;
+      btop.enable = mkIf shell true;
+      #yazi.enable = mkIf shell true; #!# Wait for release
       firefox.enable = false;
       vscode.enable = mkIf (exists "vscode") false;
     };
diff --git a/modules/shell/default.nix b/modules/shell/default.nix
@@ -32,15 +32,14 @@ in {
       # Utilities
       environment.systemPackages = with pkgs; [
         bat
-        etcher
+        browsh
+        btop
         eza
         fd
-        file
         lolcat
         neofetch
-        shellcheck
-        stylua
         tree
+        yazi
       ];
 
       ## Program Configuration
@@ -68,7 +67,9 @@ in {
               {initExtra = mkBefore ''eval $(${getExe' pkgs.thefuck "thefuck"} --alias "fix")'';})
             (modules.name ./.))
             // {
+              btop.enable = true; # Resource Monitor
               hstr.enable = true; # Command History Browser
+              #yazi.enable = true # File Browser #!# Wait for release
 
               # DirENV Support
               direnv = {