From 5f6e8ef364103e46b8b79dc802f23e1df0016289 Mon Sep 17 00:00:00 2001
From: Jimbo <jimbo@nixfox.ca>
Date: Sun, 22 Dec 2024 22:02:10 -0500
Subject: [PATCH] More server prep

---
 .../extras/variables/look/fonts/default.nix   |  4 +-
 .../extras/variables/workspaces/default.nix   | 38 ++++++-------
 modules/home/files/default.nix                |  2 +-
 modules/home/settings/aliases/default.nix     |  4 +-
 .../accounts/groups/nfsShare/default.nix      |  4 +-
 .../devices/boot/lanzaboote/default.nix       |  2 -
 modules/system/devices/default.nix            |  1 -
 modules/system/devices/firmware/default.nix   |  4 --
 modules/system/devices/udev/default.nix       | 20 +++++--
 .../system/devices/udev/oculus/default.nix    | 12 -----
 modules/system/devices/udev/pdp/default.nix   | 12 -----
 modules/system/programs/gaming/default.nix    |  2 +-
 .../server/fileserver/local/samba/default.nix |  8 +--
 .../icecast/liquidsoap/jimbops/default.nix    | 54 ++++++++++---------
 .../liquidsoap/jimscrapped/default.nix        | 54 ++++++++++---------
 .../server/mailserver/simplenix/default.nix   |  4 +-
 .../mailserver/simplenix/nginx/default.nix    |  2 +-
 17 files changed, 103 insertions(+), 124 deletions(-)
 delete mode 100644 modules/system/devices/firmware/default.nix
 delete mode 100644 modules/system/devices/udev/oculus/default.nix
 delete mode 100644 modules/system/devices/udev/pdp/default.nix

diff --git a/modules/extras/variables/look/fonts/default.nix b/modules/extras/variables/look/fonts/default.nix
index 00e764b..c116762 100644
--- a/modules/extras/variables/look/fonts/default.nix
+++ b/modules/extras/variables/look/fonts/default.nix
@@ -6,7 +6,7 @@
   };
 
   config.look.fonts = {
-    main = ''Ubuntu'';
-    nerd = ''UbuntuMono Nerd Font'';
+    main = "Ubuntu";
+    nerd = "UbuntuMono Nerd Font";
   };
 }
diff --git a/modules/extras/variables/workspaces/default.nix b/modules/extras/variables/workspaces/default.nix
index b428cd5..8e8fd12 100644
--- a/modules/extras/variables/workspaces/default.nix
+++ b/modules/extras/variables/workspaces/default.nix
@@ -6,24 +6,24 @@
   };
 
   config.ws = {
-    w0 = ''0'';
-    w1 = ''1'';
-    w2 = ''2'';
-    w3 = ''3'';
-    w4 = ''4'';
-    w5 = ''5'';
-    w6 = ''6'';
-    w7 = ''7'';
-    w8 = ''8'';
-    w9 = ''9'';
-    w1a = ''I'';
-    w2a = ''II'';
-    w3a = ''III'';
-    w4a = ''IV'';
-    w5a = ''V'';
-    w6a = ''VI'';
-    w7a = ''VII'';
-    w8a = ''VIII'';
-    w9a = ''IX'';
+    w0 = "0";
+    w1 = "1";
+    w2 = "2";
+    w3 = "3";
+    w4 = "4";
+    w5 = "5";
+    w6 = "6";
+    w7 = "7";
+    w8 = "8";
+    w9 = "9";
+    w1a = "I";
+    w2a = "II";
+    w3a = "III";
+    w4a = "IV";
+    w5a = "V";
+    w6a = "VI";
+    w7a = "VII";
+    w8a = "VIII";
+    w9a = "IX";
   };
 }
diff --git a/modules/home/files/default.nix b/modules/home/files/default.nix
index f1dc17b..2a26b3c 100644
--- a/modules/home/files/default.nix
+++ b/modules/home/files/default.nix
@@ -3,6 +3,6 @@
     ".face".source = ./assets/pfp.png;
     ".assets/wallpapers".source = ./assets/wallpapers;
     ".assets/lockscreen".source = ./assets/lockscreen;
-    ".alsoftrc".text = ''drivers=pulse'';
+    ".alsoftrc".text = "drivers=pulse";
   };
 }
diff --git a/modules/home/settings/aliases/default.nix b/modules/home/settings/aliases/default.nix
index e251b01..bfa1bcd 100644
--- a/modules/home/settings/aliases/default.nix
+++ b/modules/home/settings/aliases/default.nix
@@ -15,13 +15,11 @@
     # Shortcuts
     ff = "clear && fastfetch";
     ip = "ip -c";
