From 800045c1c5993fb57b91a3f03a4426946dc9c477 Mon Sep 17 00:00:00 2001
From: Ingolf Wagner <contact@ingolf-wagner.de>
Date: Sun, 11 Aug 2024 00:02:11 +0200
Subject: [PATCH] working on usbstick

---
 components/gui/fonts.nix                      | 14 ++++----
 .../network/sshd/known-hosts-zerotier.nix     |  1 +
 flake.nix                                     |  5 +--
 machines/usbstick/configuration.nix           | 35 ++++++++++---------
 .../hardware-configuration.nix                |  6 ++--
 5 files changed, 31 insertions(+), 30 deletions(-)

diff --git a/components/gui/fonts.nix b/components/gui/fonts.nix
index d94151f..0f48789 100644
--- a/components/gui/fonts.nix
+++ b/components/gui/fonts.nix
@@ -19,16 +19,16 @@ with lib;
 
       # symbol fonts
       # ------------
-      nerdfonts
-      powerline-fonts
-      font-awesome
-      fira-code-symbols
-      jetbrains-mono
+      #nerdfonts
+      #powerline-fonts
+      #font-awesome
+      #fira-code-symbols
+      #jetbrains-mono
 
       # shell font
       # ----------
-      terminus_font
-      gohufont
+      #terminus_font
+      #gohufont
 
     ];
 
diff --git a/components/network/sshd/known-hosts-zerotier.nix b/components/network/sshd/known-hosts-zerotier.nix
index 13fb191..8c58282 100644
--- a/components/network/sshd/known-hosts-zerotier.nix
+++ b/components/network/sshd/known-hosts-zerotier.nix
@@ -32,6 +32,7 @@ let
 in
 {
 
+  # todo : move this to the proper place
   options.components.network.zerotier = {
     enable = mkOption {
       type = bool;
diff --git a/flake.nix b/flake.nix
index cef0af7..6e59d02 100644
--- a/flake.nix
+++ b/flake.nix
@@ -468,9 +468,9 @@
             host = "orbi.bear";
             #host = "95.216.66.212";
             modules = [
-              zerotierModules
               homeManagerModules
               stylixModules
+              zerotierModules
               srvos.nixosModules.hardware-hetzner-online-intel
               #srvos.nixosModules.server
               #srvos.nixosModules.mixins-terminfo
@@ -510,9 +510,10 @@
             #host = "usbstick.bear";
             host = "10.100.0.100";
             modules = [
-              zerotierModules
               homeManagerModules
               stylixModules
+              zerotierModules
+              { home-manager.users.mainUser.gui.enable = true; }
               {
                 home-manager.users.mainUser = import ./homes/palo;
                 home-manager.users.root = import ./homes/root;
diff --git a/machines/usbstick/configuration.nix b/machines/usbstick/configuration.nix
index 9155a05..e60fe0d 100644
--- a/machines/usbstick/configuration.nix
+++ b/machines/usbstick/configuration.nix
@@ -10,31 +10,32 @@
   ];
 
   components.gui.enable = true;
-
+  components.gui.wayland.enable = false;
+  components.gui.xorg.enable = true;
   components.mainUser.enable = true;
-  components.network.enable = true;
   components.monitor.enable = false;
-
-  #networking.networkmanager.enable = true;
+  components.network.enable = true;
+  components.network.wifi.enable = true;
+  components.terminal.enable = true;
 
   networking.hostName = "usbstick";
 
   # Set your time zone.
-  time.timeZone = "Europe/Berlin";
+  #time.timeZone = "Europe/Berlin";
 
-  environment.systemPackages = with pkgs; [
-    vim
-    wget
-    htop
-    silver-searcher
-  ];
+  #environment.systemPackages = with pkgs; [
+  #  vim
+  #  wget
+  #  htop
+  #  silver-searcher
+  #];
 
-  environment.extraInit = ''
-    # use vi shortcuts
-    # ----------------
-    set -o vi
-    EDITOR=vim
-  '';
+  #environment.extraInit = ''
+  #  # use vi shortcuts
+  #  # ----------------
+  #  set -o vi
+  #  EDITOR=vim
+  #'';
 
   services.openssh.enable = true;
 
diff --git a/machines/usbstick/hardware-configuration/hardware-configuration.nix b/machines/usbstick/hardware-configuration/hardware-configuration.nix
index a6dbcab..a5a3652 100644
--- a/machines/usbstick/hardware-configuration/hardware-configuration.nix
+++ b/machines/usbstick/hardware-configuration/hardware-configuration.nix
@@ -21,13 +21,11 @@
       fsType = "ext4";
     };
 
-  #boot.initrd.luks.devices."root-enc".device = "/dev/disk/by-uuid/c2a56e0f-f831-4d21-8cf4-7ddf3901ea8a";
-  boot.initrd.luks.devices."root-enc".device = "/dev/sda3";
+  boot.initrd.luks.devices."root-enc".device = "/dev/disk/by-uuid/c2a56e0f-f831-4d21-8cf4-7ddf3901ea8a";
 
   fileSystems."/boot" =
     {
-      #device = "/dev/disk/by-uuid/EBCE-D756";
-      device = "/dev/sda2";
+      device = "/dev/disk/by-uuid/EBCE-D756";
       fsType = "vfat";
     };