From 2458e38dfb13007884732f1faa3b35f7fa5c08ef Mon Sep 17 00:00:00 2001
From: pagedMov <pagedmov@gmail.com>
Date: Sat, 2 Nov 2024 12:15:46 -0400
Subject: [PATCH] some more server-related tune-ups

---
 hosts/server/home.nix             |  5 +++++
 modules/sys/hardware/network.nix  | 10 +++-------
 modules/sys/software/programs.nix | 10 +++++-----
 3 files changed, 13 insertions(+), 12 deletions(-)

diff --git a/hosts/server/home.nix b/hosts/server/home.nix
index 714da4d..bf29c0a 100644
--- a/hosts/server/home.nix
+++ b/hosts/server/home.nix
@@ -24,12 +24,14 @@ in {
         imports = [ movModules ];
         autojumpConfig.enable            = true;
         btopConfig.enable                = true;
+        starshipConfig.enable            = true;
         ezaConfig.enable                 = true;
         fzfConfig.enable                 = true;
         gitConfig.enable                 = true;
         yaziConfig.enable                = true;
         zshConfig.enable                 = true;
         batConfig.enable                 = true;
+        userPkgs.enable                  = true;
 
         movScripts = {
           enable = true;
@@ -38,6 +40,9 @@ in {
             enable = true;
             toolbelt.enable = false;
           };
+          hyprlandControls = {
+            scheck.enable = true;
+          };
         };
 
         home = {
diff --git a/modules/sys/hardware/network.nix b/modules/sys/hardware/network.nix
index fa2ded1..85638ac 100644
--- a/modules/sys/hardware/network.nix
+++ b/modules/sys/hardware/network.nix
@@ -1,16 +1,12 @@
-{host, lib, config, ...}: let
-  desktop = host == "oganesson";
-in {
+{host, lib, config, ...}:
+{
   options = {
     networkModule.enable = lib.mkEnableOption "enables network configuration";
   };
   config = lib.mkIf config.networkModule.enable {
     networking = {
       networkmanager.enable = true;
-      hostName =
-        if desktop
-        then "oganesson"
-        else "mercury";
+      hostName = "${host}";
       hosts = {
         "192.168.1.201" = ["xenon"];
         "192.168.1.111" = ["argon"];
diff --git a/modules/sys/software/programs.nix b/modules/sys/software/programs.nix
index e49f20b..2eab7e5 100644
--- a/modules/sys/software/programs.nix
+++ b/modules/sys/software/programs.nix
@@ -4,18 +4,18 @@
   };
   config = lib.mkIf config.sysProgs.enable {
     programs = {
-      hyprland.enable = true;
-      zsh.enable = true;
+      hyprland.enable = lib.mkDefault true;
+      zsh.enable = lib.mkDefault true;
       nix-ld = {
-        enable = true;
+        enable = lib.mkDefault true;
         libraries = with pkgs; [
           stdenv.cc.cc
           ffmpeg-full
         ];
       };
       gnupg.agent = {
-        enable = true;
-        enableSSHSupport = true;
+        enable = lib.mkDefault true;
+        enableSSHSupport = lib.mkDefault true;
       };
     };
   };