From 3c37d9f3352f41365a9fe40028cc6b3025257698 Mon Sep 17 00:00:00 2001
From: MichaelFisher1997 <contact@micahelfisher.tech>
Date: Sat, 10 May 2025 16:29:46 +0100
Subject: [PATCH] pre-restructor

---
 docker.nix     | 61 ++++++++++++++++++++------------------------------
 networking.nix |  1 +
 packages.nix   | 24 +++++++++++++++-----
 sunshine.nix   |  2 +-
 4 files changed, 45 insertions(+), 43 deletions(-)

diff --git a/docker.nix b/docker.nix
index 2ba125b..d64d5a2 100644
--- a/docker.nix
+++ b/docker.nix
@@ -1,41 +1,28 @@
-{ pkgs, ... }:
-#let
-#  # When using easyCerts=true the IP Address must resolve to the master on creation.
-# # So use simply 127.0.0.1 in that case. Otherwise you will have errors like this https://github.com/NixOS/nixpkgs/issues/59364
-#  kubeMasterIP = "10.1.1.2";
-#  kubeMasterHostname = "api.kube";
-#  kubeMasterAPIServerPort = 6443;
-#in
+{ ... }:
+
 {
+  # Enable Docker program itself
   virtualisation.docker.enable = true;
-  virtualisation.docker.rootless = {
-  	enable = true;
-  	setSocketVariable = true;
+
+  # Create a socket to lazy-load Docker
+  systemd.sockets.docker = {
+    wantedBy = [ "sockets.target" ];
+    listenStreams = [ "/run/docker.sock" ];
+    socketConfig = {
+      SocketMode = "0660";
+      SocketUser = "root";
+      SocketGroup = "docker";
+    };
+  };
+
+  # Override the Docker service to disable autostart
+  systemd.services.docker = {
+    enable = false;
+    wants = [ "docker.socket" ];
+    after = [ "docker.socket" ];
+    serviceConfig = {
+      ExecStartPre = "-/usr/bin/rm -f /run/docker.sock";
+    };
   };
-#  # resolve master hostname
-#  networking.extraHosts = "${kubeMasterIP} ${kubeMasterHostname}";
-#
-#  # packages for administration tasks
-#  environment.systemPackages = with pkgs; [
-#    kompose
-#    kubectl
-#    kubernetes
-#  ];
-#
-#  services.kubernetes = {
-#    roles = ["master" "node"];
-#    masterAddress = kubeMasterHostname;
-#    apiserverAddress = "https://${kubeMasterHostname}:${toString kubeMasterAPIServerPort}";
-#    easyCerts = true;
-#    apiserver = {
-#      securePort = kubeMasterAPIServerPort;
-#      advertiseAddress = kubeMasterIP;
-#    };
-#
-#    # use coredns
-#    addons.dns.enable = true;
-#
-#    # needed if you use swap
-#    kubelet.extraOpts = "--fail-swap-on=false";
-#  };
 }
+
diff --git a/networking.nix b/networking.nix
index 1ce2a9b..0699abc 100644
--- a/networking.nix
+++ b/networking.nix
@@ -17,4 +17,5 @@
     ];
   };
   services.tailscale.enable = true;
+  systemd.services.NetworkManager-wait-online.enable = false;
 }
diff --git a/packages.nix b/packages.nix
index 03a63ca..334a9a9 100644
--- a/packages.nix
+++ b/packages.nix
@@ -8,7 +8,6 @@ in
   environment.systemPackages = with pkgs; [
     # Text Editors
     vim
-    neovim
     libsForQt5.kate
     sublime
     lunarvim
@@ -38,7 +37,6 @@ in
     libsForQt5.kdenlive
     exercism
     betterdiscord-installer
-    unstable.nodejs_23
     unstable.go
     unstable.bun
     air
@@ -127,7 +125,7 @@ in
     discord
     webcord
     slack
-    telegram-desktop
+    #telegram-desktop
     
     # Media
     vlc
@@ -145,7 +143,6 @@ in
     bottles
     wine
     wine64
-    minecraft
     
     # Fonts
     noto-fonts-color-emoji
@@ -190,7 +187,7 @@ in
     svt-av1
     rav1e
     libaom
-    sunshine
+    unstable.sunshine
     
     # Miscellaneous
     fastfetch
@@ -199,7 +196,24 @@ in
     guacamole-client
     rpi-imager
     kdePackages.filelight
+    light
 
+    #games
+    flightgear
+    minetest
+    openttd
+    endless-sky
+    cataclysm-dda
+    xonotic
+    superTux
+    superTuxKart
+    airshipper
+    mindustry-wayland
+    speed_dreams
+    simutrans_binaries
+    modrinth-app
+    minecraft
+    nsnake
   ];
 
 }
diff --git a/sunshine.nix b/sunshine.nix
index 7645fc3..a3f1b5f 100644
--- a/sunshine.nix
+++ b/sunshine.nix
@@ -1,4 +1,4 @@
-{ pkgs, ... }:
+{ ... }:
 {
   services.sunshine = {
     enable = true;