From 6469c70d3bdce63aad3c50fe6d1b4197263b9e22 Mon Sep 17 00:00:00 2001
From: Daniel Flanagan <daniel@lyte.dev>
Date: Sat, 29 Jun 2024 01:40:25 -0500
Subject: [PATCH] Add krdp for remote desktop

---
 flake.lock                | 19 ++++++++++++++++++-
 flake.nix                 | 21 ++++++++++-----------
 modules/nixos/default.nix | 12 +++++++-----
 3 files changed, 35 insertions(+), 17 deletions(-)

diff --git a/flake.lock b/flake.lock
index 3e5a883..9629999 100644
--- a/flake.lock
+++ b/flake.lock
@@ -346,6 +346,22 @@
         "type": "github"
       }
     },
+    "nixpkgs-unstable": {
+      "locked": {
+        "lastModified": 1719468428,
+        "narHash": "sha256-vN5xJAZ4UGREEglh3lfbbkIj+MPEYMuqewMn4atZFaQ=",
+        "owner": "nixos",
+        "repo": "nixpkgs",
+        "rev": "1e3deb3d8a86a870d925760db1a5adecc64d329d",
+        "type": "github"
+      },
+      "original": {
+        "owner": "nixos",
+        "ref": "nixpkgs-unstable",
+        "repo": "nixpkgs",
+        "type": "github"
+      }
+    },
     "nixpkgs_2": {
       "locked": {
         "lastModified": 1719075281,
@@ -425,6 +441,7 @@
         "home-manager": "home-manager",
         "hyprland": "hyprland",
         "nixpkgs": "nixpkgs_3",
+        "nixpkgs-unstable": "nixpkgs-unstable",
         "pre-commit": "pre-commit",
         "slippi": "slippi",
         "sops-nix": "sops-nix"
@@ -476,7 +493,7 @@
     "sops-nix": {
       "inputs": {
         "nixpkgs": [
-          "nixpkgs"
+          "nixpkgs-unstable"
         ],
         "nixpkgs-stable": [
           "nixpkgs"
diff --git a/flake.nix b/flake.nix
index 9d5c390..e701c28 100644
--- a/flake.nix
+++ b/flake.nix
@@ -1,14 +1,13 @@
 {
   inputs = {
     nixpkgs.url = "github:nixos/nixpkgs/nixos-24.05";
-    # nixpkgs-unstable.url = "github:nixos/nixpkgs/nixpkgs-unstable";
+    nixpkgs-unstable.url = "github:nixos/nixpkgs/nixpkgs-unstable";
 
     disko.url = "github:nix-community/disko/master";
     disko.inputs.nixpkgs.follows = "nixpkgs";
 
     sops-nix.url = "github:Mic92/sops-nix";
-    # sops-nix.inputs.nixpkgs.follows = "nixpkgs-unstable";
-    sops-nix.inputs.nixpkgs.follows = "nixpkgs";
+    sops-nix.inputs.nixpkgs.follows = "nixpkgs-unstable";
     sops-nix.inputs.nixpkgs-stable.follows = "nixpkgs";
 
     pre-commit.url = "github:cachix/pre-commit-hooks.nix";
@@ -46,7 +45,7 @@
   outputs = {
     self,
     nixpkgs,
-    # nixpkgs-unstable,
+    nixpkgs-unstable,
     disko,
     sops-nix,
     pre-commit,
@@ -119,7 +118,7 @@
         overlays = with overlays; [
           additions
           modifications
-          # unstable-packages
+          unstable-packages
         ];
       };
 
@@ -136,12 +135,12 @@
         final.helix = helix.outputs.packages.${prev.system}.helix;
       };
 
-      # unstable-packages = final: _prev: {
-      #   final.unstable = import nixpkgs-unstable {
-      #     system = final.system;
-      #     config.allowUnfree = true;
-      #   };
-      # };
+      unstable-packages = final: _prev: {
+        unstable-packages = import nixpkgs-unstable {
+          system = final.system;
+          config.allowUnfree = true;
+        };
+      };
     };
 
     nixosModules = import ./modules/nixos {
diff --git a/modules/nixos/default.nix b/modules/nixos/default.nix
index a77dc68..1c45092 100644
--- a/modules/nixos/default.nix
+++ b/modules/nixos/default.nix
@@ -175,8 +175,8 @@
     nixpkgs = {
       overlays = with overlays; [
         additions
-        # modifications
-        # unstable-packages
+        modifications
+        unstable-packages
       ];
       config.allowUnfree = true;
     };
@@ -383,9 +383,9 @@
     services.desktopManager.plasma6.enable = true;
     programs.dconf.enable = true;
 
-    services.xrdp.enable = true;
-    services.xrdp.defaultWindowManager = "plasma";
-    services.xrdp.openFirewall = false;
+    # services.xrdp.enable = true;
+    # services.xrdp.defaultWindowManager = "plasma";
+    # services.xrdp.openFirewall = false;
 
     environment.systemPackages = with pkgs; [
       wl-clipboard
@@ -413,6 +413,8 @@
       # kdePackages.kdevelop
       # kdePackages.kdialog
       kdePackages.kdeplasma-addons
+
+      unstable-packages.kdePackages.krdp
     ];
 
     programs.gnupg.agent = {