provision/modules/desktop/gnome.nix

@@ -30,7 +30,6 @@ in {
       gnome.dconf-editor
       gnome.gnome-tweaks
       gnomeExtensions.focus-changer
-      evolution
       # TODO: Add back when fixed upstream
       #gnomeExtensions.fullscreen-avoider
     ];
@@ -203,11 +202,8 @@ in {
           minimize = [];
         };
       } // generate_custom_keybindings {
-        "terminal" = { binding = "<Super><Control>Return"; command = "kgx"; name = "Open Terminal"; };
+        "terminal" = { binding = "<Super>Return"; command = "kgx"; name = "Open Terminal"; };
         "browser" = { binding = "<Super><Control>b"; command = "google-chrome-stable --simulate-outdated-no-au='Tue, 31 Dec 2099 23:59:59 GMT'"; name = "Open Browser"; };
-        "steam" = { binding = "<Super><Control>s"; command = "steam"; name = "Open Steam"; };
-        "discord" = { binding = "<Super><Control>d"; command = "discord"; name = "Open Discord"; };
-        "nautilus" = { binding = "<Super><Control>f"; command = "nautilus"; name = "Open File Manager"; };
       };
     };
   };

provision/modules/desktop/keyd.nix

@@ -1,33 +1,19 @@
 { config, lib, pkgs, user, inputs, ... }:
-let
+{
-  cfg = config.modules.desktop.gnome;
+  services.keyd = {
-in {
+    enable = true;
-  # Only launch for Gnome
+    keyboards.true = {
-  # TODO: if using with other WMs/DEs revise this.
+      ids = [ "*" ];
-  config = lib.mkIf cfg.enable {
+      settings = { 
-    services.keyd = {
+        main = {
-      enable = true;
+          capslock = "overload(meta, esc)";
-      keyboards.true = {
+          leftalt = "layer(alt)";
-        ids = [ "*" ];
+        };
-        settings = {
+        alt = {
-          main = {
+          h = "left";
-            capslock = "overload(meta, esc)";
+          j = "down";
-            leftalt = "layer(alt)";
+          k = "up";
-            f1 = "oneshot(open)";
+          l = "right";
-          };
-          open = {
-            enter = "C-M-enter"; # terminal
-            b = "C-M-b";         # browser
-            s = "C-M-s";         # steam
-            d = "C-M-d";         # discord
-            f = "C-M-f";         # nautilus
-          };
-          alt = {
-            h = "left";
-            j = "down";
-            k = "up";
-            l = "right";
-          };
         };
       };
     };

resources/wireguard/kestrel.conf

@@ -1,10 +0,0 @@
-[Interface]
-# your own IP on the wireguard network
-Address = 192.168.3.3/24
-PrivateKey = <replace with secret>
-[Peer]
-PublicKey = bd7bbZOngl/FTdBlnbIhgCLNf6yx5X8WjiRB7E1NEQQ=
-# restrict this to the wireguard subnet if you don't want to route everything to the tunnel
-AllowedIPs = 0.0.0.0/0, ::/0
-# ip and port of the peer
-Endpoint = 66.218.43.87:51820