dotfiles

commit f240bd6894665b7e44a8c42e84c12f9da04c9776
parent c4995f80e6a6bd067820b3817a6206b934154a47
Author: maydayv7 <maydayv7@gmail.com>
Date:   Mon, 15 Apr 2024 18:00:33 +0530

feat: Hyprland v0.39

Diffstat:

8 files changed, 38 insertions(+), 25 deletions(-)
diff --git a/flake.lock b/flake.lock
@@ -560,15 +560,16 @@
         "xdph": "xdph"
       },
       "locked": {
-        "lastModified": 1713042788,
-        "narHash": "sha256-gnUFZtjsBYjS3L8ItEaSGSr38/8485YfURR6GioozJk=",
+        "lastModified": 1713120508,
+        "narHash": "sha256-piBUBQsQ8R20/lX9GMJjwdntal6yfJZMVCIi21XCZ8Y=",
         "owner": "hyprwm",
         "repo": "Hyprland",
-        "rev": "61fe47189b885058157b23326118627ae61f3746",
+        "rev": "e93fbd7c4f991cb8ef03e433ccc4d43587923e15",
         "type": "github"
       },
       "original": {
         "owner": "hyprwm",
+        "ref": "v0.39.0",
         "repo": "Hyprland",
         "type": "github"
       }
@@ -663,11 +664,11 @@
         ]
       },
       "locked": {
-        "lastModified": 1713060259,
-        "narHash": "sha256-v5sdYIJgEJJ/wrX9o6k2L9ouW+rcxe2aObFfcrghUyA=",
+        "lastModified": 1713165700,
+        "narHash": "sha256-gDrXQpub0lxJu1IlDnfttSSMGYsf36XvYoLbUuvYpsE=",
         "owner": "KZDKM",
         "repo": "Hyprspace",
-        "rev": "e4251c52acc47deba063bb4a3f46f5eb17339997",
+        "rev": "0d3b9466cf6fc19a3173d4dfa58fe37178e6aaae",
         "type": "github"
       },
       "original": {
@@ -976,7 +977,7 @@
         "unstable": "unstable",
         "utils": "utils_2",
         "vscode": "vscode",
-        "vscode-catppuccin": "vscode-catppuccin",
+        "vsppuccin": "vsppuccin",
         "wayland": "wayland",
         "wfvm": "wfvm",
         "windows": "windows"
@@ -1211,7 +1212,7 @@
         "type": "github"
       }
     },
-    "vscode-catppuccin": {
+    "vsppuccin": {
       "inputs": {
         "nixpkgs": "nixpkgs_4"
       },
diff --git a/flake.nix b/flake.nix
@@ -145,7 +145,7 @@
 
     # Hyprland
     hyprland = {
-      url = "github:hyprwm/Hyprland";
+      url = "github:hyprwm/Hyprland?ref=v0.39.0";
       inputs.systems.follows = "systems";
     };
 
@@ -164,7 +164,7 @@
     flatpak.url = "github:gmodena/nix-flatpak";
 
     # VS Code Extensions
-    vscode-catppuccin.url = "github:catppuccin/vscode";
+    vsppuccin.url = "github:catppuccin/vscode";
     vscode = {
       url = "github:nix-community/nix-vscode-extensions";
       inputs = {
diff --git a/modules/gui/desktop/hyprland/settings/default.nix b/modules/gui/desktop/hyprland/settings/default.nix
@@ -43,10 +43,18 @@ in {
         };
       };
 
+      # Workspace Behaviour
+      binds = {
+        workspace_center_on = 1;
+        movefocus_cycles_fullscreen = true;
+        workspace_back_and_forth = true;
+      };
+
       gestures = {
         workspace_swipe = true;
         workspace_swipe_fingers = 3;
         workspace_swipe_forever = true;
+        workspace_swipe_use_r = true;
         workspace_swipe_create_new = true;
       };
 
@@ -69,6 +77,7 @@ in {
         # Graphics
         vrr = 1;
         no_direct_scanout = false;
+        hide_cursor_on_key_press = true;
       };
 
       general =
diff --git a/modules/gui/desktop/hyprland/settings/plugins.nix b/modules/gui/desktop/hyprland/settings/plugins.nix
@@ -5,7 +5,7 @@
   files,
   ...
 }: let
-  inherit (sys.lib.stylix.colors) base00 base0A;
+  inherit (sys.lib.stylix.colors) base00 base0D;
 in {
   ## Plugin Settings
   # Pyprland
@@ -29,7 +29,7 @@ in {
           bg_col = rgb(${base00})
           workspace_method = center current
           enable_gesture = true
-          gesture_positive = true
+          gesture_positive = false
         }
 
         # Overview
@@ -39,10 +39,12 @@ in {
           centerAligned = true
           hideTopLayers = true
           hideOverlayLayers = false
+          showNewWorkspace = true
+          showEmptyWorkspace = false
           overrideGaps = true
           gapsIn = ${gaps}
           gapsOut = ${gaps}
-          workspaceActiveBorder = rgb(${base0A})
+          workspaceActiveBorder = rgb(${base0D})
         }
       }
     '';
diff --git a/packages/flake.nix b/packages/flake.nix
@@ -48,8 +48,7 @@ in {
         inherit system config;
 
         overlays = [
-          (import ./patches)
-          vscode-catppuccin.overlays.default
+          vsppuccin.overlays.default
           (pkg: _: {
             nixFlakes = pkg.unstable.nixVersions.nix_2_20;
 
diff --git a/packages/patches/.keep b/packages/patches/.keep
diff --git a/packages/patches/debugpy.patch b/packages/patches/debugpy.patch
@@ -0,0 +1,12 @@
+diff --git a/pkgs/development/python-modules/debugpy/default.nix b/pkgs/development/python-modules/debugpy/default.nix
+index 85389fba2fb2f2..4d76a7be3c9ea0 100644
+--- a/pkgs/development/python-modules/debugpy/default.nix
++++ b/pkgs/development/python-modules/debugpy/default.nix
+@@ -87,6 +87,7 @@ buildPythonPackage rec {
+     requests
+   ];
+
++  doCheck = false;
+   preCheck = ''
+     export DEBUGPY_PROCESS_SPAWN_TIMEOUT=0
+     export DEBUGPY_PROCESS_EXIT_TIMEOUT=0
diff --git a/packages/patches/default.nix b/packages/patches/default.nix
@@ -1,10 +0,0 @@
-final: prev: {
-  python3Packages = final.python3.pkgs;
-  python3 = prev.python3.override {
-    packageOverrides = pfinal: pprev: {
-      debugpy = pprev.debugpy.overrideAttrs (oldAttrs: {
-        pytestCheckPhase = "true";
-      });
-    };
-  };
-}