From 5a0e4e630a8734d02eee7e52754cd695a4a8ebc3 Mon Sep 17 00:00:00 2001
From: ahuston-0 <aliceghuston@gmail.com>
Date: Tue, 28 May 2024 17:28:22 -0400
Subject: [PATCH] migrate packages to non-server, enable hyprland config

Signed-off-by: ahuston-0 <aliceghuston@gmail.com>
---
 users/alice/home.nix              | 51 ++++++++-----------------------
 users/alice/home/hypr/default.nix |  3 ++
 users/alice/non-server.nix        |  3 ++
 3 files changed, 18 insertions(+), 39 deletions(-)

diff --git a/users/alice/home.nix b/users/alice/home.nix
index 1170cd0..1f1c4a8 100644
--- a/users/alice/home.nix
+++ b/users/alice/home.nix
@@ -7,12 +7,17 @@
 }:
 
 {
-  imports = [
-    ./home/zsh.nix
-    ./home/doom
-    ./home/gammastep.nix
-    ./home/git.nix
-  ] ++ lib.optionals (!machineConfig.server) [ ./non-server.nix ];
+  imports =
+    [
+      ./home/zsh.nix
+      ./home/doom
+      ./home/gammastep.nix
+      ./home/git.nix
+    ]
+    ++ lib.optionals (!machineConfig.server) [
+      ./home/hypr
+      ./non-server.nix
+    ];
 
   home = {
     # # Adds the 'hello' command to your environment. It prints a friendly
@@ -35,16 +40,8 @@
     username = "alice";
     homeDirectory = "/home/alice";
     packages = with pkgs; [
-      cmake
-      shellcheck
-      glslang
       gnumake
-      pipenv
       python312
-      python312Packages.isort
-      python312Packages.pynose
-      python312Packages.pytest
-      shellcheck
 
       # useful tools
       ncdu
@@ -55,44 +52,20 @@
 
       # Rust packages
       bat
-      trunk
-      wasm-pack
-      cargo-watch
-      #pkgs.cargo-tarpaulin
-      cargo-generate
-      cargo-audit
       cargo-update
       diesel-cli
-      gitoxide
       tealdeer
       helix
 
       # nix specific packages
-      nil
-      nixfmt-rfc-style
-      nix-init
       nix-output-monitor
       nix-prefetch
       nix-tree
-
-      # markdown
-      nodePackages.markdownlint-cli
+      nh
 
       # doom emacs dependencies
       fd
       ripgrep
-      yaml-language-server
-      nodePackages.typescript-language-server
-      nodePackages.bash-language-server
-      pyright
-      cmake-language-server
-      multimarkdown
-      rustc
-      cargo
-      rust-analyzer
-      clang
-      clang-tools
-      wakatime
 
       # audit
       lynis
diff --git a/users/alice/home/hypr/default.nix b/users/alice/home/hypr/default.nix
index be98865..09f1d5d 100644
--- a/users/alice/home/hypr/default.nix
+++ b/users/alice/home/hypr/default.nix
@@ -6,4 +6,7 @@
 }:
 
 {
+  xdg.configFile = {
+    "hypr/hyprland.conf".source = ./hyprland.conf;
+  };
 }
diff --git a/users/alice/non-server.nix b/users/alice/non-server.nix
index 55938dd..bc30a7f 100644
--- a/users/alice/non-server.nix
+++ b/users/alice/non-server.nix
@@ -21,10 +21,13 @@
     cargo-watch
     cargo-generate
     diesel-cli
+    cargo-audit
+    gitoxide
 
     # nix tools
     nil
     nixfmt-rfc-style
+    nix-init
 
     # markdown
     nodePackages.markdownlint-cli