From 273e88cb54e80542d047dad0d6332fd66ea66250 Mon Sep 17 00:00:00 2001
From: Andreas Schaafsma <andreas@subsonics.nl>
Date: Tue, 8 Oct 2024 19:53:10 +0200
Subject: [PATCH] changes

---
 flake.lock                             | 30 +++++++++++++-------------
 flake.nix                              | 18 ++++++++--------
 installed-packages/desktop/default.nix | 21 ++++++++++++++++++
 3 files changed, 45 insertions(+), 24 deletions(-)
 create mode 100644 installed-packages/desktop/default.nix

diff --git a/flake.lock b/flake.lock
index 2bf5fc6..ffcacc4 100644
--- a/flake.lock
+++ b/flake.lock
@@ -58,11 +58,11 @@
         "systems": "systems"
       },
       "locked": {
-        "lastModified": 1710146030,
-        "narHash": "sha256-SZ5L6eA7HJ/nmkzGG7/ISclqe6oZdOZTNoesiInkXPQ=",
+        "lastModified": 1726560853,
+        "narHash": "sha256-X6rJYSESBVr3hBoH0WbKE5KvhPU5bloyZ2L4K60/fPQ=",
         "owner": "numtide",
         "repo": "flake-utils",
-        "rev": "b1d9ab70662946ef0850d488da1c9019f3a9752a",
+        "rev": "c1dfcf08411b08f6b8615f7d8971a2bfa81d5e8a",
         "type": "github"
       },
       "original": {
@@ -130,11 +130,11 @@
         "nixpkgs-regression": "nixpkgs-regression"
       },
       "locked": {
-        "lastModified": 1726840928,
-        "narHash": "sha256-kXJvsJwtf03lb1TNgWDg14wuFTUz+BpwcjuQmVIItGM=",
+        "lastModified": 1728310575,
+        "narHash": "sha256-R13o8hNhzuTuEwUBViVOmT4OM0/I2d9DxnkxQOip1yg=",
         "owner": "NixOS",
         "repo": "nix",
-        "rev": "68ba6ff4709d936c1a714de35da08f8ed354c710",
+        "rev": "26c3fc11eada3fa7df0284190095868a947fefe2",
         "type": "github"
       },
       "original": {
@@ -149,11 +149,11 @@
         "nixpkgs": "nixpkgs_2"
       },
       "locked": {
-        "lastModified": 1726981058,
-        "narHash": "sha256-065MWSg1xhMdYun53S7mWKUEDviAEyxT/kl6JrjZwe4=",
+        "lastModified": 1728299182,
+        "narHash": "sha256-wzxKH5DyG+uyhnGtP8YmN3LCYtEyYR/4fhjKVY2Rtxg=",
         "owner": "nix-community",
         "repo": "NixOS-WSL",
-        "rev": "f9f28d8ff5288f821f1e64ec03185a9bb0edb0d0",
+        "rev": "830b6a752d0097c2043985ff4c1203aba07b268d",
         "type": "github"
       },
       "original": {
@@ -213,11 +213,11 @@
     },
     "nixpkgs_2": {
       "locked": {
-        "lastModified": 1726320982,
-        "narHash": "sha256-RuVXUwcYwaUeks6h3OLrEmg14z9aFXdWppTWPMTwdQw=",
+        "lastModified": 1728193676,
+        "narHash": "sha256-PbDWAIjKJdlVg+qQRhzdSor04bAPApDqIv2DofTyynk=",
         "owner": "NixOS",
         "repo": "nixpkgs",
-        "rev": "8f7492cce28977fbf8bd12c72af08b1f6c7c3e49",
+        "rev": "ecbc1ca8ffd6aea8372ad16be9ebbb39889e55b6",
         "type": "github"
       },
       "original": {
@@ -229,11 +229,11 @@
     },
     "nixpkgs_3": {
       "locked": {
-        "lastModified": 1726755586,
-        "narHash": "sha256-PmUr/2GQGvFTIJ6/Tvsins7Q43KTMvMFhvG6oaYK+Wk=",
+        "lastModified": 1728241625,
+        "narHash": "sha256-yumd4fBc/hi8a9QgA9IT8vlQuLZ2oqhkJXHPKxH/tRw=",
         "owner": "NixOS",
         "repo": "nixpkgs",
-        "rev": "c04d5652cfa9742b1d519688f65d1bbccea9eb7e",
+        "rev": "c31898adf5a8ed202ce5bea9f347b1c6871f32d1",
         "type": "github"
       },
       "original": {
diff --git a/flake.nix b/flake.nix
index 4856ca5..503d2c0 100644
--- a/flake.nix
+++ b/flake.nix
@@ -93,16 +93,16 @@
                 flatpak remote-add --if-not-exists flathub https://flathub.org/repo/flathub.flatpakrepo
               '';
             };
-            services.xrdp.enable = true;
-            services.xrdp.defaultWindowManager = "${pkgs.gnome-session}/bin/gnome-session";
-            # services.xrdp.openFirewall = true;
+            # services.xrdp.enable = true;
+            # services.xrdp.defaultWindowManager = "${pkgs.gnome-session}/bin/gnome-session";
+            # # services.xrdp.openFirewall = true;
 
-            # Disable the GNOME3/GDM auto-suspend feature that cannot be disabled in GUI!
-            # If no user is logged in, the machine will power down after 20 minutes.
-            systemd.targets.sleep.enable = false;
-            systemd.targets.suspend.enable = false;
-            systemd.targets.hibernate.enable = false;
-            systemd.targets.hybrid-sleep.enable = false;
+            # # Disable the GNOME3/GDM auto-suspend feature that cannot be disabled in GUI!
+            # # If no user is logged in, the machine will power down after 20 minutes.
+            # systemd.targets.sleep.enable = false;
+            # systemd.targets.suspend.enable = false;
+            # systemd.targets.hibernate.enable = false;
+            # systemd.targets.hybrid-sleep.enable = false;
           }
         ];
         specialArgs = { inherit inputs; };
diff --git a/installed-packages/desktop/default.nix b/installed-packages/desktop/default.nix
new file mode 100644
index 0000000..7c6bb3a
--- /dev/null
+++ b/installed-packages/desktop/default.nix
@@ -0,0 +1,21 @@
+{ pkgs }:
+let 
+    baseBackages = [
+      pkgs.vim
+      pkgs.nixpkgs-fmt
+    ];
+    utilPackages = [
+      pkgs.wget
+      pkgs.curl
+      pkgs.git
+      pkgs.ffmpeg
+    ];
+    haxeDevelopmentPackages = [
+      pkgs.haxe
+    ];
+in
+{
+  mkPackages = {
+    packages = baseBackages ++ utilPackages ++ haxeDevelopmentPackages;
+  };
+}