From 202e5c098a7c324a7934df9f9ba26acacb0152d4 Mon Sep 17 00:00:00 2001
From: macronova <trivial@invariantspace.com>
Date: Sat, 2 Mar 2024 15:29:23 -0800
Subject: [PATCH] Update Steam Deck config

---
 linux/blitzar/network.nix         |  5 ++---
 linux/comet/network.nix           |  4 +---
 linux/nebula/network.nix          |  1 -
 linux/protostar/configuration.nix |  6 +++++-
 linux/protostar/default.nix       |  3 ++-
 linux/protostar/gui.nix           |  2 +-
 linux/protostar/network.nix       | 15 ++++-----------
 linux/protostar/syncthing.nix     | 28 ++++++++++++++--------------
 linux/protostar/zfs.nix           |  8 ++------
 linux/singularity/network.nix     |  5 +----
 10 files changed, 32 insertions(+), 45 deletions(-)

diff --git a/linux/blitzar/network.nix b/linux/blitzar/network.nix
index a6b53ee..5799f6c 100644
--- a/linux/blitzar/network.nix
+++ b/linux/blitzar/network.nix
@@ -1,8 +1,7 @@
-{ config, ... }:
+{ ... }:
 
 {
-  networking = let const = config.constants; in {
-    domain = const.domain;
+  networking = {
     hostId = "30f8f777";
     networkmanager = {
       enable = true;
diff --git a/linux/comet/network.nix b/linux/comet/network.nix
index 791ecb5..45a2435 100644
--- a/linux/comet/network.nix
+++ b/linux/comet/network.nix
@@ -1,9 +1,7 @@
-{ config, ... }:
+{ ... }:
 
 {
   networking = {
-    domain = config.constants.domain;
-    firewall.trustedInterfaces = [ config.services.tailscale.interfaceName ];
     hostId = "3ddd2ad2";
     nftables.enable = true;
   };
diff --git a/linux/nebula/network.nix b/linux/nebula/network.nix
index 6f7c966..fcc6900 100644
--- a/linux/nebula/network.nix
+++ b/linux/nebula/network.nix
@@ -2,7 +2,6 @@
 
 {
   networking = {
-    domain = config.constants.domain;
     firewall.trustedInterfaces = [ config.services.tailscale.interfaceName ];
     hostId = "e6449321";
     networkmanager = {
diff --git a/linux/protostar/configuration.nix b/linux/protostar/configuration.nix
index 13c30b0..d64b1a7 100644
--- a/linux/protostar/configuration.nix
+++ b/linux/protostar/configuration.nix
@@ -6,7 +6,11 @@
 
 {
   # Configuration boot
-  boot.loader.grub.device = "nodev";
+  boot.loader = {
+    efi.canTouchEfiVariables = true;
+    systemd-boot.enable = true;
+    timeout = 0;
+  };
 
   # Change secrets file
   constants.sopsFile = ../../common/auths.yaml;
diff --git a/linux/protostar/default.nix b/linux/protostar/default.nix
index 442c441..3175da6 100644
--- a/linux/protostar/default.nix
+++ b/linux/protostar/default.nix
@@ -7,9 +7,10 @@
   ] ++ [
     ./configuration.nix
     ./disko.nix
+    ./gui.nix
     ./hardware-configuration.nix
     ./network.nix
-    # ./syncthing.nix
+    ./syncthing.nix
     ./tailscale.nix
     ./zfs.nix
     ../../common
diff --git a/linux/protostar/gui.nix b/linux/protostar/gui.nix
index b0d0340..a2e82f9 100644
--- a/linux/protostar/gui.nix
+++ b/linux/protostar/gui.nix
@@ -2,7 +2,7 @@
 
 let usr = config.constants.userName; in {
   jovian = {
-    decky-loader.enable = true;
+    devices.steamdeck.enable = true;
     steam = {
       enable = true;
       autoStart = true;
diff --git a/linux/protostar/network.nix b/linux/protostar/network.nix
index b9e2b65..2ef8d95 100644
--- a/linux/protostar/network.nix
+++ b/linux/protostar/network.nix
@@ -1,17 +1,10 @@
-{ config, ... }:
+{ ... }:
 
-let hn = config.networking.hostName; in {
+{
   networking = {
-    domain = config.constants.domain;
-    firewall.trustedInterfaces = [ config.services.tailscale.interfaceName ];
-    hostId = "e6449321";
-    networkmanager = {
-      enable = true;
-      wifi.backend = "iwd";
-    };
+    hostId = "74247225";
+    networkmanager.enable = true;
     nftables.enable = true;
-    tempAddresses = "disabled";
-    wireless.iwd.enable = true;
   };
   services.openssh.enable = true;
 }
diff --git a/linux/protostar/syncthing.nix b/linux/protostar/syncthing.nix
index 3767734..e8e3a571 100644
--- a/linux/protostar/syncthing.nix
+++ b/linux/protostar/syncthing.nix
@@ -8,20 +8,20 @@
     openDefaultPorts = true;
     overrideDevices = true;
     overrideFolders = true;
-    settings = let pc = "blitzar"; in {
-      devices.${pc} = {
-        name = pc;
-        id = "KGCBCIZ-GG6KMQ2-FLK5BWW-GLCEDML-5LCI24S-UKO5UWL-HWNCPYX-ZWWD5AQ";
-      };
-      folders.music = {
-        enable = true;
-        devices = [ pc ];
-        id = "Music";
-        label = "Music";
-        path = "~/Music";
-        type = "receiveonly";
-      };
-    };
+    # settings = let pc = "blitzar"; in {
+    #   devices.${pc} = {
+    #     name = pc;
+    #     id = "KGCBCIZ-GG6KMQ2-FLK5BWW-GLCEDML-5LCI24S-UKO5UWL-HWNCPYX-ZWWD5AQ";
+    #   };
+    #   folders.music = {
+    #     enable = true;
+    #     devices = [ pc ];
+    #     id = "Music";
+    #     label = "Music";
+    #     path = "~/Music";
+    #     type = "receiveonly";
+    #   };
+    # };
     user = config.constants.userName;
   };
 }
diff --git a/linux/protostar/zfs.nix b/linux/protostar/zfs.nix
index 35d7371..549a322 100644
--- a/linux/protostar/zfs.nix
+++ b/linux/protostar/zfs.nix
@@ -1,12 +1,8 @@
-{ config, ... }:
+{ ... }:
 
 {
 
-  boot = {
-    kernelPackages = config.boot.zfs.package.latestCompatibleLinuxPackages;
-    loader.grub.zfsSupport = true;
-    zfs.enableUnstable = true;
-  };
+  boot.zfs.enableUnstable = true;
 
   services.zfs = {
     autoScrub.enable = true;
diff --git a/linux/singularity/network.nix b/linux/singularity/network.nix
index 2f98a21..b1d96e1 100644
--- a/linux/singularity/network.nix
+++ b/linux/singularity/network.nix
@@ -2,10 +2,7 @@
 
 let hn = config.networking.hostName; in {
   networking = {
-    domain = config.constants.domain;
-    firewall = {
-      allowedTCPPorts = with config.constants.port; [ http https ];
-    };
+    firewall.allowedTCPPorts = with config.constants.port; [ http https ];
     hostId = "2cadb253";
     nftables.enable = true;
   };