dotfiles

commit c4995f80e6a6bd067820b3817a6206b934154a47
parent e2e29ac24b941af7ee8ae71b00b4a21a6795ae2f
Author: maydayv7 <maydayv7@gmail.com>
Date:   Sun, 14 Apr 2024 13:03:54 +0530

fix: Update to build successfully

+ Update Hyprland and plugins
+ Rollback some `inputs`
+ Add `devcontainer` for Github Codespaces

Diffstat:

15 files changed, 163 insertions(+), 222 deletions(-)
diff --git a/.devcontainer/devcontainer.json b/.devcontainer/devcontainer.json
@@ -0,0 +1,10 @@
+{
+  "image":"mcr.microsoft.com/devcontainers/base:alpine",
+  "features": {
+    "ghcr.io/devcontainers/features/nix:1": {
+      "multiUser": true,
+      "version": "latest",
+	  "extraNixConfig": "experimental-features = nix-command flakes"
+    }
+  }
+}
diff --git a/checks/devcontainer b/checks/devcontainer
@@ -0,0 +1 @@
+../.devcontainer
+\ No newline at end of file
diff --git a/files/hyprland/binds.pango b/files/hyprland/binds.pango
@@ -1,21 +1,21 @@
 <span size="10.75pt">
 <b><big>Keyboard Shortcuts</big></b>																	<b><big>Mouse Actions</big></b>
-<i>$mod -> SUPER</i>																			<i>L' -> Left Click</i>
-<i> -> ALT Release Selection</i>																<i>R' -> Right Click</i>
+<i>$mod -> SUPER</i>																			<i>L'/R' -> Left/Right Click</i>
 
 <tt>$mod Q</tt>							Quit application										<tt>$mod L'</tt>				Move window
 <tt>$mod P</tt>							Pin window on all Workspaces							<tt>$mod R'</tt>				Window resize
 <tt>$mod M</tt>							Maximize window										<tt>$mod CTRL L'</tt>		Window resize
 <tt>$mod SHIFT M</tt>					Fullscreen window										<tt>$mod SHIFT L'</tt>		Move window into application group
 <tt>ALT Q</tt>								Minimize window
-<tt>ALT SHIFT Q </tt>					Show all minimized windows
+<tt>ALT SHIFT Q</tt>					Activate previously minimized windows
 <tt>$mod <i>ARROW</i></tt>						Switch focus to window in desired direction
 <tt>$mod SHIFT <i>ARROW</i></tt>			Swap current window with window in desired direction
 <tt>$mod Space</tt>						Change window split direction
 <tt>$mod SHIFT Space</tt>			Toggle application grouping
 
