From 67be7fb446e68af5742a4c181fe12f65c31df685 Mon Sep 17 00:00:00 2001
From: Daniel Flanagan <daniel@lyte.dev>
Date: Fri, 20 Oct 2023 09:31:24 -0500
Subject: [PATCH] Melee and kde connect?

---
 flake.lock                             | 62 +++-----------------------
 flake.nix                              |  2 +-
 modules/home-manager/kde-connect.nix   |  6 +++
 modules/home-manager/linux-desktop.nix |  5 ---
 modules/home-manager/melee.nix         |  1 +
 modules/nixos/default.nix              |  1 +
 modules/nixos/desktop-usage.nix        |  1 +
 modules/nixos/kde-connect.nix          | 20 +++++++++
 8 files changed, 36 insertions(+), 62 deletions(-)
 create mode 100644 modules/home-manager/kde-connect.nix
 create mode 100644 modules/nixos/kde-connect.nix

diff --git a/flake.lock b/flake.lock
index f280d29..a35942e 100644
--- a/flake.lock
+++ b/flake.lock
@@ -223,40 +223,6 @@
         "type": "github"
       }
     },
-    "lowdown-src": {
-      "flake": false,
-      "locked": {
-        "lastModified": 1598695561,
-        "narHash": "sha256-gyH/5j+h/nWw0W8AcR2WKvNBUsiQ7QuxqSJNXAwV+8E=",
-        "owner": "kristapsdz",
-        "repo": "lowdown",
-        "rev": "1705b4a26fbf065d9574dce47a94e8c7c79e052f",
-        "type": "github"
-      },
-      "original": {
-        "owner": "kristapsdz",
-        "repo": "lowdown",
-        "type": "github"
-      }
-    },
-    "nix": {
-      "inputs": {
-        "lowdown-src": "lowdown-src",
-        "nixpkgs": "nixpkgs_8"
-      },
-      "locked": {
-        "lastModified": 1609520816,
-        "narHash": "sha256-IGO7tfJXsv9u2wpW76VCzOsHYapRZqH9pHGVsoffPrI=",
-        "owner": "NixOS",
-        "repo": "nix",
-        "rev": "8a2ce0f455da32bc20978e68c0aad9efb4560abc",
-        "type": "github"
-      },
-      "original": {
-        "id": "nix",
-        "type": "indirect"
-      }
-    },
     "nixpkgs": {
       "locked": {
         "lastModified": 1697456312,
@@ -386,21 +352,6 @@
       }
     },
     "nixpkgs_8": {
-      "locked": {
-        "lastModified": 1602702596,
-        "narHash": "sha256-fqJ4UgOb4ZUnCDIapDb4gCrtAah5Rnr2/At3IzMitig=",
-        "owner": "NixOS",
-        "repo": "nixpkgs",
-        "rev": "ad0d20345219790533ebe06571f82ed6b034db31",
-        "type": "github"
-      },
-      "original": {
-        "id": "nixpkgs",
-        "ref": "nixos-20.09-small",
-        "type": "indirect"
-      }
-    },
-    "nixpkgs_9": {
       "locked": {
         "lastModified": 1692447944,
         "narHash": "sha256-fkJGNjEmTPvqBs215EQU4r9ivecV5Qge5cF/QDLVn3U=",
@@ -491,20 +442,19 @@
     },
     "ssbm": {
       "inputs": {
-        "nix": "nix",
-        "nixpkgs": "nixpkgs_9",
+        "nixpkgs": "nixpkgs_8",
         "slippi-desktop": "slippi-desktop"
       },
       "locked": {
-        "lastModified": 1696638790,
-        "narHash": "sha256-fmpFkchuAyQfaSOWqEMnw4wRxWFkD7LqBwjKcVog8xQ=",
-        "owner": "djanatyn",
+        "lastModified": 1697581527,
+        "narHash": "sha256-sw4K8A9Wy6V4y54TlNjpsY4l11fxrEFHXrYq3NXoZcc=",
+        "owner": "lytedev",
         "repo": "ssbm-nix",
-        "rev": "cfeb1874b437e5883272c522234d1d15cb3d3ebd",
+        "rev": "abc984d77bb41b6358f84a78b29694445d77d1d2",
         "type": "github"
       },
       "original": {
-        "owner": "djanatyn",
+        "owner": "lytedev",
         "repo": "ssbm-nix",
         "type": "github"
       }
diff --git a/flake.nix b/flake.nix
index 9a2d120..5fcd98c 100644
--- a/flake.nix
+++ b/flake.nix
@@ -10,7 +10,7 @@
 
     api-lyte-dev.url = "git+ssh://gitea@git.lyte.dev/lytedev/api.lyte.dev.git";
 
-    ssbm.url = "github:djanatyn/ssbm-nix";
+    ssbm.url = "github:lytedev/ssbm-nix";
 
     # need to bump ishiiruka upstream I think
     # slippi-desktop.url = "github:project-slippi/slippi-desktop-app";
diff --git a/modules/home-manager/kde-connect.nix b/modules/home-manager/kde-connect.nix
new file mode 100644
index 0000000..544c162
--- /dev/null
+++ b/modules/home-manager/kde-connect.nix
@@ -0,0 +1,6 @@
+{
+  services.kdeconnect = {
+    enable = true;
+    indicator = true;
+  };
+}
diff --git a/modules/home-manager/linux-desktop.nix b/modules/home-manager/linux-desktop.nix
index 04adb2f..edf951c 100644
--- a/modules/home-manager/linux-desktop.nix
+++ b/modules/home-manager/linux-desktop.nix
@@ -21,9 +21,4 @@
       };
     };
   };
-
-  services.kdeconnect = {
-    enable = true;
-    indicator = true;
-  };
 }
diff --git a/modules/home-manager/melee.nix b/modules/home-manager/melee.nix
index 5778b87..34856d1 100644
--- a/modules/home-manager/melee.nix
+++ b/modules/home-manager/melee.nix
@@ -19,6 +19,7 @@
   ssbm = {
     slippi-launcher = {
       enable = true;
+      launchMeleeOnPlay = false;
     };
   };
 }
diff --git a/modules/nixos/default.nix b/modules/nixos/default.nix
index 68514f5..8c6b8ef 100644
--- a/modules/nixos/default.nix
+++ b/modules/nixos/default.nix
@@ -12,4 +12,5 @@
   sway = import ./sway.nix;
   user-installed-applications = import ./user-installed-applications.nix;
   wifi = import ./wifi.nix;
+  kde-connect = import ./kde-connect.nix;
 }
diff --git a/modules/nixos/desktop-usage.nix b/modules/nixos/desktop-usage.nix
index ebc0793..d9001e8 100644
--- a/modules/nixos/desktop-usage.nix
+++ b/modules/nixos/desktop-usage.nix
@@ -11,6 +11,7 @@
     # ./plasma.nix
     # ./gnome.nix
     ./user-installed-applications.nix
+    ./kde-connect.nix
   ];
 
   nixpkgs.overlays = [outputs.overlays.modifications];
diff --git a/modules/nixos/kde-connect.nix b/modules/nixos/kde-connect.nix
new file mode 100644
index 0000000..f23acb3
--- /dev/null
+++ b/modules/nixos/kde-connect.nix
@@ -0,0 +1,20 @@
+{
+  programs.kdeconnect = {
+    enable = true;
+  };
+
+  networking.firewall = {
+    allowedTCPPortRanges = [
+      {
+        from = 1714;
+        to = 1764;
+      }
+    ];
+    allowedUDPPortRanges = [
+      {
+        from = 1714;
+        to = 1764;
+      }
+    ];
+  };
+}