From ec4a9cf623fb1a2748346e88ac7505b8d497ebd8 Mon Sep 17 00:00:00 2001
From: ahuston-0 <aliceghuston@gmail.com>
Date: Tue, 21 May 2024 23:34:58 -0400
Subject: [PATCH] fix statix issue, migrate non-essential packages to
 non-server

Signed-off-by: ahuston-0 <aliceghuston@gmail.com>
---
 systems/artemision/desktop.nix | 38 ++++++++++++++++--------------
 users/alice/home/waybar.nix    |  5 ++--
 users/alice/non-server.nix     | 43 ++++++++++++++++++++++++++++++++++
 3 files changed, 65 insertions(+), 21 deletions(-)

diff --git a/systems/artemision/desktop.nix b/systems/artemision/desktop.nix
index 187dc25..3f283ad 100644
--- a/systems/artemision/desktop.nix
+++ b/systems/artemision/desktop.nix
@@ -10,25 +10,27 @@
   # Optional, hint electron apps to use wayland:
   environment.sessionVariables.NIXOS_OZONE_WL = "1";
 
-  services.xserver.enable = true;
-  services.xserver.displayManager.session = [
-    {
-      manage = "desktop";
-      name = "hyprland";
-      start = ''
-        bash ${./hypr/wrappedhl} &
-        waitPID=$!
-      '';
-    }
-  ];
-  services.displayManager.sddm = {
-    enable = true;
-    wayland.enable = true;
-  };
+  services = {
+    xserver.enable = true;
+    xserver.displayManager.session = [
+      {
+        manage = "desktop";
+        name = "hyprland";
+        start = ''
+          bash ${./hypr/wrappedhl} &
+          waitPID=$!
+        '';
+      }
+    ];
+    displayManager.sddm = {
+      enable = true;
+      wayland.enable = true;
+    };
 
-  services.dbus = {
-    enable = true;
-    implementation = "broker";
+    dbus = {
+      enable = true;
+      implementation = "broker";
+    };
   };
 
   programs.gnupg.agent = {
diff --git a/users/alice/home/waybar.nix b/users/alice/home/waybar.nix
index a768fd6..77d6d11 100644
--- a/users/alice/home/waybar.nix
+++ b/users/alice/home/waybar.nix
@@ -1,6 +1,5 @@
-{ ... }:
-
-{
+{ lib, machineConfig, ... }:
+lib.mkIf (!machineConfig.server) {
   programs.waybar = {
     enable = true;
     #settings = builtins.fromJSON (import ./waybar.json);
diff --git a/users/alice/non-server.nix b/users/alice/non-server.nix
index b834c58..55938dd 100644
--- a/users/alice/non-server.nix
+++ b/users/alice/non-server.nix
@@ -5,4 +5,47 @@
     enable = true;
     package = pkgs.emacs29-pgtk;
   };
+  home.packages = with pkgs; [
+    cmake
+    shellcheck
+    glslang
+    pipenv
+    python312Packages.isort
+    python312Packages.pynose
+    python312Packages.pytest
+
+    # rust tools
+    trunk
+    wasm-pack
+    cargo-tarpaulin
+    cargo-watch
+    cargo-generate
+    diesel-cli
+
+    # nix tools
+    nil
+    nixfmt-rfc-style
+
+    # markdown
+    nodePackages.markdownlint-cli
+
+    # doom emacs dependencies
+    yaml-language-server
+    nodePackages.typescript-language-server
+    nodePackages.bash-language-server
+    pyright
+    cmake-language-server
+    multimarkdown
+    rustc
+    cargo
+    rust-analyzer
+    clang
+    clang-tools
+    wakatime
+
+    # dependencies for nix-dotfiles/hydra-check-action
+    nodejs_20
+    nodePackages.prettier
+    treefmt
+  ];
 }