-<tt>ALT [SHIFT] Tab </tt>			Show application overview [of all workspaces]
-<tt>ALT <i>ARROW</i></tt>						Switch to window in desired direction in overview
+<tt>$mod CTRL Tab</tt>					Show workspace expose view
+<tt>$mod [SHIFT] Tab</tt>			Show workspace overview [of all monitors]
+<tt>ALT [SHIFT] Tab</tt>				Cycle [backwards] through open applications
 <tt>ALT CTRL Tab</tt>					Activate urgent/last window
 <tt>ALT [SHIFT] `</tt>					Cycle [backwards] through grouped applications
 
diff --git a/flake.lock b/flake.lock
@@ -329,7 +329,7 @@
     },
     "flake-utils": {
       "inputs": {
-        "systems": "systems_4"
+        "systems": "systems_3"
       },
       "locked": {
         "lastModified": 1710146030,
@@ -424,11 +424,11 @@
         "nixpkgs": "nixpkgs"
       },
       "locked": {
-        "lastModified": 1712969975,
-        "narHash": "sha256-QckL3hBXRRwapLNbPdjy7+5WQNl2n2o7onmQRpyHwYs=",
+        "lastModified": 1709168939,
+        "narHash": "sha256-btWt7NRsA8Hysgin5su77nIdmZZbxsKW5qqyj/bBlF0=",
         "owner": "fufexan",
         "repo": "nix-gaming",
-        "rev": "52f21f01ecbcc48d25c94a8a1e5c98cebf519a78",
+        "rev": "22586cc4910284c9c7306f19dcd63ac0adbcbcc9",
         "type": "github"
       },
       "original": {
@@ -518,49 +518,12 @@
         "type": "github"
       }
     },
-    "hych": {
-      "inputs": {
-        "hyprland": [
-          "hyprland"
-        ]
-      },
-      "locked": {
-        "lastModified": 1708921401,
-        "narHash": "sha256-ab7RjgNRdMf3ao8sDXA1kAhfB2aDG6hx4hm7VV6DqJA=",
-        "owner": "DreamMaoMao",
-        "repo": "hych",
-        "rev": "3c7d0a21776c01eadceb4f910876ff7bd3c30a2b",
-        "type": "github"
-      },
-      "original": {
-        "owner": "DreamMaoMao",
-        "repo": "hych",
-        "type": "github"
-      }
-    },
-    "hycov": {
-      "inputs": {
-        "hyprland": [
-          "hyprland"
-        ]
-      },
-      "locked": {
-        "lastModified": 1712516945,
-        "narHash": "sha256-cJTNdbAbY0KuIXuQXRLXSRSUQiwzkrJ2+aRtfz8ViNo=",
-        "owner": "nlintn",
-        "repo": "hycov",
-        "rev": "add2e7084142ae7f7fd8b246f5c6e599e8597cc7",
-        "type": "github"
-      },
-      "original": {
-        "owner": "nlintn",
-        "repo": "hycov",
-        "type": "github"
-      }
-    },
     "hyprcursor": {
       "inputs": {
-        "hyprlang": "hyprlang",
+        "hyprlang": [
+          "hyprland",
+          "hyprlang"
+        ],
         "nixpkgs": [
           "hyprland",
           "nixpkgs"
@@ -571,11 +534,11 @@
         ]
       },
       "locked": {
-        "lastModified": 1710257359,
-        "narHash": "sha256-43re5pzE/cswFAgw92/ugsB3+d5ufDaCcLtl9ztKfBo=",
+        "lastModified": 1712434681,
+        "narHash": "sha256-qwmR2p1oc48Bj7gUDvb1oGL19Rjs2PmEmk4ChV01A5o=",
         "owner": "hyprwm",
         "repo": "hyprcursor",
-        "rev": "1761f6cefd77f4fcd2039d930c88d6716ddc4974",
+        "rev": "818d8c4b69e0997483d60b75f701fe14b561a7a3",
         "type": "github"
       },
       "original": {
@@ -588,7 +551,7 @@
       "inputs": {
         "hyprcursor": "hyprcursor",
         "hyprland-protocols": "hyprland-protocols",
-        "hyprlang": "hyprlang_2",
+        "hyprlang": "hyprlang",
         "nixpkgs": "nixpkgs_2",
         "systems": [
           "systems"
@@ -597,16 +560,15 @@
         "xdph": "xdph"
       },
       "locked": {
-        "lastModified": 1710600709,
-        "narHash": "sha256-W+34KhCnqscRXN/IkvuJMiVx0Fa64RcYn8H4sZjzceI=",
+        "lastModified": 1713042788,
+        "narHash": "sha256-gnUFZtjsBYjS3L8ItEaSGSr38/8485YfURR6GioozJk=",
         "owner": "hyprwm",
         "repo": "Hyprland",
-        "rev": "c5e28ebcfe00a510922779b2c568cfa52a317445",
+        "rev": "61fe47189b885058157b23326118627ae61f3746",
         "type": "github"
       },
       "original": {
         "owner": "hyprwm",
-        "ref": "v0.37.1",
         "repo": "Hyprland",
         "type": "github"
       }
@@ -665,17 +627,19 @@
       "inputs": {
         "nixpkgs": [
           "hyprland",
-          "hyprcursor",
           "nixpkgs"
         ],
-        "systems": "systems"
+        "systems": [
+          "hyprland",
+          "systems"
+        ]
       },
       "locked": {
-        "lastModified": 1709914708,
-        "narHash": "sha256-bR4o3mynoTa1Wi4ZTjbnsZ6iqVcPGriXp56bZh5UFTk=",
+        "lastModified": 1711671891,
+        "narHash": "sha256-C/Wwsy/RLxHP1axFFl+AnwJRWfd8gxDKKoa8nt8Qk3c=",
         "owner": "hyprwm",
         "repo": "hyprlang",
-        "rev": "a685493fdbeec01ca8ccdf1f3655c044a8ce2fe2",
+        "rev": "c1402612146ba06606ebf64963a02bc1efe11e74",
         "type": "github"
       },
       "original": {
@@ -684,28 +648,31 @@
         "type": "github"
       }
     },
-    "hyprlang_2": {
+    "hyprspace": {
       "inputs": {
+        "hyprland": [
+          "hyprland"
+        ],
+        "hyprlandPlugins": [
+          "hyprland-plugins"
+        ],
         "nixpkgs": [
+          "hyprspace",
           "hyprland",
           "nixpkgs"
-        ],
-        "systems": [
-          "hyprland",
-          "systems"
         ]
       },
       "locked": {
-        "lastModified": 1709914708,
-        "narHash": "sha256-bR4o3mynoTa1Wi4ZTjbnsZ6iqVcPGriXp56bZh5UFTk=",
-        "owner": "hyprwm",
-        "repo": "hyprlang",
-        "rev": "a685493fdbeec01ca8ccdf1f3655c044a8ce2fe2",
+        "lastModified": 1713060259,
+        "narHash": "sha256-v5sdYIJgEJJ/wrX9o6k2L9ouW+rcxe2aObFfcrghUyA=",
+        "owner": "KZDKM",
+        "repo": "Hyprspace",
+        "rev": "e4251c52acc47deba063bb4a3f46f5eb17339997",
         "type": "github"
       },
       "original": {
-        "owner": "hyprwm",
-        "repo": "hyprlang",
+        "owner": "KZDKM",
+        "repo": "Hyprspace",
         "type": "github"
       }
     },
@@ -767,7 +734,7 @@
       "inputs": {
         "flake-parts": "flake-parts",
         "nix-github-actions": "nix-github-actions",
-        "nixpkgs": "nixpkgs_4",
+        "nixpkgs": "nixpkgs_5",
         "treefmt-nix": "treefmt-nix"
       },
       "locked": {
@@ -808,11 +775,11 @@
     },
     "nixpkgs": {
       "locked": {
-        "lastModified": 1712420723,
-        "narHash": "sha256-VnG0Eu394Ga2FCe8Q66m6OEQF8iAqjDYsjmtl+N2omk=",
+        "lastModified": 1708751719,
+        "narHash": "sha256-0uWOKSpXJXmXswOvDM5Vk3blB74apFB6rNGWV5IjoN0=",
         "owner": "NixOS",
         "repo": "nixpkgs",
-        "rev": "9e7f26f82acb057498335362905fde6fea4ca50a",
+        "rev": "f63ce824cd2f036216eb5f637dfef31e1a03ee89",
         "type": "github"
       },
       "original": {
@@ -855,11 +822,11 @@
     },
     "nixpkgs_2": {
       "locked": {
-        "lastModified": 1710272261,
-        "narHash": "sha256-g0bDwXFmTE7uGDOs9HcJsfLFhH7fOsASbAuOzDC+fhQ=",
+        "lastModified": 1712439257,
+        "narHash": "sha256-aSpiNepFOMk9932HOax0XwNxbA38GOUVOiXfUVPOrck=",
         "owner": "NixOS",
         "repo": "nixpkgs",
-        "rev": "0ad13a6833440b8e238947e47bea7f11071dc2b2",
+        "rev": "ff0dbd94265ac470dda06a657d5fe49de93b4599",
         "type": "github"
       },
       "original": {
@@ -887,6 +854,22 @@
     },
     "nixpkgs_4": {
       "locked": {
+        "lastModified": 1712791164,
+        "narHash": "sha256-3sbWO1mbpWsLepZGbWaMovSO7ndZeFqDSdX0hZ9nVyw=",
+        "owner": "NixOS",
+        "repo": "nixpkgs",
+        "rev": "1042fd8b148a9105f3c0aca3a6177fd1d9360ba5",
+        "type": "github"
+      },
+      "original": {
+        "owner": "NixOS",
+        "ref": "nixos-unstable",
+        "repo": "nixpkgs",
+        "type": "github"
+      }
+    },
+    "nixpkgs_5": {
+      "locked": {
         "lastModified": 1703134684,
         "narHash": "sha256-SQmng1EnBFLzS7WSRyPM9HgmZP2kLJcPAz+Ug/nug6o=",
         "owner": "NixOS",
@@ -901,7 +884,7 @@
         "type": "github"
       }
     },
-    "nixpkgs_5": {
+    "nixpkgs_6": {
       "locked": {
         "lastModified": 1712791164,
         "narHash": "sha256-3sbWO1mbpWsLepZGbWaMovSO7ndZeFqDSdX0hZ9nVyw=",
@@ -980,17 +963,16 @@
         "generators": "generators",
         "hardware": "hardware",
         "home-manager": "home-manager",
-        "hych": "hych",
-        "hycov": "hycov",
         "hyprland": "hyprland",
         "hyprland-plugins": "hyprland-plugins",
+        "hyprspace": "hyprspace",
         "impermanence": "impermanence",
         "index": "index",
         "nixpkgs": "nixpkgs_3",
         "proprietary": "proprietary",
         "sops": "sops",
         "stylix": "stylix",
-        "systems": "systems_3",
+        "systems": "systems_2",
         "unstable": "unstable",
         "utils": "utils_2",
         "vscode": "vscode",
@@ -1084,21 +1066,6 @@
     },
     "systems": {
       "locked": {
-        "lastModified": 1689347949,
-        "narHash": "sha256-12tWmuL2zgBgZkdoB6qXZsgJEH9LR3oUgpaQq2RbI80=",
-        "owner": "nix-systems",
-        "repo": "default-linux",
-        "rev": "31732fcf5e8fea42e59c2488ad31a0e651500f68",
-        "type": "github"
-      },
-      "original": {
-        "owner": "nix-systems",
-        "repo": "default-linux",
-        "type": "github"
-      }
-    },
-    "systems_2": {
-      "locked": {
         "lastModified": 1681028828,
         "narHash": "sha256-Vy1rq5AaRuLzOxct8nz4T6wlgyUR7zLU309k9mBC768=",
         "owner": "nix-systems",
@@ -1112,7 +1079,7 @@
         "type": "github"
       }
     },
-    "systems_3": {
+    "systems_2": {
       "flake": false,
       "locked": {
         "lastModified": 1707463813,
@@ -1129,7 +1096,7 @@
         "type": "github"
       }
     },
-    "systems_4": {
+    "systems_3": {
       "locked": {
         "lastModified": 1681028828,
         "narHash": "sha256-Vy1rq5AaRuLzOxct8nz4T6wlgyUR7zLU309k9mBC768=",
@@ -1184,7 +1151,7 @@
     },
     "utils": {
       "inputs": {
-        "systems": "systems_2"
+        "systems": "systems"
       },
       "locked": {
         "lastModified": 1694529238,
@@ -1246,16 +1213,14 @@
     },
     "vscode-catppuccin": {
       "inputs": {
-        "nixpkgs": [
-          "nixpkgs"
-        ]
+        "nixpkgs": "nixpkgs_4"
       },
       "locked": {
-        "lastModified": 1710544781,
-        "narHash": "sha256-nkxihb3D85k1nZV1CzlB3seMKtTEeKb688sblIGp/Bs=",
+        "lastModified": 1713019360,
+        "narHash": "sha256-5ngbcZjAB42kpjnmFNHJfXlCrujtzDsqynG1afKnqXc=",
         "owner": "catppuccin",
         "repo": "vscode",
-        "rev": "d7b96ccac36fd29929bd97bc9357413cc4e0240c",
+        "rev": "eead26917ad2f00c32145975cb04340c8bc5e91e",
         "type": "github"
       },
       "original": {
@@ -1269,7 +1234,7 @@
         "flake-compat": "flake-compat_4",
         "lib-aggregate": "lib-aggregate",
         "nix-eval-jobs": "nix-eval-jobs",
-        "nixpkgs": "nixpkgs_5"
+        "nixpkgs": "nixpkgs_6"
       },
       "locked": {
         "lastModified": 1712972067,
@@ -1329,20 +1294,18 @@
     "wlroots": {
       "flake": false,
       "locked": {
-        "host": "gitlab.freedesktop.org",
-        "lastModified": 1709983277,
-        "narHash": "sha256-wXWIJLd4F2JZeMaihWVDW/yYXCLEC8OpeNJZg9a9ly8=",
-        "owner": "wlroots",
-        "repo": "wlroots",
-        "rev": "50eae512d9cecbf0b3b1898bb1f0b40fa05fe19b",
-        "type": "gitlab"
+        "lastModified": 1712935342,
+        "narHash": "sha256-zzIbTFNFd/as42jyGx23fil2uBDYYv+8GA5JmRq5y9c=",
+        "owner": "hyprwm",
+        "repo": "wlroots-hyprland",
+        "rev": "62eeffbe233d199f520a5755c344e85f8eab7940",
+        "type": "github"
       },
       "original": {
-        "host": "gitlab.freedesktop.org",
-        "owner": "wlroots",
-        "repo": "wlroots",
-        "rev": "50eae512d9cecbf0b3b1898bb1f0b40fa05fe19b",
-        "type": "gitlab"
+        "owner": "hyprwm",
+        "repo": "wlroots-hyprland",
+        "rev": "62eeffbe233d199f520a5755c344e85f8eab7940",
+        "type": "github"
       }
     },
     "xdph": {
diff --git a/flake.nix b/flake.nix
@@ -145,7 +145,7 @@
 
     # Hyprland
     hyprland = {
-      url = "github:hyprwm/Hyprland?ref=v0.37.1";
+      url = "github:hyprwm/Hyprland";
       inputs.systems.follows = "systems";
     };
 
@@ -154,20 +154,17 @@
       inputs.hyprland.follows = "hyprland";
     };
 
-    hych = {
-      url = "github:DreamMaoMao/hych";
-      inputs.hyprland.follows = "hyprland";
-    };
-
-    hycov = {
-      url = "github:nlintn/hycov";
+    hyprspace = {
+      url = "github:KZDKM/Hyprspace";
       inputs.hyprland.follows = "hyprland";
+      inputs.hyprlandPlugins.follows = "hyprland-plugins";
     };
 
     # Declarative Flatpak Wrapper
     flatpak.url = "github:gmodena/nix-flatpak";
 
     # VS Code Extensions
+    vscode-catppuccin.url = "github:catppuccin/vscode";
     vscode = {
       url = "github:nix-community/nix-vscode-extensions";
       inputs = {
@@ -176,11 +173,6 @@
       };
     };
 
-    vscode-catppuccin = {
-      url = "github:catppuccin/vscode";
-      inputs.nixpkgs.follows = "nixpkgs";
-    };
-
     # Windows VM Creator
     wfvm = {
       url = "git+https://git.m-labs.hk/M-Labs/wfvm";
diff --git a/modules/gui/desktop/hyprland/apps/default.nix b/modules/gui/desktop/hyprland/apps/default.nix
@@ -43,7 +43,7 @@ in {
     mission-center
     custom.nwg-clipman
     unstable.nwg-displays
-    custom.nwg-drawer
+    unstable.nwg-drawer
     nwg-wrapper
     unstable.overskride
     playerctl
diff --git a/modules/gui/desktop/hyprland/settings/default.nix b/modules/gui/desktop/hyprland/settings/default.nix
@@ -47,7 +47,7 @@ in {
         workspace_swipe = true;
         workspace_swipe_fingers = 3;
         workspace_swipe_forever = true;
-        workspace_swipe_numbered = true;
+        workspace_swipe_create_new = true;
       };
 
       # Tiling Layout
diff --git a/modules/gui/desktop/hyprland/settings/keybindings.nix b/modules/gui/desktop/hyprland/settings/keybindings.nix
@@ -16,6 +16,12 @@ _: {
         "$mod, right, movefocus, r"
         "$mod, up, movefocus, u"
         "$mod, down, movefocus, d"
+
+        # Window Switcher
+        "ALT, Tab, cyclenext,"
+        "ALT, Tab, bringactivetotop,"
+        "ALT SHIFT, Tab, cyclenext, prev"
+        "ALT SHIFT, Tab, bringactivetotop,"
         "ALT CTRL, Tab, focusurgentorlast"
         "ALT CTRL, Tab, bringactivetotop,"
 
@@ -35,6 +41,11 @@ _: {
         "$mod, apostrophe, workspaceopt, allfloat"
         "$mod, C, centerwindow"
 
+        # Window Minimization
+        "ALT, Q, movetoworkspacesilent, special:minimized"
+        "ALT SHIFT, Q, togglespecialworkspace, minimized"
+        "ALT SHIFT, Q, movetoworkspace, +0"
+
         # Cycle Workspaces
         "$mod, comma, workspace, m-1"
         "$mod, period, workspace, m+1"
diff --git a/modules/gui/desktop/hyprland/settings/plugins.nix b/modules/gui/desktop/hyprland/settings/plugins.nix
@@ -1,8 +1,12 @@
 {
+  sys,
+  config,
   pkgs,
   files,
   ...
-}: {
+}: let
+  inherit (sys.lib.stylix.colors) base00 base0A;
+in {
   ## Plugin Settings
   # Pyprland
   home = {
@@ -11,27 +15,34 @@
   };
 
   wayland.windowManager.hyprland = {
-    plugins = with pkgs.wayworld; [hych hycov];
-    extraConfig = ''
+    plugins = with pkgs.wayworld; [hyprexpo Hyprspace];
+    extraConfig = let
+      gaps =
+        builtins.toString
+        config.wayland.windowManager.hyprland.settings.general.gaps_in;
+    in ''
       plugin {
-        # Window Minimize
-        hych {
-          enable_alt_release_exit = 1
-          alt_replace_key = code:64
+        # Expose
+        hyprexpo {
+          columns = 3
+          gap_size = ${gaps}
+          bg_col = rgb(${base00})
+          workspace_method = center current
+          enable_gesture = true
+          gesture_positive = true
         }
 
         # Overview
-        hycov {
-          enable_hotarea = 1
-          hotarea_pos = 3
-          only_active_workspace = 1
-          overview_gappi = 24
-          overview_gappo = 60
-          enable_gesture = 1
-          swipe_fingers = 4
-          enable_alt_release_exit = 1
-          alt_replace_key = Alt_L
-          alt_toggle_auto_next = 1
+        overview {
+          autoDrag = false
+          exitOnClick = true
+          centerAligned = true
+          hideTopLayers = true
+          hideOverlayLayers = false
+          overrideGaps = true
+          gapsIn = ${gaps}
+          gapsOut = ${gaps}
+          workspaceActiveBorder = rgb(${base0A})
         }
       }
     '';
@@ -39,17 +50,12 @@
     settings = {
       exec-once = ["pypr"];
       bind = [
-        # Window Minimize
-        "ALT, Q, hych:minimize"
-        "ALT SHIFT, Q, hych:toggle_restore_window"
+        # Expose
+        "$MOD CTRL, TAB, hyprexpo:expo, toggle"
 
         # Overview
-        "ALT, Tab, hycov:toggleoverview"
-        "ALT SHIFT, Tab, hycov:toggleoverview, forceall"
-        "ALT, left, hycov:movefocus, l"
-        "ALT, right, hycov:movefocus, r"
-        "ALT, up, hycov:movefocus, u"
-        "ALT, down, hycov:movefocus, d"
+        "$mod, Tab, overview:toggle"
+        "$mod SHIFT, Tab, overview:toggle, all"
       ];
     };
   };
diff --git a/packages/flake.nix b/packages/flake.nix
@@ -48,6 +48,7 @@ in {
         inherit system config;
 
         overlays = [
+          (import ./patches)
           vscode-catppuccin.overlays.default
           (pkg: _: {
             nixFlakes = pkg.unstable.nixVersions.nix_2_20;
@@ -60,8 +61,7 @@ in {
             wine = windows.packages."${system}";
             wayworld =
               wayland.packages."${system}"
-              // hych.packages."${system}"
-              // hycov.packages."${system}"
+              // hyprspace.packages."${system}"
               // hyprland-plugins.packages."${system}"
               // hyprland.packages."${system}";
           })
diff --git a/packages/nwg-drawer.nix b/packages/nwg-drawer.nix
@@ -1,54 +0,0 @@
-{
-  lib,
-  pkgs,
-  ...
-}:
-with pkgs;
-  unstable.buildGo122Module rec {
-    pname = "nwg-drawer";
-    version = "0.4.7";
-
-    src = fetchFromGitHub {
-      owner = "nwg-piotr";
-      repo = "nwg-drawer";
-      rev = "v${version}";
-      sha256 = "sha256-rBb2ArjllCBO2+9hx3f/c+uUQD1nCZzzfQGz1Wovy/0=";
-    };
-
-    vendorHash = "sha256-L8gdJd5cPfQrcSXLxFx6BAVWOXC8HRuk5fFQ7MsKpIc=";
-
-    nativeBuildInputs = [
-      gobject-introspection
-      pkg-config
-      wrapGAppsHook
-    ];
-
-    buildInputs = [
-      cairo
-      gtk-layer-shell
-      gtk3
-    ];
-
-    doCheck = false; # Too slow
-    preInstall = ''
-      mkdir -p $out/share/nwg-drawer
-      cp -r desktop-directories drawer.css $out/share/nwg-drawer
-    '';
-
-    preFixup = ''
-      # Make xdg-open overrideable at runtime
-      gappsWrapperArgs+=(
-        --suffix PATH : ${xdg-utils}/bin
-        --prefix XDG_DATA_DIRS : $out/share
-      )
-    '';
-
-    meta = with lib; {
-      mainProgram = "nwg-drawer";
-      description = "Application Drawer for Wayland compositors";
-      homepage = "https://github.com/nwg-piotr/nwg-drawer";
-      license = licenses.mit;
-      maintainers = ["maydayv7"];
-      platforms = platforms.linux;
-    };
-  }
diff --git a/packages/patches/.keep b/packages/patches/.keep
diff --git a/packages/patches/default.nix b/packages/patches/default.nix
@@ -0,0 +1,10 @@
+final: prev: {
+  python3Packages = final.python3.pkgs;
+  python3 = prev.python3.override {
+    packageOverrides = pfinal: pprev: {
+      debugpy = pprev.debugpy.overrideAttrs (oldAttrs: {
+        pytestCheckPhase = "true";
+      });
+    };
+  };
+}
diff --git a/scripts/nixos.nix b/scripts/nixos.nix
@@ -430,7 +430,7 @@ in
           cp -r "$KEY"/. ./keys
         fi
         echo "Importing Keys..."
-        find ./keys -name '*.gpg' -exec gpg --homedir ${files.gpg} --import {} \+
+        find ./keys -name '*.gpg' -exec sudo gpg --homedir ${files.gpg} --import {} \+
         rm -rf ./keys
         newline
 
diff --git a/site/content/anime.md b/site/content/anime.md
@@ -66,6 +66,7 @@ comments = true
 - Prison School
 - Rent-a-Girlfriend <sup>\*</sup>
 - RikeKoi <sup>#</sup>
+- Saint Cecilia and Pastor Lawrence <sup>\*</sup>
 - Scums Wish <sup>\*</sup>
 - Sekai Saikou no Ansatsusha, Isekai Kizoku ni Tensei suru <sup>\*</sup>
 - Senryu Girl