+    rm = "trash-rm";
     ls = "${pkgs.eza}/bin/eza -a --color=always --group-directories-first --icons";
     cat = "${pkgs.bat}/bin/bat --paging never";
     copycat = "wl-copy <";
     myip = "curl ifconfig.co";
     seneca = "ssh jhampton1@matrix.senecapolytechnic.ca";
-
-    # Deny
-    rm = ''echo "Use trash."; false'';
   };
 }
diff --git a/modules/system/accounts/groups/nfsShare/default.nix b/modules/system/accounts/groups/nfsShare/default.nix
index 81ca445..362f176 100644
--- a/modules/system/accounts/groups/nfsShare/default.nix
+++ b/modules/system/accounts/groups/nfsShare/default.nix
@@ -1,6 +1,4 @@
 { ... }:
 {
-  users.groups.nfsShare = {
-    gid = 983;
-  };
+  users.groups.nfsShare.gid = 983;
 }
diff --git a/modules/system/devices/boot/lanzaboote/default.nix b/modules/system/devices/boot/lanzaboote/default.nix
index bc7b636..c294482 100644
--- a/modules/system/devices/boot/lanzaboote/default.nix
+++ b/modules/system/devices/boot/lanzaboote/default.nix
@@ -12,13 +12,11 @@
   config = lib.mkIf config.system.lanzaboote.enable {
     boot = {
       loader.systemd-boot.enable = lib.mkForce false;
-
       lanzaboote = {
         enable = true;
         pkiBundle = "/etc/secureboot";
       };
     };
-
     environment.systemPackages = with pkgs; [ sbctl ];
   };
 }
diff --git a/modules/system/devices/default.nix b/modules/system/devices/default.nix
index c2e6050..0ccbcf4 100644
--- a/modules/system/devices/default.nix
+++ b/modules/system/devices/default.nix
@@ -5,7 +5,6 @@
     ./bluetooth
     ./boot
     ./disks
-    ./firmware
     ./networking
     ./printing
     ./udev
diff --git a/modules/system/devices/firmware/default.nix b/modules/system/devices/firmware/default.nix
deleted file mode 100644
index 8b6f5f3..0000000
--- a/modules/system/devices/firmware/default.nix
+++ /dev/null
@@ -1,4 +0,0 @@
-{ ... }:
-{
-  hardware.enableRedistributableFirmware = true;
-}
diff --git a/modules/system/devices/udev/default.nix b/modules/system/devices/udev/default.nix
index 8e43e33..6297ea2 100644
--- a/modules/system/devices/udev/default.nix
+++ b/modules/system/devices/udev/default.nix
@@ -1,7 +1,17 @@
-{ ... }:
+{ pkgs, ... }:
 {
-  imports = [
-    ./oculus
-    ./pdp
-  ];
+  services.udev = {
+    packages = [ 
+      (pkgs.writeTextFile {
+        name = "10-oculus.rules";
+        text = ''KERNEL=="hidraw*", ATTRS{idVendor}=="0e6f", ATTRS{idProduct}=="0184", MODE="0660", TAG+="uaccess"'';
+        destination = "/etc/udev/rules.d/10-oculus.rules";
+      })
+      (pkgs.writeTextFile {
+        name = "10-pdp.rules";
+        text = ''SUBSYSTEM=="usb", ATTR{idVendor}=="2833", MODE="0666"'';
+        destination = "/etc/udev/rules.d/10-pdp.rules";
+      })
+    ];
+  };
 }
diff --git a/modules/system/devices/udev/oculus/default.nix b/modules/system/devices/udev/oculus/default.nix
deleted file mode 100644
index 9789b9e..0000000
--- a/modules/system/devices/udev/oculus/default.nix
+++ /dev/null
@@ -1,12 +0,0 @@
-{ pkgs, ... }:
-{
-  services.udev = {
-    packages = [ 
-      (pkgs.writeTextFile {
-        name = "10-oculus.rules";
-        text = ''KERNEL=="hidraw*", ATTRS{idVendor}=="0e6f", ATTRS{idProduct}=="0184", MODE="0660", TAG+="uaccess"'';
-        destination = "/etc/udev/rules.d/10-oculus.rules";
-      })
-    ];
-  };
-}
diff --git a/modules/system/devices/udev/pdp/default.nix b/modules/system/devices/udev/pdp/default.nix
deleted file mode 100644
index 15d4e6a..0000000
--- a/modules/system/devices/udev/pdp/default.nix
+++ /dev/null
@@ -1,12 +0,0 @@
-{ pkgs, ... }:
-{
-  services.udev = {
-    packages = [
-      (pkgs.writeTextFile {
-        name = "10-pdp.rules";
-        text = ''SUBSYSTEM=="usb", ATTR{idVendor}=="2833", MODE="0666"'';
-        destination = "/etc/udev/rules.d/10-pdp.rules";
-      })
-    ];
-  };
-}
diff --git a/modules/system/programs/gaming/default.nix b/modules/system/programs/gaming/default.nix
index 7a4f414..18c109f 100644
--- a/modules/system/programs/gaming/default.nix
+++ b/modules/system/programs/gaming/default.nix
@@ -6,6 +6,6 @@
       settings.general.renice = 10;
     };
 
-    hardware.steam-hardware.enable = config.system.desktop.enable;
+    hardware.steam-hardware.enable = true;
   };
 }
diff --git a/modules/system/services/server/fileserver/local/samba/default.nix b/modules/system/services/server/fileserver/local/samba/default.nix
index f3df7d5..6934cda 100644
--- a/modules/system/services/server/fileserver/local/samba/default.nix
+++ b/modules/system/services/server/fileserver/local/samba/default.nix
@@ -1,8 +1,8 @@
-{ config, ... }:
+{ config, lib, ... }:
 {
-  services = {
+  services = lib.mkIf config.system.server.enable {
     samba = {
-      enable = config.system.server.enable;
+      enable = true;
       securityType = "user";
       openFirewall = true;
       settings = {
@@ -20,7 +20,7 @@
 
     # Advertise to Windows
     samba-wsdd = {
-      enable = config.services.samba.enable;
+      enable = true;
       openFirewall = true;
     };
   };
diff --git a/modules/system/services/server/icecast/liquidsoap/jimbops/default.nix b/modules/system/services/server/icecast/liquidsoap/jimbops/default.nix
index ecc2ac7..2cce949 100644
--- a/modules/system/services/server/icecast/liquidsoap/jimbops/default.nix
+++ b/modules/system/services/server/icecast/liquidsoap/jimbops/default.nix
@@ -1,30 +1,32 @@
-{ pkgs, config, ... }:
+{ pkgs, lib, config, ... }:
 {
-  services.liquidsoap.streams.jimbops = pkgs.writeText "liquidstream1" ''
-    settings.log.stdout.set(true)
-    settings.init.allow_root.set(true)
-    settings.scheduler.fast_queues.set(2)
-    
-    jimbops = mksafe(playlist(mode='randomize', reload=1, reload_mode="rounds", "/export/JimboNFS/Music/JimBops"))
-    jimbops_fallback = fallback([jimbops, jimbops])
-    
-    output.icecast(
-      %ffmpeg(format="ogg", %audio(codec="libvorbis", samplerate=48000, b="256k", channels=2)),
-      host="127.0.0.1",
-      port=265,
-      password="${config.secrets.castSourcePass}",
-      encoding = "UTF-8",
+  services.liquidsoap.streams = lib.mkIf config.services.icecast.enable {
+    jimbops = pkgs.writeText "liquidstream1" ''
+      settings.log.stdout.set(true)
+      settings.init.allow_root.set(true)
+      settings.scheduler.fast_queues.set(2)
+      
+      jimbops = mksafe(playlist(mode='randomize', reload=1, reload_mode="rounds", "/export/JimboNFS/Music/JimBops"))
+      jimbops_fallback = fallback([jimbops, jimbops])
+      
+      output.icecast(
+        %ffmpeg(format="ogg", %audio(codec="libvorbis", samplerate=48000, b="256k", channels=2)),
+        host="127.0.0.1",
+        port=265,
+        password="${config.secrets.castSourcePass}",
+        encoding = "UTF-8",
 
-      radio="JimBops Radio",
-      genre = "Anything",
-      description="Music gathered by me, Jimbo.",
-      website="https://icecast.${config.domains.jim1}",
-      url="https://icecast.${config.domains.jim1}/jimbops.opus",
-      mount="jimbops.opus",
-      icy_metadata=["artist", "title"],
-      public=true,
+        radio="JimBops Radio",
+        genre = "Anything",
+        description="Music gathered by me, Jimbo.",
+        website="https://icecast.${config.domains.jim1}",
+        url="https://icecast.${config.domains.jim1}/jimbops.opus",
+        mount="jimbops.opus",
+        icy_metadata=["artist", "title"],
+        public=true,
 
-      jimbops_fallback
-    )
-  '';
+        jimbops_fallback
+      )
+    '';
+  };
 }
diff --git a/modules/system/services/server/icecast/liquidsoap/jimscrapped/default.nix b/modules/system/services/server/icecast/liquidsoap/jimscrapped/default.nix
index af6907a..0c51482 100644
--- a/modules/system/services/server/icecast/liquidsoap/jimscrapped/default.nix
+++ b/modules/system/services/server/icecast/liquidsoap/jimscrapped/default.nix
@@ -1,30 +1,32 @@
-{ pkgs, config, ... }:
+{ pkgs, lib, config, ... }:
 {
-  services.liquidsoap.streams.jimscrapped = pkgs.writeText "liquidstream2" ''
-    settings.log.stdout.set(true)
-    settings.init.allow_root.set(true)
-    settings.scheduler.fast_queues.set(2)
-    
-    jimscrapped = mksafe(playlist(mode='randomize', reload=1, reload_mode="rounds", "/export/JimboNFS/Music/JimScrapped"))
-    jimscrapped_fallback = fallback([jimscrapped, jimscrapped])
-    
-    output.icecast(
-      %ffmpeg(format="ogg", %audio(codec="libvorbis", samplerate=48000, b="256k", channels=2)),
-      host="127.0.0.1",
-      port=265,
-      password="${config.secrets.castSourcePass}",
-      encoding = "UTF-8",
+  services.liquidsoap.streams = lib.mkIf config.services.icecast.enable {
+    jimscrapped = pkgs.writeText "liquidstream2" ''
+      settings.log.stdout.set(true)
+      settings.init.allow_root.set(true)
+      settings.scheduler.fast_queues.set(2)
+      
+      jimscrapped = mksafe(playlist(mode='randomize', reload=1, reload_mode="rounds", "/export/JimboNFS/Music/JimScrapped"))
+      jimscrapped_fallback = fallback([jimscrapped, jimscrapped])
+      
+      output.icecast(
+        %ffmpeg(format="ogg", %audio(codec="libvorbis", samplerate=48000, b="256k", channels=2)),
+        host="127.0.0.1",
+        port=265,
+        password="${config.secrets.castSourcePass}",
+        encoding = "UTF-8",
 
-      radio="Jimbo's Scrap",
-      genre = "Scrapped",
-      description="Music canned from the main radio.",
-      website="https://icecast.${config.domains.jim1}",
-      url="https://icecast.${config.domains.jim1}/jimscrapped.opus",
-      mount="jimscrapped.opus",
-      icy_metadata=["artist", "title"],
-      public=true,
+        radio="Jimbo's Scrap",
+        genre = "Scrapped",
+        description="Music canned from the main radio.",
+        website="https://icecast.${config.domains.jim1}",
+        url="https://icecast.${config.domains.jim1}/jimscrapped.opus",
+        mount="jimscrapped.opus",
+        icy_metadata=["artist", "title"],
+        public=true,
 
-      jimscrapped_fallback
-    )
-  '';
+        jimscrapped_fallback
+      )
+    '';
+  };
 }
diff --git a/modules/system/services/server/mailserver/simplenix/default.nix b/modules/system/services/server/mailserver/simplenix/default.nix
index 8aad38c..f8252e7 100644
--- a/modules/system/services/server/mailserver/simplenix/default.nix
+++ b/modules/system/services/server/mailserver/simplenix/default.nix
@@ -6,7 +6,7 @@
   ];
 
   mailserver = rec {
-    enable = true;
+    enable = config.system.mailserver.enable;
     domains = [
       "${config.domains.jim1}"
       "${config.domains.jim2}"
@@ -25,7 +25,7 @@
       organizationName = "Jimbo's Files";
     };
         
-    # Passwords generated with 'mkpasswd -sm bcrypt'
+    # Passwords made with 'mkpasswd -sm bcrypt'
     loginAccounts = {
       "noreply@${config.domains.jim1}" = {
         hashedPasswordFile = pkgs.writeText "noreply" config.secrets.noreplyMailHash;
diff --git a/modules/system/services/server/mailserver/simplenix/nginx/default.nix b/modules/system/services/server/mailserver/simplenix/nginx/default.nix
index e0a30d5..da75c28 100644
--- a/modules/system/services/server/mailserver/simplenix/nginx/default.nix
+++ b/modules/system/services/server/mailserver/simplenix/nginx/default.nix
@@ -1,6 +1,6 @@
 { pkgs, config, ... }: 
 {
-  services.nginx.virtualHosts."mx.${config.domains.jim1}" =  {
+  services.nginx.virtualHosts."mx.${config.domains.jim1}" = lib.mkIf config.mailserver.enable {
     enableACME = true;
     forceSSL = true;
     locations."/" = {